@samitouri / QOSAMI-cakewallet-1 / commits / 55b37164d

- Make getters to ease attribute access - Add the old 'disable_fiat' translation - rename getters to be more bool like names

- Make getters to ease attribute access - Add the old 'disable_fiat' translation - rename getters to be more bool like names

OmarHatem committed Dec 7, 2022 at 22:07 UTC 55b37164dc7149875f68dba11738debdc67d4291
25 files changed +51 -56
lib/entities/default_settings_migration.dart
-17
@@ -20,8 +20,6 @@ import 'package:cake_wallet/exchange/trade.dart';
20 import 'package:encrypt/encrypt.dart' as encrypt;
21 import 'package:collection/collection.dart';
22
23 -import 'fiat_api_mode.dart';
24 -
23 const newCakeWalletMoneroUri = 'xmr-node.cakewallet.com:18081';
24 const cakeWalletBitcoinElectrumUri = 'electrum.cakewallet.com:50002';
25 const cakeWalletLitecoinElectrumUri = 'ltc-electrum.cakewallet.com:50002';
@@ -63,9 +61,6 @@ Future defaultSettingsMigration(
61 await sharedPreferences.setInt(
62 PreferencesKey.currentBalanceDisplayModeKey,
63 BalanceDisplayMode.availableBalance.raw);
66 - await sharedPreferences.setInt(
67 - PreferencesKey.currentFiatApiModeKey,
68 - FiatApiMode.enabled.raw);
64 await sharedPreferences.setBool('save_recipient_address', true);
65 await resetToDefault(nodes);
66 await changeMoneroCurrentNodeToDefault(
@@ -144,10 +139,6 @@ Future defaultSettingsMigration(
139 await addOnionNode(nodes);
140 break;
141
147 - case 19:
148 - await updateFiatApiModes(sharedPreferences);
149 - break;
150 -
142 default:
143 break;
144 }
@@ -358,14 +349,6 @@ Future<void> updateDisplayModes(SharedPreferences sharedPreferences) async {
349 PreferencesKey.currentBalanceDisplayModeKey, balanceDisplayMode);
350 }
351
361 -Future<void> updateFiatApiModes(SharedPreferences sharedPreferences) async {
362 - final currentFiatApiMode =
363 - sharedPreferences.getInt(PreferencesKey.currentFiatApiModeKey) ?? -1;
364 - final fiatApiMode = currentFiatApiMode < 1 ? 2 : 1;
365 - await sharedPreferences.setInt(
366 - PreferencesKey.currentFiatApiModeKey, fiatApiMode);
367 -}
368 -
352 Future<void> generateBackupPassword(FlutterSecureStorage secureStorage) async {
353 final key = generateStoreKeyFor(key: SecretStoreKey.backupPassword);
354
lib/src/screens/dashboard/widgets/transactions_page.dart
+1 -1
@@ -58,7 +58,7 @@ class TransactionsPage extends StatelessWidget {
58 .format(transaction.date),
59 formattedAmount: item.formattedCryptoAmount,
60 formattedFiatAmount:
61 - dashboardViewModel.balanceViewModel.disableFiat
61 + dashboardViewModel.balanceViewModel.isFiatDisabled
62 ? '' : item.formattedFiatAmount,
63 isPending: transaction.isPending));
64 }
lib/src/screens/exchange_trade/exchange_trade_page.dart
+1 -4
@@ -74,12 +74,9 @@ class ExchangeTradePage extends BasePage {
74 }
75
76 class ExchangeTradeForm extends StatefulWidget {
77 - ExchangeTradeForm(this.exchangeTradeViewModel)
78 - : disableFiat =
79 - exchangeTradeViewModel.sendViewModel.balanceViewModel.disableFiat;
77 + ExchangeTradeForm(this.exchangeTradeViewModel);
78
79 final ExchangeTradeViewModel exchangeTradeViewModel;
82 - final bool disableFiat;
80
81 @override
82 ExchangeTradeState createState() => ExchangeTradeState();
lib/src/screens/send/widgets/send_card.dart
+3 -3
@@ -331,8 +331,8 @@ class SendCardState extends State<SendCard>
331 ],
332 ),
333 )),
334 - if (!sendViewModel.balanceViewModel.disableFiat)
335 - Padding(
334 + if (!sendViewModel.isFiatDisabled)
335 + Padding(
336 padding: const EdgeInsets.only(top: 20),
337 child: BaseTextFormField(
338 focusNode: fiatAmountFocus,
@@ -438,7 +438,7 @@ class SendCardState extends State<SendCard>
438 Padding(
439 padding:
440 EdgeInsets.only(top: 5),
441 - child: sendViewModel.balanceViewModel.disableFiat
441 + child: sendViewModel.isFiatDisabled
442 ? const SizedBox(height: 14)
443 : Text(output
444 .estimatedFeeFiatAmount
lib/src/screens/settings/privacy_page.dart
+2 -5
@@ -1,12 +1,9 @@
1 import 'package:cake_wallet/generated/i18n.dart';
2 import 'package:cake_wallet/src/screens/base_page.dart';
3 -import 'package:cake_wallet/src/screens/settings/widgets/settings_choices_cell.dart';
3 import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
4 import 'package:cake_wallet/view_model/settings/privacy_settings_view_model.dart';
5 import 'package:flutter/material.dart';
6 import 'package:flutter_mobx/flutter_mobx.dart';
8 -import 'package:cake_wallet/view_model/settings/choices_list_item.dart';
9 -import 'package:cake_wallet/entities/fiat_api_mode.dart';
7
8 class PrivacyPage extends BasePage {
9 PrivacyPage(this._privacySettingsViewModel);
@@ -25,8 +22,8 @@ class PrivacyPage extends BasePage {
22 mainAxisSize: MainAxisSize.min,
23 children: [
24 SettingsSwitcherCell(
28 - title: S.current.fiat_api,
29 - value: _privacySettingsViewModel.fiatApiMode,
25 + title: S.current.disable_fiat,
26 + value: _privacySettingsViewModel.isFiatDisabled,
27 onValueChange: (BuildContext context, bool value) {
28 _privacySettingsViewModel.setFiatMode(value);
29 }),
lib/store/settings_store.dart
+1 -1
@@ -237,7 +237,7 @@ abstract class SettingsStoreBase with Store {
237 sharedPreferences.getBool(PreferencesKey.shouldSaveRecipientAddressKey) ?? false;
238 final currentFiatApiMode = FiatApiMode.deserialize(
239 raw: sharedPreferences
240 - .getInt(PreferencesKey.currentFiatApiModeKey)!);
240 + .getInt(PreferencesKey.currentFiatApiModeKey) ?? FiatApiMode.enabled.raw);
241 final allowBiometricalAuthentication = sharedPreferences
242 .getBool(PreferencesKey.allowBiometricalAuthenticationKey) ??
243 false;
lib/view_model/dashboard/balance_view_model.dart
+5 -5
@@ -72,7 +72,7 @@ abstract class BalanceViewModelBase with Store {
72 BalanceDisplayMode get savedDisplayMode => settingsStore.balanceDisplayMode;
73
74 @computed
75 - bool get disableFiat => settingsStore.fiatApiMode == FiatApiMode.disabled;
75 + bool get isFiatDisabled => settingsStore.fiatApiMode == FiatApiMode.disabled;
76
77 @computed
78 String get asset {
@@ -183,8 +183,8 @@ abstract class BalanceViewModelBase with Store {
183 return MapEntry(key, BalanceRecord(
184 availableBalance: '---',
185 additionalBalance: '---',
186 - fiatAdditionalBalance: disableFiat ? '' : '---',
187 - fiatAvailableBalance: disableFiat ? '' : '---',
186 + fiatAdditionalBalance: isFiatDisabled ? '' : '---',
187 + fiatAvailableBalance: isFiatDisabled ? '' : '---',
188 asset: key,
189 formattedAssetTitle: _formatterAsset(key)));
190 }
@@ -195,13 +195,13 @@ abstract class BalanceViewModelBase with Store {
195 // throw Exception('Price is null for: $key');
196 // }
197
198 - final additionalFiatBalance = disableFiat ? '' : (fiatCurrency.toString()
198 + final additionalFiatBalance = isFiatDisabled ? '' : (fiatCurrency.toString()
199 + ' '
200 + _getFiatBalance(
201 price: price,
202 cryptoAmount: value.formattedAdditionalBalance));
203
204 - final availableFiatBalance = disableFiat ? '' : (fiatCurrency.toString()
204 + final availableFiatBalance = isFiatDisabled ? '' : (fiatCurrency.toString()
205 + ' '
206 + _getFiatBalance(
207 price: price,
lib/view_model/exchange/exchange_trade_view_model.dart
+2 -2
@@ -74,13 +74,13 @@ abstract class ExchangeTradeViewModelBase with Store {
74
75 @computed
76 String get pendingTransactionFiatAmountValueFormatted =>
77 - sendViewModel.balanceViewModel.disableFiat
77 + sendViewModel.isFiatDisabled
78 ? '' : sendViewModel.pendingTransactionFiatAmount
79 + ' ' + sendViewModel.fiat.title;
80
81 @computed
82 String get pendingTransactionFeeFiatAmountFormatted =>
83 - sendViewModel.balanceViewModel.disableFiat
83 + sendViewModel.isFiatDisabled
84 ? '' : sendViewModel.pendingTransactionFeeFiatAmount
85 + ' ' + sendViewModel.fiat.title;
86
lib/view_model/send/send_view_model.dart
+5 -2
@@ -142,14 +142,17 @@ abstract class SendViewModelBase with Store {
142 @computed
143 String get balance => balanceViewModel.availableBalance;
144
145 + @computed
146 + bool get isFiatDisabled => balanceViewModel.isFiatDisabled;
147 +
148 @computed
149 String get pendingTransactionFiatAmountFormatted =>
147 - balanceViewModel.disableFiat ? '' : pendingTransactionFiatAmount +
150 + isFiatDisabled ? '' : pendingTransactionFiatAmount +
151 ' ' + fiat.title;
152
153 @computed
154 String get pendingTransactionFeeFiatAmountFormatted =>
152 - balanceViewModel.disableFiat ? '' : pendingTransactionFeeFiatAmount +
155 + isFiatDisabled ? '' : pendingTransactionFeeFiatAmount +
156 ' ' + fiat.title;
157
158 @computed
lib/view_model/settings/privacy_settings_view_model.dart
+1 -1
@@ -18,7 +18,7 @@ abstract class PrivacySettingsViewModelBase with Store {
18 bool get shouldSaveRecipientAddress => _settingsStore.shouldSaveRecipientAddress;
19
20 @computed
21 - bool get fiatApiMode => _settingsStore.fiatApiMode == FiatApiMode.disabled;
21 + bool get isFiatDisabled => _settingsStore.fiatApiMode == FiatApiMode.disabled;
22
23 @action
24 void setShouldSaveRecipientAddress(bool value) => _settingsStore.shouldSaveRecipientAddress = value;
res/values/strings_de.arb
+2 -1
@@ -654,7 +654,6 @@
654 "use_suggested": "Vorgeschlagen verwenden",
655 "do_not_share_warning_text" : "Teilen Sie diese nicht mit anderen, einschließlich des Supports.\n\nSie werden Ihr Geld stehlen!",
656 "help": "hilfe",
657 - "fiat_api": "Fiat API",
657 "disable_exchange": "Exchange deaktivieren",
658 "connection_sync": "Verbindung und Synchronisierung",
659 "security_and_backup": "Sicherheit und Datensicherung",
@@ -663,6 +662,8 @@
662 "privacy": "Datenschutz",
663 "display_settings": "Anzeigeeinstellungen",
664 "other_settings": "Andere Einstellungen",
665 + "disable_fiat": "Fiat deaktivieren",
666 + "fiat_api": "Fiat API",
667 "disabled": "Deaktiviert",
668 "enabled": "Ermöglicht",
669 "tor_only": "Nur Tor"
res/values/strings_en.arb
+2 -1
@@ -654,7 +654,6 @@
654 "use_suggested": "Use Suggested",
655 "do_not_share_warning_text" : "Do not share these with anyone else, including support.\n\nThey will steal your money!",
656 "help": "help",
657 - "fiat_api": "Fiat API",
657 "disable_exchange": "Disable exchange",
658 "connection_sync": "Connection and sync",
659 "security_and_backup": "Security and backup",
@@ -663,6 +662,8 @@
662 "privacy": "Privacy",
663 "display_settings": "Display settings",
664 "other_settings": "Other settings",
665 + "disable_fiat": "Disable fiat",
666 + "fiat_api": "Fiat API",
667 "disabled": "Disabled",
668 "enabled": "Enabled",
669 "tor_only": "Tor only"
res/values/strings_es.arb
+2 -1
@@ -654,7 +654,6 @@
654 "use_suggested": "Usar sugerido",
655 "do_not_share_warning_text" : "No comparta estos con nadie más, incluido el soporte.\n\n¡Te robarán tu dinero!",
656 "help": "ayuda",
657 - "fiat_api": "Fiat API",
657 "disable_exchange": "Deshabilitar intercambio",
658 "connection_sync": "Conexión y sincronización",
659 "security_and_backup": "Seguridad y respaldo",
@@ -663,6 +662,8 @@
662 "privacy": "Privacidad",
663 "display_settings": "Configuración de pantalla",
664 "other_settings": "Otras configuraciones",
665 + "disable_fiat": "Deshabilitar fiat",
666 + "fiat_api": "Fiat API",
667 "disabled": "Desactivado",
668 "enabled": "Activado",
669 "tor_only": "solo Tor"
res/values/strings_fr.arb
+2 -1
@@ -652,7 +652,6 @@
652 "use_suggested": "Utilisation suggérée",
653 "do_not_share_warning_text" : "Ne les partagez avec personne d'autre, y compris avec l'assistance.\n\nIls vont voler votre argent!",
654 "help": "aider",
655 - "fiat_api": "Fiat API",
655 "disable_exchange": "Désactiver l'échange",
656 "connection_sync": "Connexion et synchronisation",
657 "security_and_backup": "Sécurité et sauvegarde",
@@ -661,6 +660,8 @@
660 "privacy": "Confidentialité",
661 "display_settings": "Paramètres d'affichage",
662 "other_settings": "Autres paramètres",
663 + "disable_fiat": "Désactiver fiat",
664 + "fiat_api": "Fiat API",
665 "disabled": "Handicapé",
666 "enabled": "Activé",
667 "tor_only": "Tor uniquement"
res/values/strings_hi.arb
+2 -1
@@ -655,7 +655,6 @@
655 "do_not_share_warning_text" : "इन्हें समर्थन सहित किसी और के साथ साझा न करें।\n\nवे आपका पैसा चुरा लेंगे!",
656 "help": "मदद करना",
657 "disable_fiat": "िएट अक्षम करें",
658 - "fiat_api": "फिएट पैसे API",
658 "connection_sync": "कनेक्शन और सिंक",
659 "security_and_backup": "सुरक्षा और बैकअप",
660 "create_backup": "बैकअप बनाएँ",
@@ -663,6 +662,8 @@
662 "privacy": "गोपनीयता",
663 "display_settings": "प्रदर्शन सेटिंग्स",
664 "other_settings": "अन्य सेटिंग्स",
665 + "disable_exchange": "एक्सचेंज अक्षम करें",
666 + "fiat_api": "फिएट पैसे API",
667 "disabled": "अक्षम",
668 "enabled": "सक्रिय",
669 "tor_only": "Tor केवल"
res/values/strings_hr.arb
+2 -1
@@ -654,7 +654,6 @@
654 "use_suggested": "Koristite predloženo",
655 "do_not_share_warning_text" : "Nemojte ih dijeliti ni s kim, uključujući podršku.\n\nUkrast će vam novac!",
656 "help": "pomozite",
657 - "fiat_api": "Fiat API",
657 "disable_exchange": "Onemogući exchange",
658 "connection_sync": "Povezivanje i sinkronizacija",
659 "security_and_backup": "Sigurnost i sigurnosna kopija",
@@ -663,6 +662,8 @@
662 "privacy": "Privatnost",
663 "display_settings": "Postavke zaslona",
664 "other_settings": "Ostale postavke",
665 + "disable_fiat": "Isključi, fiat",
666 + "fiat_api": "Fiat API",
667 "disabled": "Onemogućeno",
668 "enabled": "Omogućeno",
669 "tor_only": "Samo Tor"
res/values/strings_it.arb
+2 -1
@@ -654,7 +654,6 @@
654 "use_suggested": "Usa suggerito",
655 "do_not_share_warning_text" : "Non condividerli con nessun altro, incluso il supporto.\n\nTi ruberanno i soldi!",
656 "help": "aiuto",
657 - "fiat_api": "Fiat API",
657 "disable_exchange": "Disabilita scambio",
658 "connection_sync": "Connessione e sincronizzazione",
659 "security_and_backup": "Sicurezza e backup",
@@ -663,6 +662,8 @@
662 "privacy": "Privacy",
663 "display_settings": "Impostazioni di visualizzazione",
664 "other_settings": "Altre impostazioni",
665 + "disable_fiat": "Disabilita fiat",
666 + "fiat_api": "Fiat API",
667 "disabled": "Disabilitato",
668 "enabled": "Abilitato",
669 "tor_only": "Solo Tor"
res/values/strings_ja.arb
+2 -1
@@ -654,7 +654,6 @@
654 "use_suggested": "推奨を使用",
655 "do_not_share_warning_text" : "サポートを含め、これらを他の誰とも共有しないでください。\n\n彼らはあなたのお金を盗みます！",
656 "help": "ヘルプ",
657 - "fiat_api": "不換紙幣 API",
657 "disable_exchange": "交換を無効にする",
658 "connection_sync": "接続と同期",
659 "security_and_backup": "セキュリティとバックアップ",
@@ -663,6 +662,8 @@
662 "privacy": "プライバシー",
663 "display_settings": "表示設定",
664 "other_settings": "その他の設定",
665 + "disable_fiat": "フィアットを無効にする",
666 + "fiat_api": "不換紙幣 API",
667 "disabled": "無効",
668 "enabled": "有効",
669 "tor_only": "Torのみ"
res/values/strings_ko.arb
+2 -1
@@ -654,7 +654,6 @@
654 "use_suggested": "추천 사용",
655 "do_not_share_warning_text" : "지원을 포함하여 다른 사람과 이러한 정보를 공유하지 마십시오.\n\n그들은 당신의 돈을 훔칠 것입니다!",
656 "help": "돕다",
657 - "fiat_api": "명목 화폐 API",
657 "disable_exchange": "교환 비활성화",
658 "connection_sync": "연결 및 동기화",
659 "security_and_backup": "보안 및 백업",
@@ -663,6 +662,8 @@
662 "privacy": "프라이버시",
663 "display_settings": "디스플레이 설정",
664 "other_settings": "기타 설정",
665 + "disable_fiat": "법정화폐 비활성화",
666 + "fiat_api": "명목 화폐 API",
667 "disabled": "장애가 있는",
668 "enabled": "사용",
669 "tor_only": "Tor 뿐"
res/values/strings_nl.arb
+2 -1
@@ -654,7 +654,6 @@
654 "use_suggested": "Gebruik aanbevolen",
655 "do_not_share_warning_text" : "Deel deze met niemand anders, ook niet met support.\n\nZe zullen je geld stelen!",
656 "help": "helpen",
657 - "fiat_api": "Fiat API",
657 "disable_exchange": "Uitwisseling uitschakelen",
658 "connection_sync": "Verbinding en synchronisatie",
659 "security_and_backup": "Beveiliging en back-up",
@@ -663,6 +662,8 @@
662 "privacy": "Privacy",
663 "display_settings": "Weergave-instellingen",
664 "other_settings": "Andere instellingen",
665 + "disable_fiat": "Schakel Fiat uit",
666 + "fiat_api": "Fiat API",
667 "disabled": "Gehandicapt",
668 "enabled": "Ingeschakeld",
669 "tor_only": "Alleen Tor"
res/values/strings_pl.arb
+2 -1
@@ -654,7 +654,6 @@
654 "use_suggested": "Użyj sugerowane",
655 "do_not_share_warning_text" : "Nie udostępniaj ich nikomu innemu, w tym wsparcia.\n\nUkradną twoje pieniądze!",
656 "help": "pomoc",
657 - "fiat_api": "API Fiata",
657 "disable_exchange": "Wyłącz wymianę",
658 "connection_sync": "Połączenie i synchronizacja",
659 "security_and_backup": "Bezpieczeństwo i kopia zapasowa",
@@ -663,6 +662,8 @@
662 "privacy": "Prywatność",
663 "display_settings": "Ustawienia wyświetlania",
664 "other_settings": "Inne ustawienia",
665 + "disable_fiat": "Wyłącz fiat",
666 + "fiat_api": "API Fiata",
667 "disabled": "Wyłączone",
668 "enabled": "Włączony",
669 "tor_only": "Tylko Tor"
res/values/strings_pt.arb
+2 -1
@@ -653,7 +653,6 @@
653 "use_suggested": "Uso sugerido",
654 "do_not_share_warning_text" : "Não os compartilhe com mais ninguém, incluindo suporte.\n\nEles vão roubar seu dinheiro!",
655 "help": "ajuda",
656 - "fiat_api": "API da Fiat",
656 "disable_exchange": "Desativar troca",
657 "connection_sync": "Conexão e sincronização",
658 "security_and_backup": "Segurança e backup",
@@ -662,6 +661,8 @@
661 "privacy": "Privacidade",
662 "display_settings": "Configurações de exibição",
663 "other_settings": "Outras configurações",
664 + "disable_fiat": "Desativar fiat",
665 + "fiat_api": "API da Fiat",
666 "disabled": "Desabilitado",
667 "enabled": "Habilitado",
668 "tor_only": "Tor apenas"
res/values/strings_ru.arb
+2 -1
@@ -654,7 +654,6 @@
654 "use_suggested": "Использовать предложенный",
655 "do_not_share_warning_text" : "Не делитесь ими с кем-либо еще, в том числе со службой поддержки.\n\nОни украдут ваши деньги!",
656 "help": "помощь",
657 - "fiat_api": "Фиат API",
657 "disable_exchange": "Отключить обмен",
658 "connection_sync": "Подключение и синхронизация",
659 "security_and_backup": "Безопасность и резервное копирование",
@@ -663,6 +662,8 @@
662 "privacy": "Конфиденциальность",
663 "display_settings": "Настройки отображения",
664 "other_settings": "Другие настройки",
665 + "disable_fiat": "Отключить фиат",
666 + "fiat_api": "Фиат API",
667 "disabled": "Отключено",
668 "enabled": "Включено",
669 "tor_only": "Только Tor"
res/values/strings_uk.arb
+2 -1
@@ -653,7 +653,6 @@
653 "use_suggested": "Використати запропоноване",
654 "do_not_share_warning_text" : "Не повідомляйте їх нікому, включно зі службою підтримки.\n\nВони вкрадуть ваші гроші!",
655 "help": "допомога",
656 - "fiat_api": "Фіат API",
656 "disable_exchange": "Вимкнути exchange",
657 "connection_sync": "Підключення та синхронізація",
658 "security_and_backup": "Безпека та резервне копіювання",
@@ -662,6 +661,8 @@
661 "privacy": "Конфіденційність",
662 "display_settings": "Налаштування дисплея",
663 "other_settings": "Інші налаштування",
664 + "disable_fiat": "Вимкнути фиат",
665 + "fiat_api": "Фіат API",
666 "disabled": "Вимкнено",
667 "enabled": "Увімкнено",
668 "tor_only": "Тільки Tor"
res/values/strings_zh.arb
+2 -1
@@ -652,7 +652,6 @@
652 "use_suggested": "使用建议",
653 "do_not_share_warning_text" : "不要與其他任何人分享這些內容，包括支持。\n\n他們會偷你的錢！",
654 "help": "帮助",
655 - "fiat_api": "法币API",
655 "disable_exchange": "禁用交换",
656 "connection_sync": "连接和同步",
657 "security_and_backup": "安全和备份",
@@ -661,6 +660,8 @@
660 "privacy":"隐私",
661 "display_settings": "显示设置",
662 "other_settings": "其他设置",
663 + "disable_fiat": "禁用法令",
664 + "fiat_api": "法币API",
665 "disabled": "禁用",
666 "enabled": "启用",
667 "tor_only": "仅限 Tor"