Updated on 2026-08-14

app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt

@@ -23,6 +23,7 @@ import com.tangem.tap.domain.extensions.makePrimaryWalletManager
 import com.tangem.tap.domain.extensions.makeWalletManagersForApp
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.demo.isDemoCard
+import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.network.NetworkConnectivity
 import com.tangem.tap.store
@@ -88,14 +89,16 @@ class TapWalletManager {
 
         withMainContext {
             store.dispatch(WalletAction.ResetState(data.card.cardId))
+            store.dispatch(WalletConnectAction.ResetState)
             store.dispatch(GlobalAction.SaveScanNoteResponse(data))
             store.dispatch(WalletAction.SetIfTestnetCard(data.card.isTestCard))
             store.dispatch(WalletAction.MultiWallet.SetIsMultiwalletAllowed(data.card.isMultiwalletAllowed))
+            store.dispatch(WalletConnectAction.RestoreSessions(data))
             store.dispatch(
                 WalletAction.MultiWallet.ShowWalletBackupWarning(
                     show = data.card.settings.isBackupAllowed
-                        && data.card.backupStatus == Card.BackupStatus.NoBackup
-                )
+                        && data.card.backupStatus == Card.BackupStatus.NoBackup,
+                ),
             )
             loadData(data)
         }

app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectManager.kt

@@ -1,7 +1,9 @@
 package com.tangem.tap.domain.walletconnect
 
 import com.tangem.blockchain.common.Blockchain
+import com.tangem.common.card.EllipticCurve
 import com.tangem.common.extensions.guard
+import com.tangem.domain.common.ScanResponse
 import com.tangem.tap.common.analytics.Analytics
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -69,7 +71,7 @@ class WalletConnectManager {
             remotePeerId = null,
             session = session,
             client = client,
-            wallet = WalletForSession(cardId = "")
+            wallet = WalletForSession(),
         )
         setupConnectionTimeoutCheck(session)
     }
@@ -110,8 +112,12 @@ class WalletConnectManager {
         }
     }
 
-    fun restoreSessions() {
+    fun restoreSessions(scanResponse: ScanResponse) {
+        val walletPublicKey = scanResponse.card.wallets.firstOrNull { it.curve == EllipticCurve.Secp256k1 }?.publicKey
+            ?: return
         val sessions = walletConnectRepository.loadSavedSessions()
+            // filter sessions for this particular card
+            .filter { it.wallet.walletPublicKey.contentEquals(walletPublicKey) }
         this.sessions = sessions
             .map { session ->
                 WalletConnectActiveData(
@@ -126,8 +132,8 @@ class WalletConnectManager {
                         setListeners(it.client)
                         it.client.connect(it.session, tangemPeerMeta, it.peerId, it.remotePeerId)
                     }
-            }
-            .map { it.session to it }.toMap().toMutableMap()
+            }.associateBy { it.session }.toMutableMap()
+
         store.dispatchOnMain(WalletConnectAction.SetSessionsRestored(sessions))
     }
 

app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt

@@ -92,7 +92,6 @@ class WalletConnectSdkHelper {
             )
         )
         val dialogData = TransactionRequestDialogData(
-            cardId = session.wallet.cardId,
             dAppName = session.peerMeta.name,
             dAppUrl = session.peerMeta.url,
             amount = value.toFormattedString(decimals),
@@ -235,7 +234,6 @@ class WalletConnectSdkHelper {
 
 
         val dialogData = PersonalSignDialogData(
-            cardId = session.wallet.cardId,
             dAppName = session.peerMeta.name,
             message = messageString,
             session = session.session,
@@ -272,11 +270,11 @@ class WalletConnectSdkHelper {
     suspend fun signPersonalMessage(hashToSign: ByteArray, wallet: WalletForSession): String? {
         val key = wallet.derivedPublicKey ?: wallet.walletPublicKey
         val command = SignHashCommand(hashToSign, wallet.walletPublicKey!!, wallet.derivationPath)
-        return when (val result = tangemSdkManager.runTaskAsync(command, wallet.cardId)) {
+        return when (val result = tangemSdkManager.runTaskAsync(command)) {
             is CompletionResult.Success -> {
                 val hash = result.data.signature
                 return EthereumUtils.prepareSignedMessageData(
-                    hash, hashToSign, CryptoUtils.decompressPublicKey(key!!)
+                    hash, hashToSign, CryptoUtils.decompressPublicKey(key!!),
                 )
             }
             is CompletionResult.Failure -> {

app/src/main/java/com/tangem/tap/domain/walletconnect/WcWalletManagerFactory.kt

@@ -1,13 +1,10 @@
 package com.tangem.tap.domain.walletconnect
 
 import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.Wallet
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchain.common.WalletManagerFactory
-import com.tangem.common.card.EllipticCurve
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TapWorkarounds.isTestCard
-import com.tangem.tap.domain.extensions.getPrimaryCurve
 import com.tangem.tap.domain.extensions.makeWalletManagerForApp
 import com.tangem.tap.domain.tokens.CurrenciesRepository
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
@@ -17,51 +14,25 @@ import com.tangem.tap.features.wallet.redux.WalletState
 class WcWalletManagerFactory(
     private val factory: WalletManagerFactory,
     private val currenciesRepository: CurrenciesRepository,
-    ) {
-
-    suspend fun getWalletManager(
-        wallet: WalletForSession, blockchain: Blockchain, walletState: WalletState
+) {
+    fun getWalletManager(
+        wallet: WalletForSession, blockchain: Blockchain, walletState: WalletState,
     ): WalletManager? {
         val blockchainToMake = if (blockchain == Blockchain.Ethereum && wallet.isTestNet) {
             Blockchain.EthereumTestnet
         } else {
             blockchain
         }
-
         val blockchainNetwork = BlockchainNetwork(
             blockchain = blockchainToMake,
             derivationPath = wallet.derivationPath?.rawPath,
-            tokens = emptyList()
+            tokens = emptyList(),
         )
-
-        return if (walletState.cardId == wallet.cardId) {
-            walletState.getWalletManager(blockchainNetwork)
-        } else {
-            val blockchainNetworkWithTokens = currenciesRepository
-                .loadSavedCurrencies(
-                    cardId = wallet.cardId,
-                    isHdWalletSupported = wallet.derivationPath != null
-                ).firstOrNull { it == blockchainNetwork }
-
-            if (blockchainNetworkWithTokens != null) {
-                factory.makeWalletManager(
-                    blockchain = blockchainToMake,
-                    publicKey = Wallet.PublicKey(
-                        wallet.walletPublicKey!!,
-                        wallet.derivedPublicKey,
-                        wallet.derivationPath
-                    ),
-                    tokens = blockchainNetworkWithTokens.tokens,
-                    curve = blockchainToMake.getPrimaryCurve() ?: EllipticCurve.Secp256k1
-                )
-            } else {
-                null
-            }
-        }
+        return walletState.getWalletManager(blockchainNetwork)
     }
 
     suspend fun getWalletManager(
-        scanResponse: ScanResponse, blockchain: Blockchain, walletState: WalletState
+        scanResponse: ScanResponse, blockchain: Blockchain, walletState: WalletState,
     ): WalletManager? {
         val card = scanResponse.card
         val blockchainToMake = if (blockchain == Blockchain.Ethereum && card.isTestCard) {
@@ -69,14 +40,13 @@ class WcWalletManagerFactory(
         } else {
             blockchain
         }
-
         val blockchainNetwork = BlockchainNetwork(
             blockchain = blockchainToMake,
-            card = card
+            card = card,
         )
 
         return if (walletState.cardId == card.cardId) {
-           walletState.getWalletManager(blockchainNetwork)
+            walletState.getWalletManager(blockchainNetwork)
         } else {
             if (currenciesRepository
                     .loadSavedCurrencies(card.cardId, card.settings.isHDWalletAllowed)
@@ -84,7 +54,7 @@ class WcWalletManagerFactory(
             ) {
                 factory.makeWalletManagerForApp(
                     scanResponse = scanResponse,
-                    blockchainNetwork = blockchainNetwork
+                    blockchainNetwork = blockchainNetwork,
                 )
             } else {
                 null