From 4838da68ec55dca248697b542105ae99a0f5db04 Mon Sep 17 00:00:00 2001
From: David Adegoke <64401859+Blazebrain@users.noreply.github.com>
Date: Tue, 17 Feb 2026 23:35:53 +0100
Subject: [PATCH] general-fixes (#2912)

* Handle tokens bottomsheet triggering on non-evm wallets

* fix:Swith to the right fee currency when sending in bsc wallets
---
 cw_evm/lib/evm_chain_wallet.dart              |  3 +-
 lib/src/screens/send/widgets/send_card.dart   | 35 +++++++++++--------
 .../swap_confirmation_bottom_sheet.dart       |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/cw_evm/lib/evm_chain_wallet.dart b/cw_evm/lib/evm_chain_wallet.dart
index 1649e7964..ea1312e23 100644
--- a/cw_evm/lib/evm_chain_wallet.dart
+++ b/cw_evm/lib/evm_chain_wallet.dart
@@ -1020,7 +1020,7 @@ abstract class EVMChainWalletBase
       gasFee: estimatedFeesForTransaction,
       priority: _credentials.priority,
       currency: transactionCurrency,
-      feeCurrency: switch (selectedChainId) { 137 => "POL", _ => "ETH" },
+      feeCurrency: EVMChainUtils.getFeeCurrency(selectedChainId),
       maxFeePerGas: maxFeePerGasForTransaction,
       exponent: exponent,
       contractAddress:
@@ -1051,6 +1051,7 @@ abstract class EVMChainWalletBase
 
     final nativeCurrency = switch (selectedChainId) {
       137 => CryptoCurrency.maticpoly,
+      56 => CryptoCurrency.bnb,
       8453 => CryptoCurrency.baseEth,
       42161 => CryptoCurrency.arbEth,
       _ => CryptoCurrency.eth,
diff --git a/lib/src/screens/send/widgets/send_card.dart b/lib/src/screens/send/widgets/send_card.dart
index 5c39e6975..77a6e795b 100644
--- a/lib/src/screens/send/widgets/send_card.dart
+++ b/lib/src/screens/send/widgets/send_card.dart
@@ -275,22 +275,29 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
           paymentRequest: paymentRequest,
           fixedNetwork: fixedNetwork,
           onNext: (PaymentFlowResult newResult) {
-            final selectedChainId = newResult.chainId;
-            final isCompatible = selectedChainId == evm!.getSelectedChainId(sendViewModel.wallet);
+            final canCheckCompatibility = evm != null &&
+                isEVMCompatibleChain(sendViewModel.wallet.type) &&
+                newResult.chainId != null;
 
-            if (isCompatible) {
-              sendViewModel.setSelectedCryptoCurrency(
-                newResult.addressDetectionResult!.detectedCurrency!.title,
-              );
-              _applyPaymentRequest(paymentRequest);
-            } else {
-              _showPaymentConfirmation(
-                paymentViewModel,
-                walletSwitcherViewModel,
-                paymentRequest,
-                newResult,
-              );
+            if (canCheckCompatibility) {
+              final selectedChainId = newResult.chainId!;
+              final isCompatible = selectedChainId == evm!.getSelectedChainId(sendViewModel.wallet);
+
+              if (isCompatible) {
+                sendViewModel.setSelectedCryptoCurrency(
+                  newResult.addressDetectionResult!.detectedCurrency!.title,
+                );
+                _applyPaymentRequest(paymentRequest);
+                return;
+              }
             }
+
+            _showPaymentConfirmation(
+              paymentViewModel,
+              walletSwitcherViewModel,
+              paymentRequest,
+              newResult,
+            );
           },
         );
       },
diff --git a/lib/src/widgets/bottom_sheet/swap_confirmation_bottom_sheet.dart b/lib/src/widgets/bottom_sheet/swap_confirmation_bottom_sheet.dart
index 224d12358..614a33949 100644
--- a/lib/src/widgets/bottom_sheet/swap_confirmation_bottom_sheet.dart
+++ b/lib/src/widgets/bottom_sheet/swap_confirmation_bottom_sheet.dart
@@ -163,7 +163,7 @@ class SwapConfirmationContentState extends State<SwapConfirmationContent> {
                   clipBehavior: Clip.none,
                   children: [
                     CakeImageWidget(
-                      imageUrl: detectedCurrency.iconPath!,
+                      imageUrl: detectedCurrency.iconPath ?? '',
                       width: 32,
                       height: 32,
                     ),