Updated on 2026-08-14

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

@@ -51,6 +51,13 @@ class DialogManager : StoreSubscriber<GlobalState> {
                     context = context
                 )
             }
+            is WalletConnectDialog.SessionTimeout -> {
+                dialog = SimpleAlertDialog.create(
+                    titleRes = R.string.wallet_connect,
+                    messageRes = R.string.wallet_connect_error_timeout,
+                    context = context
+                )
+            }
             is WalletConnectDialog.ApproveWcSession ->
                 dialog = ApproveWcSessionDialog.create(state.dialog.session, context)
             is WalletConnectDialog.ClipboardOrScanQr ->

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

@@ -16,6 +16,7 @@ import com.trustwallet.walletconnect.models.ethereum.WCEthereumSignMessage
 import com.trustwallet.walletconnect.models.ethereum.WCEthereumTransaction
 import com.trustwallet.walletconnect.models.session.WCSession
 import com.trustwallet.walletconnect.models.session.WCSessionUpdate
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import okhttp3.*
 import okhttp3.logging.HttpLoggingInterceptor
@@ -27,9 +28,9 @@ class WalletConnectManager {
 
     private val okHttpClient: OkHttpClient by lazy {
         OkHttpClient.Builder()
-            .connectTimeout(30, TimeUnit.SECONDS)
-            .readTimeout(30, TimeUnit.SECONDS)
-            .writeTimeout(30, TimeUnit.SECONDS)
+            .connectTimeout(20, TimeUnit.SECONDS)
+            .readTimeout(20, TimeUnit.SECONDS)
+            .writeTimeout(20, TimeUnit.SECONDS)
             .addInterceptor(interceptor)
             .addInterceptor(RetryInterceptor())
             .build()
@@ -57,6 +58,18 @@ class WalletConnectManager {
             client = client,
             wallet = wallet
         )
+        setupConnectionTimeoutCheck(session)
+    }
+
+    private fun setupConnectionTimeoutCheck(session: WCSession) {
+        scope.launch {
+            delay(20_000)
+            val data = sessions[session]
+            if (data != null && data.peerMeta == null) {
+                disconnect(session)
+                store.dispatchOnMain(WalletConnectAction.OpeningSessionTimeout(session))
+            }
+        }
     }
 
     fun restoreSessions() {
@@ -186,7 +199,6 @@ class WalletConnectManager {
             acceptRequest(data.session.session, data.id, hash)
             sessions[data.session.session] = activeData.copy(transactionData = null)
         }
-
     }
 
     fun handlePersonalSignRequest(
@@ -263,7 +275,6 @@ class WalletConnectManager {
                     type = WcTransactionType.EthSendTransaction
                 ))
             }
-
         }
         client.onEthSignTransaction = { id: Long, transaction: WCEthereumTransaction ->
             Timber.d("onEthSignTransaction: $transaction")

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

@@ -31,6 +31,8 @@ sealed class WalletConnectAction : Action {
 
     object RefuseOpeningSession : WalletConnectAction()
 
+    data class OpeningSessionTimeout(val session: WCSession) : WalletConnectAction()
+
     data class AcceptOpeningSession(val session: WalletConnectSession) : WalletConnectAction()
 
     data class ApproveSession(
@@ -41,7 +43,6 @@ sealed class WalletConnectAction : Action {
 
     data class FailureEstablishingSession(val session: WCSession?) : WalletConnectAction()
 
-
     data class SetSessionsRestored(val sessions: List<WalletConnectSession>) :
         WalletConnectAction()
 

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

@@ -61,6 +61,10 @@ class WalletConnectMiddleware {
                         handleScanCard(action.wcUri)
                     }
 
+                    is WalletConnectAction.OpeningSessionTimeout -> {
+                        store.dispatchOnMain(GlobalAction.ShowDialog(WalletConnectDialog.SessionTimeout))
+                    }
+
                     is WalletConnectAction.FailureEstablishingSession -> {
                         if (action.session != null) {
                             walletConnectManager.disconnect(action.session)

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

@@ -28,6 +28,7 @@ class WalletConnectReducer {
 
                 is WalletConnectAction.UnsupportedCard -> state.copy(loading = false)
                 is WalletConnectAction.RefuseOpeningSession -> state.copy(loading = false)
+                is WalletConnectAction.OpeningSessionTimeout -> state.copy(loading = false)
                 is WalletConnectAction.FailureEstablishingSession -> state.copy(loading = false)
 
                 else -> state

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

@@ -1,9 +1,7 @@
 package com.tangem.tap.features.details.redux.walletconnect
 
-import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.TransactionData
 import com.tangem.blockchain.common.WalletManager
-import com.tangem.common.extensions.hexToBytes
 import com.tangem.tap.common.redux.global.StateDialog
 import com.tangem.tap.features.details.ui.walletconnect.dialogs.PersonalSignDialogData
 import com.tangem.tap.features.details.ui.walletconnect.dialogs.TransactionRequestDialogData
@@ -30,11 +28,6 @@ data class WalletForSession(
 ) {
     val chainId
         get() = if (isTestNet) 4 else 1
-
-    fun getAddress(): String {
-        val blockchain = if (isTestNet) Blockchain.EthereumTestnet else Blockchain.Ethereum
-        return blockchain.makeAddresses(walletPublicKey.hexToBytes()).first().value
-    }
 }
 
 
@@ -42,6 +35,7 @@ sealed class WalletConnectDialog : StateDialog {
     data class ClipboardOrScanQr(val clipboardUri: String) : WalletConnectDialog()
     object UnsupportedCard : WalletConnectDialog()
     object OpeningSessionRejected : WalletConnectDialog()
+    object SessionTimeout : WalletConnectDialog()
     data class ApproveWcSession(val session: WalletConnectSession) : WalletConnectDialog()
     data class RequestTransaction(val dialogData: TransactionRequestDialogData) :
         WalletConnectDialog()

app/src/main/res/values/strings_untranslated.xml

@@ -156,7 +156,7 @@ this wallet.
     <string name="wallet_connect_scanner_error_no_ethereum_wallet" translatable="false">This card can’t be used to establish WalletConnect session</string>
     <string name="wallet_connect_could_not_complete" translatable="false">The operation couldn\'t be completed</string>
     <string name="wallet_connect_same_wcuri" translatable="false">The operation couldn\'t be completed. \n\nYou have already established a WalletConnect session with this parameters.</string>
+    <string name="wallet_connect_error_timeout" translatable="false">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
 
     <string name="warning_testnet_card_message" translatable="false">This is a Testnet card. Don\'t accept it as a payment. This card must only be used for testing and development purposes.</string>
-
 </resources>