From d9f57b33b1fafd875c9d8ace2da413247ef8ee78 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 29 Sep 2022 17:41:10 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 .../tap/features/wallet/redux/WalletState.kt  | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
index f81d4662a5..933ca823bc 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
+++ b/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)
         }
     }