Updated on 2026-08-14

app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt

@@ -28,6 +28,8 @@ fun Blockchain.getRoundIconRes(): Int {
         Blockchain.Dogecoin -> R.drawable.ic_dogecoin_round
         Blockchain.Tron, Blockchain.TronTestnet -> R.drawable.ic_tron_round
         Blockchain.Gnosis -> R.drawable.ic_gnosis_round
+        Blockchain.EthereumPow, Blockchain.EthereumPowTestnet -> R.drawable.ic_ethereumpow_round
+        Blockchain.EthereumFair -> R.drawable.ic_ethereumfair_round
         Blockchain.Polkadot, Blockchain.PolkadotTestnet -> R.drawable.ic_polkadot_round
         Blockchain.Kusama -> R.drawable.ic_kusama_round
         Blockchain.Optimism, Blockchain.OptimismTestnet -> R.drawable.ic_optimism
@@ -59,6 +61,8 @@ fun Blockchain.getGreyedOutIconRes(): Int {
         Blockchain.Dogecoin -> R.drawable.ic_dogecoin_no_color
         Blockchain.Tron, Blockchain.TronTestnet -> R.drawable.ic_tron_no_color
         Blockchain.Gnosis -> R.drawable.ic_gnosis_no_color
+        Blockchain.EthereumPow, Blockchain.EthereumPowTestnet -> R.drawable.ic_ethereumpow_no_color
+        Blockchain.EthereumFair -> R.drawable.ic_ethereumfair_no_color
         Blockchain.Polkadot, Blockchain.PolkadotTestnet -> R.drawable.ic_polkadot_no_color
         Blockchain.Kusama -> R.drawable.ic_kusama_no_color
         Blockchain.Optimism, Blockchain.OptimismTestnet -> R.drawable.ic_optimism_no_color

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

@@ -42,7 +42,7 @@ sealed class TapError(
 
     data class UnsupportedState(
         val stateError: String,
-        val customMessage: String = "Unsupported state:"
+        val customMessage: String = "Unsupported state:",
     ) : TapError(R.string.common_custom_string, listOf("$customMessage $stateError"))
 
     sealed class WalletManager {
@@ -53,9 +53,13 @@ sealed class TapError(
         object BlockchainIsUnreachableTryLater : TapError(R.string.wallet_balance_blockchain_unreachable_try_later)
     }
 
+    sealed class WalletConnect {
+        object UnsupportedDapp : TapError(R.string.wallet_connect_error_unsupported_dapp)
+    }
+
     data class ValidateTransactionErrors(
         override val errorList: List<TapError>,
-        override val builder: (List<String>) -> String
+        override val builder: (List<String>) -> String,
     ) : TapError(-1), MultiMessageError
 }
 

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

@@ -7,6 +7,8 @@ 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
+import com.tangem.tap.domain.TapError
+import com.tangem.tap.domain.walletconnect.extensions.isDappSupported
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectDialog
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectSession
@@ -341,21 +343,30 @@ class WalletConnectManager {
             val session = client.session
             val data = sessions[session]?.copy(peerMeta = peer, remotePeerId = client.remotePeerId)
             if (data != null && session != null) {
-                sessions[session] = data
-                val sessionData = data.toWalletConnectSession()
-                sessionData?.let {
+                if (!peer.isDappSupported()) {
                     store.dispatchOnMain(
-                        WalletConnectAction.ScanCard(
-                            session = sessionData,
-                            chainId = client.chainId?.toIntOrNull()
+                        WalletConnectAction.FailureEstablishingSession(
+                            session = session,
+                            error = TapError.WalletConnect.UnsupportedDapp,
+                        ),
+                    )
+                } else {
+                    sessions[session] = data
+                    val sessionData = data.toWalletConnectSession()
+                    sessionData?.let {
+                        store.dispatchOnMain(
+                            WalletConnectAction.ScanCard(
+                                session = sessionData,
+                                chainId = client.chainId?.toIntOrNull(),
+                            ),
                         )
+                    }
+                    store.state.globalState.analyticsHandlers?.logWcEvent(
+                        Analytics.WcAnalyticsEvent.Session(
+                            Analytics.WcSessionEvent.Connect, peer.url,
+                        ),
                     )
                 }
-                store.state.globalState.analyticsHandlers?.logWcEvent(
-                    Analytics.WcAnalyticsEvent.Session(
-                        Analytics.WcSessionEvent.Connect, peer.url
-                    )
-                )
             }
         }
         client.onSessionUpdate = { id: Long, update: WCSessionUpdate ->

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

@@ -0,0 +1,9 @@
+package com.tangem.tap.domain.walletconnect.extensions
+
+import com.trustwallet.walletconnect.models.WCPeerMeta
+
+fun WCPeerMeta.isDappSupported(): Boolean {
+    return !unsupportedDappsList.any { this.url.contains(it) }
+}
+
+private val unsupportedDappsList: List<String> = listOf("dydx.exchange")

app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt

@@ -448,6 +448,33 @@ class DemoConfig {
         "AB02000000049533",
         "AB02000000049541",
         "AB02000000049830",
+        // === more cids ===
+        "AC03000000091418",
+        "AC03000000091400",
+        "AC03000000099007",
+        "AC03000000098991",
+        "AC03000000098942",
+        "AC03000000091715",
+        "AC03000000091301",
+        "AC03000000091343",
+        "AB01000000055705",
+        "AB01000000052918",
+        "AB01000000047710",
+        "AB01000000052306",
+        "AB01000000047645",
+        "AB01000000048957",
+        "AB01000000052900",
+        "AB01000000050391",
+        "AB01000000047363",
+        "AB02000000053998",
+        "AB02000000019809",
+        "AB02000000020872",
+        "AB02000000022027",
+        "AB02000000058955",
+        "AB02000000053253",
+        "AB02000000048063",
+        "AB02000000023736",
+        "AB02000000058187",
     )
 
     private val testDemoCardIds = listOf(

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

@@ -3,6 +3,7 @@ package com.tangem.tap.features.details.redux.walletconnect
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.domain.common.ScanResponse
 import com.tangem.tap.common.redux.NotificationAction
+import com.tangem.tap.domain.TapError
 import com.tangem.wallet.R
 import com.trustwallet.walletconnect.models.binance.WCBinanceTradeOrder
 import com.trustwallet.walletconnect.models.binance.WCBinanceTransferOrder
@@ -52,11 +53,7 @@ sealed class WalletConnectAction : Action {
         val updatedSession: WalletConnectSession,
     ) : WalletConnectAction()
 
-    data class FailureEstablishingSession(
-        val session: WCSession?,
-        val showWarning: Boolean = false,
-    ) : WalletConnectAction()
-
+    data class FailureEstablishingSession(val session: WCSession?, val error: TapError? = null) : WalletConnectAction()
     data class SetSessionsRestored(val sessions: List<WalletConnectSession>) :
         WalletConnectAction()
 

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

@@ -98,19 +98,19 @@ class WalletConnectMiddleware {
                 store.dispatchOnMain(GlobalAction.ShowDialog(WalletConnectDialog.SessionTimeout))
             }
             is WalletConnectAction.FailureEstablishingSession -> {
-                if (action.session != null) {
-                    walletConnectManager.disconnect(action.session)
-                }
-                if (action.showWarning) {
-                    store.dispatchOnMain(
+                if (action.error != null) {
+                    store.dispatch(
                         GlobalAction.ShowDialog(
                             AppDialog.SimpleOkDialogRes(
                                 headerId = R.string.common_warning,
-                                messageId = R.string.wallet_connect_error_failed_to_connect,
+                                messageId = action.error.messageResource,
                             ),
                         ),
                     )
                 }
+                if (action.session != null) {
+                    walletConnectManager.disconnect(action.session)
+                }
             }
             is WalletConnectAction.UnsupportedCard -> {
                 store.dispatchOnMain(GlobalAction.ShowDialog(WalletConnectDialog.UnsupportedCard))