Updated on 2026-08-14

app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletManagersRepository.kt

@@ -1,18 +1,17 @@
 package com.tangem.tap.domain.walletStores.repository.implementation
 
 import com.tangem.blockchain.common.*
-import com.tangem.blockchain.common.derivation.DerivationStyle
 import com.tangem.common.CompletionResult
 import com.tangem.common.catching
 import com.tangem.common.doOnSuccess
 import com.tangem.common.mapFailure
 import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.domain.common.BlockchainNetwork
+import com.tangem.domain.common.DerivationStyleProvider
 import com.tangem.domain.common.TapWorkarounds.isTestCard
-import com.tangem.domain.common.TapWorkarounds.useOldStyleDerivation
 import com.tangem.domain.common.extensions.makeWalletManagerForApp
 import com.tangem.domain.common.util.cardTypesResolver
-import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.wallets.legacy.WalletManagersRepository
 import com.tangem.domain.wallets.models.UserWallet
@@ -70,7 +69,7 @@ internal class DefaultWalletManagersRepository(
             }
         val derivationParams = getDerivationParams(
             derivationPath = blockchainNetwork?.derivationPath,
-            card = scanResponse.card,
+            derivationStyleProvider = scanResponse.derivationStyleProvider,
         )
 
         val walletManager = blockchain?.let {
@@ -209,17 +208,16 @@ internal class DefaultWalletManagersRepository(
             }
     }
 
-    private fun getDerivationParams(derivationPath: String?, card: CardDTO): DerivationParams? {
-        return derivationPath?.let {
-            DerivationParams.Custom(
-                path = DerivationPath(it),
-            )
-        } ?: if (!card.settings.isHDWalletAllowed) {
-            null
-        } else if (card.useOldStyleDerivation) {
-            DerivationParams.Default(DerivationStyle.LEGACY)
+    private fun getDerivationParams(
+        derivationPath: String?,
+        derivationStyleProvider: DerivationStyleProvider,
+    ): DerivationParams? {
+        val derivationStyle = derivationStyleProvider.getDerivationStyle() ?: return null
+
+        return if (derivationPath == null) {
+            DerivationParams.Default(derivationStyle)
         } else {
-            DerivationParams.Default(DerivationStyle.NEW)
+            DerivationParams.Custom(DerivationPath(derivationPath))
         }
     }
 }

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

@@ -13,6 +13,7 @@ import com.tangem.domain.common.extensions.toCoinId
 import com.tangem.domain.common.extensions.toNetworkId
 import com.tangem.domain.tokens.legacy.TradeCryptoAction
 import com.tangem.domain.tokens.models.CryptoCurrency
+import com.tangem.domain.tokens.models.Network
 import com.tangem.feature.swap.presentation.SwapFragment
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Token
@@ -53,11 +54,18 @@ class TradeCryptoMiddleware {
             is TradeCryptoAction.SendCrypto -> preconfigureAndOpenSendScreen(action)
             is TradeCryptoAction.FinishSelling -> openReceiptUrl(action.transactionId)
             is TradeCryptoAction.Swap -> {
-                openSwap(currency = store.state.walletState.selectedWalletData?.currency?.toSwapCurrency())
+                openSwap(
+                    currency = store.state.walletState.selectedWalletData?.currency?.toSwapCurrency(),
+                    derivationPath = store.state.walletState.selectedWalletData?.currency?.derivationPath,
+                )
             }
             is TradeCryptoAction.New.Buy -> proceedNewBuyAction(state, action)
             is TradeCryptoAction.New.Sell -> proceedNewSellAction(action)
-            is TradeCryptoAction.New.Swap -> openSwap(currency = action.cryptoCurrency.toSwapCurrency())
+            is TradeCryptoAction.New.Swap -> openSwap(
+                currency = action.cryptoCurrency.toSwapCurrency(),
+                derivationPath = action.cryptoCurrency.network.derivationPath.value,
+                network = action.cryptoCurrency.network,
+            )
             is TradeCryptoAction.New.SendToken -> handleNewSendToken(action = action)
             is TradeCryptoAction.New.SendCoin -> handleNewSendCoin(action = action)
         }
@@ -240,10 +248,11 @@ class TradeCryptoMiddleware {
         )?.let { store.dispatchOpenUrl(it) }
     }
 
-    private fun openSwap(currency: SwapCurrency?) {
+    private fun openSwap(currency: SwapCurrency?, derivationPath: String?, network: Network? = null) {
         val bundle = bundleOf(
             SwapFragment.CURRENCY_BUNDLE_KEY to Json.encodeToString(currency),
-            SwapFragment.DERIVATION_PATH to store.state.walletState.selectedWalletData?.currency?.derivationPath,
+            SwapFragment.DERIVATION_PATH to derivationPath,
+            SwapFragment.NETWORK to network,
         )
 
         store.dispatchOnMain(NavigationAction.NavigateTo(screen = AppScreen.Swap, bundle = bundle))
@@ -266,11 +275,11 @@ class TradeCryptoMiddleware {
             }
             is CryptoCurrency.Token -> {
                 SwapCurrency.NonNativeToken(
-                    id = id.value,
+                    id = id.rawCurrencyId ?: "",
                     name = name,
                     symbol = symbol,
                     networkId = blockchain.toNetworkId(),
-                    logoUrl = getIconUrl(id.value),
+                    logoUrl = getIconUrl(id.rawCurrencyId ?: ""),
                     contractAddress = contractAddress,
                     decimalCount = decimals,
                 )

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

@@ -17,6 +17,8 @@ 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
@@ -35,6 +37,8 @@ class TransactionManagerImpl(
     private val appStateHolder: AppStateHolder,
     private val analytics: AnalyticsEventHandler,
     private val cardSdkConfigRepository: CardSdkConfigRepository,
+    private val walletManagersFacade: WalletManagersFacade,
+    private val walletFeatureToggles: WalletFeatureToggles,
 ) : TransactionManager {
 
     override suspend fun sendApproveTransaction(
@@ -409,9 +413,20 @@ class TransactionManagerImpl(
         }
     }
 
-    private fun getActualWalletManager(blockchain: Blockchain, derivationPath: String?): WalletManager {
-        val blockchainNetwork = BlockchainNetwork(blockchain, derivationPath, emptyList())
-        val walletManager = appStateHolder.walletState?.getWalletManager(blockchainNetwork)
+    private suspend fun getActualWalletManager(blockchain: Blockchain, derivationPath: String?): WalletManager {
+        val walletManager = if (walletFeatureToggles.isRedesignedScreenEnabled) {
+            val selectedUserWallet = requireNotNull(
+                appStateHolder.userWalletsListManager?.selectedUserWalletSync,
+            ) { "userWallet or userWalletsListManager is null" }
+            walletManagersFacade.getOrCreateWalletManager(
+                selectedUserWallet,
+                blockchain,
+                derivationPath,
+            )
+        } else {
+            val blockchainNetwork = BlockchainNetwork(blockchain, derivationPath, emptyList())
+            appStateHolder.walletState?.getWalletManager(blockchainNetwork)
+        }
         return requireNotNull(walletManager) { "no wallet manager found" }
     }
 

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

@@ -11,6 +11,8 @@ 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.userwallets.UserWalletIdBuilder
+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
@@ -29,6 +31,8 @@ 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(
@@ -142,13 +146,13 @@ class UserWalletManagerImpl(
             }
     }
 
-    override fun getWalletAddress(networkId: String, derivationPath: String?): String {
+    override suspend fun getWalletAddress(networkId: String, derivationPath: String?): String {
         val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
         val walletManager = getActualWalletManager(blockchain, derivationPath)
         return walletManager.wallet.address
     }
 
-    override fun getLastTransactionHash(networkId: String, derivationPath: String?): String? {
+    override suspend fun getLastTransactionHash(networkId: String, derivationPath: String?): String? {
         val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
         val walletManager = getActualWalletManager(blockchain, derivationPath)
         return walletManager.wallet.recentTransactions
@@ -187,7 +191,7 @@ class UserWalletManagerImpl(
         return balances
     }
 
-    override fun getNativeTokenBalance(networkId: String, derivationPath: String?): ProxyAmount? {
+    override suspend fun getNativeTokenBalance(networkId: String, derivationPath: String?): ProxyAmount? {
         val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
         val walletManager = getActualWalletManager(blockchain, derivationPath)
         return walletManager.wallet.amounts.firstNotNullOfOrNull {
@@ -220,10 +224,24 @@ class UserWalletManagerImpl(
         appStateHolder.mainStore?.dispatchOnMain(WalletAction.LoadData.Refresh)
     }
 
-    @kotlin.jvm.Throws(IllegalArgumentException::class)
-    private fun getActualWalletManager(blockchain: Blockchain, derivationPath: String?): WalletManager {
-        val blockchainNetwork = BlockchainNetwork(blockchain, derivationPath, emptyList())
-        return requireNotNull(appStateHolder.walletState?.getWalletManager(blockchainNetwork)) {
+    @Throws(IllegalArgumentException::class)
+    private suspend fun getActualWalletManager(blockchain: Blockchain, derivationPath: String?): WalletManager {
+        val walletManager = if (walletFeatureToggles.isRedesignedScreenEnabled) {
+            val selectedUserWallet = requireNotNull(
+                appStateHolder.userWalletsListManager?.selectedUserWalletSync,
+            ) { "userWallet or userWalletsListManager is null" }
+            walletManagersFacade.getOrCreateWalletManager(
+                selectedUserWallet,
+                blockchain,
+                derivationPath,
+            )
+        } else {
+            val blockchainNetwork = BlockchainNetwork(blockchain, derivationPath, emptyList())
+            return requireNotNull(appStateHolder.walletState?.getWalletManager(blockchainNetwork)) {
+                "No wallet manager found"
+            }
+        }
+        return requireNotNull(walletManager) {
             "No wallet manager found"
         }
     }

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

@@ -6,7 +6,9 @@ import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
 import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.common.CardTypesResolver
 import com.tangem.domain.common.util.cardTypesResolver
+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
@@ -32,9 +34,15 @@ class ProxyModule {
 
     @Provides
     @Singleton
-    fun provideUserWalletManager(appStateHolder: AppStateHolder): UserWalletManager {
+    fun provideUserWalletManager(
+        appStateHolder: AppStateHolder,
+        walletManagersFacade: WalletManagersFacade,
+        walletFeatureToggles: WalletFeatureToggles,
+    ): UserWalletManager {
         return UserWalletManagerImpl(
             appStateHolder = appStateHolder,
+            walletManagersFacade = walletManagersFacade,
+            walletFeatureToggles = walletFeatureToggles,
         )
     }
 
@@ -44,11 +52,15 @@ class ProxyModule {
         appStateHolder: AppStateHolder,
         analytics: AnalyticsEventHandler,
         cardSdkConfigRepository: CardSdkConfigRepository,
+        walletManagersFacade: WalletManagersFacade,
+        walletFeatureToggles: WalletFeatureToggles,
     ): TransactionManager {
         return TransactionManagerImpl(
             appStateHolder = appStateHolder,
             analytics = analytics,
             cardSdkConfigRepository = cardSdkConfigRepository,
+            walletManagersFacade = walletManagersFacade,
+            walletFeatureToggles = walletFeatureToggles,
         )
     }