Updated on 2026-08-14

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/organizetokens/OrganizeTokensComponent.kt

@@ -7,7 +7,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.ui.decompose.ComposableContentComponent
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.child.organizetokens.model.OrganizeTokensModel
 import com.tangem.feature.wallet.presentation.organizetokens.OrganizeTokensScreen
 import kotlinx.coroutines.launch

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/organizetokens/model/OrganizeTokensModel.kt

@@ -11,6 +11,7 @@ import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
 import com.tangem.domain.core.lce.Lce
+import com.tangem.domain.models.TokensSortType
 import com.tangem.domain.tokens.ApplyTokenListSortingUseCase
 import com.tangem.domain.tokens.GetTokenListUseCase
 import com.tangem.domain.tokens.ToggleTokenListGroupingUseCase
@@ -89,7 +90,7 @@ internal class OrganizeTokensModel @Inject constructor(
 
     override fun onSortClick() {
         val list = cachedTokenList ?: return
-        if (list.sortedBy == TokenList.SortType.BALANCE) return
+        if (list.sortedBy == TokensSortType.BALANCE) return
 
         analyticsEventsHandler.send(PortfolioOrganizeTokensAnalyticsEvent.ByBalance)
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt

@@ -4,18 +4,16 @@ import androidx.compose.runtime.Stable
 import arrow.core.getOrElse
 import com.arkivanov.decompose.router.slot.activate
 import com.arkivanov.decompose.router.slot.dismiss
-import com.tangem.common.routing.AppRoute
-import com.tangem.common.routing.AppRouter
-import com.tangem.common.routing.RoutingFeatureToggle
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.analytics.models.event.MainScreenAnalyticsEvent
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
-import com.tangem.core.deeplink.DeepLinksRegistry
-import com.tangem.core.deeplink.global.ReferralDeepLink
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
-import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.card.common.util.cardTypesResolver
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.models.wallet.isMultiCurrency
 import com.tangem.domain.nft.ObserveAndClearNFTCacheIfNeedUseCase
 import com.tangem.domain.notifications.GetIsHuaweiDeviceWithoutGoogleServicesUseCase
 import com.tangem.domain.notifications.repository.NotificationsRepository
@@ -23,19 +21,13 @@ import com.tangem.domain.notifications.toggles.NotificationsFeatureToggles
 import com.tangem.domain.settings.*
 import com.tangem.domain.tokens.FetchCurrencyStatusUseCase
 import com.tangem.domain.tokens.RefreshMultiCurrencyWalletQuotesUseCase
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.UserWalletId
-import com.tangem.domain.wallets.models.isMultiCurrency
+import com.tangem.domain.tokens.TokensFeatureToggles
 import com.tangem.domain.wallets.usecase.*
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
-import com.tangem.feature.wallet.presentation.deeplink.WalletDeepLinksHandler
 import com.tangem.feature.wallet.presentation.router.InnerWalletRouter
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.SelectedWalletAnalyticsSender
-import com.tangem.feature.wallet.presentation.wallet.domain.MultiWalletTokenListStore
-import com.tangem.feature.wallet.presentation.wallet.domain.OnrampStatusFactory
-import com.tangem.feature.wallet.presentation.wallet.domain.WalletImageResolver
-import com.tangem.feature.wallet.presentation.wallet.domain.WalletNameMigrationUseCase
+import com.tangem.feature.wallet.presentation.wallet.domain.*
 import com.tangem.feature.wallet.presentation.wallet.loaders.WalletScreenContentLoader
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletDialogConfig
@@ -48,9 +40,11 @@ import com.tangem.feature.wallet.presentation.wallet.utils.ScreenLifecycleProvid
 import com.tangem.features.biometry.AskBiometryComponent
 import com.tangem.features.pushnotifications.api.PushNotificationsModelCallbacks
 import com.tangem.features.pushnotifications.api.utils.PUSH_PERMISSION
+import com.tangem.features.wallet.deeplink.WalletDeepLinkActionListener
 import com.tangem.utils.Provider
 import com.tangem.utils.coroutines.*
 import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.*
 import timber.log.Timber
 import javax.inject.Inject
@@ -74,7 +68,6 @@ internal class WalletModel @Inject constructor(
     private val isWalletsScrollPreviewEnabled: IsWalletsScrollPreviewEnabled,
     private val getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase,
     private val selectedWalletAnalyticsSender: SelectedWalletAnalyticsSender,
-    private val walletDeepLinksHandler: WalletDeepLinksHandler,
     private val walletNameMigrationUseCase: WalletNameMigrationUseCase,
     private val refreshMultiCurrencyWalletQuotesUseCase: RefreshMultiCurrencyWalletQuotesUseCase,
     private val shouldAskPermissionUseCase: ShouldAskPermissionUseCase,
@@ -82,11 +75,11 @@ internal class WalletModel @Inject constructor(
     private val tokenListStore: MultiWalletTokenListStore,
     private val onrampStatusFactory: OnrampStatusFactory,
     private val analyticsEventsHandler: AnalyticsEventHandler,
-    private val deepLinksRegistry: DeepLinksRegistry,
     private val fetchCurrencyStatusUseCase: FetchCurrencyStatusUseCase,
-    private val appRouter: AppRouter,
-    private val routingFeatureToggle: RoutingFeatureToggle,
+    private val walletContentFetcher: WalletContentFetcher,
+    private val tokensFeatureToggles: TokensFeatureToggles,
     private val observeAndClearNFTCacheIfNeedUseCase: ObserveAndClearNFTCacheIfNeedUseCase,
+    private val walletDeepLinkActionListener: WalletDeepLinkActionListener,
     private val notificationsRepository: NotificationsRepository,
     private val getWalletsListForEnablingUseCase: GetWalletsForAutomaticallyPushEnablingUseCase,
     private val setNotificationsEnabledUseCase: SetNotificationsEnabledUseCase,
@@ -176,7 +169,16 @@ internal class WalletModel @Inject constructor(
         return innerWalletRouter.isWalletLastScreen() && shouldShowSaveWalletScreenUseCase() && canUseBiometryUseCase()
     }
 
-    private fun subscribeToUserWalletsUpdates() {
+    private fun subscribeToUserWalletsUpdates() = channelFlow<Unit> {
+        val firstWalletsUseCaseEmit = MutableStateFlow(false)
+        suspend fun waitFirstWalletsUseCaseEmit() = firstWalletsUseCaseEmit.filter { it }.first()
+
+        // deepLinkActionFlow must wait for fist getWalletsUseCase() emit to correct handle Action.InitializeWallets
+        walletDeepLinkActionListener.selectWalletFlow
+            .onEach { waitFirstWalletsUseCaseEmit() }
+            .onEach(::selectWalletById)
+            .launchIn(this)
+
         getWalletsUseCase()
             .conflate()
             .distinctUntilChanged()
@@ -187,10 +189,13 @@ internal class WalletModel @Inject constructor(
                 )
             }
             .onEach(::updateWallets)
-            .flowOn(dispatchers.main)
-            .launchIn(modelScope)
-            .saveIn(walletsUpdateJobHolder)
+            .onEach { firstWalletsUseCaseEmit.update { true } }
+            .launchIn(this)
+        awaitClose()
     }
+        .flowOn(dispatchers.default)
+        .launchIn(modelScope)
+        .saveIn(walletsUpdateJobHolder)
 
     private fun subscribeOnBalanceHiding() {
         getBalanceHidingSettingsUseCase()
@@ -234,12 +239,6 @@ internal class WalletModel @Inject constructor(
                         selectedWalletAnalyticsSender.send(selectedWallet)
                     }
 
-                    if (!routingFeatureToggle.isDeepLinkNavigationEnabled) {
-                        // Registering here, because `WalletDeepLinksHandler` unregisters deeplink when scope is cancelled
-                        // This is temporary solution, will be removed with complete deeplink navigation overhaul
-                        addReferralDeepLink(selectedWallet)
-                        walletDeepLinksHandler.registerForWallet(scope = modelScope, userWallet = selectedWallet)
-                    }
                     subscribeOnExpressTransactionsUpdates(selectedWallet)
                     observeAndClearNFTCacheIfNeedUseCase(selectedWallet)
                 }
@@ -248,18 +247,17 @@ internal class WalletModel @Inject constructor(
         }
     }
 
-    private fun addReferralDeepLink(userWallet: UserWallet) {
-        deepLinksRegistry.register(
-            ReferralDeepLink(
-                onReceive = {
-                    if (userWallet !is UserWallet.Cold || userWallet.cardTypesResolver.isTangemWallet()) {
-                        appRouter.push(
-                            AppRoute.ReferralProgram(userWalletId = userWallet.walletId),
-                        )
-                    }
-                },
-            ),
-        )
+    private fun selectWalletById(selectedWalletId: UserWalletId) {
+        val currentWalletId = stateHolder.getSelectedWalletId()
+
+        if (currentWalletId == selectedWalletId) return
+
+        val currentIndex = stateHolder.getWalletIndexByWalletId(userWalletId = currentWalletId) ?: return
+        val newIndex = stateHolder.getWalletIndexByWalletId(userWalletId = selectedWalletId) ?: return
+
+        scrollToWallet(prevIndex = currentIndex, newIndex = newIndex) {
+            stateHolder.update { it.copy(selectedWalletIndex = newIndex) }
+        }
     }
 
     // We need to update the current wallet quotes if the application was in the background for more than 10 seconds
@@ -380,24 +378,28 @@ internal class WalletModel @Inject constructor(
             coroutineScope = modelScope,
         )
 
-        fetchIfSingleWallet(action.selectedWallet)
+        fetchWalletContent(userWallet = action.selectedWallet)
+
+        val otherWallets = action.wallets.minus(action.selectedWallet)
+
+        if (tokensFeatureToggles.isWalletBalanceFetcherEnabled) {
+            otherWallets.onEach { userWallet ->
+                modelScope.launch { walletContentFetcher(userWalletId = userWallet.walletId) }
+            }
+        }
 
         if (action.wallets.size > 1 && isWalletsScrollPreviewEnabled()) {
-            withContext(dispatchers.io) { delay(timeMillis = 1_800) }
+            val direction = if (action.selectedWalletIndex == action.wallets.lastIndex) {
+                Direction.RIGHT
+            } else {
+                Direction.LEFT
+            }
 
-            walletEventSender.send(
-                event = WalletEvent.DemonstrateWalletsScrollPreview(
-                    direction = if (action.selectedWalletIndex == action.wallets.lastIndex) {
-                        Direction.RIGHT
-                    } else {
-                        Direction.LEFT
-                    },
-                ),
-            )
+            demonstrateWalletsScrollPreview(direction = direction)
         }
     }
 
-    private fun reinitializeWallet(action: WalletsUpdateActionResolver.Action.ReinitializeWallet) {
+    private suspend fun reinitializeWallet(action: WalletsUpdateActionResolver.Action.ReinitializeWallet) {
         walletScreenContentLoader.cancel(action.prevWalletId)
         tokenListStore.remove(action.prevWalletId)
 
@@ -407,7 +409,7 @@ internal class WalletModel @Inject constructor(
             coroutineScope = modelScope,
         )
 
-        fetchIfSingleWallet(userWallet = action.selectedWallet)
+        fetchWalletContent(userWallet = action.selectedWallet)
 
         stateHolder.update(
             ReinitializeWalletTransformer(
@@ -419,14 +421,14 @@ internal class WalletModel @Inject constructor(
         )
     }
 
-    private fun addWallet(action: WalletsUpdateActionResolver.Action.AddWallet) {
+    private suspend fun addWallet(action: WalletsUpdateActionResolver.Action.AddWallet) {
         walletScreenContentLoader.load(
             userWallet = action.selectedWallet,
             clickIntents = clickIntents,
             coroutineScope = modelScope,
         )
 
-        fetchIfSingleWallet(userWallet = action.selectedWallet)
+        fetchWalletContent(userWallet = action.selectedWallet)
 
         stateHolder.update(
             AddWalletTransformer(
@@ -500,6 +502,16 @@ internal class WalletModel @Inject constructor(
         )
     }
 
+    private fun demonstrateWalletsScrollPreview(direction: Direction) {
+        modelScope.launch(dispatchers.mainImmediate) {
+            delay(timeMillis = 1_800)
+
+            walletEventSender.send(
+                event = WalletEvent.DemonstrateWalletsScrollPreview(direction = direction),
+            )
+        }
+    }
+
     private fun scrollToWallet(prevIndex: Int, newIndex: Int, onConsume: () -> Unit = {}) {
         // Should not show scroll animation if WalletScreen isn't in the background.
         if (screenLifecycleProvider.isBackgroundState.value) {
@@ -527,6 +539,20 @@ internal class WalletModel @Inject constructor(
         }
     }
 
+    private suspend fun fetchWalletContent(userWallet: UserWallet) {
+        if (tokensFeatureToggles.isWalletBalanceFetcherEnabled) {
+            /*
+             * Updating the balance of the current wallet is an essential part of InitializationWallets,
+             * so the coroutine is launched in the current context
+             */
+            supervisorScope {
+                launch { walletContentFetcher(userWalletId = userWallet.walletId) }
+            }
+        } else {
+            fetchIfSingleWallet(userWallet = userWallet)
+        }
+    }
+
     private fun fetchIfSingleWallet(userWallet: UserWallet) {
         if (userWallet is UserWallet.Cold && userWallet.scanResponse.cardTypesResolver.isSingleWallet()) {
             modelScope.launch {

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletsUpdateActionResolver.kt

@@ -2,10 +2,10 @@ package com.tangem.feature.wallet.child.wallet.model
 
 import arrow.core.getOrElse
 import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.domain.common.util.getCardsCount
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.UserWalletId
-import com.tangem.domain.wallets.models.isLocked
+import com.tangem.domain.card.common.util.getCardsCount
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.models.wallet.isLocked
 import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.feature.wallet.presentation.wallet.state.model.NOT_INITIALIZED_WALLET_INDEX
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletCardState

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/VisaWalletIntents.kt

@@ -10,7 +10,7 @@ import com.tangem.domain.feedback.models.FeedbackEmailType
 import com.tangem.domain.visa.GetVisaCurrencyUseCase
 import com.tangem.domain.visa.GetVisaTxDetailsUseCase
 import com.tangem.domain.visa.model.VisaTxDetails
-import com.tangem.domain.wallets.models.requireColdWallet
+import com.tangem.domain.models.wallet.requireColdWallet
 import com.tangem.domain.wallets.usecase.GetWalletsUseCase
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.converter.BalancesAndLimitsBottomSheetConverter

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletCardClickIntents.kt

@@ -8,8 +8,8 @@ import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.domain.card.DeleteSavedAccessCodesUseCase
 import com.tangem.domain.redux.ReduxStateHolder
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.wallets.usecase.DeleteWalletUseCase
 import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletClickIntents.kt

@@ -3,27 +3,26 @@ package com.tangem.feature.wallet.child.wallet.model.intents
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.extenstions.unwrap
-import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.exchange.RampStateManager
 import com.tangem.domain.onramp.FetchHotCryptoUseCase
 import com.tangem.domain.settings.NeverToShowWalletsScrollPreview
 import com.tangem.domain.tokens.FetchCardTokenListUseCase
 import com.tangem.domain.tokens.FetchCurrencyStatusUseCase
 import com.tangem.domain.tokens.FetchTokenListUseCase
-import com.tangem.domain.tokens.FetchTokenListUseCase.RefreshMode
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.tokens.TokensFeatureToggles
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.domain.wallets.usecase.SelectWalletUseCase
 import com.tangem.feature.wallet.presentation.router.InnerWalletRouter
 import com.tangem.feature.wallet.presentation.wallet.domain.OnrampStatusFactory
+import com.tangem.feature.wallet.presentation.wallet.domain.WalletContentFetcher
 import com.tangem.feature.wallet.presentation.wallet.domain.unwrap
 import com.tangem.feature.wallet.presentation.wallet.loaders.WalletScreenContentLoader
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.SetRefreshStateTransformer
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.SetTokenListErrorTransformer
-import com.tangem.features.onramp.OnrampFeatureToggles
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -44,13 +43,13 @@ internal class WalletClickIntents @Inject constructor(
     private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
     private val selectWalletUseCase: SelectWalletUseCase,
     private val fetchTokenListUseCase: FetchTokenListUseCase,
+    private val walletContentFetcher: WalletContentFetcher,
+    private val tokensFeatureToggles: TokensFeatureToggles,
     private val fetchCardTokenListUseCase: FetchCardTokenListUseCase,
     private val fetchCurrencyStatusUseCase: FetchCurrencyStatusUseCase,
     private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
     private val neverToShowWalletsScrollPreview: NeverToShowWalletsScrollPreview,
     private val rampStateManager: RampStateManager,
-    private val dispatchers: CoroutineDispatcherProvider,
-    private val onrampFeatureToggles: OnrampFeatureToggles,
     private val fetchHotCryptoUseCase: FetchHotCryptoUseCase,
     private val onrampStatusFactory: OnrampStatusFactory,
 ) : BaseWalletClickIntents(),
@@ -88,6 +87,10 @@ internal class WalletClickIntents @Inject constructor(
             stateHolder.update { it.copy(selectedWalletIndex = index) }
 
             maybeUserWallet.onRight {
+                if (tokensFeatureToggles.isWalletBalanceFetcherEnabled) {
+                    launch { walletContentFetcher(userWalletId = it.walletId) }
+                }
+
                 walletScreenContentLoader.load(
                     userWallet = it,
                     clickIntents = this@WalletClickIntents,
@@ -127,36 +130,36 @@ internal class WalletClickIntents @Inject constructor(
         )
 
         modelScope.launch {
-            val maybeFetchResult = if (
-                userWallet is UserWallet.Cold &&
-                userWallet.scanResponse.cardTypesResolver.isSingleWalletWithToken()
-            ) {
-                fetchCardTokenListUseCase(userWalletId = userWallet.walletId, refresh = true)
+            if (tokensFeatureToggles.isWalletBalanceFetcherEnabled) {
+                walletContentFetcher(userWalletId = userWallet.walletId, forceUpdate = true)
             } else {
-                fetchTokenListUseCase(userWalletId = userWallet.walletId, mode = RefreshMode.FULL)
+                val isSingleWalletWithToken = userWallet is UserWallet.Cold &&
+                    userWallet.cardTypesResolver.isSingleWalletWithToken()
+
+                val maybeFetchResult = if (isSingleWalletWithToken) {
+                    fetchCardTokenListUseCase(userWalletId = userWallet.walletId, refresh = true)
+                } else {
+                    fetchTokenListUseCase(userWalletId = userWallet.walletId)
+                }
+
+                maybeFetchResult.onLeft {
+                    stateHolder.update(
+                        SetTokenListErrorTransformer(
+                            selectedWallet = userWallet,
+                            error = it,
+                            appCurrency = getSelectedAppCurrencyUseCase.unwrap(),
+                        ),
+                    )
+                }
             }
 
             buildList {
-                if (!onrampFeatureToggles.isFeatureEnabled) {
-                    async { rampStateManager.fetchBuyServiceData() }.let(::add)
-                }
-
                 async { rampStateManager.fetchSellServiceData() }.let(::add)
 
                 async { fetchHotCryptoUseCase() }.let(::add)
             }
                 .awaitAll()
 
-            maybeFetchResult.onLeft {
-                stateHolder.update(
-                    SetTokenListErrorTransformer(
-                        selectedWallet = userWallet,
-                        error = it,
-                        appCurrency = getSelectedAppCurrencyUseCase.unwrap(),
-                    ),
-                )
-            }
-
             stateHolder.update(
                 SetRefreshStateTransformer(userWalletId = userWallet.walletId, isRefreshing = false),
             )
@@ -172,8 +175,13 @@ internal class WalletClickIntents @Inject constructor(
             SetRefreshStateTransformer(userWalletId = userWallet.walletId, isRefreshing = showRefreshState),
         )
 
-        modelScope.launch(dispatchers.main) {
-            fetchCurrencyStatusUseCase(userWallet.walletId, refresh = true)
+        modelScope.launch {
+            if (tokensFeatureToggles.isWalletBalanceFetcherEnabled) {
+                walletContentFetcher(userWalletId = userWallet.walletId, forceUpdate = true)
+            } else {
+                fetchCurrencyStatusUseCase(userWallet.walletId, refresh = true)
+            }
+
             onrampStatusFactory.updateOnrmapTransactionStatuses(userWallet)
             walletScreenContentLoader.load(
                 userWallet = userWallet,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletContentClickIntents.kt

@@ -13,8 +13,8 @@ import com.tangem.domain.tokens.TokensAction
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.TokenActionsState
 import com.tangem.domain.txhistory.usecase.GetExplorerTransactionUrlUseCase
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.isLocked
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.isLocked
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.feature.wallet.presentation.wallet.domain.OnrampStatusFactory
 import com.tangem.feature.wallet.presentation.wallet.domain.unwrap

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletCurrencyActionsClickIntents.kt

@@ -48,8 +48,8 @@ import com.tangem.domain.tokens.model.analytics.TokenScreenAnalyticsEvent
 import com.tangem.domain.tokens.model.analytics.TokenScreenAnalyticsEvent.Companion.AVAILABLE
 import com.tangem.domain.tokens.model.analytics.TokenScreenAnalyticsEvent.Companion.toReasonAnalyticsText
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.wallets.usecase.GetExploreUrlUseCase
 import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.feature.wallet.impl.R
@@ -61,7 +61,6 @@ import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletTokensListState
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.CloseBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state.utils.WalletEventSender
-import com.tangem.features.onramp.OnrampFeatureToggles
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
@@ -129,7 +128,6 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
     private val shareManager: ShareManager,
     private val appRouter: AppRouter,
     private val rampStateManager: RampStateManager,
-    private val onrampFeatureToggles: OnrampFeatureToggles,
 ) : BaseWalletClickIntents(), WalletCurrencyActionsClickIntents {
 
     override fun onSendClick(
@@ -345,28 +343,13 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
 
         if (handleUnavailabilityReason(unavailabilityReason)) return
 
-        if (onrampFeatureToggles.isFeatureEnabled) {
-            appRouter.push(
-                AppRoute.Onramp(
-                    userWalletId = userWallet.walletId,
-                    currency = cryptoCurrencyStatus.currency,
-                    source = OnrampSource.TOKEN_LONG_TAP,
-                ),
-            )
-        } else {
-            showErrorIfDemoModeOrElse {
-                modelScope.launch(dispatchers.main) {
-                    reduxStateHolder.dispatch(
-                        TradeCryptoAction.Buy(
-                            userWallet = userWallet,
-                            source = OnrampSource.TOKEN_LONG_TAP,
-                            cryptoCurrencyStatus = cryptoCurrencyStatus,
-                            appCurrencyCode = getSelectedAppCurrencyUseCase.unwrap().code,
-                        ),
-                    )
-                }
-            }
-        }
+        appRouter.push(
+            AppRoute.Onramp(
+                userWalletId = userWallet.walletId,
+                currency = cryptoCurrencyStatus.currency,
+                source = OnrampSource.TOKEN_LONG_TAP,
+            ),
+        )
     }
 
     override fun onSwapClick(
@@ -482,11 +465,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
 
     override fun onMultiWalletBuyClick(userWalletId: UserWalletId, screenType: String) {
         onMultiWalletActionClick(
-            statusFlow = if (onrampFeatureToggles.isFeatureEnabled) {
-                rampStateManager.getExpressInitializationStatus(userWalletId)
-            } else {
-                rampStateManager.getBuyInitializationStatus()
-            },
+            statusFlow = rampStateManager.getExpressInitializationStatus(userWalletId),
             route = AppRoute.BuyCrypto(userWalletId = userWalletId),
             eventCreator = { MainScreenAnalyticsEvent.ButtonBuy(status = it, screenType = screenType) },
         )

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletWarningsClickIntents.kt

@@ -15,6 +15,7 @@ import com.tangem.domain.feedback.GetCardInfoUseCase
 import com.tangem.domain.feedback.SendFeedbackEmailUseCase
 import com.tangem.domain.feedback.models.FeedbackEmailType
 import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.networks.multi.MultiNetworkStatusFetcher
 import com.tangem.domain.promo.ShouldShowPromoWalletUseCase
 import com.tangem.domain.promo.models.PromoId
@@ -25,9 +26,8 @@ import com.tangem.domain.staking.multi.MultiYieldBalanceFetcher
 import com.tangem.domain.tokens.model.analytics.TokenSwapPromoAnalyticsEvent
 import com.tangem.domain.wallets.legacy.UserWalletsListManager.Lockable.UnlockType
 import com.tangem.domain.wallets.models.UnlockWalletsError
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.UserWalletId
-import com.tangem.domain.wallets.models.requireColdWallet
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.requireColdWallet
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.domain.wallets.usecase.SeedPhraseNotificationUseCase
 import com.tangem.domain.wallets.usecase.UnlockWalletsUseCase
@@ -87,6 +87,8 @@ internal interface WalletWarningsClickIntents {
     fun onSeedPhraseSecondNotificationAccept()
 
     fun onSeedPhraseSecondNotificationReject()
+
+    fun onFinishWalletActivationClick()
 }
 
 @Suppress("LongParameterList")
@@ -371,6 +373,10 @@ internal class WalletWarningsClickIntentsImplementor @Inject constructor(
         }
     }
 
+    override fun onFinishWalletActivationClick() {
+        // TODO implement wallet activation process
+    }
+
     private suspend fun fetchCryptoCurrencies(userWalletId: UserWalletId, currencies: List<CryptoCurrency>) {
         coroutineScope {
             listOf(

features/wallet/impl/src/main/java/com/tangem/feature/wallet/deeplink/DefaultWalletDeepLinkActionTrigger.kt

@@ -0,0 +1,24 @@
+package com.tangem.feature.wallet.deeplink
+
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.features.wallet.deeplink.WalletDeepLinkActionListener
+import com.tangem.features.wallet.deeplink.WalletDeepLinkActionTrigger
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.receiveAsFlow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+internal class DefaultWalletDeepLinkActionTrigger @Inject constructor() :
+    WalletDeepLinkActionTrigger,
+    WalletDeepLinkActionListener {
+
+    private val _selectWalletFlow = Channel<UserWalletId>()
+    override val selectWalletFlow: Flow<UserWalletId>
+        get() = _selectWalletFlow.receiveAsFlow()
+
+    override fun selectWallet(userWalletId: UserWalletId) {
+        _selectWalletFlow.trySend(userWalletId)
+    }
+}

features/wallet/impl/src/main/java/com/tangem/feature/wallet/deeplink/di/WalletDeepLinkModule.kt

@@ -1,6 +1,9 @@
 package com.tangem.feature.wallet.deeplink.di
 
+import com.tangem.feature.wallet.deeplink.DefaultWalletDeepLinkActionTrigger
 import com.tangem.feature.wallet.deeplink.DefaultWalletDeepLinkHandler
+import com.tangem.features.wallet.deeplink.WalletDeepLinkActionListener
+import com.tangem.features.wallet.deeplink.WalletDeepLinkActionTrigger
 import com.tangem.features.wallet.deeplink.WalletDeepLinkHandler
 import dagger.Binds
 import dagger.Module
@@ -15,4 +18,12 @@ internal interface WalletDeepLinkModule {
     @Binds
     @Singleton
     fun bindWalletDeepLinkHandlerFactory(impl: DefaultWalletDeepLinkHandler.Factory): WalletDeepLinkHandler.Factory
+
+    @Binds
+    @Singleton
+    fun bindWalletDeepLinkActionTrigger(impl: DefaultWalletDeepLinkActionTrigger): WalletDeepLinkActionTrigger
+
+    @Binds
+    @Singleton
+    fun bindWalletDeepLinkActionListener(impl: DefaultWalletDeepLinkActionTrigger): WalletDeepLinkActionListener
 }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/navigation/WalletRoute.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.navigation
 
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import kotlinx.serialization.Serializable
 
 @Serializable

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/WalletPreviewData.kt

@@ -7,7 +7,7 @@ import com.tangem.core.ui.event.consumedEvent
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.res.TangemColorPalette
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.ActionsBottomSheetConfig
 import com.tangem.feature.wallet.presentation.wallet.state.model.TokenActionButtonConfig
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletAdditionalInfo

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt

@@ -8,7 +8,7 @@ import com.tangem.core.ui.components.tokenlist.state.TokensListItemUM
 import com.tangem.core.ui.event.consumedEvent
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.stringReference
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletAdditionalInfo
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.common.WalletPreviewData.topBarConfig
@@ -117,6 +117,7 @@ internal object WalletScreenPreviewData {
             buttons = persistentListOf(buyButton),
             warnings = persistentListOf(
                 WalletNotification.Warning.SomeNetworksUnreachable,
+                WalletNotification.FinishWalletActivation { },
             ),
             bottomSheetConfig = null,
             tokensListState = textContentTokensState,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/deeplink/WalletDeepLinksHandler.kt

@@ -1,94 +0,0 @@
-package com.tangem.feature.wallet.presentation.deeplink
-
-import com.tangem.common.routing.AppRoute
-import com.tangem.common.routing.AppRouter
-import com.tangem.core.analytics.api.AnalyticsEventHandler
-import com.tangem.core.deeplink.DeepLink
-import com.tangem.core.deeplink.DeepLinksRegistry
-import com.tangem.core.deeplink.global.BuyCurrencyDeepLink
-import com.tangem.core.deeplink.global.SellCurrencyDeepLink
-import com.tangem.domain.tokens.GetCryptoCurrencyUseCase
-import com.tangem.domain.tokens.model.analytics.TokenScreenAnalyticsEvent
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.UserWalletId
-import com.tangem.domain.wallets.models.isMultiCurrency
-import com.tangem.features.onramp.OnrampFeatureToggles
-import com.tangem.utils.coroutines.launchOnCancellation
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-
-@Suppress("LongParameterList")
-internal class WalletDeepLinksHandler @Inject constructor(
-    private val deepLinksRegistry: DeepLinksRegistry,
-    private val analyticsEventHandler: AnalyticsEventHandler,
-    private val getCryptoCurrencyUseCase: GetCryptoCurrencyUseCase,
-    private val onrampFeatureToggles: OnrampFeatureToggles,
-    private val router: AppRouter,
-) {
-
-    private var deepLinksMap = mutableMapOf<UserWalletId, List<DeepLink>>()
-
-    fun registerForWallet(scope: CoroutineScope, userWallet: UserWallet) {
-        val deepLinks = deepLinksMap.getOrPut(userWallet.walletId) {
-            getDeepLinks(userWallet, scope)
-        }
-        deepLinksRegistry.unregisterByIds(deepLinks.map { it.id })
-        deepLinksRegistry.register(deepLinks = deepLinks)
-
-        // When navigation to another screen scope is Cancelled and deeplinks are hot handled
-        scope.launchOnCancellation {
-            deepLinksRegistry.unregister(deepLinks)
-        }
-    }
-
-    private fun getDeepLinks(userWallet: UserWallet, scope: CoroutineScope): List<DeepLink> {
-        val sellCurrencyDeepLink = SellCurrencyDeepLink(
-            onReceive = { data ->
-                scope.launch {
-                    onSellCurrencyDeepLink(userWallet, data)
-                }
-            },
-            shouldHandleDelayed = true,
-        )
-
-        return buildList {
-            add(sellCurrencyDeepLink)
-            if (!onrampFeatureToggles.isFeatureEnabled && !userWallet.isMultiCurrency) {
-                add(
-                    BuyCurrencyDeepLink(
-                        onReceive = {
-                            scope.launch { onBuyCurrencyDeepLink(userWallet) }
-                        },
-                    ),
-                )
-            }
-        }
-    }
-
-    private suspend fun onSellCurrencyDeepLink(userWallet: UserWallet, data: SellCurrencyDeepLink.Data) {
-        val cryptoCurrency = getCryptoCurrencyUseCase(userWallet, data.currencyId).getOrNull()
-
-        if (cryptoCurrency == null) {
-            Timber.e("onSellCurrencyDeepLink cryptoCurrency is null")
-            return
-        }
-
-        val route = AppRoute.Send(
-            currency = cryptoCurrency,
-            userWalletId = userWallet.walletId,
-            transactionId = data.transactionId,
-            destinationAddress = data.depositWalletAddress,
-            amount = data.baseCurrencyAmount,
-            tag = data.depositWalletAddressTag,
-        )
-
-        router.push(route)
-    }
-
-    private suspend fun onBuyCurrencyDeepLink(userWallet: UserWallet) {
-        val cryptoCurrency = getCryptoCurrencyUseCase(userWallet.walletId).getOrNull() ?: return
-        analyticsEventHandler.send(TokenScreenAnalyticsEvent.Bought(cryptoCurrency.symbol))
-    }
-}

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt

@@ -20,6 +20,8 @@ import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
@@ -38,7 +40,9 @@ import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.reordarable.ReorderableItem
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
+import com.tangem.core.ui.test.OrganizeTokensScreenTestTags
 import com.tangem.core.ui.utils.WindowInsetsZero
+import com.tangem.core.ui.utils.lazyListItemPosition
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.common.WalletPreviewData
 import com.tangem.feature.wallet.presentation.organizetokens.model.DraggableItem
@@ -122,7 +126,8 @@ private fun TokenList(
         LazyColumn(
             modifier = Modifier
                 .align(Alignment.TopCenter)
-                .reorderable(reorderableListState),
+                .reorderable(reorderableListState)
+                .testTag(OrganizeTokensScreenTestTags.TOKENS_LAZY_LIST),
             state = reorderableListState.listState,
             contentPadding = listContentPadding,
         ) {
@@ -173,16 +178,18 @@ private fun LazyItemScope.DraggableItem(
     ) { isItemDragging ->
         isDragging = isItemDragging
 
-        val modifierWithBackground = itemModifier.background(color = TangemTheme.colors.background.primary)
+        val modifierWithBackground = itemModifier
+            .background(color = TangemTheme.colors.background.primary)
+            .semantics { lazyListItemPosition = index }
 
         when (item) {
             is DraggableItem.GroupHeader -> DraggableGroupTitleItem(
                 state = item.groupTitle,
                 reorderableTokenListState = reorderableState,
-                modifier = modifierWithBackground,
+                modifier = modifierWithBackground.testTag(OrganizeTokensScreenTestTags.GROUP_TITLE_ITEM),
             )
             is DraggableItem.Token -> TokenItem(
-                modifier = modifierWithBackground,
+                modifier = modifierWithBackground.testTag(OrganizeTokensScreenTestTags.TOKEN_LIST_ITEM),
                 state = item.tokenItemState,
                 reorderableTokenListState = reorderableState,
                 isBalanceHidden = isBalanceHidden,
@@ -201,6 +208,7 @@ private fun LazyItemScope.DraggableItem(
     }
 }
 
+@Suppress("LongMethod")
 @Composable
 private fun TopBar(
     config: OrganizeTokensState.HeaderConfig,
@@ -246,7 +254,9 @@ private fun TopBar(
             horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing8),
         ) {
             RoundedActionButton(
-                modifier = Modifier.weight(1f),
+                modifier = Modifier
+                    .weight(1f)
+                    .testTag(OrganizeTokensScreenTestTags.SORT_BY_BALANCE_BUTTON),
                 config = ActionButtonConfig(
                     text = TextReference.Res(id = R.string.organize_tokens_sort_by_balance),
                     iconResId = R.drawable.ic_sort_24,
@@ -257,7 +267,9 @@ private fun TopBar(
                 color = TangemTheme.colors.background.primary,
             )
             RoundedActionButton(
-                modifier = Modifier.weight(1f),
+                modifier = Modifier
+                    .weight(1f)
+                    .testTag(OrganizeTokensScreenTestTags.GROUP_BUTTON),
                 config = ActionButtonConfig(
                     text = TextReference.Res(
                         id = if (config.isGrouped) {
@@ -286,12 +298,16 @@ private fun Actions(config: OrganizeTokensState.ActionsConfig, modifier: Modifie
         horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12),
     ) {
         SecondaryButton(
-            modifier = Modifier.weight(1f),
+            modifier = Modifier
+                .weight(1f)
+                .testTag(OrganizeTokensScreenTestTags.CANCEL_BUTTON),
             text = stringResourceSafe(id = R.string.common_cancel),
             onClick = config.onCancelClick,
         )
         PrimaryButton(
-            modifier = Modifier.weight(1f),
+            modifier = Modifier
+                .weight(1f)
+                .testTag(OrganizeTokensScreenTestTags.APPLY_BUTTON),
             text = stringResourceSafe(id = R.string.common_apply),
             onClick = config.onApplyClick,
             showProgress = config.showApplyProgress,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/common/TokenListOperations.kt

@@ -1,12 +1,12 @@
 package com.tangem.feature.wallet.presentation.organizetokens.utils.common
 
+import com.tangem.domain.models.TokensSortType
 import com.tangem.domain.tokens.model.TokenList
-import com.tangem.domain.tokens.model.TokenList.SortType
 
 internal fun TokenList.disableSortingByBalance(): TokenList {
     return when (this) {
-        is TokenList.GroupedByNetwork -> this.copy(sortedBy = SortType.NONE)
-        is TokenList.Ungrouped -> this.copy(sortedBy = SortType.NONE)
+        is TokenList.GroupedByNetwork -> this.copy(sortedBy = TokensSortType.NONE)
+        is TokenList.Ungrouped -> this.copy(sortedBy = TokensSortType.NONE)
         is TokenList.Empty -> this
     }
 }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/TokenListToStateConverter.kt

@@ -1,5 +1,6 @@
 package com.tangem.feature.wallet.presentation.organizetokens.utils.converter
 
+import com.tangem.domain.models.TokensSortType
 import com.tangem.domain.tokens.model.TokenList
 import com.tangem.feature.wallet.presentation.organizetokens.model.OrganizeTokensListState
 import com.tangem.feature.wallet.presentation.organizetokens.model.OrganizeTokensState
@@ -20,7 +21,7 @@ internal class TokenListToStateConverter(
             itemsState = itemsState,
             header = state.header.copy(
                 isEnabled = itemsState !is OrganizeTokensListState.Empty,
-                isSortedByBalance = value.sortedBy == TokenList.SortType.BALANCE,
+                isSortedByBalance = value.sortedBy == TokensSortType.BALANCE,
                 isGrouped = value is TokenList.GroupedByNetwork,
             ),
             actions = state.actions.copy(

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt

@@ -10,8 +10,8 @@ import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.redux.ReduxStateHolder
 import com.tangem.domain.redux.StateDialog
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.navigation.WalletRoute
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletDialogConfig
 import kotlinx.coroutines.channels.BufferOverflow

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt

@@ -4,8 +4,8 @@ import androidx.compose.runtime.Stable
 import com.arkivanov.decompose.router.slot.SlotNavigation
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.navigation.WalletRoute
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletDialogConfig
 import kotlinx.coroutines.flow.SharedFlow

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/WalletScreenAnalyticsEvent.kt

@@ -3,7 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.analytics
 import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.analytics.models.OneTimeAnalyticsEvent
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 
 sealed class WalletScreenAnalyticsEvent {
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/utils/SelectedWalletAnalyticsSender.kt

@@ -2,8 +2,8 @@ package com.tangem.feature.wallet.presentation.wallet.analytics.utils
 
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.analytics.models.AnalyticsEvent
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.isLocked
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.isLocked
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
 import com.tangem.feature.wallet.presentation.wallet.utils.ScreenLifecycleProvider
 import javax.inject.Inject

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/utils/TokenListAnalyticsSender.kt

@@ -12,12 +12,12 @@ import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.domain.analytics.CheckIsWalletToppedUpUseCase
 import com.tangem.domain.analytics.model.WalletBalanceState
 import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.TotalFiatBalance
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.models.wallet.isMultiCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.TokenList
-import com.tangem.domain.tokens.model.TotalFiatBalance
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.UserWalletId
-import com.tangem.domain.wallets.models.isMultiCurrency
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent.Basic
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent.MainScreen
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/utils/WalletWarningsAnalyticsSender.kt

@@ -61,6 +61,7 @@ internal class WalletWarningsAnalyticsSender @Inject constructor(
             is WalletNotification.Warning.NetworksUnreachable,
             is WalletNotification.UsedOutdatedData,
             is WalletNotification.UnlockVisaAccess,
+            is WalletNotification.FinishWalletActivation,
             -> null
             is WalletNotification.Critical.SeedPhraseNotification -> MainScreen.NoticeSeedPhraseSupport
             is WalletNotification.Critical.SeedPhraseSecondNotification -> MainScreen.NoticeSeedPhraseSupportSecond

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/utils/WalletWarningsSingleEventSender.kt

@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.analytics.utils
 
 import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.wallets.usecase.SeedPhraseNotificationUseCase
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletNotification
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/BackupValidator.kt

@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.domain
 
 import com.tangem.common.card.EllipticCurve
-import com.tangem.domain.common.configs.CardConfig
+import com.tangem.domain.card.configs.CardConfig
 import com.tangem.domain.models.scan.CardDTO
 import javax.inject.Inject
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetMultiWalletWarningsFactory.kt

@@ -1,21 +1,21 @@
 package com.tangem.feature.wallet.presentation.wallet.domain
 
 import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.domain.common.CardTypesResolver
-import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.card.CardTypesResolver
+import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.core.lce.Lce
 import com.tangem.domain.demo.IsDemoCardUseCase
 import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.TotalFiatBalance
 import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.promo.ShouldShowPromoWalletUseCase
 import com.tangem.domain.promo.models.PromoId
 import com.tangem.domain.settings.IsReadyToShowRateAppUseCase
 import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.TokenList
-import com.tangem.domain.tokens.model.TotalFiatBalance
 import com.tangem.domain.wallets.models.SeedPhraseNotificationsStatus
-import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.usecase.IsNeedToBackupUseCase
 import com.tangem.domain.wallets.usecase.SeedPhraseNotificationUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
@@ -25,7 +25,6 @@ import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import javax.inject.Inject
-import kotlin.collections.count
 
 @Suppress("LongParameterList")
 @ModelScoped
@@ -55,6 +54,8 @@ internal class GetMultiWalletWarningsFactory @Inject constructor(
 
                 addCriticalNotifications(userWallet, seedPhraseIssueStatus, clickIntents)
 
+                addFinishWalletActivationNotification(userWallet, clickIntents)
+
                 addReferralPromoNotification(cardTypesResolver, clickIntents, shouldShowReferralPromo)
 
                 addInformationalNotifications(cardTypesResolver, maybeTokenList, clickIntents)
@@ -259,6 +260,23 @@ internal class GetMultiWalletWarningsFactory @Inject constructor(
         if (condition) add(element = element)
     }
 
+    private fun MutableList<WalletNotification>.addFinishWalletActivationNotification(
+        userWallet: UserWallet,
+        clickIntents: WalletClickIntents,
+    ) {
+        if (userWallet !is UserWallet.Hot) return
+
+        // TODO [REDACTED_TASK_KEY] set an actual value
+        val shouldShowFinishActivation = false
+
+        addIf(
+            element = WalletNotification.FinishWalletActivation(
+                onFinishClick = clickIntents::onFinishWalletActivationClick,
+            ),
+            condition = shouldShowFinishActivation,
+        )
+    }
+
     private companion object {
         const val MAX_REMAINING_SIGNATURES_COUNT = 10
     }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetSingleWalletWarningsFactory.kt

@@ -2,15 +2,15 @@ package com.tangem.feature.wallet.presentation.wallet.domain
 
 import arrow.core.Either
 import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.domain.common.CardTypesResolver
-import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.card.CardTypesResolver
+import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.demo.IsDemoCardUseCase
 import com.tangem.domain.models.StatusSource
 import com.tangem.domain.settings.IsReadyToShowRateAppUseCase
 import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.tokens.error.CurrencyStatusError
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.usecase.GetWalletsUseCase
 import com.tangem.domain.wallets.usecase.IsNeedToBackupUseCase
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletNotification
@@ -186,7 +186,7 @@ internal class GetSingleWalletWarningsFactory @Inject constructor(
                 .conflate()
                 .distinctUntilChanged()
                 .firstOrNull()
-        } ?: false
+        } == true
     }
 
     private fun MutableList<WalletNotification>.addRateTheAppNotification(

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/HasSingleWalletSignedHashesUseCase.kt

@@ -2,11 +2,11 @@ package com.tangem.feature.wallet.presentation.wallet.domain
 
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.domain.card.repository.CardRepository
-import com.tangem.domain.common.util.cardTypesResolver
-import com.tangem.domain.demo.DemoConfig
+import com.tangem.domain.card.common.util.cardTypesResolver
+import com.tangem.domain.demo.models.DemoConfig
 import com.tangem.domain.models.network.Network
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/IsWalletNFTEnabledSyncUseCase.kt

@@ -1,22 +1,18 @@
 package com.tangem.feature.wallet.presentation.wallet.domain
 
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.wallets.repository.WalletsRepository
-import com.tangem.features.nft.NFTFeatureToggles
 import kotlinx.coroutines.flow.firstOrNull
 
 class IsWalletNFTEnabledSyncUseCase(
     private val walletsRepository: WalletsRepository,
-    private val nftFeatureToggles: NFTFeatureToggles,
 ) {
 
-    suspend operator fun invoke(userWalletId: UserWalletId): Boolean = if (nftFeatureToggles.isNFTEnabled) {
-        walletsRepository
-            .nftEnabledStatuses()
+    suspend operator fun invoke(userWalletId: UserWalletId): Boolean {
+        val isNFTEnabled = walletsRepository.nftEnabledStatuses()
             .firstOrNull()
-            ?.let { it[userWalletId] }
-            ?: false
-    } else {
-        false
+            ?.get(userWalletId)
+
+        return isNFTEnabled == true
     }
 }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/MultiWalletTokenListStore.kt

@@ -5,7 +5,7 @@ import com.tangem.domain.core.lce.LceFlow
 import com.tangem.domain.tokens.GetTokenListUseCase
 import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.tokens.model.TokenList
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.SharingStarted

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/OnrampStatusFactory.kt

@@ -11,7 +11,7 @@ import com.tangem.domain.onramp.OnrampUpdateTransactionStatusUseCase
 import com.tangem.domain.onramp.model.OnrampStatus
 import com.tangem.domain.onramp.model.OnrampStatus.Status.*
 import com.tangem.domain.tokens.model.analytics.TokenOnrampAnalyticsEvent
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/ScanCardToUnlockWalletClickHandler.kt

@@ -8,7 +8,7 @@ import com.tangem.common.core.TangemSdkError
 import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.wallets.builder.ColdUserWalletBuilder
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.wallets.usecase.SaveWalletUseCase
 import javax.inject.Inject
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/UseCaseExt.kt

@@ -4,8 +4,8 @@ import arrow.core.Either
 import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.tokens.error.CurrencyStatusError
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import kotlinx.coroutines.flow.*
 import timber.log.Timber

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletAdditionalInfoFactory.kt

@@ -6,11 +6,9 @@ import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.core.ui.format.bigdecimal.crypto
 import com.tangem.core.ui.format.bigdecimal.format
-import com.tangem.domain.common.util.cardTypesResolver
-import com.tangem.domain.common.util.getCardsCount
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.isLocked
-import com.tangem.domain.wallets.models.isMultiCurrency
+import com.tangem.domain.card.common.util.cardTypesResolver
+import com.tangem.domain.card.common.util.getCardsCount
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletAdditionalInfo
 import java.math.BigDecimal
@@ -39,10 +37,22 @@ internal object WalletAdditionalInfoFactory {
                     wallet.resolveSingleCurrencyInfo(currencyAmount)
                 }
             }
-            is UserWallet.Hot -> TODO("[REDACTED_TASK_KEY]")
+            is UserWallet.Hot -> wallet.resolveAdditionalInfo()
         }
     }
 
+    private fun UserWallet.Hot.resolveAdditionalInfo(): WalletAdditionalInfo {
+        return WalletAdditionalInfo(
+            hideable = false,
+            content = TextReference.Res(R.string.hw_mobile_wallet) +
+                when {
+                    isLocked -> DIVIDER + TextReference.Res(R.string.common_locked)
+                    backedUp.not() -> DIVIDER + TextReference.Res(R.string.hw_backup_no_backup)
+                    else -> TextReference.Str("")
+                },
+        )
+    }
+
     private fun UserWallet.Cold.resolveMultiCurrencyInfo(): WalletAdditionalInfo {
         return if (isLocked) {
             WalletAdditionalInfo(

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletContentFetcher.kt

@@ -0,0 +1,75 @@
+package com.tangem.feature.wallet.presentation.wallet.domain
+
+import com.tangem.domain.tokens.wallet.WalletBalanceFetcher
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.coroutines.JobHolder
+import com.tangem.utils.coroutines.saveInAndJoin
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.supervisorScope
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.util.concurrent.ConcurrentHashMap
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Wallet content fetcher
+ *
+ * @property walletBalanceFetcher fetcher for wallet balance
+ * @property dispatchers          dispatchers
+ *
+[REDACTED_AUTHOR]
+ */
+@Singleton
+internal class WalletContentFetcher @Inject constructor(
+    private val walletBalanceFetcher: WalletBalanceFetcher,
+    private val dispatchers: CoroutineDispatcherProvider,
+) {
+
+    private val fetchingJobMap = ConcurrentHashMap<UserWalletId, JobHolder>()
+    private val mutex = Mutex()
+
+    suspend operator fun invoke(userWalletId: UserWalletId, forceUpdate: Boolean = false) = supervisorScope {
+        withContext(dispatchers.default) {
+            // Use mutex to ensure thread safety
+            val jobHolder = mutex.withLock {
+                val savedJobHolder = fetchingJobMap.getOrPut(key = userWalletId, defaultValue = ::JobHolder)
+
+                /*
+                 * If this is not a forced update and there is a saved job in the cache
+                 * (doesn't matter if it is active or not), then skip the update process.
+                 */
+                if (!forceUpdate && savedJobHolder != null && !savedJobHolder.isEmpty()) {
+                    Timber.d("Skip fetching for $userWalletId")
+
+                    return@withContext
+                }
+
+                /*
+                 * If this is a forced update and there is already a job in the cache that is updating the balance,
+                 * then cancel the previous update.
+                 */
+                if (forceUpdate && savedJobHolder?.isActive == true) {
+                    Timber.d("Cancel old fetching for $userWalletId")
+
+                    savedJobHolder.cancel()
+                }
+
+                JobHolder().also { fetchingJobMap[userWalletId] = it }
+            }
+
+            Timber.d("Start fetching for $userWalletId")
+
+            val maybeResult = launch {
+                walletBalanceFetcher(params = WalletBalanceFetcher.Params(userWalletId = userWalletId))
+                    .onLeft(Timber::e)
+            }
+                .saveInAndJoin(jobHolder)
+
+            Timber.d("Finish fetching with result $maybeResult for $userWalletId")
+        }
+    }
+}

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletImageResolver.kt

@@ -1,10 +1,10 @@
 package com.tangem.feature.wallet.presentation.wallet.domain
 
 import androidx.annotation.DrawableRes
-import com.tangem.domain.common.util.cardTypesResolver
-import com.tangem.domain.common.util.getCardsCount
-import com.tangem.domain.demo.DemoConfig
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.card.common.util.cardTypesResolver
+import com.tangem.domain.card.common.util.getCardsCount
+import com.tangem.domain.demo.models.DemoConfig
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.feature.wallet.impl.R
 import kotlinx.coroutines.runBlocking
@@ -24,7 +24,11 @@ internal class WalletImageResolver @Inject constructor(
     /** Get a specified wallet [userWallet] image */
     @Suppress("CyclomaticComplexMethod")
     @DrawableRes
-    fun resolve(userWallet: UserWallet.Cold): Int? {
+    fun resolve(userWallet: UserWallet): Int? {
+        if (userWallet !is UserWallet.Cold) {
+            return null
+        }
+
         val cardTypesResolver = userWallet.scanResponse.cardTypesResolver
 
         val cobrandImage = Wallet2CobrandImage.entries.firstOrNull {

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletNameMigrationUseCase.kt

@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.domain
 
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.wallets.models.copy
+import com.tangem.domain.models.wallet.copy
 import com.tangem.domain.wallets.repository.WalletNamesMigrationRepository
 import timber.log.Timber
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/WalletContentLoaderFactory.kt

@@ -1,9 +1,9 @@
 package com.tangem.feature.wallet.presentation.wallet.loaders
 
 import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.domain.common.util.cardTypesResolver
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.isMultiCurrency
+import com.tangem.domain.card.common.util.cardTypesResolver
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.isMultiCurrency
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.loaders.implementors.*
 import javax.inject.Inject
@@ -31,7 +31,7 @@ internal class WalletContentLoaderFactory @Inject constructor(
             userWallet is UserWallet.Cold && userWallet.scanResponse.cardTypesResolver.isVisaWallet() -> {
                 visaWalletContentLoaderFactory.create(userWallet, clickIntents, isRefresh)
             }
-            !userWallet.isMultiCurrency -> {
+            userWallet is UserWallet.Cold && !userWallet.isMultiCurrency -> {
                 singleWalletContentLoaderFactory.create(userWallet, clickIntents, isRefresh)
             }
             else -> null

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/WalletLoaderStorage.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.loaders
 
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import kotlinx.coroutines.Job
 import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/WalletScreenContentLoader.kt

@@ -1,9 +1,9 @@
 package com.tangem.feature.wallet.presentation.wallet.loaders
 
 import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.UserWalletId
-import com.tangem.domain.wallets.models.isLocked
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.models.wallet.isLocked
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.CoroutineScope

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/MultiWalletContentLoader.kt

@@ -1,15 +1,13 @@
 package com.tangem.feature.wallet.presentation.wallet.loaders.implementors
 
-import com.tangem.common.routing.RoutingFeatureToggle
 import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.core.deeplink.DeepLinksRegistry
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.nft.GetNFTCollectionsUseCase
 import com.tangem.domain.promo.GetStoryContentUseCase
 import com.tangem.domain.tokens.ApplyTokenListSortingUseCase
 import com.tangem.domain.tokens.RunPolkadotAccountHealthCheckUseCase
 import com.tangem.domain.tokens.repository.CurrenciesRepository
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
@@ -21,11 +19,6 @@ import com.tangem.feature.wallet.presentation.wallet.domain.MultiWalletTokenList
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.subscribers.*
-import com.tangem.feature.wallet.presentation.wallet.subscribers.MultiWalletActionButtonsSubscriber
-import com.tangem.feature.wallet.presentation.wallet.subscribers.MultiWalletTokenListSubscriber
-import com.tangem.feature.wallet.presentation.wallet.subscribers.MultiWalletWarningsSubscriber
-import com.tangem.feature.wallet.presentation.wallet.subscribers.WalletSubscriber
-import com.tangem.features.nft.NFTFeatureToggles
 
 @Suppress("LongParameterList")
 @ModelScoped
@@ -45,11 +38,8 @@ internal class MultiWalletContentLoader(
     private val runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
     private val shouldSaveUserWalletsUseCase: ShouldSaveUserWalletsUseCase,
     private val getStoryContentUseCase: GetStoryContentUseCase,
-    private val deepLinksRegistry: DeepLinksRegistry,
-    private val nftFeatureToggles: NFTFeatureToggles,
     private val walletsRepository: WalletsRepository,
     private val currenciesRepository: CurrenciesRepository,
-    private val routingFeatureToggle: RoutingFeatureToggle,
 ) : WalletContentLoader(id = userWallet.walletId) {
 
     override fun create(): List<WalletSubscriber> {
@@ -64,19 +54,17 @@ internal class MultiWalletContentLoader(
                 getSelectedAppCurrencyUseCase = getSelectedAppCurrencyUseCase,
                 applyTokenListSortingUseCase = applyTokenListSortingUseCase,
                 runPolkadotAccountHealthCheckUseCase = runPolkadotAccountHealthCheckUseCase,
-                deepLinksRegistry = deepLinksRegistry,
-                routingFeatureToggle = routingFeatureToggle,
             ).let(::add)
-            if (nftFeatureToggles.isNFTEnabled) {
-                WalletNFTListSubscriber(
-                    userWallet = userWallet,
-                    getNFTCollectionsUseCase = getNFTCollectionsUseCase,
-                    stateHolder = stateHolder,
-                    walletsRepository = walletsRepository,
-                    clickIntents = clickIntents,
-                    currenciesRepository = currenciesRepository,
-                ).let(::add)
-            }
+
+            WalletNFTListSubscriber(
+                userWallet = userWallet,
+                getNFTCollectionsUseCase = getNFTCollectionsUseCase,
+                stateHolder = stateHolder,
+                walletsRepository = walletsRepository,
+                clickIntents = clickIntents,
+                currenciesRepository = currenciesRepository,
+            ).let(::add)
+
             MultiWalletWarningsSubscriber(
                 userWallet = userWallet,
                 stateHolder = stateHolder,
@@ -85,11 +73,13 @@ internal class MultiWalletContentLoader(
                 walletWarningsAnalyticsSender = walletWarningsAnalyticsSender,
                 walletWarningsSingleEventSender = walletWarningsSingleEventSender,
             ).let(::add)
+
             MultiWalletActionButtonsSubscriber(
                 userWallet = userWallet,
                 stateHolder = stateHolder,
                 getStoryContentUseCase = getStoryContentUseCase,
             ).let(::add)
+
             WalletDropDownItemsSubscriber(
                 stateHolder = stateHolder,
                 shouldSaveUserWalletsUseCase = shouldSaveUserWalletsUseCase,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/MultiWalletContentLoaderFactory.kt

@@ -1,15 +1,13 @@
 package com.tangem.feature.wallet.presentation.wallet.loaders.implementors
 
-import com.tangem.common.routing.RoutingFeatureToggle
 import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.core.deeplink.DeepLinksRegistry
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.nft.GetNFTCollectionsUseCase
 import com.tangem.domain.promo.GetStoryContentUseCase
 import com.tangem.domain.tokens.ApplyTokenListSortingUseCase
 import com.tangem.domain.tokens.RunPolkadotAccountHealthCheckUseCase
 import com.tangem.domain.tokens.repository.CurrenciesRepository
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
@@ -20,7 +18,6 @@ import com.tangem.feature.wallet.presentation.wallet.domain.GetMultiWalletWarnin
 import com.tangem.feature.wallet.presentation.wallet.domain.MultiWalletTokenListStore
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
-import com.tangem.features.nft.NFTFeatureToggles
 import javax.inject.Inject
 
 @Suppress("LongParameterList")
@@ -38,11 +35,8 @@ internal class MultiWalletContentLoaderFactory @Inject constructor(
     private val runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
     private val shouldSaveUserWalletsUseCase: ShouldSaveUserWalletsUseCase,
     private val getStoryContentUseCase: GetStoryContentUseCase,
-    private val deepLinksRegistry: DeepLinksRegistry,
-    private val nftFeatureToggles: NFTFeatureToggles,
     private val walletsRepository: WalletsRepository,
     private val getNFTCollectionsUseCase: GetNFTCollectionsUseCase,
-    private val routingFeatureToggle: RoutingFeatureToggle,
     private val currenciesRepository: CurrenciesRepository,
 ) {
 
@@ -62,11 +56,8 @@ internal class MultiWalletContentLoaderFactory @Inject constructor(
             runPolkadotAccountHealthCheckUseCase = runPolkadotAccountHealthCheckUseCase,
             getStoryContentUseCase = getStoryContentUseCase,
             shouldSaveUserWalletsUseCase = shouldSaveUserWalletsUseCase,
-            deepLinksRegistry = deepLinksRegistry,
-            nftFeatureToggles = nftFeatureToggles,
             walletsRepository = walletsRepository,
             getNFTCollectionsUseCase = getNFTCollectionsUseCase,
-            routingFeatureToggle = routingFeatureToggle,
             currenciesRepository = currenciesRepository,
         )
     }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletContentLoader.kt

@@ -9,7 +9,7 @@ import com.tangem.domain.tokens.GetCryptoCurrencyActionsUseCase
 import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsCountUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.WalletWarningsAnalyticsSender
@@ -19,7 +19,7 @@ import com.tangem.feature.wallet.presentation.wallet.subscribers.*
 
 @Suppress("LongParameterList")
 internal class SingleWalletContentLoader(
-    private val userWallet: UserWallet,
+    private val userWallet: UserWallet.Cold,
     private val clickIntents: WalletClickIntents,
     private val isRefresh: Boolean,
     private val stateHolder: WalletStateController,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletContentLoaderFactory.kt

@@ -10,7 +10,7 @@ import com.tangem.domain.tokens.GetCryptoCurrencyActionsUseCase
 import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsCountUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.WalletWarningsAnalyticsSender
@@ -36,7 +36,7 @@ internal class SingleWalletContentLoaderFactory @Inject constructor(
     private val walletWarningsAnalyticsSender: WalletWarningsAnalyticsSender,
 ) {
 
-    fun create(userWallet: UserWallet, clickIntents: WalletClickIntents, isRefresh: Boolean): WalletContentLoader {
+    fun create(userWallet: UserWallet.Cold, clickIntents: WalletClickIntents, isRefresh: Boolean): WalletContentLoader {
         return SingleWalletContentLoader(
             userWallet = userWallet,
             clickIntents = clickIntents,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletWithTokenContentLoader.kt

@@ -1,11 +1,9 @@
 package com.tangem.feature.wallet.presentation.wallet.loaders.implementors
 
-import com.tangem.common.routing.RoutingFeatureToggle
-import com.tangem.core.deeplink.DeepLinksRegistry
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.promo.GetStoryContentUseCase
 import com.tangem.domain.tokens.RunPolkadotAccountHealthCheckUseCase
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
@@ -19,7 +17,7 @@ import com.tangem.feature.wallet.presentation.wallet.subscribers.*
 
 @Suppress("LongParameterList")
 internal class SingleWalletWithTokenContentLoader(
-    private val userWallet: UserWallet,
+    private val userWallet: UserWallet.Cold,
     private val clickIntents: WalletClickIntents,
     private val stateHolder: WalletStateController,
     private val tokenListAnalyticsSender: TokenListAnalyticsSender,
@@ -32,8 +30,6 @@ internal class SingleWalletWithTokenContentLoader(
     private val runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
     private val shouldSaveUserWalletsUseCase: ShouldSaveUserWalletsUseCase,
     private val getStoryContentUseCase: GetStoryContentUseCase,
-    private val deepLinksRegistry: DeepLinksRegistry,
-    private val routingFeatureToggle: RoutingFeatureToggle,
 ) : WalletContentLoader(id = userWallet.walletId) {
 
     override fun create(): List<WalletSubscriber> {
@@ -47,8 +43,6 @@ internal class SingleWalletWithTokenContentLoader(
                 tokenListStore = tokenListStore,
                 getSelectedAppCurrencyUseCase = getSelectedAppCurrencyUseCase,
                 runPolkadotAccountHealthCheckUseCase = runPolkadotAccountHealthCheckUseCase,
-                deepLinksRegistry = deepLinksRegistry,
-                routingFeatureToggle = routingFeatureToggle,
             ).let(::add)
             MultiWalletWarningsSubscriber(
                 userWallet = userWallet,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletWithTokenContentLoaderFactory.kt

@@ -1,13 +1,12 @@
 package com.tangem.feature.wallet.presentation.wallet.loaders.implementors
 
-import com.tangem.common.routing.RoutingFeatureToggle
 import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.core.deeplink.DeepLinksRegistry
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.promo.GetStoryContentUseCase
 import com.tangem.domain.tokens.RunPolkadotAccountHealthCheckUseCase
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsUseCase
+import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.WalletWarningsAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.WalletWarningsSingleEventSender
@@ -15,7 +14,6 @@ import com.tangem.feature.wallet.presentation.wallet.domain.GetMultiWalletWarnin
 import com.tangem.feature.wallet.presentation.wallet.domain.MultiWalletTokenListStore
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
-import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import javax.inject.Inject
 
 // TODO: Refactor
@@ -33,11 +31,9 @@ internal class SingleWalletWithTokenContentLoaderFactory @Inject constructor(
     private val runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
     private val shouldSaveUserWalletsUseCase: ShouldSaveUserWalletsUseCase,
     private val getStoryContentUseCase: GetStoryContentUseCase,
-    private val deepLinksRegistry: DeepLinksRegistry,
-    private val routingFeatureToggle: RoutingFeatureToggle,
 ) {
 
-    fun create(userWallet: UserWallet, clickIntents: WalletClickIntents): SingleWalletWithTokenContentLoader {
+    fun create(userWallet: UserWallet.Cold, clickIntents: WalletClickIntents): SingleWalletWithTokenContentLoader {
         return SingleWalletWithTokenContentLoader(
             userWallet = userWallet,
             clickIntents = clickIntents,
@@ -52,8 +48,6 @@ internal class SingleWalletWithTokenContentLoaderFactory @Inject constructor(
             runPolkadotAccountHealthCheckUseCase = runPolkadotAccountHealthCheckUseCase,
             getStoryContentUseCase = getStoryContentUseCase,
             shouldSaveUserWalletsUseCase = shouldSaveUserWalletsUseCase,
-            deepLinksRegistry = deepLinksRegistry,
-            routingFeatureToggle = routingFeatureToggle,
         )
     }
 }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/VisaWalletContentLoader.kt

@@ -2,14 +2,14 @@ package com.tangem.feature.wallet.presentation.wallet.loaders.implementors
 
 import com.tangem.domain.visa.GetVisaCurrencyUseCase
 import com.tangem.domain.visa.GetVisaTxHistoryUseCase
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.subscribers.VisaWalletSubscriber
 import com.tangem.feature.wallet.presentation.wallet.subscribers.WalletSubscriber
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 
 internal class VisaWalletContentLoader(
-    private val userWallet: UserWallet,
+    private val userWallet: UserWallet.Cold,
     private val clickIntents: WalletClickIntents,
     private val isRefresh: Boolean,
     private val stateController: WalletStateController,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/VisaWalletContentLoaderFactory.kt

@@ -3,7 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.loaders.implementors
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.domain.visa.GetVisaCurrencyUseCase
 import com.tangem.domain.visa.GetVisaTxHistoryUseCase
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import javax.inject.Inject
@@ -15,7 +15,7 @@ internal class VisaWalletContentLoaderFactory @Inject constructor(
     private val getVisaTxHistoryUseCase: GetVisaTxHistoryUseCase,
 ) {
 
-    fun create(userWallet: UserWallet, clickIntents: WalletClickIntents, isRefresh: Boolean): WalletContentLoader {
+    fun create(userWallet: UserWallet.Cold, clickIntents: WalletClickIntents, isRefresh: Boolean): WalletContentLoader {
         return VisaWalletContentLoader(
             userWallet = userWallet,
             clickIntents = clickIntents,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/WalletContentLoader.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.loaders.implementors
 
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.subscribers.WalletSubscriber
 
 /**

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletStateController.kt

@@ -2,7 +2,7 @@ package com.tangem.feature.wallet.presentation.wallet.state
 
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
 import com.tangem.core.ui.event.consumedEvent
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.NOT_INITIALIZED_WALLET_INDEX
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletScreenState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
@@ -10,6 +10,7 @@ import com.tangem.feature.wallet.presentation.wallet.state.model.WalletTopBarCon
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.CloseBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.OpenBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.WalletScreenStateTransformer
+import com.tangem.utils.extensions.indexOfFirstOrNull
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -68,6 +69,10 @@ internal class WalletStateController @Inject constructor() {
         return with(value) { wallets[selectedWalletIndex].walletCardState.id }
     }
 
+    fun getWalletIndexByWalletId(userWalletId: UserWalletId): Int? {
+        return with(value) { wallets.indexOfFirstOrNull { it.walletCardState.id == userWalletId } }
+    }
+
     fun showBottomSheet(
         content: TangemBottomSheetConfigContent,
         userWalletId: UserWalletId = getSelectedWalletId(),

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletCardState.kt

@@ -3,7 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.state.model
 import androidx.annotation.DrawableRes
 import androidx.compose.runtime.Immutable
 import com.tangem.core.ui.extensions.TextReference
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.utils.StringsSigns.DASH_SIGN
 import kotlinx.collections.immutable.ImmutableList
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletDialogConfig.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.state.model
 
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import kotlinx.serialization.Serializable
 
 /**

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletNotification.kt

@@ -255,6 +255,20 @@ sealed class WalletNotification(val config: NotificationConfig) {
         ),
     )
 
+    data class FinishWalletActivation(
+        val onFinishClick: () -> Unit,
+    ) : WalletNotification(
+        config = NotificationConfig(
+            title = resourceReference(R.string.hw_activation_need_title),
+            subtitle = resourceReference(R.string.hw_activation_need_description),
+            iconResId = R.drawable.img_knight_shield_32,
+            buttonsState = NotificationConfig.ButtonsState.SecondaryButtonConfig(
+                text = resourceReference(R.string.hw_activation_need_finish),
+                onClick = onFinishClick,
+            ),
+        ),
+    )
+
     data class ReferralPromo(
         val onCloseClick: () -> Unit,
         val onClick: () -> Unit,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/AddWalletTransformer.kt

@@ -1,10 +1,10 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletImageResolver
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletScreenState
 import com.tangem.feature.wallet.presentation.wallet.state.utils.WalletLoadingStateFactory
-import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import kotlinx.collections.immutable.toImmutableList
 
 internal class AddWalletTransformer(

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/CloseBottomSheetTransformer.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 
 internal class CloseBottomSheetTransformer(userWalletId: UserWalletId) : WalletStateTransformer(userWalletId) {

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/DeleteWalletTransformer.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletScreenState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import kotlinx.collections.immutable.toImmutableList

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/DisableActionTransformer.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletManageButton
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import kotlinx.collections.immutable.PersistentList

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/InitializeWalletsTransformer.kt

@@ -1,9 +1,8 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.common.util.cardTypesResolver
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.isLocked
-import com.tangem.domain.wallets.models.requireColdWallet
+import com.tangem.domain.card.common.util.cardTypesResolver
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.isLocked
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletAdditionalInfoFactory
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletImageResolver
 import com.tangem.feature.wallet.presentation.wallet.state.model.*
@@ -55,8 +54,6 @@ internal class InitializeWalletsTransformer(
     }
 
     private fun createLockedState(userWallet: UserWallet): WalletState {
-        userWallet.requireColdWallet()
-
         return userWallet.createStateByWalletType(
             multiCurrencyCreator = {
                 WalletState.MultiCurrency.Locked(
@@ -87,7 +84,7 @@ internal class InitializeWalletsTransformer(
         )
     }
 
-    private fun UserWallet.Cold.toLockedWalletCardState(): WalletCardState {
+    private fun UserWallet.toLockedWalletCardState(): WalletCardState {
         return WalletCardState.LockedContent(
             id = walletId,
             title = name,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/OpenBottomSheetTransformer.kt

@@ -2,7 +2,7 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 
 internal class OpenBottomSheetTransformer(

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/ReinitializeWalletTransformer.kt

@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletImageResolver
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletScreenState

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/RemoveNFTCollectionsTransformer.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletNFTItemUM
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/RenameWalletsTransformer.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletScreenState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import kotlinx.collections.immutable.toImmutableList

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetCryptoCurrencyActionsTransformer.kt

@@ -1,9 +1,9 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.tokens.model.ScenarioUnavailabilityReason
 import com.tangem.domain.tokens.model.TokenActionsState
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletManageButton
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetExpressStatusesTransformer.kt

@@ -6,7 +6,7 @@ import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.onramp.model.cache.OnrampTransaction
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.common.ui.expressStatus.state.ExpressTransactionStateUM
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.converter.SingleWalletOnrampTransactionConverter

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetNFTCollectionsTransformer.kt

@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
 import com.tangem.domain.nft.models.*
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletNFTItemUM
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import kotlinx.collections.immutable.toPersistentList

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetPrimaryCurrencyTransformer.kt

@@ -3,7 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers
 import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletCardState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.converter.SingleWalletCardStateConverter

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetRefreshStateTransformer.kt

@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
 import com.tangem.core.ui.components.containers.pullToRefresh.PullToRefreshConfig
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.BalancesAndLimitsBlockState
 import com.tangem.feature.wallet.presentation.wallet.state.model.*
 import kotlinx.collections.immutable.PersistentList

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTokenListErrorTransformer.kt

@@ -3,10 +3,9 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers
 import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.common.util.getCardsCount
+import com.tangem.domain.card.common.util.getCardsCount
 import com.tangem.domain.tokens.error.TokenListError
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.requireColdWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletAdditionalInfoFactory
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletCardState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
@@ -57,8 +56,6 @@ internal class SetTokenListErrorTransformer(
     }
 
     private fun WalletCardState.toLoadedState(): WalletCardState {
-        selectedWallet.requireColdWallet() // TODO [REDACTED_TASK_KEY]
-
         return WalletCardState.Content(
             id = id,
             title = title,
@@ -68,7 +65,10 @@ internal class SetTokenListErrorTransformer(
             balance = BigDecimal.ZERO.format {
                 fiat(fiatCurrencyCode = appCurrency.code, fiatCurrencySymbol = appCurrency.symbol)
             },
-            cardCount = selectedWallet.getCardsCount(),
+            cardCount = when (selectedWallet) {
+                is UserWallet.Cold -> selectedWallet.getCardsCount()
+                is UserWallet.Hot -> null
+            },
             isZeroBalance = true,
             isBalanceFlickering = false,
         )

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTokenListTransformer.kt

@@ -2,7 +2,7 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.tokens.model.TokenList
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletCardState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletTokensListState

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTxHistoryCountErrorTransformer.kt

@@ -2,10 +2,10 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
-import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.models.network.TxInfo
 import com.tangem.domain.txhistory.models.TxHistoryStateError
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.converter.TxHistoryItemStateConverter

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTxHistoryCountTransformer.kt

@@ -3,7 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers
 import androidx.paging.PagingData
 import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import kotlinx.coroutines.flow.MutableStateFlow

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTxHistoryItemsErrorTransformer.kt

@@ -3,7 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
 import com.tangem.domain.txhistory.models.TxHistoryListError
 import com.tangem.domain.visa.exception.RefreshTokenExpiredException
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import timber.log.Timber

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTxHistoryItemsTransformer.kt

@@ -3,7 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers
 import androidx.paging.PagingData
 import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.converter.TxHistoryItemFlowConverter
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetVisaInfoTransformer.kt

@@ -8,12 +8,11 @@ import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.format.bigdecimal.crypto
 import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
-import com.tangem.domain.common.util.getCardsCount
+import com.tangem.domain.card.common.util.getCardsCount
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.visa.exception.RefreshTokenExpiredException
 import com.tangem.domain.visa.model.VisaCurrency
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.requireColdWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.model.BalancesAndLimitsBlockState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletAdditionalInfo
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletCardState
@@ -27,7 +26,7 @@ import org.joda.time.DateTime
 import org.joda.time.Days
 
 internal class SetVisaInfoTransformer(
-    private val userWallet: UserWallet,
+    private val userWallet: UserWallet.Cold,
     private val maybeVisaCurrency: Either<Throwable, VisaCurrency>,
     private val clickIntents: WalletClickIntents,
 ) : TypedWalletStateTransformer<WalletState.Visa.Content>(
@@ -76,8 +75,6 @@ internal class SetVisaInfoTransformer(
     }
 
     private fun getContentWalletCardState(prevState: WalletCardState, visaCurrency: VisaCurrency): WalletCardState {
-        userWallet.requireColdWallet() // TODO [REDACTED_TASK_KEY]
-
         return with(prevState) {
             WalletCardState.Content(
                 id = id,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetWalletCardDropDownItemsTransformer.kt

@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
 import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletDropDownItems
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletScreenState

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetWarningsTransformer.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletNotification
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import kotlinx.collections.immutable.ImmutableList

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/TypedWalletStateTransformer.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import kotlin.reflect.KClass
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/UnlockWalletTransformer.kt

@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletImageResolver
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletScreenState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/UpdateMultiWalletActionButtonBadgeTransformer.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.utils.showSwapBadge
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/UpdateMultiWalletActionsTransformer.kt

@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
 import com.tangem.domain.core.lce.Lce
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletManageButton
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import kotlinx.collections.immutable.PersistentList

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/UpdateWalletCardsCountTransformer.kt

@@ -1,8 +1,8 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.common.util.getCardsCount
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.requireColdWallet
+import com.tangem.domain.card.common.util.getCardsCount
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.requireColdWallet
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletAdditionalInfoFactory
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletImageResolver
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletCardState

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/WalletStateTransformer.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
-import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletScreenState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import kotlinx.collections.immutable.toImmutableList

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/MultiWalletCardStateConverter.kt

@@ -3,11 +3,10 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers.convert
 import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.common.util.getCardsCount
+import com.tangem.domain.card.common.util.getCardsCount
 import com.tangem.domain.models.StatusSource
-import com.tangem.domain.tokens.model.TotalFiatBalance
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.requireColdWallet
+import com.tangem.domain.models.TotalFiatBalance
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletAdditionalInfoFactory
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletCardState
 import com.tangem.utils.converter.Converter
@@ -48,8 +47,6 @@ internal class MultiWalletCardStateConverter(
     }
 
     private fun WalletCardState.toWalletCardState(fiatBalance: TotalFiatBalance.Loaded): WalletCardState {
-        selectedWallet.requireColdWallet()
-
         return WalletCardState.Content(
             id = id,
             title = title,
@@ -60,7 +57,10 @@ internal class MultiWalletCardStateConverter(
                 fiat(fiatCurrencyCode = appCurrency.code, fiatCurrencySymbol = appCurrency.symbol)
             },
             isZeroBalance = fiatBalance.amount.isZero(),
-            cardCount = selectedWallet.getCardsCount(),
+            cardCount = when (selectedWallet) {
+                is UserWallet.Cold -> selectedWallet.getCardsCount()
+                is UserWallet.Hot -> null
+            },
             isBalanceFlickering = fiatBalance.source == StatusSource.CACHE,
         )
     }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/MultiWalletCurrencyActionsConverter.kt

@@ -2,11 +2,11 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers.convert
 
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.tokens.model.ScenarioUnavailabilityReason
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.TokenActionsState
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.wallet.state.model.TokenActionButtonConfig
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletCurrencyActionsClickIntents

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/SingleWalletCardStateConverter.kt

@@ -3,11 +3,10 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers.convert
 import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.common.util.getCardsCount
+import com.tangem.domain.card.common.util.getCardsCount
 import com.tangem.domain.models.StatusSource
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.requireColdWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletAdditionalInfoFactory
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletCardState
 import com.tangem.utils.StringsSigns.DASH_SIGN
@@ -64,7 +63,10 @@ internal class SingleWalletCardStateConverter(
             imageResId = imageResId,
             dropDownItems = dropDownItems,
             balance = formatFiatAmount(status = status, appCurrency = appCurrency),
-            cardCount = selectedWallet.requireColdWallet().getCardsCount(), // TODO [REDACTED_TASK_KEY]
+            cardCount = when (selectedWallet) {
+                is UserWallet.Cold -> selectedWallet.getCardsCount()
+                is UserWallet.Hot -> null
+            },
             isZeroBalance = status.fiatAmount?.isZero(),
             isBalanceFlickering = (status as? CryptoCurrencyStatus.Loaded)?.sources?.total == StatusSource.CACHE,
         )

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenListStateConverter.kt

@@ -5,15 +5,15 @@ import com.tangem.core.ui.components.tokenlist.state.TokensListItemUM
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.card.common.util.cardTypesResolver
+import com.tangem.domain.models.TotalFiatBalance
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.tokens.model.NetworkGroup
 import com.tangem.domain.tokens.model.TokenList
-import com.tangem.domain.tokens.model.TotalFiatBalance
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletTokensListState
-import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.utils.converter.Converter
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.mutate

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/UserWalletConverterExt.kt

@@ -1,17 +1,20 @@
 package com.tangem.feature.wallet.presentation.wallet.state.utils
 
-import com.tangem.domain.common.util.cardTypesResolver
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.card.common.util.cardTypesResolver
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 
-internal inline fun UserWallet.Cold.createStateByWalletType(
+internal inline fun UserWallet.createStateByWalletType(
     multiCurrencyCreator: () -> WalletState.MultiCurrency,
     singleCurrencyCreator: () -> WalletState.SingleCurrency,
     visaWalletCreator: () -> WalletState.Visa,
-): WalletState = when {
-    isVisaWallet() -> visaWalletCreator()
-    isWalletWithTokens() -> multiCurrencyCreator()
-    else -> singleCurrencyCreator()
+): WalletState = when (this) {
+    is UserWallet.Cold -> when {
+        isVisaWallet() -> visaWalletCreator()
+        isWalletWithTokens() -> multiCurrencyCreator()
+        else -> singleCurrencyCreator()
+    }
+    is UserWallet.Hot -> multiCurrencyCreator()
 }
 
 private fun UserWallet.Cold.isWalletWithTokens(): Boolean {

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt

@@ -4,9 +4,8 @@ import com.tangem.core.analytics.models.event.MainScreenAnalyticsEvent.Companion
 import com.tangem.core.ui.components.containers.pullToRefresh.PullToRefreshConfig
 import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
-import com.tangem.domain.common.util.cardTypesResolver
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.requireColdWallet
+import com.tangem.domain.card.common.util.cardTypesResolver
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletAdditionalInfoFactory
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletImageResolver
@@ -26,12 +25,35 @@ internal class WalletLoadingStateFactory(
 ) {
 
     fun create(userWallet: UserWallet): WalletState {
-        userWallet.requireColdWallet()
+        return when (userWallet) {
+            is UserWallet.Cold -> {
+                userWallet.createStateByWalletType(
+                    multiCurrencyCreator = { createLoadingMultiCurrencyContent(userWallet) },
+                    singleCurrencyCreator = { createLoadingSingleCurrencyContent(userWallet) },
+                    visaWalletCreator = { createLoadingVisaWalletContent(userWallet) },
+                )
+            }
+            is UserWallet.Hot -> {
+                createLoadingHotWalletContent(userWallet)
+            }
+        }
+    }
 
-        return userWallet.createStateByWalletType(
-            multiCurrencyCreator = { createLoadingMultiCurrencyContent(userWallet) },
-            singleCurrencyCreator = { createLoadingSingleCurrencyContent(userWallet) },
-            visaWalletCreator = { createLoadingVisaWalletContent(userWallet) },
+    private fun createLoadingHotWalletContent(userWallet: UserWallet.Hot): WalletState.MultiCurrency.Content {
+        return WalletState.MultiCurrency.Content(
+            pullToRefreshConfig = createPullToRefreshConfig(),
+            walletCardState = WalletCardState.Loading(
+                id = userWallet.walletId,
+                title = userWallet.name,
+                additionalInfo = null, // TODO [REDACTED_TASK_KEY]
+                imageResId = null, // TODO [REDACTED_TASK_KEY]
+                dropDownItems = persistentListOf(),
+            ),
+            buttons = createMultiWalletActions(userWallet),
+            warnings = persistentListOf(),
+            bottomSheetConfig = null,
+            tokensListState = WalletTokensListState.ContentState.Loading,
+            nftState = WalletNFTItemUM.Hidden,
         )
     }
 
@@ -99,15 +121,21 @@ internal class WalletLoadingStateFactory(
         )
     }
 
-    private fun createMultiWalletActions(userWallet: UserWallet.Cold): PersistentList<WalletManageButton> {
-        val isSingleWalletWithToken = userWallet.scanResponse.cardTypesResolver.isSingleWalletWithToken()
+    private fun createMultiWalletActions(userWallet: UserWallet): PersistentList<WalletManageButton> {
+        val isSingleWalletWithToken =
+            userWallet is UserWallet.Cold && userWallet.scanResponse.cardTypesResolver.isSingleWalletWithToken()
         if (isSingleWalletWithToken) return persistentListOf()
 
         return persistentListOf(
             WalletManageButton.Buy(
                 enabled = true,
                 dimContent = false,
-                onClick = { clickIntents.onMultiWalletBuyClick(userWalletId = userWallet.walletId, WALLET_TYPE) },
+                onClick = {
+                    clickIntents.onMultiWalletBuyClick(
+                        userWalletId = userWallet.walletId,
+                        WALLET_TYPE,
+                    )
+                },
             ),
             WalletManageButton.Swap(
                 enabled = true,
@@ -124,14 +152,24 @@ internal class WalletLoadingStateFactory(
 
     private fun createVisaDimmedButtons(): PersistentList<WalletManageButton> {
         return persistentListOf(
-            WalletManageButton.Receive(enabled = true, dimContent = true, onClick = {}, onLongClick = null),
+            WalletManageButton.Receive(
+                enabled = true,
+                dimContent = true,
+                onClick = {},
+                onLongClick = null,
+            ),
             WalletManageButton.Buy(enabled = true, dimContent = true, onClick = {}),
         )
     }
 
     private fun createDimmedButtons(): PersistentList<WalletManageButton> {
         return persistentListOf(
-            WalletManageButton.Receive(enabled = true, dimContent = true, onClick = {}, onLongClick = null),
+            WalletManageButton.Receive(
+                enabled = true,
+                dimContent = true,
+                onClick = {},
+                onLongClick = null,
+            ),
             WalletManageButton.Send(enabled = true, dimContent = true, onClick = {}),
             WalletManageButton.Buy(enabled = true, dimContent = true, onClick = {}),
             WalletManageButton.Sell(enabled = true, dimContent = true, onClick = {}),

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/BasicTokenListSubscriber.kt

@@ -1,19 +1,15 @@
 package com.tangem.feature.wallet.presentation.wallet.subscribers
 
 import arrow.core.getOrElse
-import com.tangem.common.routing.RoutingFeatureToggle
-import com.tangem.core.deeplink.DeepLinksRegistry
-import com.tangem.core.deeplink.global.ReferralDeepLink
-import com.tangem.core.deeplink.global.SellCurrencyDeepLink
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.core.lce.Lce
 import com.tangem.domain.core.lce.LceFlow
 import com.tangem.domain.core.utils.getOrElse
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.tokens.RunPolkadotAccountHealthCheckUseCase
 import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.tokens.model.TokenList
-import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
@@ -39,8 +35,6 @@ internal abstract class BasicTokenListSubscriber(
     private val walletWithFundsChecker: WalletWithFundsChecker,
     private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
     private val runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
-    private val deepLinksRegistry: DeepLinksRegistry,
-    private val routingFeatureToggle: RoutingFeatureToggle,
 ) : WalletSubscriber() {
 
     private val sendAnalyticsJobHolder = JobHolder()
@@ -48,6 +42,8 @@ internal abstract class BasicTokenListSubscriber(
 
     protected abstract fun tokenListFlow(coroutineScope: CoroutineScope): LceFlow<TokenListError, TokenList>
 
+    protected abstract suspend fun onTokenListReceived(maybeTokenList: Lce<TokenListError, TokenList>)
+
     override fun create(coroutineScope: CoroutineScope): Flow<*> {
         return combine(
             flow = tokenListFlow(coroutineScope)
@@ -114,21 +110,6 @@ internal abstract class BasicTokenListSubscriber(
         }
     }
 
-    protected open suspend fun onTokenListReceived(maybeTokenList: Lce<TokenListError, TokenList>) {
-        if (!routingFeatureToggle.isDeepLinkNavigationEnabled) {
-            /* no-op */
-            // Handling sell deeplink requires full content in order to correctly open Send screen
-            if (maybeTokenList.getOrNull(false) != null) {
-                deepLinksRegistry.triggerDelayedDeeplink(deepLinkClass = SellCurrencyDeepLink::class.java)
-            }
-            // Handling referral deeplink requires only selected wallet to be loaded
-            // This is temporary solution, will be removed with complete deeplink navigation overhaul
-            if (maybeTokenList.getOrNull(true) != null) {
-                deepLinksRegistry.triggerDelayedDeeplink(deepLinkClass = ReferralDeepLink::class.java)
-            }
-        }
-    }
-
     private suspend fun sendTokenListAnalytics(maybeTokenList: Lce<TokenListError, TokenList>) {
         val displayedState = stateHolder.getWalletStateIfSelected(userWallet.walletId)
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/MultiWalletActionButtonsSubscriber.kt

@@ -2,7 +2,7 @@ package com.tangem.feature.wallet.presentation.wallet.subscribers
 
 import com.tangem.domain.promo.GetStoryContentUseCase
 import com.tangem.domain.promo.models.StoryContentIds
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.UpdateMultiWalletActionButtonBadgeTransformer
 import kotlinx.coroutines.CoroutineScope

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/MultiWalletTokenListSubscriber.kt

@@ -1,17 +1,16 @@
 package com.tangem.feature.wallet.presentation.wallet.subscribers
 
-import com.tangem.common.routing.RoutingFeatureToggle
-import com.tangem.core.deeplink.DeepLinksRegistry
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.core.lce.Lce
 import com.tangem.domain.core.lce.LceFlow
+import com.tangem.domain.models.TokensSortType
+import com.tangem.domain.models.TotalFiatBalance
 import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.tokens.ApplyTokenListSortingUseCase
 import com.tangem.domain.tokens.RunPolkadotAccountHealthCheckUseCase
 import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.tokens.model.TokenList
-import com.tangem.domain.tokens.model.TotalFiatBalance
-import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.MultiWalletTokenListStore
@@ -30,8 +29,6 @@ internal class MultiWalletTokenListSubscriber(
     walletWithFundsChecker: WalletWithFundsChecker,
     getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
     runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
-    deepLinksRegistry: DeepLinksRegistry,
-    routingFeatureToggle: RoutingFeatureToggle,
 ) : BasicTokenListSubscriber(
     userWallet = userWallet,
     stateHolder = stateHolder,
@@ -40,8 +37,6 @@ internal class MultiWalletTokenListSubscriber(
     walletWithFundsChecker = walletWithFundsChecker,
     getSelectedAppCurrencyUseCase = getSelectedAppCurrencyUseCase,
     runPolkadotAccountHealthCheckUseCase = runPolkadotAccountHealthCheckUseCase,
-    deepLinksRegistry = deepLinksRegistry,
-    routingFeatureToggle = routingFeatureToggle,
 ) {
 
     override fun tokenListFlow(coroutineScope: CoroutineScope): LceFlow<TokenListError, TokenList> {
@@ -52,7 +47,6 @@ internal class MultiWalletTokenListSubscriber(
 
     override suspend fun onTokenListReceived(maybeTokenList: Lce<TokenListError, TokenList>) {
         updateSortingIfNeeded(maybeTokenList)
-        super.onTokenListReceived(maybeTokenList)
     }
 
     private suspend fun updateSortingIfNeeded(maybeTokenList: Lce<*, TokenList>) {
@@ -62,7 +56,7 @@ internal class MultiWalletTokenListSubscriber(
             userWalletId = userWallet.walletId,
             sortedTokensIds = getCurrenciesIds(tokenList),
             isGroupedByNetwork = tokenList is TokenList.GroupedByNetwork,
-            isSortedByBalance = tokenList.sortedBy == TokenList.SortType.BALANCE,
+            isSortedByBalance = tokenList.sortedBy == TokensSortType.BALANCE,
         )
     }
 
@@ -72,7 +66,7 @@ internal class MultiWalletTokenListSubscriber(
 
         return tokenList.takeIf {
             tokenList.totalFiatBalance is TotalFiatBalance.Loaded &&
-                tokenList.sortedBy == TokenList.SortType.BALANCE
+                tokenList.sortedBy == TokensSortType.BALANCE
         }
     }
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/MultiWalletWarningsSubscriber.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.subscribers
 
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.WalletWarningsAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.WalletWarningsSingleEventSender

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/PrimaryCurrencySubscriber.kt

@@ -11,7 +11,7 @@ import com.tangem.domain.settings.SetWalletWithFundsFoundUseCase
 import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.tokens.error.CurrencyStatusError
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.SetPrimaryCurrencyTransformer

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletButtonsSubscriber.kt

@@ -3,7 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.subscribers
 import com.tangem.domain.tokens.GetCryptoCurrencyActionsUseCase
 import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.tokens.model.TokenActionsState
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.domain.collectLatest
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletExpressStatusesSubscriber.kt

@@ -11,7 +11,7 @@ import com.tangem.domain.onramp.model.cache.OnrampTransaction
 import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.tokens.error.CurrencyStatusError
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.SetExpressStatusesTransformer

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletNotificationsSubscriber.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.subscribers
 
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.WalletWarningsAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.GetSingleWalletWarningsFactory

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletWithTokenListSubscriber.kt

@@ -1,13 +1,12 @@
 package com.tangem.feature.wallet.presentation.wallet.subscribers
 
-import com.tangem.common.routing.RoutingFeatureToggle
-import com.tangem.core.deeplink.DeepLinksRegistry
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
+import com.tangem.domain.core.lce.Lce
 import com.tangem.domain.core.lce.LceFlow
 import com.tangem.domain.tokens.RunPolkadotAccountHealthCheckUseCase
 import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.tokens.model.TokenList
-import com.tangem.domain.wallets.models.UserWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.MultiWalletTokenListStore
@@ -17,7 +16,7 @@ import kotlinx.coroutines.CoroutineScope
 
 @Suppress("LongParameterList")
 internal class SingleWalletWithTokenListSubscriber(
-    private val userWallet: UserWallet,
+    private val userWallet: UserWallet.Cold,
     private val tokenListStore: MultiWalletTokenListStore,
     stateHolder: WalletStateController,
     clickIntents: WalletClickIntents,
@@ -25,8 +24,6 @@ internal class SingleWalletWithTokenListSubscriber(
     walletWithFundsChecker: WalletWithFundsChecker,
     getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
     runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
-    deepLinksRegistry: DeepLinksRegistry,
-    routingFeatureToggle: RoutingFeatureToggle,
 ) : BasicTokenListSubscriber(
     userWallet = userWallet,
     stateHolder = stateHolder,
@@ -35,8 +32,6 @@ internal class SingleWalletWithTokenListSubscriber(
     walletWithFundsChecker = walletWithFundsChecker,
     getSelectedAppCurrencyUseCase = getSelectedAppCurrencyUseCase,
     runPolkadotAccountHealthCheckUseCase = runPolkadotAccountHealthCheckUseCase,
-    deepLinksRegistry = deepLinksRegistry,
-    routingFeatureToggle = routingFeatureToggle,
 ) {
 
     override fun tokenListFlow(coroutineScope: CoroutineScope): LceFlow<TokenListError, TokenList> {
@@ -44,4 +39,6 @@ internal class SingleWalletWithTokenListSubscriber(
 
         return tokenListStore.getOrThrow(userWallet.walletId)
     }
+
+    override suspend fun onTokenListReceived(maybeTokenList: Lce<TokenListError, TokenList>) = Unit
 }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/TxHistorySubscriber.kt

@@ -4,7 +4,7 @@ import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import androidx.paging.map
 import arrow.core.Either
-import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.models.network.TxInfo
 import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
@@ -12,8 +12,7 @@ import com.tangem.domain.txhistory.models.TxHistoryListError
 import com.tangem.domain.txhistory.models.TxHistoryStateError
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsCountUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
-import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.models.requireColdWallet
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.domain.collectLatest
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
@@ -32,7 +31,7 @@ typealias MaybeTxHistoryItems = Either<TxHistoryListError, Flow<PagingData<TxInf
 
 @Suppress("LongParameterList")
 internal class TxHistorySubscriber(
-    private val userWallet: UserWallet,
+    private val userWallet: UserWallet.Cold,
     private val isRefresh: Boolean,
     private val stateHolder: WalletStateController,
     private val clickIntents: WalletClickIntents,
@@ -97,7 +96,7 @@ internal class TxHistorySubscriber(
                     )
                 },
                 ifRight = { itemsFlow ->
-                    val blockchain = userWallet.requireColdWallet().scanResponse.cardTypesResolver.getBlockchain()
+                    val blockchain = userWallet.scanResponse.cardTypesResolver.getBlockchain()
                     val itemConverter = TxHistoryItemStateConverter(
                         symbol = blockchain.currency,
                         decimals = blockchain.decimals(),