Fix fee priority display (#540)
* Fix transaction priority displaying empty string * Fix priority label with rate in send screen * Make price nullable in transaction list items
Omar Hatem committed
Oct 20, 2022 at 00:24 UTC
e1885e44a2d94e8ba2bc2a5fd1d82ced73ba7f98
3 files changed
+5
-7
lib/view_model/dashboard/transaction_list_item.dart
+1
-1
@@ -53,7 +53,7 @@ class TransactionListItem extends ActionListItem with Keyable {
53
break;
54
case WalletType.haven:
55
final asset = haven!.assetOfTransaction(transaction);
56
- final price = balanceViewModel.fiatConvertationStore.prices[asset]!;
56
+ final price = balanceViewModel.fiatConvertationStore.prices[asset];
57
amount = calculateFiatAmountRaw(
58
cryptoAmount: haven!.formatterMoneroAmountToDouble(amount: transaction.amount),
59
price: price);
lib/view_model/send/send_view_model.dart
+2
-3
@@ -1,6 +1,7 @@
1
import 'package:cake_wallet/entities/balance_display_mode.dart';
2
import 'package:cake_wallet/entities/transaction_description.dart';
3
import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
4
+import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
5
import 'package:cw_core/transaction_priority.dart';
6
import 'package:cake_wallet/view_model/send/output.dart';
7
import 'package:cake_wallet/view_model/send/send_template_view_model.dart';
@@ -275,9 +276,7 @@ abstract class SendViewModelBase with Store {
276
277
if (isElectrumWallet) {
278
final rate = bitcoin!.getFeeRate(wallet, _priority);
278
- // FIX-ME: labelWithRate
279
- // return '${priority.labelWithRate(rate)}';
280
- return '';
279
+ return '${(priority as BitcoinTransactionPriority).labelWithRate(rate)}';
280
}
281
282
return priority.toString();
lib/view_model/settings/settings_view_model.dart
+2
-3
@@ -1,6 +1,7 @@
1
import 'package:cake_wallet/entities/language_service.dart';
2
import 'package:cake_wallet/store/yat/yat_store.dart';
3
import 'package:cake_wallet/view_model/settings/choices_list_item.dart';
4
+import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
5
import 'package:flutter/cupertino.dart';
6
import 'package:mobx/mobx.dart';
7
import 'package:package_info/package_info.dart';
@@ -136,9 +137,7 @@ abstract class SettingsViewModelBase with Store {
137
if (wallet.type == WalletType.bitcoin
138
|| wallet.type == WalletType.litecoin) {
139
final rate = bitcoin!.getFeeRate(wallet, _priority);
139
- // FIX-ME: BitcoinTransactionPriority
140
- // return '${priority.labelWithRate(rate)}';
141
- return '';
140
+ return '${(priority as BitcoinTransactionPriority).labelWithRate(rate)}';
141
}
142
143
return priority.toString();