Updated on 2026-08-14

app/src/main/java/com/tangem/tap/common/DialogManager.kt

@@ -100,12 +100,19 @@ class DialogManager : StoreSubscriber<GlobalState> {
                     preparedData = state.dialog.data,
                     context = context,
                 )
-            is WalletConnectDialog.UnsupportedNetwork ->
+            is WalletConnectDialog.UnsupportedNetwork -> {
+                val warning = if (state.dialog.networks.isNullOrEmpty()) {
+                    context.getString(R.string.wallet_connect_scanner_error_unsupported_network)
+                } else {
+                    context.getString(R.string.wallet_connect_error_unsupported_blockchains) +
+                        state.dialog.networks
+                }
                 SimpleAlertDialog.create(
                     titleRes = R.string.wallet_connect_title,
-                    messageRes = R.string.wallet_connect_scanner_error_unsupported_network,
+                    message = warning,
                     context = context,
                 )
+            }
             is WalletConnectDialog.SessionProposalDialog -> {
                 SessionProposalDialog.create(
                     sessionProposal = state.dialog.sessionProposal,

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

@@ -1,15 +1,22 @@
 package com.tangem.tap.domain.walletconnect2.data
 
-import android.app.*
-import com.tangem.tap.domain.walletconnect2.domain.*
+import android.app.Application
+import com.tangem.tap.domain.walletconnect2.domain.WalletConnectRepository
+import com.tangem.tap.domain.walletconnect2.domain.WcJrpcRequestsDeserializer
 import com.tangem.tap.domain.walletconnect2.domain.models.*
-import com.walletconnect.android.*
-import com.walletconnect.android.relay.*
-import com.walletconnect.web3.wallet.client.*
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.*
-import timber.log.*
-import javax.inject.*
+import com.walletconnect.android.Core
+import com.walletconnect.android.CoreClient
+import com.walletconnect.android.relay.ConnectionType
+import com.walletconnect.web3.wallet.client.Wallet
+import com.walletconnect.web3.wallet.client.Web3Wallet
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
 
 class WalletConnectRepositoryImpl @Inject constructor(
     private val application: Application,
@@ -181,7 +188,7 @@ class WalletConnectRepositoryImpl @Inject constructor(
             userNamespaces = userNamespaces,
         )
         if (missingNetworks.isNotEmpty()) {
-            Timber.e("Unsupported blockchains: $missingNetworks")
+            Timber.e("Not added blockchains: $missingNetworks")
             scope.launch {
                 _events.emit(
                     WalletConnectEvents.SessionApprovalError(

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

@@ -1,13 +1,16 @@
 package com.tangem.tap.domain.walletconnect2.domain
 
-import com.tangem.tap.common.extensions.*
-import com.tangem.tap.domain.walletconnect.*
+import com.tangem.tap.common.extensions.filterNotNull
+import com.tangem.tap.domain.walletconnect.WalletConnectSdkHelper
 import com.tangem.tap.domain.walletconnect2.domain.models.*
-import com.tangem.tap.features.details.ui.walletconnect.*
-import com.tangem.utils.coroutines.*
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.*
-import timber.log.*
+import com.tangem.tap.features.details.ui.walletconnect.WcSessionForScreen
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import timber.log.Timber
 
 class WalletConnectInteractor(
     private val handler: WalletConnectEventsHandler,
@@ -47,6 +50,14 @@ class WalletConnectInteractor(
                 when (wcEvent) {
                     is WalletConnectEvents.SessionProposal -> {
                         Timber.d("WC session proposal event received")
+                        val unsupportedNetworks = wcEvent.chainIds
+                            .filter { blockchainHelper.chainIdToNetworkIdOrNull(it) == null }
+                        if (unsupportedNetworks.isNotEmpty()) {
+                            val error = WalletConnectError.ApprovalErrorUnsupportedNetwork(unsupportedNetworks)
+                            handler.onSessionRejected(error)
+                            return@onEach
+                        }
+
                         val networksFormatted = wcEvent.chainIds
                             .mapNotNull { blockchainHelper.chainIdToFullNameOrNull(it) }
                             .toString()
@@ -57,12 +68,7 @@ class WalletConnectInteractor(
                             is WalletConnectError.ApprovalErrorMissingNetworks -> {
                                 val missingNetworks = wcEvent.error.missingChains
                                     .map { blockchainHelper.chainIdToNetworkIdOrNull(it) }
-                                val containsUnsupportedNetworks = missingNetworks.any { it == null }
-                                if (containsUnsupportedNetworks) {
-                                    WalletConnectError.ApprovalErrorUnsupportedNetwork
-                                } else {
-                                    WalletConnectError.ApprovalErrorAddNetwork(missingNetworks.filterNotNull())
-                                }
+                                WalletConnectError.ApprovalErrorAddNetwork(missingNetworks.filterNotNull())
                             }
                             else -> wcEvent.error
                         }

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

@@ -3,7 +3,7 @@ package com.tangem.tap.domain.walletconnect2.domain.models
 sealed class WalletConnectError : Exception() {
     data class ApprovalErrorMissingNetworks(val missingChains: List<String>) : WalletConnectError()
     data class ApprovalErrorAddNetwork(val networks: List<String>) : WalletConnectError()
-    object ApprovalErrorUnsupportedNetwork : WalletConnectError()
+    data class ApprovalErrorUnsupportedNetwork(val unsupportedNetworks: List<String>) : WalletConnectError()
     data class ExternalApprovalError(override val message: String?) : WalletConnectError()
     object WrongUserWallet : WalletConnectError()
     object UnsupportedMethod : WalletConnectError()

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

@@ -238,7 +238,7 @@ class WalletConnectMiddleware {
                     return
                 }
                 val blockchain = action.blockchain.guard {
-                    store.dispatchOnMain(GlobalAction.ShowDialog(WalletConnectDialog.UnsupportedNetwork))
+                    store.dispatchOnMain(GlobalAction.ShowDialog(WalletConnectDialog.UnsupportedNetwork()))
                     return
                 }
                 val walletManager = getWalletManager(
@@ -298,9 +298,12 @@ class WalletConnectMiddleware {
                             ),
                         )
                     }
-
-                    WalletConnectError.ApprovalErrorUnsupportedNetwork -> {
-                        store.dispatchOnMain(GlobalAction.ShowDialog(WalletConnectDialog.UnsupportedNetwork))
+                    is WalletConnectError.ApprovalErrorUnsupportedNetwork -> {
+                        store.dispatchOnMain(
+                            GlobalAction.ShowDialog(
+                                WalletConnectDialog.UnsupportedNetwork(action.error.unsupportedNetworks),
+                            ),
+                        )
                     }
                     is WalletConnectError.ExternalApprovalError -> {
                         store.dispatchOnMain(
@@ -327,7 +330,7 @@ class WalletConnectMiddleware {
                 scope.launch { walletConnectInteractor.continueWithRequest(action.sessionRequest) }
             }
             is WalletConnectAction.RejectUnsupportedRequest -> {
-                store.dispatchOnMain(GlobalAction.ShowDialog(WalletConnectDialog.UnsupportedNetwork))
+                store.dispatchOnMain(GlobalAction.ShowDialog(WalletConnectDialog.UnsupportedNetwork()))
             }
         }
     }
@@ -337,7 +340,7 @@ class WalletConnectMiddleware {
             chainId = chainId,
             peer = session.peerMeta,
         ).guard {
-            store.dispatchOnMain(GlobalAction.ShowDialog(WalletConnectDialog.UnsupportedNetwork))
+            store.dispatchOnMain(GlobalAction.ShowDialog(WalletConnectDialog.UnsupportedNetwork()))
             return
         }
 

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

@@ -91,7 +91,7 @@ data class WalletForSession(
 sealed class WalletConnectDialog : StateDialog {
     data class ClipboardOrScanQr(val clipboardUri: String) : WalletConnectDialog()
     object UnsupportedCard : WalletConnectDialog()
-    object UnsupportedNetwork : WalletConnectDialog()
+    data class UnsupportedNetwork(val networks: List<String>? = null) : WalletConnectDialog()
     data class AddNetwork(val network: String) : WalletConnectDialog()
     object OpeningSessionRejected : WalletConnectDialog()
     object SessionTimeout : WalletConnectDialog()