Updated on 2026-08-14

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

@@ -47,6 +47,14 @@ class WalletConnectSdkHelper {
         store.inject(DaggerGraphState::generalUserWalletsListManager)
     }
 
+    private val userWalletsListRepository by lazy {
+        store.inject(DaggerGraphState::userWalletsListRepository)
+    }
+
+    private val hotWalletFeatureToggles by lazy {
+        store.inject(DaggerGraphState::hotWalletFeatureToggles)
+    }
+
     @Suppress("MagicNumber")
     suspend fun prepareTransactionData(data: EthTransactionData): WcTransactionData {
         val transaction = data.transaction
@@ -128,13 +136,13 @@ class WalletConnectSdkHelper {
         )
     }
 
-    fun isDemoCard(): Boolean {
-        val userWallet = userWalletsListManager.selectedUserWalletSync ?: return false
+    suspend fun isDemoCard(): Boolean {
+        val userWallet = getSelectedWallet() ?: return false
         return userWallet is UserWallet.Cold && userWallet.scanResponse.isDemoCard()
     }
 
     private suspend fun getWalletManager(blockchain: Blockchain, derivationPath: String?): WalletManager? {
-        val userWallet = userWalletsListManager.selectedUserWalletSync ?: return null
+        val userWallet = getSelectedWallet() ?: return null
         val walletManagerFacade = store.inject(DaggerGraphState::walletManagersFacade)
         return walletManagerFacade.getOrCreateWalletManager(
             userWalletId = userWallet.walletId,
@@ -481,6 +489,14 @@ class WalletConnectSdkHelper {
         }
     }
 
+    private suspend fun getSelectedWallet(): UserWallet? {
+        return if (hotWalletFeatureToggles.isHotWalletEnabled) {
+            userWalletsListRepository.selectedUserWalletSync()
+        } else {
+            userWalletsListManager.selectedUserWalletSync
+        }
+    }
+
     private fun getSolanaResultString(signedHash: ByteArray) = "{ signature: \"${signedHash.encodeBase58()}\" }"
 
     /**

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

@@ -3,6 +3,7 @@ package com.tangem.tap.features.details.redux.walletconnect
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchainsdk.utils.toNetworkId
 import com.tangem.common.routing.AppRoute
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.tap.common.extensions.dispatchNavigationAction
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.inject
@@ -183,9 +184,19 @@ class WalletConnectMiddleware {
 
     private suspend fun getWalletManagers(): List<WalletManager> {
         val walletManagerFacade = store.inject(DaggerGraphState::walletManagersFacade)
-        val userWalletsListManager = store.inject(DaggerGraphState::generalUserWalletsListManager)
-        val userWallet = userWalletsListManager.selectedUserWalletSync ?: return emptyList()
-
+        val userWallet = getSelectedWallet() ?: return emptyList()
         return walletManagerFacade.getStoredWalletManagers(userWallet.walletId)
     }
+
+    private suspend fun getSelectedWallet(): UserWallet? {
+        val userWalletsListManager = store.inject(DaggerGraphState::generalUserWalletsListManager)
+        val userWalletsListRepository = store.inject(DaggerGraphState::userWalletsListRepository)
+        val hotWalletFeatureToggles = store.inject(DaggerGraphState::hotWalletFeatureToggles)
+
+        return if (hotWalletFeatureToggles.isHotWalletEnabled) {
+            userWalletsListRepository.selectedUserWalletSync()
+        } else {
+            userWalletsListManager.selectedUserWalletSync
+        }
+    }
 }

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

@@ -18,6 +18,7 @@ import com.tangem.domain.wallets.legacy.asLockable
 import com.tangem.domain.wallets.usecase.DeleteWalletUseCase
 import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
+import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import com.tangem.tap.common.analytics.events.Settings
 import com.tangem.tap.common.extensions.dispatchNavigationAction
 import com.tangem.tap.common.extensions.onUserWalletSelected
@@ -50,6 +51,7 @@ internal class ResetCardModel @Inject constructor(
     private val userWalletsListManager: UserWalletsListManager,
     private val analyticsEventHandler: AnalyticsEventHandler,
     private val cardSettingsInteractor: CardSettingsInteractor,
+    private val hotWalletFeatureToggles: HotWalletFeatureToggles,
 ) : Model() {
 
     private val params = paramsContainer.require<ResetCardComponent.Params>()
@@ -259,16 +261,20 @@ internal class ResetCardModel @Inject constructor(
     private fun finishFullReset() {
         cardSettingsInteractor.clear()
 
-        val newSelectedWallet = userWalletsListManager.selectedUserWalletSync
+        val newSelectedWallet = getSelectedWalletSyncUseCase.invoke().getOrNull()
 
         if (newSelectedWallet != null) {
             store.dispatchNavigationAction { popTo<AppRoute.Wallet>() }
         } else {
-            val isLocked = runCatching { userWalletsListManager.asLockable()?.isLockedSync }.isSuccess
-            if (isLocked && userWalletsListManager.hasUserWallets) {
-                store.dispatchNavigationAction { popTo<AppRoute.Welcome>() }
-            } else {
+            if (hotWalletFeatureToggles.isHotWalletEnabled) {
                 store.dispatchNavigationAction { replaceAll(AppRoute.Home()) }
+            } else {
+                val isLocked = runCatching { userWalletsListManager.asLockable()?.isLockedSync }.isSuccess
+                if (isLocked && userWalletsListManager.hasUserWallets) {
+                    store.dispatchNavigationAction { popTo<AppRoute.Welcome>() }
+                } else {
+                    store.dispatchNavigationAction { replaceAll(AppRoute.Home()) }
+                }
             }
         }
     }

app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt

@@ -24,6 +24,7 @@ import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
 import com.tangem.domain.balancehiding.ListenToFlipsUseCase
 import com.tangem.domain.balancehiding.UpdateBalanceHidingSettingsUseCase
 import com.tangem.domain.common.LogConfig
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.notifications.GetApplicationIdUseCase
 import com.tangem.domain.notifications.SendPushTokenUseCase
 import com.tangem.domain.notifications.models.ApplicationId
@@ -37,9 +38,9 @@ import com.tangem.domain.settings.DeleteDeprecatedLogsUseCase
 import com.tangem.domain.settings.IncrementAppLaunchCounterUseCase
 import com.tangem.domain.settings.usercountry.FetchUserCountryUseCase
 import com.tangem.domain.staking.FetchStakingTokensUseCase
-import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.usecase.AssociateWalletsWithApplicationIdUseCase
 import com.tangem.domain.wallets.usecase.GetSavedWalletsCountUseCase
+import com.tangem.domain.wallets.usecase.GetSelectedWalletUseCase
 import com.tangem.domain.wallets.usecase.UpdateRemoteWalletsInfoUseCase
 import com.tangem.feature.swap.analytics.StoriesEvents
 import com.tangem.tap.common.extensions.setContext
@@ -69,7 +70,6 @@ internal class MainViewModel @Inject constructor(
     deleteDeprecatedLogsUseCase: DeleteDeprecatedLogsUseCase,
     private val incrementAppLaunchCounterUseCase: IncrementAppLaunchCounterUseCase,
     private val blockchainSDKFactory: BlockchainSDKFactory,
-    private val userWalletsListManager: UserWalletsListManager,
     private val dispatchers: CoroutineDispatcherProvider,
     private val fetchStakingTokensUseCase: FetchStakingTokensUseCase,
     private val fetchUserCountryUseCase: FetchUserCountryUseCase,
@@ -90,6 +90,7 @@ internal class MainViewModel @Inject constructor(
     private val multiQuoteUpdater: MultiQuoteUpdater,
     private val appStateHolder: AppStateHolder,
     private val environmentConfigStorage: EnvironmentConfigStorage,
+    private val getSelectedWalletUseCase: GetSelectedWalletUseCase,
     getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase,
 ) : ViewModel() {
 
@@ -185,13 +186,16 @@ internal class MainViewModel @Inject constructor(
     }
 
     private fun prepareSelectedWalletFeedback() {
-        userWalletsListManager.selectedUserWallet
-            .distinctUntilChanged()
-            .onEach { userWallet ->
-                Analytics.setContext(userWallet)
+        getSelectedWalletUseCase.invoke()
+            .mapLeft { emptyFlow<UserWallet>() }
+            .onRight {
+                it.distinctUntilChanged()
+                    .onEach { userWallet ->
+                        Analytics.setContext(userWallet)
+                    }
+                    .flowOn(dispatchers.io)
+                    .launchIn(viewModelScope)
             }
-            .flowOn(dispatchers.io)
-            .launchIn(viewModelScope)
     }
 
     private suspend fun fetchStakingTokens() {
@@ -214,7 +218,7 @@ internal class MainViewModel @Inject constructor(
             apiKey = environmentConfig.moonPayApiKey,
             secretKey = environmentConfig.moonPayApiSecretKey,
             logEnabled = LogConfig.network.moonPayService,
-            userWalletProvider = { userWalletsListManager.selectedUserWalletSync },
+            userWalletProvider = { getSelectedWalletUseCase.sync().getOrNull() },
         )
     }
 

app/src/main/java/com/tangem/tap/network/exchangeServices/CryptoCurrencyConverter.kt

@@ -6,6 +6,7 @@ import com.tangem.blockchainsdk.utils.ExcludedBlockchains
 import com.tangem.blockchainsdk.utils.toBlockchain
 import com.tangem.data.common.currency.CryptoCurrencyFactory
 import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.tap.common.extensions.inject
 import com.tangem.tap.domain.model.Currency
 import com.tangem.tap.proxy.redux.DaggerGraphState
@@ -24,9 +25,7 @@ internal class CryptoCurrencyConverter(
                 cryptoCurrencyFactory.createCoin(
                     blockchain = value.blockchain,
                     extraDerivationPath = value.derivationPath,
-                    userWallet = requireNotNull(
-                        store.inject(DaggerGraphState::generalUserWalletsListManager).selectedUserWalletSync,
-                    ),
+                    userWallet = getSelectedWallet(),
                 ),
             )
             is Currency.Token -> requireNotNull(
@@ -34,9 +33,7 @@ internal class CryptoCurrencyConverter(
                     sdkToken = value.token,
                     blockchain = value.blockchain,
                     extraDerivationPath = value.derivationPath,
-                    userWallet = requireNotNull(
-                        store.inject(DaggerGraphState::generalUserWalletsListManager).selectedUserWalletSync,
-                    ),
+                    userWallet = getSelectedWallet(),
                 ),
             )
         }
@@ -63,4 +60,15 @@ internal class CryptoCurrencyConverter(
             )
         }
     }
+
+    fun getSelectedWallet(): UserWallet {
+        val userWalletListManager = store.inject(DaggerGraphState::generalUserWalletsListManager)
+        val userWalletsListRepository = store.inject(DaggerGraphState::userWalletsListRepository)
+        val hotWalletFeatureToggles = store.inject(DaggerGraphState::hotWalletFeatureToggles)
+        return if (hotWalletFeatureToggles.isHotWalletEnabled) {
+            requireNotNull(userWalletsListRepository.selectedUserWallet.value)
+        } else {
+            requireNotNull(userWalletListManager.selectedUserWalletSync)
+        }
+    }
 }

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

@@ -5,7 +5,7 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchainsdk.utils.fromNetworkId
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.domain.wallets.legacy.UserWalletsListManager
+import com.tangem.domain.wallets.usecase.GetSelectedWalletUseCase
 import com.tangem.lib.crypto.UserWalletManager
 import com.tangem.lib.crypto.models.ProxyAmount
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -15,13 +15,13 @@ import java.math.BigDecimal
 
 class UserWalletManagerImpl(
     private val walletManagersFacade: WalletManagersFacade,
-    private val userWalletsListManager: UserWalletsListManager,
+    private val getSelectedWalletUseCase: GetSelectedWalletUseCase,
     private val dispatchers: CoroutineDispatcherProvider,
 ) : UserWalletManager {
 
     override fun getWalletId(): String {
         val selectedUserWallet = requireNotNull(
-            userWalletsListManager.selectedUserWalletSync,
+            getSelectedWalletUseCase.sync().getOrNull(),
         ) { "selectedUserWallet shouldn't be null" }
         return selectedUserWallet.walletId.stringValue
     }
@@ -62,7 +62,7 @@ class UserWalletManagerImpl(
     @Throws(IllegalArgumentException::class)
     private suspend fun getActualWalletManager(blockchain: Blockchain, derivationPath: String?): WalletManager {
         val selectedUserWallet = requireNotNull(
-            userWalletsListManager.selectedUserWalletSync,
+            getSelectedWalletUseCase.sync().getOrNull(),
         ) { "userWallet or userWalletsListManager is null" }
         val walletManager = withContext(dispatchers.io) {
             walletManagersFacade.getOrCreateWalletManager(

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

@@ -1,7 +1,7 @@
 package com.tangem.tap.proxy.di
 
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.domain.wallets.legacy.UserWalletsListManager
+import com.tangem.domain.wallets.usecase.GetSelectedWalletUseCase
 import com.tangem.lib.crypto.UserWalletManager
 import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.tap.proxy.UserWalletManagerImpl
@@ -26,12 +26,12 @@ internal object ProxyModule {
     @Singleton
     fun provideUserWalletManager(
         walletManagersFacade: WalletManagersFacade,
-        userWalletsListManager: UserWalletsListManager,
+        getSelectedWalletUseCase: GetSelectedWalletUseCase,
         dispatchers: CoroutineDispatcherProvider,
     ): UserWalletManager {
         return UserWalletManagerImpl(
             walletManagersFacade = walletManagersFacade,
-            userWalletsListManager = userWalletsListManager,
+            getSelectedWalletUseCase = getSelectedWalletUseCase,
             dispatchers = dispatchers,
         )
     }