From a4462d226c1b564c3b01931baa9af836499b5b34 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 11 May 2023 13:39:03 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
index fc1d4e3958..7d5a21594a 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
@@ -14,6 +14,7 @@ import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.setContext
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.model.builders.UserWalletIdBuilder
 import com.tangem.tap.domain.walletStores.WalletStoresError
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
 import com.tangem.tap.features.disclaimer.createDisclaimer
@@ -36,7 +37,10 @@ class TapWalletManager {
 
     suspend fun onWalletSelected(userWallet: UserWallet, refresh: Boolean, sendAnalyticsEvent: Boolean) {
         // do nothing if its the same wallet
-        if (store.state.globalState.scanResponse == userWallet.scanResponse) return
+        store.state.globalState.scanResponse?.let {
+            val userWalletId = UserWalletIdBuilder.scanResponse(it).build()
+            if (userWalletId == userWallet.walletId) return
+        }
 
         Analytics.setContext(userWallet.scanResponse)
         if (sendAnalyticsEvent) {