From e1885e44a2d94e8ba2bc2a5fd1d82ced73ba7f98 Mon Sep 17 00:00:00 2001
From: Omar Hatem <omarh.ismail1@gmail.com>
Date: Thu, 20 Oct 2022 00:24:50 +0200
Subject: [PATCH] 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
---
 lib/view_model/dashboard/transaction_list_item.dart | 2 +-
 lib/view_model/send/send_view_model.dart            | 5 ++---
 lib/view_model/settings/settings_view_model.dart    | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/view_model/dashboard/transaction_list_item.dart b/lib/view_model/dashboard/transaction_list_item.dart
index d6e8f60ec..35f30a937 100644
--- a/lib/view_model/dashboard/transaction_list_item.dart
+++ b/lib/view_model/dashboard/transaction_list_item.dart
@@ -53,7 +53,7 @@ class TransactionListItem extends ActionListItem with Keyable {
         break;
       case WalletType.haven:
         final asset = haven!.assetOfTransaction(transaction);
-        final price = balanceViewModel.fiatConvertationStore.prices[asset]!;
+        final price = balanceViewModel.fiatConvertationStore.prices[asset];
         amount = calculateFiatAmountRaw(
           cryptoAmount: haven!.formatterMoneroAmountToDouble(amount: transaction.amount),
           price: price);
diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart
index a983778a9..b6bac59e0 100644
--- a/lib/view_model/send/send_view_model.dart
+++ b/lib/view_model/send/send_view_model.dart
@@ -1,6 +1,7 @@
 import 'package:cake_wallet/entities/balance_display_mode.dart';
 import 'package:cake_wallet/entities/transaction_description.dart';
 import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
+import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
 import 'package:cw_core/transaction_priority.dart';
 import 'package:cake_wallet/view_model/send/output.dart';
 import 'package:cake_wallet/view_model/send/send_template_view_model.dart';
@@ -275,9 +276,7 @@ abstract class SendViewModelBase with Store {
 
     if (isElectrumWallet) {
       final rate = bitcoin!.getFeeRate(wallet, _priority);
-      // FIX-ME: labelWithRate
-      // return '${priority.labelWithRate(rate)}';
-      return '';
+      return '${(priority as BitcoinTransactionPriority).labelWithRate(rate)}';
     }
 
     return priority.toString();
diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart
index 0994b84b1..c3ca2e3b9 100644
--- a/lib/view_model/settings/settings_view_model.dart
+++ b/lib/view_model/settings/settings_view_model.dart
@@ -1,6 +1,7 @@
 import 'package:cake_wallet/entities/language_service.dart';
 import 'package:cake_wallet/store/yat/yat_store.dart';
 import 'package:cake_wallet/view_model/settings/choices_list_item.dart';
+import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:mobx/mobx.dart';
 import 'package:package_info/package_info.dart';
@@ -136,9 +137,7 @@ abstract class SettingsViewModelBase with Store {
               if (wallet.type == WalletType.bitcoin
                   || wallet.type == WalletType.litecoin) {
                 final rate = bitcoin!.getFeeRate(wallet, _priority);
-                // FIX-ME: BitcoinTransactionPriority
-                // return '${priority.labelWithRate(rate)}';
-                return '';
+                return '${(priority as BitcoinTransactionPriority).labelWithRate(rate)}';
               }
 
               return priority.toString();