Updated on 2026-08-14

app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt

@@ -13,6 +13,7 @@ import com.tangem.domain.walletconnect.WcPairService
 import com.tangem.domain.walletconnect.model.WcPairRequest
 import com.tangem.domain.walletconnect.model.legacy.Account
 import com.tangem.domain.walletconnect.usecase.initialize.WcInitializeUseCase
+import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.features.walletconnect.components.WalletConnectFeatureToggles
 import com.tangem.tap.common.analytics.events.WalletConnect
 import com.tangem.tap.domain.walletconnect2.app.TangemWcBlockchainHelper
@@ -64,14 +65,18 @@ internal class DefaultLegacyWalletConnectRepositoryFacade constructor(
         if (isNewWc) stub.updateSessions() else legacy.updateSessions()
     }
 
-    override fun pair(uri: String, source: SourceType) {
+    override fun pair(userWalletId: UserWalletId, uri: String, source: SourceType) {
         val src = when (source) {
             SourceType.QR -> WcPairRequest.Source.QR
             SourceType.DEEPLINK -> WcPairRequest.Source.DEEPLINK
             SourceType.CLIPBOARD -> WcPairRequest.Source.CLIPBOARD
             SourceType.ETC -> WcPairRequest.Source.ETC
         }
-        if (isNewWc) wcPairService.pair(WcPairRequest(uri, src)) else legacy.pair(uri, source)
+        if (isNewWc) {
+            wcPairService.pair(WcPairRequest(uri = uri, source = src, userWalletId = userWalletId))
+        } else {
+            legacy.pair(userWalletId = userWalletId, uri = uri, source = source)
+        }
     }
 
     override fun disconnect(topic: String) {
@@ -110,7 +115,7 @@ internal class LegacyWalletConnectRepositoryStub : LegacyWalletConnectRepository
 
     override fun updateSessions() = Unit
 
-    override fun pair(uri: String, source: SourceType) = Unit
+    override fun pair(userWalletId: UserWalletId, uri: String, source: SourceType) = Unit
 
     override fun disconnect(topic: String) = Unit
 
@@ -405,7 +410,7 @@ internal class DefaultLegacyWalletConnectRepository(
         this.userNamespaces = userNamespaces
     }
 
-    override fun pair(uri: String, source: SourceType) {
+    override fun pair(userWalletId: UserWalletId, uri: String, source: SourceType) {
         analyticsHandler.send(WalletConnect.NewSessionInitiated(source = source))
         WalletKit.pair(
             params = Wallet.Params.Pair(uri),

app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/LegacyWalletConnectRepository.kt

@@ -1,6 +1,7 @@
 package com.tangem.tap.domain.walletconnect2.domain
 
 import com.tangem.domain.walletconnect.model.legacy.Account
+import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.tap.domain.walletconnect2.domain.models.*
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction.OpenSession.SourceType
 import kotlinx.coroutines.flow.Flow
@@ -19,7 +20,7 @@ interface LegacyWalletConnectRepository {
 
     fun updateSessions()
 
-    fun pair(uri: String, source: SourceType)
+    fun pair(userWalletId: UserWalletId, uri: String, source: SourceType)
 
     fun disconnect(topic: String)
 

app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/WalletConnectInteractor.kt

@@ -12,6 +12,7 @@ import com.tangem.domain.walletconnect.model.legacy.WalletConnectSessionsReposit
 import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.domain.wallets.usecase.GetSelectedWalletUseCase
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.filterNotNull
@@ -139,7 +140,11 @@ class WalletConnectInteractor(
             if (deeplinkStack.empty()) return
             val lastDeeplink = deeplinkStack.pop()
             val action = WalletConnectAction
-                .OpenSession(lastDeeplink, WalletConnectAction.OpenSession.SourceType.DEEPLINK)
+                .OpenSession(
+                    wcUri = lastDeeplink,
+                    source = WalletConnectAction.OpenSession.SourceType.DEEPLINK,
+                    userWalletId = UserWalletId(userWalletId),
+                )
             store.dispatchOnMain(action)
         }.onFailure {
             Timber.e("WC deeplink handling failed. $it")
@@ -393,7 +398,11 @@ class WalletConnectInteractor(
         }
 
         if (isWalletConnectReadyForDeepLinks) {
-            val action = WalletConnectAction.OpenSession(deeplink, WalletConnectAction.OpenSession.SourceType.DEEPLINK)
+            val action = WalletConnectAction.OpenSession(
+                wcUri = deeplink,
+                source = WalletConnectAction.OpenSession.SourceType.DEEPLINK,
+                userWalletId = UserWalletId(userWalletId),
+            )
             store.dispatchOnMain(action)
         } else {
             deeplinkStack.push(deeplink)

app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt

@@ -1,5 +1,6 @@
 package com.tangem.tap.features.details.redux.walletconnect
 
+import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.tap.domain.walletconnect2.domain.WcPreparedRequest
 import com.tangem.tap.domain.walletconnect2.domain.models.WalletConnectError
 import com.tangem.tap.domain.walletconnect2.domain.models.WalletConnectEvents
@@ -14,6 +15,7 @@ sealed class WalletConnectAction : Action {
     data class OpenSession(
         val wcUri: String,
         val source: SourceType,
+        val userWalletId: UserWalletId,
     ) : WalletConnectAction() {
         enum class SourceType { QR, DEEPLINK, CLIPBOARD, ETC }
     }

app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt

@@ -63,7 +63,11 @@ class WalletConnectMiddleware {
             is WalletConnectAction.OpenSession -> {
                 val index = action.wcUri.indexOf("@")
                 when (action.wcUri[index + 1]) {
-                    '2' -> walletConnectRepository.pair(uri = action.wcUri, source = action.source)
+                    '2' -> walletConnectRepository.pair(
+                        uri = action.wcUri,
+                        source = action.source,
+                        userWalletId = action.userWalletId,
+                    )
                     '1' -> {
                         store.dispatchOnMain(WalletConnectAction.UnsupportedDappRequest)
                         store.dispatchOnMain(

app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/DefaultWalletConnectComponent.kt

@@ -22,10 +22,10 @@ import org.rekotlin.StoreSubscriber
 @Suppress("UnusedPrivateMember")
 internal class DefaultWalletConnectComponent @AssistedInject constructor(
     @Assisted appComponentContext: AppComponentContext,
-    @Assisted params: Unit,
+    @Assisted params: WalletConnectComponent.Params,
 ) : WalletConnectComponent, AppComponentContext by appComponentContext, StoreSubscriber<WalletConnectState> {
 
-    private val model: WalletConnectModel = getOrCreateModel()
+    private val model: WalletConnectModel = getOrCreateModel(params)
 
     private var screenState: MutableState<WalletConnectScreenState> =
         mutableStateOf(model.updateState(store.state.walletConnectState))
@@ -65,6 +65,9 @@ internal class DefaultWalletConnectComponent @AssistedInject constructor(
 
     @AssistedFactory
     interface Factory : WalletConnectComponent.Factory {
-        override fun create(context: AppComponentContext, params: Unit): DefaultWalletConnectComponent
+        override fun create(
+            context: AppComponentContext,
+            params: WalletConnectComponent.Params,
+        ): DefaultWalletConnectComponent
     }
 }

app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectModel.kt

@@ -4,10 +4,12 @@ import androidx.compose.runtime.Stable
 import arrow.core.getOrElse
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
+import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.domain.qrscanning.models.SourceType
 import com.tangem.domain.qrscanning.usecases.ListenToQrScanningUseCase
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectState
+import com.tangem.tap.features.details.ui.walletconnect.api.WalletConnectComponent
 import com.tangem.tap.store
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.collections.immutable.toImmutableList
@@ -22,13 +24,22 @@ import javax.inject.Inject
 internal class WalletConnectModel @Inject constructor(
     override val dispatchers: CoroutineDispatcherProvider,
     private val listenToQrScanningUseCase: ListenToQrScanningUseCase,
+    paramsContainer: ParamsContainer,
 ) : Model() {
 
+    private val params = paramsContainer.require<WalletConnectComponent.Params>()
+
     init {
         modelScope.launch {
             listenToQrScanningUseCase(SourceType.WALLET_CONNECT)
                 .getOrElse { emptyFlow() }
-                .map { WalletConnectAction.OpenSession(it, WalletConnectAction.OpenSession.SourceType.QR) }
+                .map {
+                    WalletConnectAction.OpenSession(
+                        wcUri = it,
+                        source = WalletConnectAction.OpenSession.SourceType.QR,
+                        userWalletId = params.userWalletId,
+                    )
+                }
                 .collect { store.dispatch(it) }
         }
     }

app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/api/WalletConnectComponent.kt

@@ -2,7 +2,9 @@ package com.tangem.tap.features.details.ui.walletconnect.api
 
 import com.tangem.core.decompose.factory.ComponentFactory
 import com.tangem.core.ui.decompose.ComposableContentComponent
+import com.tangem.domain.wallets.models.UserWalletId
 
 interface WalletConnectComponent : ComposableContentComponent {
-    interface Factory : ComponentFactory<Unit, WalletConnectComponent>
+    data class Params(val userWalletId: UserWalletId)
+    interface Factory : ComponentFactory<Params, WalletConnectComponent>
 }

app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt

@@ -291,13 +291,13 @@ internal class ChildFactory @Inject constructor(
                 if (walletConnectFeatureToggles.isRedesignedWalletConnectEnabled) {
                     createComponentChild(
                         context = context,
-                        params = Unit,
+                        params = RedesignedWalletConnectComponent.Params(route.userWalletId),
                         componentFactory = redesignedWalletConnectComponentFactory,
                     )
                 } else {
                     createComponentChild(
                         context = context,
-                        params = Unit,
+                        params = WalletConnectComponent.Params(route.userWalletId),
                         componentFactory = walletConnectComponentFactory,
                     )
                 }