Updated on 2026-08-14

app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt

@@ -16,7 +16,6 @@ import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.domain.TangemSdkManager
 import com.tangem.tap.domain.tokens.UserTokensRepository
 import com.tangem.tap.domain.walletStores.WalletStoresManager
-import com.tangem.tap.features.wallet.redux.WalletState
 import com.tangem.tap.network.exchangeServices.ExchangeService
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -43,7 +42,6 @@ class AppStateHolder @Inject constructor() : WalletsStateHolder, ReduxNavControl
 
     @Deprecated("Use scan response from selected user wallet")
     var scanResponse: ScanResponse? = null
-    var walletState: WalletState? = null
     var userTokensRepository: UserTokensRepository? = null
     var mainStore: Store<AppState>? = null
     var tangemSdkManager: TangemSdkManager? = null

app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt

@@ -15,10 +15,8 @@ import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.domain.card.repository.CardSdkConfigRepository
-import com.tangem.domain.common.BlockchainNetwork
 import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.lib.crypto.TransactionManager
 import com.tangem.lib.crypto.models.*
 import com.tangem.lib.crypto.models.transactions.SendTxResult
@@ -39,7 +37,6 @@ class TransactionManagerImpl(
     private val analytics: AnalyticsEventHandler,
     private val cardSdkConfigRepository: CardSdkConfigRepository,
     private val walletManagersFacade: WalletManagersFacade,
-    private val walletFeatureToggles: WalletFeatureToggles,
 ) : TransactionManager {
 
     override suspend fun sendApproveTransaction(
@@ -413,19 +410,15 @@ class TransactionManagerImpl(
     }
 
     private suspend fun getActualWalletManager(blockchain: Blockchain, derivationPath: String?): WalletManager {
-        val walletManager = if (walletFeatureToggles.isRedesignedScreenEnabled) {
-            val selectedUserWallet = requireNotNull(
-                userWalletsListManager.selectedUserWalletSync,
-            ) { "userWallet or userWalletsListManager is null" }
-            walletManagersFacade.getOrCreateWalletManager(
-                selectedUserWallet.walletId,
-                blockchain,
-                derivationPath,
-            )
-        } else {
-            val blockchainNetwork = BlockchainNetwork(blockchain, derivationPath, emptyList())
-            appStateHolder.walletState?.getWalletManager(blockchainNetwork)
-        }
+        val selectedUserWallet = requireNotNull(
+            userWalletsListManager.selectedUserWalletSync,
+        ) { "userWallet or userWalletsListManager is null" }
+        val walletManager = walletManagersFacade.getOrCreateWalletManager(
+            selectedUserWallet.walletId,
+            blockchain,
+            derivationPath,
+        )
+
         return requireNotNull(walletManager) { "no wallet manager found" }
     }
 

app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt

@@ -11,15 +11,12 @@ import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.domain.common.extensions.toCoinId
 import com.tangem.domain.common.extensions.toNetworkId
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.lib.crypto.UserWalletManager
 import com.tangem.lib.crypto.models.Currency
 import com.tangem.lib.crypto.models.Currency.NativeToken
 import com.tangem.lib.crypto.models.Currency.NonNativeToken
 import com.tangem.lib.crypto.models.ProxyAmount
 import com.tangem.lib.crypto.models.ProxyFiatCurrency
-import com.tangem.tap.common.extensions.dispatchOnMain
-import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.userWalletsListManager
 import com.tangem.tap.walletCurrenciesManager
 import com.tangem.tap.walletStoresManager
@@ -31,7 +28,6 @@ import com.tangem.tap.features.wallet.models.Currency as WalletCurrency
 class UserWalletManagerImpl(
     private val appStateHolder: AppStateHolder,
     private val walletManagersFacade: WalletManagersFacade,
-    private val walletFeatureToggles: WalletFeatureToggles,
 ) : UserWalletManager {
 
     override suspend fun getUserTokens(
@@ -216,28 +212,17 @@ class UserWalletManagerImpl(
         )
     }
 
-    override fun refreshWallet() {
-        // workaround, should update wallet after transaction
-        appStateHolder.mainStore?.dispatchOnMain(WalletAction.LoadData.Refresh)
-    }
-
     @Throws(IllegalArgumentException::class)
     private suspend fun getActualWalletManager(blockchain: Blockchain, derivationPath: String?): WalletManager {
-        val walletManager = if (walletFeatureToggles.isRedesignedScreenEnabled) {
-            val selectedUserWallet = requireNotNull(
-                userWalletsListManager.selectedUserWalletSync,
-            ) { "userWallet or userWalletsListManager is null" }
-            walletManagersFacade.getOrCreateWalletManager(
-                selectedUserWallet.walletId,
-                blockchain,
-                derivationPath,
-            )
-        } else {
-            val blockchainNetwork = BlockchainNetwork(blockchain, derivationPath, emptyList())
-            return requireNotNull(appStateHolder.walletState?.getWalletManager(blockchainNetwork)) {
-                "No wallet manager found"
-            }
-        }
+        val selectedUserWallet = requireNotNull(
+            userWalletsListManager.selectedUserWalletSync,
+        ) { "userWallet or userWalletsListManager is null" }
+        val walletManager = walletManagersFacade.getOrCreateWalletManager(
+            selectedUserWallet.walletId,
+            blockchain,
+            derivationPath,
+        )
+
         return requireNotNull(walletManager) {
             "No wallet manager found"
         }

app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt

@@ -10,7 +10,6 @@ import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.tokens.repository.NetworksRepository
 import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.feature.learn2earn.domain.api.Learn2earnDependencyProvider
-import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.lib.crypto.DerivationManager
 import com.tangem.lib.crypto.TransactionManager
 import com.tangem.lib.crypto.UserWalletManager
@@ -39,12 +38,10 @@ class ProxyModule {
     fun provideUserWalletManager(
         appStateHolder: AppStateHolder,
         walletManagersFacade: WalletManagersFacade,
-        walletFeatureToggles: WalletFeatureToggles,
     ): UserWalletManager {
         return UserWalletManagerImpl(
             appStateHolder = appStateHolder,
             walletManagersFacade = walletManagersFacade,
-            walletFeatureToggles = walletFeatureToggles,
         )
     }
 
@@ -55,14 +52,12 @@ class ProxyModule {
         analytics: AnalyticsEventHandler,
         cardSdkConfigRepository: CardSdkConfigRepository,
         walletManagersFacade: WalletManagersFacade,
-        walletFeatureToggles: WalletFeatureToggles,
     ): TransactionManager {
         return TransactionManagerImpl(
             appStateHolder = appStateHolder,
             analytics = analytics,
             cardSdkConfigRepository = cardSdkConfigRepository,
             walletManagersFacade = walletManagersFacade,
-            walletFeatureToggles = walletFeatureToggles,
         )
     }