Updated on 2026-08-14

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,7 +53,7 @@ sealed class WalletConnectAction : Action {
         val updatedSession: WalletConnectSession,
     ) : WalletConnectAction()
 
-    data class FailureEstablishingSession(val session: WCSession?) : WalletConnectAction()
+    data class FailureEstablishingSession(val session: WCSession?, val error: TapError? = null) : WalletConnectAction()
     data class SetSessionsRestored(val sessions: List<WalletConnectSession>) :
         WalletConnectAction()
 
@@ -103,6 +104,6 @@ sealed class WalletConnectAction : Action {
 
         data class Sign(
             val id: Long, val data: ByteArray, val sessionData: WCSession,
-            ) : WalletConnectAction()
+        ) : WalletConnectAction()
     }
 }

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

@@ -9,6 +9,7 @@ import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.common.redux.navigation.AppScreen
@@ -22,6 +23,7 @@ import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.wallet.redux.WalletState
 import com.tangem.tap.scope
 import com.tangem.tap.store
+import com.tangem.wallet.R
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
 import org.rekotlin.Middleware
@@ -96,6 +98,16 @@ class WalletConnectMiddleware {
                 store.dispatchOnMain(GlobalAction.ShowDialog(WalletConnectDialog.SessionTimeout))
             }
             is WalletConnectAction.FailureEstablishingSession -> {
+                if (action.error != null) {
+                    store.dispatch(
+                        GlobalAction.ShowDialog(
+                            AppDialog.SimpleOkDialogRes(
+                                headerId = R.string.common_warning,
+                                messageId = action.error.messageResource,
+                            ),
+                        ),
+                    )
+                }
                 if (action.session != null) {
                     walletConnectManager.disconnect(action.session)
                 }

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

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -86,7 +87,7 @@ fun WalletConnectDetailsItem(
 ) {
     Row(
         modifier = modifier
-            .height(84.dp)
+            .defaultMinSize(minHeight = 84.dp)
             .fillMaxWidth()
             .clickable { onItemsClick(SettingsElement.WalletConnect) },
         horizontalArrangement = Arrangement.Start,
@@ -99,7 +100,7 @@ fun WalletConnectDetailsItem(
             tint = colorResource(id = R.color.all_colors_azure),
         )
         Column(
-            modifier = modifier.height(56.dp),
+            modifier = modifier.defaultMinSize(minHeight = 56.dp),
             horizontalAlignment = Alignment.Start,
             verticalArrangement = Arrangement.Center,
         ) {

app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt

@@ -1,6 +1,8 @@
 package com.tangem.tap.features.details.ui.resetcard
 
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -89,11 +91,14 @@ fun ResetCardView(
                 color = colorResource(id = R.color.text_secondary),
             )
 
-            Spacer(modifier = modifier.size(44.dp))
+            Spacer(modifier = modifier.size(28.dp))
             Row(
                 modifier = modifier
                     .fillMaxWidth()
-                    .padding(end = 20.dp),
+                    .clickable(
+                    onClick = { state.onAcceptWarningToggleClick(!state.accepted) },
+                )
+                    .padding(top = 16.dp, bottom = 16.dp),
             ) {
                 IconToggleButton(
                     checked = state.accepted,
@@ -120,13 +125,15 @@ fun ResetCardView(
                     text = stringResource(id = R.string.reset_card_to_factory_warning_message),
                     style = TangemTypography.body2,
                     color = colorResource(id = R.color.text_secondary),
+                    modifier = modifier
+                        .padding(end = 20.dp),
                 )
             }
 
-            Spacer(modifier = modifier.size(32.dp))
+            Spacer(modifier = modifier.size(16.dp))
             Box(
                 modifier = modifier
-                    .padding(start = 16.dp, end = 16.dp),
+                    .padding(start = 16.dp, end = 16.dp, bottom = 32.dp),
             ) {
                 DetailsMainButton(
                     title = stringResource(id = R.string.reset_card_to_factory_button_title),

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

@@ -140,13 +140,12 @@ private fun WalletConnectSessions(
                 horizontalArrangement = Arrangement.SpaceBetween,
                 verticalAlignment = Alignment.CenterVertically,
             ) {
-                Column(modifier = modifier) {
-                    Text(
-                        text = session.description,
-                        style = TangemTypography.subtitle1,
-                        color = colorResource(id = R.color.text_primary_1),
-                    )
-                }
+                Text(
+                    text = session.description,
+                    style = TangemTypography.subtitle1,
+                    color = colorResource(id = R.color.text_primary_1),
+                    modifier = modifier.weight(1f),
+                )
                 IconButton(
                     onClick = { state.onRemoveSession(session.sessionId) },
                 ) {

app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt

@@ -193,21 +193,28 @@ data class WalletState(
 
     fun removeWallet(walletData: WalletData?): WalletState {
         if (walletData == null) return this
-        return if (walletData.currency is Currency.Blockchain) {
-            val walletStores = wallets.filterNot {
-                it.blockchainNetwork.blockchain == walletData.currency.blockchain
-                    && it.blockchainNetwork.derivationPath == walletData.currency.derivationPath
+        return when (val currency = walletData.currency) {
+            is Currency.Blockchain -> {
+                val walletStores = wallets.filterNot {
+                    it.blockchainNetwork.blockchain == currency.blockchain
+                        && it.blockchainNetwork.derivationPath == currency.derivationPath
+                }
+                copy(wallets = walletStores)
+                    .updateTotalBalance()
+                    .updateProgressState()
+            }
+            is Currency.Token -> {
+                val walletStore = getWalletStore(walletData.currency)
+                val walletDataList = walletStore?.walletsData
+                    ?.filterNot { it.currency == walletData.currency }
+                    ?: emptyList()
+                val updatedWalletManager = walletStore?.walletManager?.also { it.removeToken(currency.token) }
+                val updatedWalletStore = walletStore?.copy(
+                    walletsData = walletDataList,
+                    walletManager = updatedWalletManager,
+                )
+                updateWalletStore(updatedWalletStore)
             }
-            copy(wallets = walletStores)
-                .updateTotalBalance()
-                .updateProgressState()
-        } else {
-            val walletStore = getWalletStore(walletData.currency)
-            val walletDataList = walletStore?.walletsData
-                ?.filterNot { it.currency == walletData.currency }
-                ?: emptyList()
-            val updatedWalletStore = walletStore?.copy(walletsData = walletDataList)
-            updateWalletStore(updatedWalletStore)
         }
     }
 

app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt

@@ -110,8 +110,12 @@ class WalletAdapter
             lContent.tvExchangeRate.text = wallet.fiatRateString
                 ?: root.getString(id = R.string.token_item_no_rate)
 
-            cardWallet.setOnClickListener {
-                store.dispatch(WalletAction.MultiWallet.SelectWallet(wallet))
+            if (wallet.walletAddresses != null) {
+                cardWallet.setOnClickListener {
+                    store.dispatch(WalletAction.MultiWallet.SelectWallet(wallet))
+                }
+            } else {
+                cardWallet.setOnClickListener(null)
             }
         }
     }