Fix issues from code review
Godwin Asuquo committed
Mar 2, 2023 at 17:13 UTC
15237d5f799953c7c317325869603d6ce1c328ac
9 files changed
+18
-17
lib/core/backup_service.dart
+5
-5
@@ -217,7 +217,7 @@ class BackupService {
217
final fiatApiMode = data[PreferencesKey.currentFiatApiModeKey] as int?;
218
final currentPinLength = data[PreferencesKey.currentPinLength] as int?;
219
final currentTheme = data[PreferencesKey.currentTheme] as int?;
220
- final disableExchange = data[PreferencesKey.disableExchangeKey] as bool?;
220
+ final exchangeStatus = data[PreferencesKey.exchangeStatusKey] as bool?;
221
final currentDefaultSettingsMigrationVersion = data[PreferencesKey.currentDefaultSettingsMigrationVersion] as int?;
222
final moneroTransactionPriority = data[PreferencesKey.moneroTransactionPriority] as int?;
223
final bitcoinTransactionPriority = data[PreferencesKey.bitcoinTransactionPriority] as int?;
@@ -280,9 +280,9 @@ class BackupService {
280
await _sharedPreferences.setInt(
281
PreferencesKey.currentTheme, currentTheme);
282
283
- if (disableExchange != null)
283
+ if (exchangeStatus != null)
284
await _sharedPreferences.setBool(
285
- PreferencesKey.disableExchangeKey, disableExchange);
285
+ PreferencesKey.exchangeStatusKey, exchangeStatus);
286
287
if (currentDefaultSettingsMigrationVersion != null)
288
await _sharedPreferences.setInt(
@@ -431,8 +431,8 @@ class BackupService {
431
_sharedPreferences.getInt(PreferencesKey.displayActionListModeKey),
432
PreferencesKey.currentTheme:
433
_sharedPreferences.getInt(PreferencesKey.currentTheme),
434
- PreferencesKey.disableExchangeKey:
435
- _sharedPreferences.getBool(PreferencesKey.disableExchangeKey),
434
+ PreferencesKey.exchangeStatusKey:
435
+ _sharedPreferences.getBool(PreferencesKey.exchangeStatusKey),
436
PreferencesKey.currentDefaultSettingsMigrationVersion: _sharedPreferences
437
.getInt(PreferencesKey.currentDefaultSettingsMigrationVersion),
438
PreferencesKey.bitcoinTransactionPriority:
lib/exchange/trocador/trocador_exchange_provider.dart
+1
-1
@@ -308,7 +308,7 @@ class TrocadorExchangeProvider extends ExchangeProvider {
308
return onionApiAuthority;
309
}
310
311
- final uri = Uri.https(onionApiAuthority, '/api/trade');
311
+ final uri = Uri.https(onionApiAuthority, tradePath);
312
await get(uri);
313
314
return onionApiAuthority;
lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+1
-1
@@ -70,7 +70,7 @@ class _AdvancedPrivacySettingsBodyState extends State<AdvancedPrivacySettingsBod
70
items: ExchangeApiMode.all,
71
selectedItem: widget.privacySettingsViewModel.exchangeStatus,
72
onItemSelected: (ExchangeApiMode mode) =>
73
- widget.privacySettingsViewModel.setEnableExchange(mode),
73
+ widget.privacySettingsViewModel.setExchangeApiMode(mode),
74
),
75
);
76
}
lib/src/screens/settings/privacy_page.dart
+1
-1
@@ -36,7 +36,7 @@ class PrivacyPage extends BasePage {
36
title: S.current.exchange,
37
items: ExchangeApiMode.all,
38
selectedItem: _privacySettingsViewModel.exchangeStatus,
39
- onItemSelected: (ExchangeApiMode mode) => _privacySettingsViewModel.setEnableExchange(mode),
39
+ onItemSelected: (ExchangeApiMode mode) => _privacySettingsViewModel.setExchangeApiMode(mode),
40
),
41
),
42
SettingsSwitcherCell(
lib/view_model/advanced_privacy_settings_view_model.dart
+1
-1
@@ -38,7 +38,7 @@ abstract class AdvancedPrivacySettingsViewModelBase with Store {
38
}
39
40
@action
41
- void setEnableExchange(ExchangeApiMode value) {
41
+ void setExchangeApiMode(ExchangeApiMode value) {
42
_settingsStore.exchangeStatus = value;
43
}
44
lib/view_model/dashboard/dashboard_view_model.dart
+2
-1
@@ -1,3 +1,4 @@
1
+import 'package:cake_wallet/entities/exchange_api_mode.dart';
2
import 'package:cake_wallet/entities/fiat_api_mode.dart';
3
import 'package:cake_wallet/wallet_type_utils.dart';
4
import 'package:cw_core/transaction_history.dart';
@@ -274,7 +275,7 @@ abstract class DashboardViewModelBase with Store {
275
settingsStore.shouldShowYatPopup = shouldShow;
276
277
@computed
277
- bool get isEnabledExchangeAction => settingsStore.exchangeStatus != FiatApiMode.disabled;
278
+ bool get isEnabledExchangeAction => settingsStore.exchangeStatus != ExchangeApiMode.disabled;
279
280
@observable
281
bool hasExchangeAction;
lib/view_model/exchange/exchange_view_model.dart
+6
-5
@@ -2,6 +2,7 @@ import 'dart:async';
2
import 'dart:collection';
3
import 'dart:convert';
4
5
+import 'package:cake_wallet/entities/exchange_api_mode.dart';
6
import 'package:cake_wallet/entities/fiat_api_mode.dart';
7
import 'package:cake_wallet/entities/preferences_key.dart';
8
import 'package:cake_wallet/exchange/sideshift/sideshift_exchange_provider.dart';
@@ -56,7 +57,7 @@ abstract class ExchangeViewModelBase with Store {
57
isDepositAddressEnabled = false,
58
isReceiveAddressEnabled = false,
59
isReceiveAmountEditable = false,
59
- _providerUseTorOnly = false,
60
+ _useTorOnly = false,
61
receiveCurrencies = <CryptoCurrency>[],
62
depositCurrencies = <CryptoCurrency>[],
63
limits = Limits(min: 0, max: 0),
@@ -66,7 +67,7 @@ abstract class ExchangeViewModelBase with Store {
67
depositCurrency = wallet.currency,
68
providerList = [],
69
selectedProviders = ObservableList<ExchangeProvider>() {
69
- _providerUseTorOnly = _settingsStore.exchangeStatus == FiatApiMode.torOnly;
70
+ _useTorOnly = _settingsStore.exchangeStatus == ExchangeApiMode.torOnly;
71
_setProviders();
72
const excludeDepositCurrencies = [CryptoCurrency.btt, CryptoCurrency.nano];
73
const excludeReceiveCurrencies = [CryptoCurrency.xlm, CryptoCurrency.xrp,
@@ -123,7 +124,7 @@ abstract class ExchangeViewModelBase with Store {
124
_calculateBestRate();
125
});
126
}
126
- bool _providerUseTorOnly;
127
+ bool _useTorOnly;
128
final WalletBase wallet;
129
final Box<Trade> trades;
130
final ExchangeTemplateStore _exchangeTemplateStore;
@@ -134,7 +135,7 @@ abstract class ExchangeViewModelBase with Store {
135
ChangeNowExchangeProvider(),
136
SideShiftExchangeProvider(),
137
SimpleSwapExchangeProvider(),
137
- TrocadorExchangeProvider(useTorOnly: _providerUseTorOnly),
138
+ TrocadorExchangeProvider(useTorOnly: _useTorOnly),
139
];
140
141
@observable
@@ -696,7 +697,7 @@ abstract class ExchangeViewModelBase with Store {
697
}
698
699
void _setProviders(){
699
- if (_settingsStore.exchangeStatus == FiatApiMode.torOnly) {
700
+ if (_settingsStore.exchangeStatus == ExchangeApiMode.torOnly) {
701
providerList = _allProviders.where((provider) => provider.supportsOnionAddress).toList();
702
} else {
703
providerList = _allProviders;
lib/view_model/settings/privacy_settings_view_model.dart
+1
-1
@@ -25,7 +25,7 @@ abstract class PrivacySettingsViewModelBase with Store {
25
void setShouldSaveRecipientAddress(bool value) => _settingsStore.shouldSaveRecipientAddress = value;
26
27
@action
28
- void setEnableExchange(ExchangeApiMode value) => _settingsStore.exchangeStatus = value;
28
+ void setExchangeApiMode(ExchangeApiMode value) => _settingsStore.exchangeStatus = value;
29
30
@action
31
void setFiatMode(bool value) {
pubspec_base.yaml
-1
@@ -56,7 +56,6 @@ dependencies:
56
archive: ^3.3.0
57
cryptography: ^2.0.5
58
file_picker: ^4.6.1
59
- file: ^6.1.4
59
unorm_dart: ^0.2.0
60
# check unorm_dart for usage and for replace
61
permission_handler: ^10.0.0