Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-03-23 07:38:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[CW-233] Fix missing display balance setting

Browse source
This commit is contained in:
Godwin Asuquo 2022-11-18 20:53:35 +02:00
parent a82803de3a
commit c67e8c5037
6 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/di.dart
View file

@ -5,10 +5,10 @@ import 'package:cake_wallet/ionia/ionia_anypay.dart';
import 'package:cake_wallet/ionia/ionia_gift_card.dart'; import 'package:cake_wallet/ionia/ionia_gift_card.dart';
import 'package:cake_wallet/ionia/ionia_tip.dart'; import 'package:cake_wallet/ionia/ionia_tip.dart';
import 'package:cake_wallet/src/screens/buy/onramper_page.dart'; import 'package:cake_wallet/src/screens/buy/onramper_page.dart';
import 'package:cake_wallet/src/screens/setting/display_settings_page.dart'; import 'package:cake_wallet/src/screens/settings/display_settings_page.dart';
import 'package:cake_wallet/src/screens/setting/other_settings_page.dart'; import 'package:cake_wallet/src/screens/settings/other_settings_page.dart';
import 'package:cake_wallet/src/screens/setting/privacy_page.dart'; import 'package:cake_wallet/src/screens/settings/privacy_page.dart';
import 'package:cake_wallet/src/screens/setting/security_backup_page.dart'; import 'package:cake_wallet/src/screens/settings/security_backup_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_custom_redeem_page.dart'; import 'package:cake_wallet/src/screens/ionia/cards/ionia_custom_redeem_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_gift_card_detail_page.dart'; import 'package:cake_wallet/src/screens/ionia/cards/ionia_gift_card_detail_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_more_options_page.dart'; import 'package:cake_wallet/src/screens/ionia/cards/ionia_more_options_page.dart';

8
lib/router.dart
View file

@ -5,10 +5,10 @@ import 'package:cake_wallet/src/screens/backup/edit_backup_password_page.dart';
import 'package:cake_wallet/src/screens/buy/buy_webview_page.dart'; import 'package:cake_wallet/src/screens/buy/buy_webview_page.dart';
import 'package:cake_wallet/src/screens/buy/onramper_page.dart'; import 'package:cake_wallet/src/screens/buy/onramper_page.dart';
import 'package:cake_wallet/src/screens/buy/pre_order_page.dart'; import 'package:cake_wallet/src/screens/buy/pre_order_page.dart';
import 'package:cake_wallet/src/screens/setting/display_settings_page.dart'; import 'package:cake_wallet/src/screens/settings/display_settings_page.dart';
import 'package:cake_wallet/src/screens/setting/other_settings_page.dart'; import 'package:cake_wallet/src/screens/settings/other_settings_page.dart';
import 'package:cake_wallet/src/screens/setting/privacy_page.dart'; import 'package:cake_wallet/src/screens/settings/privacy_page.dart';
import 'package:cake_wallet/src/screens/setting/security_backup_page.dart'; import 'package:cake_wallet/src/screens/settings/security_backup_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_account_cards_page.dart'; import 'package:cake_wallet/src/screens/ionia/cards/ionia_account_cards_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_account_page.dart'; import 'package:cake_wallet/src/screens/ionia/cards/ionia_account_page.dart';
import 'package:cake_wallet/src/screens/ionia/cards/ionia_custom_redeem_page.dart'; import 'package:cake_wallet/src/screens/ionia/cards/ionia_custom_redeem_page.dart';

2
lib/src/screens/dashboard/dashboard_page.dart
View file

@ -60,7 +60,7 @@ class DashboardPage extends BasePage {
Widget middle(BuildContext context) { Widget middle(BuildContext context) {
return SyncIndicator(dashboardViewModel: walletViewModel, return SyncIndicator(dashboardViewModel: walletViewModel,
onTap: () => Navigator.of(context, rootNavigator: true) onTap: () => Navigator.of(context, rootNavigator: true)
.pushNamed(Routes.nodeList)); .pushNamed(Routes.connectionSync));
} }
@override @override

8
lib/src/screens/settings/display_settings_page.dart
View file

@ -29,10 +29,10 @@ class DisplaySettingsPage extends BasePage {
child: Column( child: Column(
children: [ children: [
SettingsSwitcherCell( SettingsSwitcherCell(
title: S.current.settings_save_recipient_address, title: S.current.settings_display_balance,
value: settingsViewModel.shouldSaveRecipientAddress, value: settingsViewModel.shouldDisplayBalance,
onValueChange: (BuildContext _, bool value) { onValueChange: (_, bool value) {
settingsViewModel.setShouldSaveRecipientAddress(value); settingsViewModel.setShouldDisplayBalance(value);
}), }),
if (!isHaven) if (!isHaven)
SettingsPickerCell<FiatCurrency>( SettingsPickerCell<FiatCurrency>(

2
lib/src/screens/settings/other_settings_page.dart
View file

@ -24,7 +24,7 @@ class OtherSettingsPage extends BasePage {
return Container( return Container(
padding: EdgeInsets.only(top: 10), padding: EdgeInsets.only(top: 10),
child: Column(children: [ child: Column(children: [
SettingsPickerCell<TransactionPriority>( SettingsPickerCell(
title: S.current.settings_fee_priority, title: S.current.settings_fee_priority,
items: priorityForWalletType(_settingsViewModel.walletType), items: priorityForWalletType(_settingsViewModel.walletType),
displayItem: _settingsViewModel.getDisplayPriority, displayItem: _settingsViewModel.getDisplayPriority,

12
lib/view_model/settings/settings_view_model.dart
View file

@ -116,6 +116,9 @@ abstract class SettingsViewModelBase with Store {
BalanceDisplayMode get balanceDisplayMode => BalanceDisplayMode get balanceDisplayMode =>
_settingsStore.balanceDisplayMode; _settingsStore.balanceDisplayMode;
@computed
bool get shouldDisplayBalance => balanceDisplayMode == BalanceDisplayMode.displayableBalance;
@computed @computed
bool get shouldSaveRecipientAddress => bool get shouldSaveRecipientAddress =>
_settingsStore.shouldSaveRecipientAddress; _settingsStore.shouldSaveRecipientAddress;
@ -195,6 +198,15 @@ abstract class SettingsViewModelBase with Store {
_settingsStore.currentTheme = newTheme; _settingsStore.currentTheme = newTheme;
} }
@action
void setShouldDisplayBalance(bool value){
if (value) {
_settingsStore.balanceDisplayMode = BalanceDisplayMode.displayableBalance;
} else {
_settingsStore.balanceDisplayMode = BalanceDisplayMode.hiddenBalance;
}
}
String getDisplayPriority(dynamic priority) { String getDisplayPriority(dynamic priority) {
final _priority = priority as TransactionPriority; final _priority = priority as TransactionPriority;