diff --git a/lib/new-ui/widgets/coins_page/assets_history/transaction_details_modal.dart b/lib/new-ui/widgets/coins_page/assets_history/transaction_details_modal.dart
index f7e6c952f..e390203a9 100644
--- a/lib/new-ui/widgets/coins_page/assets_history/transaction_details_modal.dart
+++ b/lib/new-ui/widgets/coins_page/assets_history/transaction_details_modal.dart
@@ -81,8 +81,7 @@ class _TransactionDetailsModalState extends State<TransactionDetailsModal> {
                                   style: TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
                                 ),
                                 Text(
-                                  widget.transactionDetailsViewModel.transactionInfo
-                                      .amountFormatted(),
+                                  widget.transactionDetailsViewModel.formattedCryptoAmount,
                                   style: TextStyle(fontSize: 28),
                                 ),
                                 Padding(
diff --git a/lib/view_model/transaction_details_view_model.dart b/lib/view_model/transaction_details_view_model.dart
index 492c561a6..2c64d6e79 100644
--- a/lib/view_model/transaction_details_view_model.dart
+++ b/lib/view_model/transaction_details_view_model.dart
@@ -6,6 +6,7 @@ import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/core/address_validator.dart';
 import 'package:cake_wallet/tron/tron.dart';
 import 'package:cake_wallet/zano/zano.dart';
+import 'package:cw_core/crypto_amount_format.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/currency_for_wallet_type.dart';
 import 'package:cw_core/utils/print_verbose.dart';
@@ -69,7 +70,7 @@ class TxDetailRowDefinition {
     TxDetailRowDefinition(
         keyString: "standard_list_item_transaction_details_height_key",
         title: S.current.transaction_details_height,
-        valueGetter: (vm) => vm.transactionInfo.height.toString(),
+        valueGetter: (vm) => vm.transactionInfo.height?.toString() ?? "",
         applicable: (vm) => !([WalletType.solana, WalletType.tron].contains(vm.wallet.type) &&
             !isLightning(vm.transactionInfo))),
 
@@ -587,6 +588,20 @@ abstract class TransactionDetailsViewModelBase with Store {
     return bitcoin!.formatterBitcoinAmountToString(amount: newFee);
   }
 
+  String get formattedCryptoAmount {
+    if (wallet.type == WalletType.bitcoin) {
+      final crypto = isLightning(transactionInfo) ? CryptoCurrency.btcln : CryptoCurrency.btc;
+      final amount = _appStore.amountParsingProxy
+          .getDisplayCryptoString(transactionInfo.amount, crypto)
+          .withMaxDecimals(8)
+          .withLocalSeperator(_appStore.settingsStore.languageCode);
+
+      return '$amount ${_appStore.amountParsingProxy.getCryptoSymbol(crypto)}';
+    }
+
+    return transactionInfo.amountFormatted();
+  }
+
   void replaceByFee(String newFee) => sendViewModel.replaceByFee(transactionInfo, newFee);
 
   @computed