From ec5e27098542116161b74874eb841add9cfcf193 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 18 Aug 2022 11:54:10 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 .../tap/features/wallet/ui/WalletFragment.kt     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
index fe3c9131e4..1389600f94 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
@@ -114,22 +114,26 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
 
     override fun newState(state: WalletState) {
         if (activity == null || view == null) return
+
         val isSaltPay = store.state.globalState.scanResponse?.card?.isSaltPay == true
+
         when {
-            isSaltPay -> {
+            isSaltPay && (walletView !is SaltPaySingleWalletView) -> {
                 walletView = SaltPaySingleWalletView()
+                walletView.changeWalletView(this, binding)
             }
-            state.isMultiwalletAllowed &&
-                state.primaryWallet?.currencyData?.status != BalanceStatus.EmptyCard &&
-                walletView is SingleWalletView -> {
+            state.isMultiwalletAllowed && state.primaryWallet?.currencyData?.status != BalanceStatus.EmptyCard &&
+                walletView !is MultiWalletView -> {
                 walletView = MultiWalletView()
+                walletView.changeWalletView(this, binding)
             }
-            !state.isMultiwalletAllowed && walletView is MultiWalletView -> {
+            !state.isMultiwalletAllowed && walletView !is SingleWalletView -> {
                 walletView = SingleWalletView()
+                walletView.changeWalletView(this, binding)
             }
+            else -> {} // we keep the same view unless we scan a card that requires a different view
         }
 
-        walletView.changeWalletView(this, binding)
         walletView.onNewState(state)
 
         if (!state.shouldShowDetails) {