github-such-software/hash-wallet
1
0
Fork 1
mirror of https://github.com/Such-Software/hash-wallet.git synced 2026-10-21 06:18:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104 from cake-tech/CAKE-288-hidden-balance-fixes

Browse Source 
Cake 288 hidden balance fixes
This commit is contained in:
M
2021-04-06 18:55:33 +03:00
parent 4e90aeebd4 5db97b6f02
commit c3fb0cfcd4
7 changed files with 120 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/view_model/dashboard/balance_view_model.dart
+7 -7
View File
@@ -69,9 +69,9 @@ abstract class BalanceViewModelBase with Store {
@computed
BalanceDisplayMode get displayMode => isReversing
? (savedDisplayMode == BalanceDisplayMode.availableBalance
? BalanceDisplayMode.fullBalance
: BalanceDisplayMode.availableBalance)
? savedDisplayMode == BalanceDisplayMode.hiddenBalance
? BalanceDisplayMode.displayableBalance
: savedDisplayMode
: savedDisplayMode;
@computed
@@ -96,7 +96,7 @@ abstract class BalanceViewModelBase with Store {
String get availableBalance {
final walletBalance = _walletBalance;
if (settingsStore.balanceDisplayMode == BalanceDisplayMode.hiddenBalance) {
if (displayMode == BalanceDisplayMode.hiddenBalance) {
return '---';
}
@@ -107,7 +107,7 @@ abstract class BalanceViewModelBase with Store {
String get additionalBalance {
final walletBalance = _walletBalance;
if (settingsStore.balanceDisplayMode == BalanceDisplayMode.hiddenBalance) {
if (displayMode == BalanceDisplayMode.hiddenBalance) {
return '---';
}
@@ -119,7 +119,7 @@ abstract class BalanceViewModelBase with Store {
final walletBalance = _walletBalance;
final fiatCurrency = settingsStore.fiatCurrency;
if (settingsStore.balanceDisplayMode == BalanceDisplayMode.hiddenBalance) {
if (displayMode == BalanceDisplayMode.hiddenBalance) {
return '---';
}
@@ -135,7 +135,7 @@ abstract class BalanceViewModelBase with Store {
final walletBalance = _walletBalance;
final fiatCurrency = settingsStore.fiatCurrency;
if (settingsStore.balanceDisplayMode == BalanceDisplayMode.hiddenBalance) {
if (displayMode == BalanceDisplayMode.hiddenBalance) {
return '---';
}
lib/view_model/dashboard/order_list_item.dart
+7 -4
View File
@@ -1,18 +1,21 @@
import 'package:cake_wallet/entities/order.dart';
import 'package:cake_wallet/store/settings_store.dart';
import 'package:cake_wallet/view_model/dashboard/action_list_item.dart';
import 'package:cake_wallet/entities/balance_display_mode.dart';
class OrderListItem extends ActionListItem {
OrderListItem({this.order, this.displayMode});
OrderListItem({this.order, this.settingsStore});
final Order order;
final BalanceDisplayMode displayMode;
final SettingsStore settingsStore;
BalanceDisplayMode get displayMode => settingsStore.balanceDisplayMode;
String get orderFormattedAmount {
return order.amount != null
? displayMode == BalanceDisplayMode.hiddenBalance
? '---'
: order.amountFormatted()
? '---'
: order.amountFormatted()
: order.amount;
}
lib/view_model/dashboard/trade_list_item.dart
+5 -2
View File
@@ -1,12 +1,15 @@
import 'package:cake_wallet/exchange/trade.dart';
import 'package:cake_wallet/store/settings_store.dart';
import 'package:cake_wallet/view_model/dashboard/action_list_item.dart';
import 'package:cake_wallet/entities/balance_display_mode.dart';
class TradeListItem extends ActionListItem {
TradeListItem({this.trade, this.displayMode});
TradeListItem({this.trade, this.settingsStore});
final Trade trade;
final BalanceDisplayMode displayMode;
final SettingsStore settingsStore;
BalanceDisplayMode get displayMode => settingsStore.balanceDisplayMode;
String get tradeFormattedAmount {
return trade.amount != null