Updated on 2026-08-14

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

@@ -6,7 +6,7 @@ import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.GetMultiWalletWarningsFactory
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.subscribers.MultiWalletWarningsSubscriber
 import com.tangem.feature.wallet.presentation.wallet.subscribers.TokenListSubscriber
 import com.tangem.feature.wallet.presentation.wallet.subscribers.WalletSubscriber
@@ -17,7 +17,7 @@ internal class MultiWalletContentLoader(
     private val userWallet: UserWallet,
     private val appCurrency: AppCurrency,
     private val clickIntents: WalletClickIntentsV2,
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val tokenListAnalyticsSender: TokenListAnalyticsSender,
     private val walletWithFundsChecker: WalletWithFundsChecker,
     private val getTokenListUseCase: GetTokenListUseCase,

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

@@ -6,14 +6,14 @@ import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.GetMultiWalletWarningsFactory
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import dagger.hilt.android.scopes.ViewModelScoped
 import javax.inject.Inject
 
 @ViewModelScoped
 internal class MultiWalletContentLoaderFactory @Inject constructor(
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val getTokenListUseCase: GetTokenListUseCase,
     private val tokenListAnalyticsSender: TokenListAnalyticsSender,
     private val walletWithFundsChecker: WalletWithFundsChecker,

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

@@ -9,7 +9,7 @@ import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsCountUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.domain.GetSingleWalletWarningsFactory
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.subscribers.*
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 
@@ -19,7 +19,7 @@ internal class SingleWalletContentLoader(
     private val appCurrency: AppCurrency,
     private val clickIntents: WalletClickIntentsV2,
     private val isRefresh: Boolean,
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val getPrimaryCurrencyStatusUpdatesUseCase: GetPrimaryCurrencyStatusUpdatesUseCase,
     private val getCryptoCurrencyActionsUseCase: GetCryptoCurrencyActionsUseCase,
     private val getSingleWalletWarningsFactory: GetSingleWalletWarningsFactory,

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

@@ -9,7 +9,7 @@ import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsCountUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.domain.GetSingleWalletWarningsFactory
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import dagger.hilt.android.scopes.ViewModelScoped
 import javax.inject.Inject
@@ -17,7 +17,7 @@ import javax.inject.Inject
 @ViewModelScoped
 @Suppress("LongParameterList")
 internal class SingleWalletContentLoaderFactory @Inject constructor(
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val getPrimaryCurrencyStatusUpdatesUseCase: GetPrimaryCurrencyStatusUpdatesUseCase,
     private val getCryptoCurrencyActionsUseCase: GetCryptoCurrencyActionsUseCase,
     private val getSingleWalletWarningsFactory: GetSingleWalletWarningsFactory,

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

@@ -6,7 +6,7 @@ import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.GetMultiWalletWarningsFactory
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.subscribers.MultiWalletWarningsSubscriber
 import com.tangem.feature.wallet.presentation.wallet.subscribers.SingleWalletWithTokenListSubscriber
 import com.tangem.feature.wallet.presentation.wallet.subscribers.WalletSubscriber
@@ -17,7 +17,7 @@ internal class SingleWalletWithTokenContentLoader(
     private val userWallet: UserWallet,
     private val appCurrency: AppCurrency,
     private val clickIntents: WalletClickIntentsV2,
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val tokenListAnalyticsSender: TokenListAnalyticsSender,
     private val walletWithFundsChecker: WalletWithFundsChecker,
     private val getCardTokensListUseCase: GetCardTokensListUseCase,

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

@@ -6,12 +6,12 @@ import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.GetMultiWalletWarningsFactory
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import javax.inject.Inject
 
 internal class SingleWalletWithTokenContentLoaderFactory @Inject constructor(
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val tokenListAnalyticsSender: TokenListAnalyticsSender,
     private val walletWithFundsChecker: WalletWithFundsChecker,
     private val getCardTokensListUseCase: GetCardTokensListUseCase,

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

@@ -7,7 +7,7 @@ import com.tangem.domain.tokens.GetPrimaryCurrencyStatusUpdatesUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsCountUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.subscribers.PrimaryCurrencySubscriber
 import com.tangem.feature.wallet.presentation.wallet.subscribers.TxHistorySubscriber
 import com.tangem.feature.wallet.presentation.wallet.subscribers.VisaWalletBalancesAndLimitsSubscriber
@@ -20,7 +20,7 @@ internal class VisaWalletContentLoader(
     private val appCurrency: AppCurrency,
     private val clickIntents: WalletClickIntentsV2,
     private val isRefresh: Boolean,
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val getPrimaryCurrencyStatusUpdatesUseCase: GetPrimaryCurrencyStatusUpdatesUseCase,
     private val setWalletWithFundsFoundUseCase: SetWalletWithFundsFoundUseCase,
     private val txHistoryItemsCountUseCase: GetTxHistoryItemsCountUseCase,

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

@@ -7,7 +7,7 @@ import com.tangem.domain.tokens.GetPrimaryCurrencyStatusUpdatesUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsCountUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import dagger.hilt.android.scopes.ViewModelScoped
 import javax.inject.Inject
@@ -15,7 +15,7 @@ import javax.inject.Inject
 @ViewModelScoped
 @Suppress("LongParameterList")
 internal class VisaWalletContentLoaderFactory @Inject constructor(
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val getPrimaryCurrencyStatusUpdatesUseCase: GetPrimaryCurrencyStatusUpdatesUseCase,
     private val setWalletWithFundsFoundUseCase: SetWalletWithFundsFoundUseCase,
     private val txHistoryItemsCountUseCase: GetTxHistoryItemsCountUseCase,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/WalletScreenState.kt

@@ -1,265 +0,0 @@
-package com.tangem.feature.wallet.presentation.wallet.state2
-
-import androidx.paging.PagingData
-import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
-import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
-import com.tangem.core.ui.components.transactions.state.TransactionState
-import com.tangem.core.ui.components.transactions.state.TxHistoryState
-import com.tangem.core.ui.event.StateEvent
-import com.tangem.core.ui.extensions.TextReference
-import com.tangem.feature.wallet.impl.R
-import com.tangem.feature.wallet.presentation.common.state.TokenItemState
-import com.tangem.feature.wallet.presentation.wallet.state.WalletEvent
-import com.tangem.feature.wallet.presentation.wallet.state.components.*
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.PersistentList
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.coroutines.flow.MutableStateFlow
-import javax.annotation.concurrent.Immutable
-
-const val NOT_INITIALIZED_WALLET_INDEX = -1
-
-internal data class WalletScreenState(
-    val onBackClick: () -> Unit,
-    val topBarConfig: WalletTopBarConfig,
-    val selectedWalletIndex: Int,
-    val wallets: ImmutableList<WalletState>,
-    val onWalletChange: (Int) -> Unit,
-    val event: StateEvent<WalletEvent>,
-    val isHidingMode: Boolean,
-)
-
-internal sealed class WalletState {
-
-    abstract val pullToRefreshConfig: WalletPullToRefreshConfig
-    abstract val walletCardState: WalletCardState
-    abstract val warnings: ImmutableList<WalletNotification>
-    abstract val bottomSheetConfig: TangemBottomSheetConfig?
-
-    sealed class MultiCurrency : WalletState() {
-
-        abstract val tokensListState: WalletTokensListState
-        abstract val manageTokensButtonConfig: ManageTokensButtonConfig?
-
-        data class Content(
-            override val pullToRefreshConfig: WalletPullToRefreshConfig,
-            override val walletCardState: WalletCardState,
-            override val warnings: ImmutableList<WalletNotification>,
-            override val bottomSheetConfig: TangemBottomSheetConfig?,
-            override val tokensListState: WalletTokensListState,
-            override val manageTokensButtonConfig: ManageTokensButtonConfig?,
-        ) : MultiCurrency()
-
-        data class Locked(
-            override val walletCardState: WalletCardState,
-            val onUnlockNotificationClick: () -> Unit,
-            val isBottomSheetShow: Boolean = false,
-            val onBottomSheetDismiss: () -> Unit = {},
-            val onUnlockClick: () -> Unit,
-            val onScanClick: () -> Unit,
-        ) : MultiCurrency() {
-
-            override val pullToRefreshConfig: WalletPullToRefreshConfig
-                get() = WalletPullToRefreshConfig(isRefreshing = false, onRefresh = {})
-
-            override val warnings: ImmutableList<WalletNotification> = persistentListOf(
-                WalletNotification.UnlockWallets(onUnlockNotificationClick),
-            )
-
-            override val bottomSheetConfig = TangemBottomSheetConfig(
-                isShow = isBottomSheetShow,
-                onDismissRequest = onBottomSheetDismiss,
-                content = WalletBottomSheetConfig.UnlockWallets(
-                    onUnlockClick = onUnlockClick,
-                    onScanClick = onScanClick,
-                ),
-            )
-
-            override val tokensListState = WalletTokensListState.ContentState.Locked
-            override val manageTokensButtonConfig = null
-        }
-    }
-
-    sealed class SingleCurrency : WalletState() {
-
-        abstract val buttons: PersistentList<WalletManageButton>
-        abstract val marketPriceBlockState: MarketPriceBlockState?
-        abstract val txHistoryState: TxHistoryState
-
-        data class Content(
-            override val pullToRefreshConfig: WalletPullToRefreshConfig,
-            override val walletCardState: WalletCardState,
-            override val warnings: ImmutableList<WalletNotification>,
-            override val bottomSheetConfig: TangemBottomSheetConfig?,
-            override val buttons: PersistentList<WalletManageButton>,
-            override val marketPriceBlockState: MarketPriceBlockState,
-            override val txHistoryState: TxHistoryState,
-        ) : SingleCurrency()
-
-        data class Locked(
-            override val walletCardState: WalletCardState,
-            override val buttons: PersistentList<WalletManageButton>,
-            val onUnlockNotificationClick: () -> Unit,
-            val isBottomSheetShow: Boolean = false,
-            val onBottomSheetDismiss: () -> Unit = {},
-            val onUnlockClick: () -> Unit,
-            val onScanClick: () -> Unit,
-            val onExploreClick: () -> Unit,
-        ) : SingleCurrency() {
-
-            override val pullToRefreshConfig: WalletPullToRefreshConfig
-                get() = WalletPullToRefreshConfig(isRefreshing = false, onRefresh = {})
-
-            override val warnings: ImmutableList<WalletNotification> = persistentListOf(
-                WalletNotification.UnlockWallets(onUnlockNotificationClick),
-            )
-
-            override val bottomSheetConfig = TangemBottomSheetConfig(
-                isShow = isBottomSheetShow,
-                onDismissRequest = onBottomSheetDismiss,
-                content = WalletBottomSheetConfig.UnlockWallets(
-                    onUnlockClick = onUnlockClick,
-                    onScanClick = onScanClick,
-                ),
-            )
-
-            override val marketPriceBlockState: MarketPriceBlockState? = null
-
-            override val txHistoryState: TxHistoryState = TxHistoryState.Content(
-                contentItems = MutableStateFlow(
-                    value = PagingData.from(
-                        data = listOf(
-                            TxHistoryState.TxHistoryItemState.Title(onExploreClick = onExploreClick),
-                            TxHistoryState.TxHistoryItemState.Transaction(
-                                state = TransactionState.Locked(txHash = "LOCKED_TX_HASH"),
-                            ),
-                        ),
-                    ),
-                ),
-            )
-        }
-    }
-
-    internal sealed class Visa : WalletState() {
-
-        abstract val balancesAndLimitBlockState: BalancesAndLimitsBlockState?
-        abstract val txHistoryState: TxHistoryState
-
-        data class Content(
-            override val pullToRefreshConfig: WalletPullToRefreshConfig,
-            override val walletCardState: WalletCardState,
-            override val warnings: ImmutableList<WalletNotification>,
-            override val bottomSheetConfig: TangemBottomSheetConfig?,
-            override val balancesAndLimitBlockState: BalancesAndLimitsBlockState,
-            override val txHistoryState: TxHistoryState,
-            val depositButtonState: DepositButtonState,
-        ) : Visa()
-
-        data class Locked(
-            override val walletCardState: WalletCardState,
-            val onUnlockNotificationClick: () -> Unit,
-            val isBottomSheetShow: Boolean = false,
-            val onBottomSheetDismiss: () -> Unit = {},
-            val onUnlockClick: () -> Unit,
-            val onScanClick: () -> Unit,
-            val onExploreClick: () -> Unit,
-        ) : Visa() {
-
-            override val pullToRefreshConfig: WalletPullToRefreshConfig
-                get() = WalletPullToRefreshConfig(isRefreshing = false, onRefresh = {})
-
-            override val warnings: ImmutableList<WalletNotification> = persistentListOf(
-                WalletNotification.UnlockWallets(onUnlockNotificationClick),
-            )
-
-            override val bottomSheetConfig = TangemBottomSheetConfig(
-                isShow = isBottomSheetShow,
-                onDismissRequest = onBottomSheetDismiss,
-                content = WalletBottomSheetConfig.UnlockWallets(
-                    onUnlockClick = onUnlockClick,
-                    onScanClick = onScanClick,
-                ),
-            )
-
-            override val balancesAndLimitBlockState: BalancesAndLimitsBlockState? = null
-
-            override val txHistoryState: TxHistoryState = TxHistoryState.Content(
-                contentItems = MutableStateFlow(
-                    value = PagingData.from(
-                        data = listOf(
-                            TxHistoryState.TxHistoryItemState.Title(onExploreClick = onExploreClick),
-                            TxHistoryState.TxHistoryItemState.Transaction(
-                                state = TransactionState.Locked(txHash = "LOCKED_TX_HASH"),
-                            ),
-                        ),
-                    ),
-                ),
-            )
-        }
-
-        sealed class BalancesAndLimitsBlockState {
-
-            object Loading : BalancesAndLimitsBlockState()
-
-            object Error : BalancesAndLimitsBlockState()
-
-            data class Content(
-                val availableBalance: String,
-                val currencySymbol: String,
-                val limitDays: Int,
-                val isEnabled: Boolean,
-                val onClick: () -> Unit,
-            ) : BalancesAndLimitsBlockState()
-        }
-
-        data class DepositButtonState(
-            val isEnabled: Boolean,
-            val onClick: () -> Unit,
-        )
-    }
-}
-
-internal sealed class WalletTokensListState {
-
-    object Empty : WalletTokensListState()
-
-    sealed class ContentState : WalletTokensListState() {
-
-        abstract val items: ImmutableList<TokensListItemState>
-        abstract val organizeTokensButtonConfig: OrganizeTokensButtonConfig?
-
-        object Loading : ContentState() {
-            override val items = persistentListOf<TokensListItemState>()
-            override val organizeTokensButtonConfig = null
-        }
-
-        data class Content(
-            override val items: ImmutableList<TokensListItemState>,
-            override val organizeTokensButtonConfig: OrganizeTokensButtonConfig?,
-        ) : ContentState()
-
-        object Locked : ContentState() {
-            override val items = persistentListOf(
-                TokensListItemState.NetworkGroupTitle(id = 42, name = TextReference.Res(id = R.string.main_tokens)),
-                TokensListItemState.Token(state = TokenItemState.Locked(id = "Locked#1")),
-            )
-            override val organizeTokensButtonConfig = null
-        }
-    }
-
-    data class OrganizeTokensButtonConfig(val isEnabled: Boolean, val onClick: () -> Unit)
-
-    @Immutable
-    sealed class TokensListItemState {
-
-        abstract val id: Any
-
-        data class NetworkGroupTitle(override val id: Int, val name: TextReference) : TokensListItemState()
-
-        data class Token(val state: TokenItemState) : TokensListItemState() {
-            override val id: String = state.id
-        }
-    }
-}
-
-internal data class ManageTokensButtonConfig(val onClick: () -> Unit)

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

@@ -3,6 +3,9 @@ package com.tangem.feature.wallet.presentation.wallet.state2
 import com.tangem.core.ui.event.consumedEvent
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTopBarConfig
+import com.tangem.feature.wallet.presentation.wallet.state2.model.NOT_INITIALIZED_WALLET_INDEX
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.WalletScreenStateTransformer
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -17,7 +20,7 @@ import javax.inject.Singleton
 [REDACTED_AUTHOR]
  */
 @Singleton
-internal class WalletStateHolderV2 @Inject constructor() {
+internal class WalletStateController @Inject constructor() {
 
     val uiState: StateFlow<WalletScreenState> get() = mutableUiState
     val value: WalletScreenState get() = uiState.value

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/model/BalancesAndLimitsBlockState.kt

@@ -0,0 +1,19 @@
+package com.tangem.feature.wallet.presentation.wallet.state2.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+internal sealed class BalancesAndLimitsBlockState {
+
+    object Loading : BalancesAndLimitsBlockState()
+
+    object Error : BalancesAndLimitsBlockState()
+
+    data class Content(
+        val availableBalance: String,
+        val currencySymbol: String,
+        val limitDays: Int,
+        val isEnabled: Boolean,
+        val onClick: () -> Unit,
+    ) : BalancesAndLimitsBlockState()
+}

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/model/DepositButtonState.kt

@@ -0,0 +1,6 @@
+package com.tangem.feature.wallet.presentation.wallet.state2.model
+
+internal data class DepositButtonState(
+    val isEnabled: Boolean,
+    val onClick: () -> Unit,
+)

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/model/ManageTokensButtonConfig.kt

@@ -0,0 +1,3 @@
+package com.tangem.feature.wallet.presentation.wallet.state2.model
+
+internal data class ManageTokensButtonConfig(val onClick: () -> Unit)

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/model/WalletScreenState.kt

@@ -0,0 +1,16 @@
+package com.tangem.feature.wallet.presentation.wallet.state2.model
+
+import com.tangem.core.ui.event.StateEvent
+import com.tangem.feature.wallet.presentation.wallet.state.WalletEvent
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTopBarConfig
+import kotlinx.collections.immutable.ImmutableList
+
+internal data class WalletScreenState(
+    val onBackClick: () -> Unit,
+    val topBarConfig: WalletTopBarConfig,
+    val selectedWalletIndex: Int,
+    val wallets: ImmutableList<WalletState>,
+    val onWalletChange: (Int) -> Unit,
+    val event: StateEvent<WalletEvent>,
+    val isHidingMode: Boolean,
+)

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/model/WalletState.kt

@@ -0,0 +1,134 @@
+package com.tangem.feature.wallet.presentation.wallet.state2.model
+
+import androidx.compose.runtime.Immutable
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.components.marketprice.MarketPriceBlockState
+import com.tangem.core.ui.components.transactions.state.TxHistoryState
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletManageButton
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletNotification
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletPullToRefreshConfig
+import com.tangem.feature.wallet.presentation.wallet.state2.model.holder.LockedTxHistoryStateHolder
+import com.tangem.feature.wallet.presentation.wallet.state2.model.holder.LockedWalletStateHolder
+import com.tangem.feature.wallet.presentation.wallet.state2.model.holder.TxHistoryStateHolder
+import com.tangem.feature.wallet.presentation.wallet.state2.model.holder.WalletStateHolder
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.PersistentList
+
+internal const val NOT_INITIALIZED_WALLET_INDEX = -1
+
+@Immutable
+internal sealed interface WalletState : WalletStateHolder {
+
+    sealed class MultiCurrency : WalletState {
+
+        abstract val tokensListState: WalletTokensListState
+        abstract val manageTokensButtonConfig: ManageTokensButtonConfig?
+
+        data class Content(
+            override val pullToRefreshConfig: WalletPullToRefreshConfig,
+            override val walletCardState: WalletCardState,
+            override val warnings: ImmutableList<WalletNotification>,
+            override val bottomSheetConfig: TangemBottomSheetConfig?,
+            override val tokensListState: WalletTokensListState,
+            override val manageTokensButtonConfig: ManageTokensButtonConfig?,
+        ) : MultiCurrency()
+
+        data class Locked(
+            override val walletCardState: WalletCardState,
+            val onUnlockNotificationClick: () -> Unit,
+            val isBottomSheetShow: Boolean = false,
+            val onBottomSheetDismiss: () -> Unit = {},
+            val onUnlockClick: () -> Unit,
+            val onScanClick: () -> Unit,
+        ) : MultiCurrency(),
+            WalletStateHolder by LockedWalletStateHolder(
+                walletCardState,
+                onUnlockNotificationClick,
+                isBottomSheetShow,
+                onBottomSheetDismiss,
+                onUnlockClick,
+                onScanClick,
+            ) {
+
+            override val tokensListState = WalletTokensListState.ContentState.Locked
+            override val manageTokensButtonConfig = null
+        }
+    }
+
+    sealed class SingleCurrency : WalletState, TxHistoryStateHolder {
+
+        abstract val buttons: PersistentList<WalletManageButton>
+        abstract val marketPriceBlockState: MarketPriceBlockState?
+
+        data class Content(
+            override val pullToRefreshConfig: WalletPullToRefreshConfig,
+            override val walletCardState: WalletCardState,
+            override val warnings: ImmutableList<WalletNotification>,
+            override val bottomSheetConfig: TangemBottomSheetConfig?,
+            override val buttons: PersistentList<WalletManageButton>,
+            override val marketPriceBlockState: MarketPriceBlockState,
+            override val txHistoryState: TxHistoryState,
+        ) : SingleCurrency()
+
+        data class Locked(
+            override val walletCardState: WalletCardState,
+            override val buttons: PersistentList<WalletManageButton>,
+            val onUnlockNotificationClick: () -> Unit,
+            val isBottomSheetShow: Boolean = false,
+            val onBottomSheetDismiss: () -> Unit = {},
+            val onUnlockClick: () -> Unit,
+            val onScanClick: () -> Unit,
+            val onExploreClick: () -> Unit,
+        ) : SingleCurrency(),
+            TxHistoryStateHolder by LockedTxHistoryStateHolder(onExploreClick),
+            WalletStateHolder by LockedWalletStateHolder(
+                walletCardState,
+                onUnlockNotificationClick,
+                isBottomSheetShow,
+                onBottomSheetDismiss,
+                onUnlockClick,
+                onScanClick,
+            ) {
+
+            override val marketPriceBlockState: MarketPriceBlockState? = null
+        }
+    }
+
+    sealed class Visa : WalletState, TxHistoryStateHolder {
+
+        abstract val balancesAndLimitBlockState: BalancesAndLimitsBlockState?
+
+        data class Content(
+            override val pullToRefreshConfig: WalletPullToRefreshConfig,
+            override val walletCardState: WalletCardState,
+            override val warnings: ImmutableList<WalletNotification>,
+            override val bottomSheetConfig: TangemBottomSheetConfig?,
+            override val balancesAndLimitBlockState: BalancesAndLimitsBlockState,
+            override val txHistoryState: TxHistoryState,
+            val depositButtonState: DepositButtonState,
+        ) : Visa()
+
+        data class Locked(
+            override val walletCardState: WalletCardState,
+            val onUnlockNotificationClick: () -> Unit,
+            val isBottomSheetShow: Boolean = false,
+            val onBottomSheetDismiss: () -> Unit = {},
+            val onUnlockClick: () -> Unit,
+            val onScanClick: () -> Unit,
+            val onExploreClick: () -> Unit,
+        ) : Visa(),
+            TxHistoryStateHolder by LockedTxHistoryStateHolder(onExploreClick),
+            WalletStateHolder by LockedWalletStateHolder(
+                walletCardState,
+                onUnlockNotificationClick,
+                isBottomSheetShow,
+                onBottomSheetDismiss,
+                onUnlockClick,
+                onScanClick,
+            ) {
+
+            override val balancesAndLimitBlockState: BalancesAndLimitsBlockState? = null
+        }
+    }
+}

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/model/WalletTokensListState.kt

@@ -0,0 +1,52 @@
+package com.tangem.feature.wallet.presentation.wallet.state2.model
+
+import androidx.compose.runtime.Immutable
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.feature.wallet.impl.R
+import com.tangem.feature.wallet.presentation.common.state.TokenItemState
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+
+@Immutable
+internal sealed class WalletTokensListState {
+
+    object Empty : WalletTokensListState()
+
+    sealed class ContentState : WalletTokensListState() {
+
+        abstract val items: ImmutableList<TokensListItemState>
+        abstract val organizeTokensButtonConfig: OrganizeTokensButtonConfig?
+
+        object Loading : ContentState() {
+            override val items = persistentListOf<TokensListItemState>()
+            override val organizeTokensButtonConfig = null
+        }
+
+        data class Content(
+            override val items: ImmutableList<TokensListItemState>,
+            override val organizeTokensButtonConfig: OrganizeTokensButtonConfig?,
+        ) : ContentState()
+
+        object Locked : ContentState() {
+            override val items = persistentListOf(
+                TokensListItemState.NetworkGroupTitle(id = 42, name = TextReference.Res(id = R.string.main_tokens)),
+                TokensListItemState.Token(state = TokenItemState.Locked(id = "Locked#1")),
+            )
+            override val organizeTokensButtonConfig = null
+        }
+    }
+
+    data class OrganizeTokensButtonConfig(val isEnabled: Boolean, val onClick: () -> Unit)
+
+    @Immutable
+    sealed class TokensListItemState {
+
+        abstract val id: Any
+
+        data class NetworkGroupTitle(override val id: Int, val name: TextReference) : TokensListItemState()
+
+        data class Token(val state: TokenItemState) : TokensListItemState() {
+            override val id: String = state.id
+        }
+    }
+}

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/model/holder/LockedWalletStateHolder.kt

@@ -0,0 +1,43 @@
+package com.tangem.feature.wallet.presentation.wallet.state2.model.holder
+
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletBottomSheetConfig
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletNotification
+import com.tangem.feature.wallet.presentation.wallet.state.components.WalletPullToRefreshConfig
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+
+internal interface WalletStateHolder {
+
+    val pullToRefreshConfig: WalletPullToRefreshConfig
+    val walletCardState: WalletCardState
+    val warnings: ImmutableList<WalletNotification>
+    val bottomSheetConfig: TangemBottomSheetConfig?
+}
+
+internal class LockedWalletStateHolder(
+    override val walletCardState: WalletCardState,
+    onUnlockNotificationClick: () -> Unit,
+    isBottomSheetShow: Boolean,
+    onBottomSheetDismiss: () -> Unit,
+    onUnlockClick: () -> Unit,
+    onScanClick: () -> Unit,
+) : WalletStateHolder {
+
+    override val pullToRefreshConfig: WalletPullToRefreshConfig
+        get() = WalletPullToRefreshConfig(isRefreshing = false, onRefresh = {})
+
+    override val warnings: ImmutableList<WalletNotification> = persistentListOf(
+        WalletNotification.UnlockWallets(onUnlockNotificationClick),
+    )
+
+    override val bottomSheetConfig = TangemBottomSheetConfig(
+        isShow = isBottomSheetShow,
+        onDismissRequest = onBottomSheetDismiss,
+        content = WalletBottomSheetConfig.UnlockWallets(
+            onUnlockClick = onUnlockClick,
+            onScanClick = onScanClick,
+        ),
+    )
+}

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/model/holder/TxHistoryStateHolder.kt

@@ -0,0 +1,27 @@
+package com.tangem.feature.wallet.presentation.wallet.state2.model.holder
+
+import androidx.paging.PagingData
+import com.tangem.core.ui.components.transactions.state.TransactionState
+import com.tangem.core.ui.components.transactions.state.TxHistoryState
+import kotlinx.coroutines.flow.MutableStateFlow
+
+internal interface TxHistoryStateHolder {
+
+    val txHistoryState: TxHistoryState
+}
+
+internal class LockedTxHistoryStateHolder(onExploreClick: () -> Unit) : TxHistoryStateHolder {
+
+    override val txHistoryState: TxHistoryState = TxHistoryState.Content(
+        contentItems = MutableStateFlow(
+            value = PagingData.from(
+                data = listOf(
+                    TxHistoryState.TxHistoryItemState.Title(onExploreClick = onExploreClick),
+                    TxHistoryState.TxHistoryItemState.Transaction(
+                        state = TransactionState.Locked(txHash = "LOCKED_TX_HASH"),
+                    ),
+                ),
+            ),
+        ),
+    )
+}

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

@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletScreenState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
 import com.tangem.feature.wallet.presentation.wallet.state2.utils.WalletLoadingStateFactory
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import kotlinx.collections.immutable.toImmutableList

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

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

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

@@ -1,8 +1,8 @@
 package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 
 import com.tangem.domain.wallets.models.UserWalletId
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletScreenState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import kotlinx.collections.immutable.toImmutableList
 import timber.log.Timber
 

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

@@ -6,8 +6,8 @@ import com.tangem.feature.wallet.presentation.wallet.domain.WalletImageResolver
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletManageButton
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTopBarConfig
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletScreenState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state2.utils.WalletLoadingStateFactory
 import com.tangem.feature.wallet.presentation.wallet.state2.utils.createStateByWalletType
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2

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

@@ -3,7 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.state2.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.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 
 internal class OpenBottomSheetTransformer(
     userWalletId: UserWalletId,

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

@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletScreenState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
 import com.tangem.feature.wallet.presentation.wallet.state2.utils.WalletLoadingStateFactory
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import kotlinx.collections.immutable.persistentListOf

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/transformers/RenameWalletTransformer.kt

@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 
 import com.tangem.domain.wallets.models.UserWalletId
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import timber.log.Timber
 
 internal class RenameWalletTransformer(

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/transformers/ScrollToWalletTransformer.kt

@@ -3,7 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 import com.tangem.core.ui.event.consumedEvent
 import com.tangem.core.ui.event.triggeredEvent
 import com.tangem.feature.wallet.presentation.wallet.state.WalletEvent
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletScreenState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
 import com.tangem.utils.Provider
 
 internal class ScrollToWalletTransformer(

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/transformers/SendEventTransformer.kt

@@ -2,7 +2,7 @@ package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 
 import com.tangem.core.ui.event.triggeredEvent
 import com.tangem.feature.wallet.presentation.wallet.state.WalletEvent
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletScreenState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
 
 internal class SendEventTransformer(
     private val event: WalletEvent,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/transformers/SetBalancesAndLimitsTransformer.kt

@@ -1,8 +1,8 @@
 package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState.Visa.BalancesAndLimitsBlockState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.BalancesAndLimitsBlockState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 
 internal class SetBalancesAndLimitsTransformer(

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

@@ -4,7 +4,7 @@ import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.tokens.model.TokenActionsState
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletManageButton
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList

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

@@ -5,7 +5,7 @@ import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.converter.SingleWalletCardStateConverter
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.converter.SingleWalletMarketPriceConverter
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.converter.VisaWalletCardStateConverter

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

@@ -3,10 +3,10 @@ package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletManageButton
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletPullToRefreshConfig
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState.Visa.BalancesAndLimitsBlockState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState.Visa.DepositButtonState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletTokensListState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.BalancesAndLimitsBlockState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.DepositButtonState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletTokensListState
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.mutate
 

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

@@ -2,8 +2,8 @@ package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 
 import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.wallets.models.UserWalletId
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletTokensListState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletTokensListState
 import timber.log.Timber
 
 internal class SetTokenListErrorTransformer(

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

@@ -5,9 +5,9 @@ import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.tokens.model.TokenList
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
-import com.tangem.feature.wallet.presentation.wallet.state2.ManageTokensButtonConfig
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletTokensListState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.ManageTokensButtonConfig
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletTokensListState
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.converter.MultiWalletCardStateConverter
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.converter.TokenListStateConverter
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2

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

@@ -5,7 +5,7 @@ import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.domain.txhistory.models.TxHistoryStateError
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.converter.TxHistoryItemStateConverter
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import kotlinx.collections.immutable.toImmutableList

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

@@ -4,7 +4,7 @@ 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.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update

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

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

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

@@ -4,7 +4,7 @@ import androidx.paging.PagingData
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
 import com.tangem.domain.txhistory.models.TxHistoryItem
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.converter.TxHistoryItemFlowConverter
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import kotlinx.coroutines.flow.Flow

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

@@ -2,7 +2,7 @@ package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletNotification
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import kotlinx.collections.immutable.ImmutableList
 import timber.log.Timber
 

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

@@ -3,8 +3,8 @@ package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTopBarConfig
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletScreenState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state2.utils.WalletLoadingStateFactory
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import kotlinx.collections.immutable.toImmutableList

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/transformers/UpdateBalanceHidingModeTransformer.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletScreenState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
 
 internal class UpdateBalanceHidingModeTransformer(
     private val isHidingMode: Boolean,

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

@@ -5,7 +5,7 @@ import com.tangem.feature.wallet.presentation.wallet.domain.WalletAdditionalInfo
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletImageResolver
 import com.tangem.feature.wallet.presentation.wallet.domain.getCardsCount
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import timber.log.Timber
 
 internal class UpdateWalletCardsCountTransformer(

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/transformers/WalletScreenStateTransformer.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletScreenState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
 
 internal interface WalletScreenStateTransformer {
 

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

@@ -1,8 +1,8 @@
 package com.tangem.feature.wallet.presentation.wallet.state2.transformers
 
 import com.tangem.domain.wallets.models.UserWalletId
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletScreenState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import kotlinx.collections.immutable.toImmutableList
 import timber.log.Timber
 

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

@@ -7,15 +7,15 @@ 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.wallets.models.UserWallet
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletTokensListState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletTokensListState.TokensListItemState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletTokensListState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletTokensListState.TokensListItemState
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import com.tangem.utils.Provider
 import com.tangem.utils.converter.Converter
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.mutate
 import kotlinx.collections.immutable.persistentListOf
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletTokensListState.OrganizeTokensButtonConfig as WalletOrganizeTokensButtonConfig
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletTokensListState.OrganizeTokensButtonConfig as WalletOrganizeTokensButtonConfig
 
 internal class TokenListStateConverter(
     private val tokenList: TokenList,

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

@@ -2,7 +2,7 @@ package com.tangem.feature.wallet.presentation.wallet.state2.utils
 
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 
 internal inline fun UserWallet.createStateByWalletType(
     multiCurrencyCreator: () -> WalletState.MultiCurrency,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state2/utils/WalletEventSender.kt

@@ -2,7 +2,7 @@ package com.tangem.feature.wallet.presentation.wallet.state2.utils
 
 import com.tangem.core.ui.event.consumedEvent
 import com.tangem.feature.wallet.presentation.wallet.state.WalletEvent
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SendEventTransformer
 import javax.inject.Inject
 
@@ -14,7 +14,7 @@ import javax.inject.Inject
 [REDACTED_AUTHOR]
  */
 internal class WalletEventSender @Inject constructor(
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
 ) {
 
     fun send(event: WalletEvent) {

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

@@ -9,11 +9,7 @@ import com.tangem.feature.wallet.presentation.wallet.domain.WalletImageResolver
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletManageButton
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletPullToRefreshConfig
-import com.tangem.feature.wallet.presentation.wallet.state2.ManageTokensButtonConfig
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState.Visa.BalancesAndLimitsBlockState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState.Visa.DepositButtonState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletTokensListState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.*
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf

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

@@ -3,7 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.subscribers
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.domain.GetMultiWalletWarningsFactory
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletNotification
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetWarningsTransformer
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import kotlinx.collections.immutable.ImmutableList
@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.onEach
 
 internal class MultiWalletWarningsSubscriber(
     private val userWalletId: UserWalletId,
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val clickIntents: WalletClickIntentsV2,
     private val getMultiWalletWarningsFactory: GetMultiWalletWarningsFactory,
 ) : WalletSubscriber() {

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

@@ -12,7 +12,7 @@ import com.tangem.domain.tokens.error.CurrencyStatusError
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetPrimaryCurrencyTransformer
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
@@ -25,7 +25,7 @@ import java.math.BigDecimal
 internal class PrimaryCurrencySubscriber(
     private val userWallet: UserWallet,
     private val appCurrency: AppCurrency,
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val getPrimaryCurrencyStatusUpdatesUseCase: GetPrimaryCurrencyStatusUpdatesUseCase,
     private val setWalletWithFundsFoundUseCase: SetWalletWithFundsFoundUseCase,
     private val analyticsEventHandler: AnalyticsEventHandler,

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

@@ -5,7 +5,7 @@ import com.tangem.domain.tokens.GetPrimaryCurrencyStatusUpdatesUseCase
 import com.tangem.domain.tokens.model.TokenActionsState
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.domain.collectLatest
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetCryptoCurrencyActionsTransformer
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import kotlinx.coroutines.CoroutineScope
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.*
 
 internal class SingleWalletButtonsSubscriber(
     private val userWallet: UserWallet,
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val clickIntents: WalletClickIntentsV2,
     private val getPrimaryCurrencyStatusUpdatesUseCase: GetPrimaryCurrencyStatusUpdatesUseCase,
     private val getCryptoCurrencyActionsUseCase: GetCryptoCurrencyActionsUseCase,

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

@@ -3,7 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.subscribers
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.feature.wallet.presentation.wallet.domain.GetSingleWalletWarningsFactory
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletNotification
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetWarningsTransformer
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import kotlinx.collections.immutable.ImmutableList
@@ -18,7 +18,7 @@ import kotlinx.coroutines.flow.onEach
  */
 internal class SingleWalletNotificationsSubscriber(
     private val userWalletId: UserWalletId,
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val getSingleWalletWarningsFactory: GetSingleWalletWarningsFactory,
     private val clickIntents: WalletClickIntentsV2,
 ) : WalletSubscriber() {

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

@@ -8,7 +8,7 @@ import com.tangem.domain.tokens.model.TokenList
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetTokenListErrorTransformer
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetTokenListTransformer
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
@@ -22,7 +22,7 @@ import kotlinx.coroutines.flow.onEach
 internal class SingleWalletWithTokenListSubscriber(
     private val userWallet: UserWallet,
     private val appCurrency: AppCurrency,
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val clickIntents: WalletClickIntentsV2,
     private val tokenListAnalyticsSender: TokenListAnalyticsSender,
     private val walletWithFundsChecker: WalletWithFundsChecker,

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

@@ -8,7 +8,7 @@ import com.tangem.domain.tokens.model.TokenList
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetTokenListErrorTransformer
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetTokenListTransformer
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
@@ -24,7 +24,7 @@ typealias MaybeTokenListFlow = Flow<Either<TokenListError, TokenList>>
 internal class TokenListSubscriber(
     private val userWallet: UserWallet,
     private val appCurrency: AppCurrency,
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val clickIntents: WalletClickIntentsV2,
     private val tokenListAnalyticsSender: TokenListAnalyticsSender,
     private val walletWithFundsChecker: WalletWithFundsChecker,

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

@@ -12,7 +12,7 @@ import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsCountUseCase
 import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.presentation.wallet.domain.collectLatest
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetTxHistoryCountErrorTransformer
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetTxHistoryCountTransformer
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetTxHistoryItemsErrorTransformer
@@ -29,7 +29,7 @@ typealias MaybeTxHistoryItems = Either<TxHistoryListError, Flow<PagingData<TxHis
 internal class TxHistorySubscriber(
     private val userWallet: UserWallet,
     private val isRefresh: Boolean,
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val clickIntents: WalletClickIntentsV2,
     private val getPrimaryCurrencyStatusUpdatesUseCase: GetPrimaryCurrencyStatusUpdatesUseCase,
     private val txHistoryItemsCountUseCase: GetTxHistoryItemsCountUseCase,

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

@@ -1,7 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.subscribers
 
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetBalancesAndLimitsTransformer
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
 import kotlinx.coroutines.CoroutineScope
@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.asFlow
 
 internal class VisaWalletBalancesAndLimitsSubscriber(
     private val userWallet: UserWallet,
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val clickIntents: WalletClickIntentsV2,
 ) : WalletSubscriber() {
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreenV2.kt

@@ -29,10 +29,10 @@ import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.wallet.state.ActionsBottomSheetConfig
 import com.tangem.feature.wallet.presentation.wallet.state.WalletAlertState
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletBottomSheetConfig
-import com.tangem.feature.wallet.presentation.wallet.state2.NOT_INITIALIZED_WALLET_INDEX
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletScreenState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletTokensListState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.NOT_INITIALIZED_WALLET_INDEX
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletTokensListState
 import com.tangem.feature.wallet.presentation.wallet.ui.components.TokenActionsBottomSheet
 import com.tangem.feature.wallet.presentation.wallet.ui.components.WalletsList
 import com.tangem.feature.wallet.presentation.wallet.ui.components.common.*

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletContent.kt

@@ -10,7 +10,7 @@ import com.tangem.feature.wallet.presentation.wallet.state.WalletSingleCurrencyS
 import com.tangem.feature.wallet.presentation.wallet.state.WalletState
 import com.tangem.feature.wallet.presentation.wallet.ui.components.multicurrency.tokensListItems
 import com.tangem.feature.wallet.presentation.wallet.ui.components.multicurrency.tokensListItemsV2
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState as WalletStateV2
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState as WalletStateV2
 
 /**
  * Wallet content

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyContent.kt

@@ -19,8 +19,8 @@ import com.tangem.core.ui.res.TangemTheme
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTokensListState
 import kotlinx.collections.immutable.ImmutableList
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletTokensListState as WalletTokensListStateV2
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletTokensListState.TokensListItemState as TokensListItemStateV2
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletTokensListState as WalletTokensListStateV2
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletTokensListState.TokensListItemState as TokensListItemStateV2
 
 private const val NON_CONTENT_TOKENS_LIST_KEY = "NON_CONTENT_TOKENS_LIST"
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyContentItem.kt

@@ -6,7 +6,7 @@ import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.feature.wallet.presentation.common.component.NetworkGroupItem
 import com.tangem.feature.wallet.presentation.common.component.TokenItem
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletTokensListState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletTokensListState.TokensListItemState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletTokensListState.TokensListItemState
 
 /**
  * Multi-currency content item

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModelV2.kt

@@ -20,8 +20,8 @@ import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnaly
 import com.tangem.feature.wallet.presentation.wallet.loaders.WalletScreenContentLoader
 import com.tangem.feature.wallet.presentation.wallet.state.WalletEvent
 import com.tangem.feature.wallet.presentation.wallet.state.WalletEvent.DemonstrateWalletsScrollPreview.Direction
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletScreenState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.*
 import com.tangem.feature.wallet.presentation.wallet.state2.utils.WalletEventSender
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntentsV2
@@ -40,7 +40,7 @@ import kotlin.properties.Delegates
 @Suppress("LongParameterList")
 @HiltViewModel
 internal class WalletViewModelV2 @Inject constructor(
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val clickIntents: WalletClickIntentsV2,
     private val walletEventSender: WalletEventSender,
     private val walletsUpdateActionResolver: WalletsUpdateActionResolverV2,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletsUpdateActionResolverV2.kt

@@ -5,9 +5,9 @@ import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.feature.wallet.presentation.wallet.domain.getCardsCount
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
-import com.tangem.feature.wallet.presentation.wallet.state2.NOT_INITIALIZED_WALLET_INDEX
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletScreenState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.NOT_INITIALIZED_WALLET_INDEX
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletScreenState
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import dagger.hilt.android.scopes.ViewModelScoped
 import timber.log.Timber
 import javax.inject.Inject

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletCardClickIntents.kt

@@ -8,8 +8,8 @@ import com.tangem.feature.wallet.presentation.wallet.loaders.WalletScreenContent
 import com.tangem.feature.wallet.presentation.wallet.state.WalletAlertState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletEvent
 import com.tangem.feature.wallet.presentation.wallet.state.components.WalletCardState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state2.utils.WalletEventSender
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.launch
@@ -26,7 +26,7 @@ internal interface WalletCardClickIntents {
 }
 
 internal class WalletCardClickIntentsImplementor @Inject constructor(
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val walletEventSender: WalletEventSender,
     private val walletScreenContentLoader: WalletScreenContentLoader,
     private val updateWalletUseCase: UpdateWalletUseCase,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletClickIntentsV2.kt

@@ -13,8 +13,8 @@ import com.tangem.feature.wallet.presentation.router.InnerWalletRouter
 import com.tangem.feature.wallet.presentation.wallet.analytics.PortfolioEvent
 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.state2.WalletState
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
+import com.tangem.feature.wallet.presentation.wallet.state2.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetRefreshStateTransformer
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.SetTokenListErrorTransformer
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -31,7 +31,7 @@ internal class WalletClickIntentsV2 @Inject constructor(
     private val currencyActionsClickIntentsImplementor: WalletCurrencyActionsClickIntentsImplementor,
     private val contentClickIntentsImplementor: WalletContentClickIntentsImplementor,
     private val visaWalletIntentsImplementor: VisaWalletIntentsImplementor,
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val walletScreenContentLoader: WalletScreenContentLoader,
     private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
     private val selectWalletUseCase: SelectWalletUseCase,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletContentClickIntents.kt

@@ -14,7 +14,7 @@ import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.feature.wallet.presentation.wallet.analytics.PortfolioEvent
 import com.tangem.feature.wallet.presentation.wallet.domain.unwrap
 import com.tangem.feature.wallet.presentation.wallet.state.ActionsBottomSheetConfig
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.CloseBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.OpenBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.converter.MultiWalletCurrencyActionsConverter
@@ -45,7 +45,7 @@ internal interface WalletContentClickIntents {
 @Suppress("LongParameterList")
 @ViewModelScoped
 internal class WalletContentClickIntentsImplementor @Inject constructor(
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val currencyActionsClickIntentsImplementor: WalletCurrencyActionsClickIntentsImplementor,
     private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
     private val getPrimaryCurrencyStatusUpdatesUseCase: GetPrimaryCurrencyStatusUpdatesUseCase,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletCurrencyActionsClickIntents.kt

@@ -33,7 +33,7 @@ import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.wallet.domain.unwrap
 import com.tangem.feature.wallet.presentation.wallet.state.WalletAlertState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletEvent
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.CloseBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.OpenBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state2.utils.WalletEventSender
@@ -69,7 +69,7 @@ interface WalletCurrencyActionsClickIntents {
 @Suppress("LongParameterList", "LargeClass")
 @ViewModelScoped
 internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val walletEventSender: WalletEventSender,
     private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
     private val walletManagersFacade: WalletManagersFacade,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletWarningsClickIntents.kt

@@ -32,7 +32,7 @@ import com.tangem.feature.wallet.presentation.wallet.domain.ScanCardToUnlockWall
 import com.tangem.feature.wallet.presentation.wallet.domain.unwrap
 import com.tangem.feature.wallet.presentation.wallet.state.WalletAlertState
 import com.tangem.feature.wallet.presentation.wallet.state.WalletEvent
-import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateHolderV2
+import com.tangem.feature.wallet.presentation.wallet.state2.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.CloseBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state2.transformers.OpenBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state2.utils.WalletEventSender
@@ -66,7 +66,7 @@ internal interface WalletWarningsClickIntents {
 @Suppress("LongParameterList")
 @ViewModelScoped
 internal class WalletWarningsClickIntentsImplementer @Inject constructor(
-    private val stateHolder: WalletStateHolderV2,
+    private val stateHolder: WalletStateController,
     private val walletEventSender: WalletEventSender,
     private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
     private val updateWalletUseCase: UpdateWalletUseCase,