Updated on 2026-08-14

app/src/main/java/com/tangem/tap/di/domain/AccountDomainModule.kt

@@ -6,7 +6,6 @@ import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
 import com.tangem.domain.account.status.usecase.ArchiveCryptoPortfolioUseCase
 import com.tangem.domain.account.status.usecase.RecoverCryptoPortfolioUseCase
 import com.tangem.domain.account.status.utils.CryptoCurrencyBalanceFetcher
-import com.tangem.domain.account.supplier.MultiAccountListSupplier
 import com.tangem.domain.account.tokens.MainAccountTokensMigration
 import com.tangem.domain.account.usecase.*
 import com.tangem.feature.referral.data.ExternalReferralRepository
@@ -91,14 +90,6 @@ internal object AccountDomainModule {
         return GetUnoccupiedAccountIndexUseCase(crudRepository = accountsCRUDRepository)
     }
 
-    @Provides
-    @Singleton
-    fun provideIsAccountsModeEnabledUseCase(
-        multiAccountListSupplier: MultiAccountListSupplier,
-    ): IsAccountsModeEnabledUseCase {
-        return IsAccountsModeEnabledUseCase(multiAccountListSupplier = multiAccountListSupplier)
-    }
-
     @Provides
     @Singleton
     fun provideApplyAccountListSortingUseCase(

data/visa/src/main/kotlin/com/tangem/data/pay/flow/DefaultPaymentAccountStatusFetcher.kt

@@ -106,7 +106,7 @@ internal class DefaultPaymentAccountStatusFetcher @Inject constructor(
 
     private suspend fun fetchTangemPayAccountStatus(account: Account.Payment): PaymentAccountStatusValue {
         val prevResult = paymentAccountStatusesStore.getSyncOrNull(account.userWalletId)
-        if (prevResult == null || prevResult.value is PaymentAccountStatusValue.Error) {
+        if (prevResult == null || prevResult.value is PaymentAccountStatusValue.Error.Unavailable) {
             paymentAccountStatusesStore.store(
                 userWalletId = account.userWalletId,
                 status = AccountStatus.Payment(account = account, value = PaymentAccountStatusValue.Loading),

domain/account/src/main/java/com/tangem/domain/account/usecase/IsAccountsModeEnabledUseCase.kt

@@ -1,35 +0,0 @@
-package com.tangem.domain.account.usecase
-
-import com.tangem.domain.account.models.AccountList
-import com.tangem.domain.account.supplier.MultiAccountListSupplier
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map
-
-/**
- * Use case to determine if the accounts mode is enabled.
- * Accounts mode is considered enabled if any [AccountList] produced for the user's wallets contains at least two
- * active accounts.
- *
- * @property multiAccountListSupplier supplier that provides a list of [AccountList]s for all user wallets
- *
-[REDACTED_AUTHOR]
- */
-class IsAccountsModeEnabledUseCase(
-    private val multiAccountListSupplier: MultiAccountListSupplier,
-) {
-
-    operator fun invoke(): Flow<Boolean> {
-        return multiAccountListSupplier.invoke()
-            .map { accountsList -> accountsList.map(AccountList::activeAccounts).isModeEnabled() }
-            .distinctUntilChanged()
-    }
-
-    suspend fun invokeSync(): Boolean {
-        return multiAccountListSupplier.getSyncOrNull(Unit)
-            ?.map(AccountList::activeAccounts)
-            ?.isModeEnabled() == true
-    }
-
-    private fun List<Int>.isModeEnabled(): Boolean = any { it >= 2 }
-}

domain/account/src/test/kotlin/com/tangem/domain/account/usecase/IsAccountsModeEnabledUseCaseTest.kt

@@ -1,159 +0,0 @@
-package com.tangem.domain.account.usecase
-
-import com.google.common.truth.Truth
-import com.tangem.domain.account.models.AccountList
-import com.tangem.domain.account.supplier.MultiAccountListSupplier
-import io.mockk.clearMocks
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.mockk
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.test.runTest
-import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.Nested
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class IsAccountsModeEnabledUseCaseTest {
-
-    private val multiAccountListSupplier: MultiAccountListSupplier = mockk()
-
-    private val useCase = IsAccountsModeEnabledUseCase(multiAccountListSupplier = multiAccountListSupplier)
-
-    @AfterEach
-    fun tearDown() {
-        clearMocks(multiAccountListSupplier)
-    }
-
-    @Nested
-    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-    inner class Invoke {
-
-        @Test
-        fun `returns false when supplier emits empty list`() = runTest {
-            // Arrange
-            every { multiAccountListSupplier.invoke() } returns flowOf(emptyList())
-
-            // Act
-            val actual = useCase.invoke().first()
-
-            // Assert
-            Truth.assertThat(actual).isFalse()
-        }
-
-        @Test
-        fun `returns false when supplier emits account list with one account`() = runTest {
-            // Arrange
-            val accountList = createAccountList(activeAccounts = 1)
-            every { multiAccountListSupplier.invoke() } returns flowOf(listOf(accountList))
-
-            // Act
-            val actual = useCase.invoke().first()
-
-            // Assert
-            Truth.assertThat(actual).isFalse()
-        }
-
-        @Test
-        fun `returns true when supplier emits account list with two accounts`() = runTest {
-            // Arrange
-            val accountList = createAccountList(activeAccounts = 2)
-            every { multiAccountListSupplier.invoke() } returns flowOf(listOf(accountList))
-
-            // Act
-            val actual = useCase.invoke().first()
-
-            // Assert
-            Truth.assertThat(actual).isTrue()
-        }
-
-        @Test
-        fun `returns true when supplier emits multiple account lists, one with two accounts`() = runTest {
-            // Arrange
-            val accountList1 = createAccountList(activeAccounts = 1)
-            val accountList2 = createAccountList(activeAccounts = 2)
-            every { multiAccountListSupplier.invoke() } returns flowOf(listOf(accountList1, accountList2))
-
-            // Act
-            val actual = useCase.invoke().first()
-
-            // Assert
-            Truth.assertThat(actual).isTrue()
-        }
-    }
-
-    @Nested
-    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-    inner class InvokeSync {
-
-        @Test
-        fun `returns false when getSyncOrNull returns null`() = runTest {
-            // Arrange
-            coEvery { multiAccountListSupplier.getSyncOrNull(Unit, any()) } returns null
-
-            // Act
-            val actual = useCase.invokeSync()
-
-            // Assert
-            Truth.assertThat(actual).isFalse()
-        }
-
-        @Test
-        fun `returns false when getSyncOrNull returns empty list`() = runTest {
-            // Arrange
-            coEvery { multiAccountListSupplier.getSyncOrNull(Unit, any()) } returns emptyList()
-
-            // Act
-            val actual = useCase.invokeSync()
-
-            // Assert
-            Truth.assertThat(actual).isFalse()
-        }
-
-        @Test
-        fun `returns false when getSyncOrNull returns account list with one account`() = runTest {
-            // Arrange
-            val accountList = createAccountList(activeAccounts = 1)
-            coEvery { multiAccountListSupplier.getSyncOrNull(Unit, any()) } returns listOf(accountList)
-
-            // Act
-            val actual = useCase.invokeSync()
-
-            // Assert
-            Truth.assertThat(actual).isFalse()
-        }
-
-        @Test
-        fun `returns true when getSyncOrNull returns account list with two accounts`() = runTest {
-            // Arrange
-            val accountList = createAccountList(activeAccounts = 2)
-            coEvery { multiAccountListSupplier.getSyncOrNull(Unit, any()) } returns listOf(accountList)
-
-            // Act
-            val actual = useCase.invokeSync()
-
-            // Assert
-            Truth.assertThat(actual).isTrue()
-        }
-
-        @Test
-        fun `returns true when getSyncOrNull returns multiple account lists, one with two accounts`() = runTest {
-            // Arrange
-            val accountList1 = createAccountList(activeAccounts = 1)
-            val accountList2 = createAccountList(activeAccounts = 2)
-            coEvery { multiAccountListSupplier.getSyncOrNull(Unit, any()) } returns listOf(accountList1, accountList2)
-
-            // Act
-            val actual = useCase.invokeSync()
-
-            // Assert
-            Truth.assertThat(actual).isTrue()
-        }
-    }
-
-    private fun createAccountList(activeAccounts: Int): AccountList = mockk {
-        every { this@mockk.activeAccounts } returns activeAccounts
-    }
-}

domain/account/status/src/main/java/com/tangem/domain/account/status/di/AccountStatusUseCaseModule.kt

@@ -48,6 +48,14 @@ internal object AccountStatusUseCaseModule {
         )
     }
 
+    @Provides
+    @Singleton
+    fun provideIsAccountsModeEnabledUseCase(
+        multiAccountStatusListSupplier: MultiAccountStatusListSupplier,
+    ): IsAccountsModeEnabledUseCase {
+        return IsAccountsModeEnabledUseCase(multiAccountStatusListSupplier = multiAccountStatusListSupplier)
+    }
+
     @Provides
     @Singleton
     fun provideGetCryptoCurrencyActionsUseCaseV2(

domain/account/status/src/main/java/com/tangem/domain/account/status/usecase/IsAccountsModeEnabledUseCase.kt

@@ -0,0 +1,50 @@
+package com.tangem.domain.account.status.usecase
+
+import com.tangem.domain.account.status.supplier.MultiAccountStatusListSupplier
+import com.tangem.domain.models.account.AccountStatus
+import com.tangem.domain.models.account.PaymentAccountStatusValue
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+
+/**
+ * Use case to determine if the accounts mode is enabled.
+ * Accounts mode is considered enabled if any [com.tangem.domain.account.models.AccountStatusList] produced for the
+ * user's wallets has more than one [AccountStatus.CryptoPortfolio], or has a [AccountStatus.Payment] with any
+
+ *
+ * @property multiAccountStatusListSupplier supplier that provides a list of
+ * [com.tangem.domain.account.models.AccountStatusList]s for all user wallets
+ *
+[REDACTED_AUTHOR]
+ */
+class IsAccountsModeEnabledUseCase(
+    private val multiAccountStatusListSupplier: MultiAccountStatusListSupplier,
+) {
+
+    operator fun invoke(): Flow<Boolean> {
+        return multiAccountStatusListSupplier.invoke()
+            .map { accountStatusLists -> accountStatusLists.any { it.accountStatuses.isModeEnabled() } }
+            .distinctUntilChanged()
+    }
+
+    suspend fun invokeSync(): Boolean {
+        return multiAccountStatusListSupplier.getSyncOrNull(Unit)
+            ?.any { it.accountStatuses.isModeEnabled() } == true
+    }
+
+    private fun List<AccountStatus>.isModeEnabled(): Boolean {
+        var cryptoPortfolioCount = 0
+        for (status in this) {
+            when {
+                status is AccountStatus.CryptoPortfolio && ++cryptoPortfolioCount > 1 -> return true
+                status is AccountStatus.Payment && status.value.isActivePayment() -> return true
+            }
+        }
+        return false
+    }
+
+    private fun PaymentAccountStatusValue.isActivePayment(): Boolean {
+        return this !is PaymentAccountStatusValue.NotCreated
+    }
+}

domain/account/status/src/main/java/com/tangem/domain/account/status/utils/ExpandedAccountsHolder.kt

@@ -4,7 +4,7 @@ import com.tangem.domain.account.models.AccountExpandedState
 import com.tangem.domain.account.models.AccountList
 import com.tangem.domain.account.repository.AccountsExpandedRepository
 import com.tangem.domain.account.supplier.SingleAccountListSupplier
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.models.account.AccountId
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId

domain/account/status/src/test/kotlin/com/tangem/domain/account/status/usecase/IsAccountsModeEnabledUseCaseTest.kt

@@ -0,0 +1,272 @@
+package com.tangem.domain.account.status.usecase
+
+import com.google.common.truth.Truth
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.status.supplier.MultiAccountStatusListSupplier
+import com.tangem.domain.models.account.AccountStatus
+import com.tangem.domain.models.account.PaymentAccountStatusValue
+import io.mockk.clearMocks
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class IsAccountsModeEnabledUseCaseTest {
+
+    private val multiAccountStatusListSupplier: MultiAccountStatusListSupplier = mockk()
+
+    private val useCase = IsAccountsModeEnabledUseCase(multiAccountStatusListSupplier = multiAccountStatusListSupplier)
+
+    @AfterEach
+    fun tearDown() {
+        clearMocks(multiAccountStatusListSupplier)
+    }
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class Invoke {
+
+        @Test
+        fun `returns false when supplier emits empty list`() = runTest {
+            every { multiAccountStatusListSupplier.invoke() } returns flowOf(emptyList())
+
+            val actual = useCase.invoke().first()
+
+            Truth.assertThat(actual).isFalse()
+        }
+
+        @Test
+        fun `returns false when single crypto portfolio account`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio()),
+            )
+            every { multiAccountStatusListSupplier.invoke() } returns flowOf(listOf(statusList))
+
+            val actual = useCase.invoke().first()
+
+            Truth.assertThat(actual).isFalse()
+        }
+
+        @Test
+        fun `returns true when two crypto portfolio accounts`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockCryptoPortfolio()),
+            )
+            every { multiAccountStatusListSupplier.invoke() } returns flowOf(listOf(statusList))
+
+            val actual = useCase.invoke().first()
+
+            Truth.assertThat(actual).isTrue()
+        }
+
+        @Test
+        fun `returns true when payment account is Loaded`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockPayment(mockk<PaymentAccountStatusValue.Loaded>())),
+            )
+            every { multiAccountStatusListSupplier.invoke() } returns flowOf(listOf(statusList))
+
+            val actual = useCase.invoke().first()
+
+            Truth.assertThat(actual).isTrue()
+        }
+
+        @Test
+        fun `returns true when payment account is Locked`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockPayment(mockk<PaymentAccountStatusValue.Locked>())),
+            )
+            every { multiAccountStatusListSupplier.invoke() } returns flowOf(listOf(statusList))
+
+            val actual = useCase.invoke().first()
+
+            Truth.assertThat(actual).isTrue()
+        }
+
+        @Test
+        fun `returns false when payment account is NotCreated`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockPayment(PaymentAccountStatusValue.NotCreated)),
+            )
+            every { multiAccountStatusListSupplier.invoke() } returns flowOf(listOf(statusList))
+
+            val actual = useCase.invoke().first()
+
+            Truth.assertThat(actual).isFalse()
+        }
+
+        @Test
+        fun `returns true when payment account is UnderReview`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockPayment(mockk<PaymentAccountStatusValue.UnderReview>())),
+            )
+            every { multiAccountStatusListSupplier.invoke() } returns flowOf(listOf(statusList))
+
+            val actual = useCase.invoke().first()
+
+            Truth.assertThat(actual).isTrue()
+        }
+
+        @Test
+        fun `returns true when payment account is IssuingCard`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockPayment(mockk<PaymentAccountStatusValue.IssuingCard>())),
+            )
+            every { multiAccountStatusListSupplier.invoke() } returns flowOf(listOf(statusList))
+
+            val actual = useCase.invoke().first()
+
+            Truth.assertThat(actual).isTrue()
+        }
+
+        @Test
+        fun `returns true when payment account is Loading`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockPayment(PaymentAccountStatusValue.Loading)),
+            )
+            every { multiAccountStatusListSupplier.invoke() } returns flowOf(listOf(statusList))
+
+            val actual = useCase.invoke().first()
+
+            Truth.assertThat(actual).isTrue()
+        }
+
+        @Test
+        fun `returns true when multiple status lists and one has two crypto portfolios`() = runTest {
+            val statusList1 = createAccountStatusList(statuses = listOf(mockCryptoPortfolio()))
+            val statusList2 = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockCryptoPortfolio()),
+            )
+            every { multiAccountStatusListSupplier.invoke() } returns flowOf(listOf(statusList1, statusList2))
+
+            val actual = useCase.invoke().first()
+
+            Truth.assertThat(actual).isTrue()
+        }
+    }
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class InvokeSync {
+
+        @Test
+        fun `returns false when getSyncOrNull returns null`() = runTest {
+            coEvery { multiAccountStatusListSupplier.getSyncOrNull(Unit, any()) } returns null
+
+            val actual = useCase.invokeSync()
+
+            Truth.assertThat(actual).isFalse()
+        }
+
+        @Test
+        fun `returns false when getSyncOrNull returns empty list`() = runTest {
+            coEvery { multiAccountStatusListSupplier.getSyncOrNull(Unit, any()) } returns emptyList()
+
+            val actual = useCase.invokeSync()
+
+            Truth.assertThat(actual).isFalse()
+        }
+
+        @Test
+        fun `returns false when single crypto portfolio account`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio()),
+            )
+            coEvery { multiAccountStatusListSupplier.getSyncOrNull(Unit, any()) } returns listOf(statusList)
+
+            val actual = useCase.invokeSync()
+
+            Truth.assertThat(actual).isFalse()
+        }
+
+        @Test
+        fun `returns true when two crypto portfolio accounts`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockCryptoPortfolio()),
+            )
+            coEvery { multiAccountStatusListSupplier.getSyncOrNull(Unit, any()) } returns listOf(statusList)
+
+            val actual = useCase.invokeSync()
+
+            Truth.assertThat(actual).isTrue()
+        }
+
+        @Test
+        fun `returns true when payment account is Loaded`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockPayment(mockk<PaymentAccountStatusValue.Loaded>())),
+            )
+            coEvery { multiAccountStatusListSupplier.getSyncOrNull(Unit, any()) } returns listOf(statusList)
+
+            val actual = useCase.invokeSync()
+
+            Truth.assertThat(actual).isTrue()
+        }
+
+        @Test
+        fun `returns true when payment account is Locked`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockPayment(mockk<PaymentAccountStatusValue.Locked>())),
+            )
+            coEvery { multiAccountStatusListSupplier.getSyncOrNull(Unit, any()) } returns listOf(statusList)
+
+            val actual = useCase.invokeSync()
+
+            Truth.assertThat(actual).isTrue()
+        }
+
+        @Test
+        fun `returns false when payment account is NotCreated`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockPayment(PaymentAccountStatusValue.NotCreated)),
+            )
+            coEvery { multiAccountStatusListSupplier.getSyncOrNull(Unit, any()) } returns listOf(statusList)
+
+            val actual = useCase.invokeSync()
+
+            Truth.assertThat(actual).isFalse()
+        }
+
+        @Test
+        fun `returns true when payment account is UnderReview`() = runTest {
+            val statusList = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockPayment(mockk<PaymentAccountStatusValue.UnderReview>())),
+            )
+            coEvery { multiAccountStatusListSupplier.getSyncOrNull(Unit, any()) } returns listOf(statusList)
+
+            val actual = useCase.invokeSync()
+
+            Truth.assertThat(actual).isTrue()
+        }
+
+        @Test
+        fun `returns true when multiple status lists and one has loaded payment`() = runTest {
+            val statusList1 = createAccountStatusList(statuses = listOf(mockCryptoPortfolio()))
+            val statusList2 = createAccountStatusList(
+                statuses = listOf(mockCryptoPortfolio(), mockPayment(mockk<PaymentAccountStatusValue.Loaded>())),
+            )
+            coEvery { multiAccountStatusListSupplier.getSyncOrNull(Unit, any()) } returns listOf(statusList1, statusList2)
+
+            val actual = useCase.invokeSync()
+
+            Truth.assertThat(actual).isTrue()
+        }
+    }
+
+    private fun mockCryptoPortfolio(): AccountStatus.CryptoPortfolio = mockk()
+
+    private fun mockPayment(value: PaymentAccountStatusValue): AccountStatus.Payment = mockk {
+        every { this@mockk.value } returns value
+    }
+
+    private fun createAccountStatusList(statuses: List<AccountStatus>): AccountStatusList = mockk {
+        every { accountStatuses } returns statuses
+    }
+}

features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultPortfolioSelectorController.kt

@@ -1,6 +1,6 @@
 package com.tangem.features.account.selector
 
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.models.account.AccountId
 import com.tangem.domain.models.account.AccountStatus
 import com.tangem.domain.models.account.filterCryptoPortfolio

features/account/impl/src/main/java/com/tangem/features/account/selector/PortfolioSelectorModel.kt

@@ -9,7 +9,7 @@ import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.models.account.AccountId
 import com.tangem.domain.models.account.AccountStatus
 import com.tangem.domain.models.account.filterCryptoPortfolio

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/details/portfolio/impl/model/MarketsPortfolioDelegate.kt

@@ -10,7 +10,7 @@ import com.tangem.core.ui.extensions.stringReference
 import com.tangem.domain.account.models.AccountStatusList
 import com.tangem.domain.account.status.supplier.MultiAccountStatusListSupplier
 import com.tangem.domain.account.status.usecase.GetCryptoCurrencyActionsUseCaseV2
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase

features/nft/impl/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
     implementation(projects.core.datasource)
 
     /** Domain modules */
-    implementation(projects.domain.account)
+    implementation(projects.domain.account.status)
     implementation(projects.domain.wallets)
     implementation(projects.domain.appCurrency.models)
     implementation(projects.domain.appCurrency)

features/nft/impl/src/main/kotlin/com/tangem/features/nft/collections/model/NFTCollectionsModel.kt

@@ -7,7 +7,7 @@ import com.tangem.core.ui.components.containers.pullToRefresh.PullToRefreshConfi
 import com.tangem.core.ui.components.fields.InputManager
 import com.tangem.core.ui.components.fields.entity.SearchBarUM
 import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.nft.FetchNFTCollectionAssetsUseCase
 import com.tangem.domain.nft.GetNFTCollectionsUseCase
 import com.tangem.domain.nft.RefreshAllNFTUseCase

features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/model/NFTReceiveModel.kt

@@ -17,7 +17,7 @@ import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.core.ui.message.DialogMessage
 import com.tangem.domain.account.producer.SingleAccountProducer
 import com.tangem.domain.account.supplier.SingleAccountSupplier
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.models.TokenReceiveConfig
 import com.tangem.domain.models.account.AccountId
 import com.tangem.domain.models.network.Network

features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/hottokens/portfolio/entity/OnrampAddTokenUiBuilder.kt

@@ -13,7 +13,7 @@ import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.iconResId
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.models.account.AccountStatus
 import com.tangem.features.onramp.hottokens.portfolio.OnrampAddTokenComponent
 import com.tangem.features.onramp.hottokens.portfolio.OnrampAddTokenComponent.AddHotCryptoData

features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/model/AvailableSwapPairsModel.kt

@@ -17,7 +17,7 @@ import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
 import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
 import com.tangem.domain.account.status.usecase.GetAccountCurrencyStatusUseCase
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase

features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/model/SwapSelectTokensModel.kt

@@ -9,7 +9,7 @@ import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.decompose.navigation.Router
 import com.tangem.core.ui.components.token.state.TokenItemState
 import com.tangem.domain.account.status.usecase.GetAccountCurrencyStatusUseCase
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.features.onramp.component.SwapSelectTokensComponent

features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/model/OnrampTokenListModel.kt

@@ -11,7 +11,7 @@ import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.domain.account.models.AccountStatusList
 import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
 import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/model/SendModel.kt

@@ -18,7 +18,7 @@ import com.tangem.core.decompose.navigation.Router
 import com.tangem.core.ui.utils.parseBigDecimal
 import com.tangem.core.ui.utils.parseBigDecimalOrNull
 import com.tangem.domain.account.status.usecase.GetAccountCurrencyStatusUseCase
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/model/NFTSendModel.kt

@@ -15,7 +15,7 @@ import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.decompose.navigation.Router
 import com.tangem.datasource.local.nft.converter.NFTSdkAssetConverter
 import com.tangem.domain.account.status.usecase.GetAccountCurrencyStatusUseCase
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.feedback.GetWalletMetaInfoUseCase

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/model/SendDestinationModel.kt

@@ -12,7 +12,7 @@ import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.decompose.navigation.Router
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.domain.account.status.supplier.MultiAccountStatusListSupplier
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.models.account.AccountStatus
 import com.tangem.domain.models.account.PaymentAccountStatusValue
 import com.tangem.domain.models.currency.CryptoCurrency

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/model/StakingModel.kt

@@ -36,7 +36,7 @@ import com.tangem.core.ui.haptic.TangemHapticEffect
 import com.tangem.core.ui.haptic.VibratorHapticManager
 import com.tangem.core.ui.message.DialogMessage
 import com.tangem.domain.account.status.usecase.GetAccountCurrencyStatusUseCase
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase

features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/model/SendWithSwapModel.kt

@@ -7,7 +7,7 @@ import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.decompose.navigation.Router
 import com.tangem.domain.account.status.usecase.GetAccountCurrencyStatusUseCase
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase

features/swap/impl/src/main/java/com/tangem/feature/swap/choosetoken/api/SettingContextUseCase.kt

@@ -1,6 +1,6 @@
 package com.tangem.feature.swap.choosetoken.api
 
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase

features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt

@@ -38,7 +38,7 @@ import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
 import com.tangem.domain.account.status.usecase.GetAccountCurrencyStatusUseCase
 import com.tangem.domain.account.status.usecase.GetFeePaidCryptoCurrencyStatusSyncUseCase
 import com.tangem.domain.account.status.utils.CryptoCurrencyStatusOperations.getCryptoCurrencyStatus
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase

features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/model/WalletSettingsModel.kt

@@ -25,7 +25,7 @@ import com.tangem.core.ui.message.EventMessageAction
 import com.tangem.core.ui.message.SnackbarMessage
 import com.tangem.core.ui.message.bottomSheetMessage
 import com.tangem.domain.account.supplier.SingleAccountListSupplier
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.demo.IsDemoCardUseCase
 import com.tangem.domain.models.account.AccountId

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

@@ -17,7 +17,7 @@ import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
 import com.tangem.domain.account.status.usecase.ApplyTokenListSortingUseCase
 import com.tangem.domain.account.status.usecase.ToggleTokenListGroupingUseCase
 import com.tangem.domain.account.status.usecase.ToggleTokenListSortingUseCase
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase

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

@@ -13,7 +13,7 @@ import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
 import com.tangem.domain.account.status.usecase.ApplyTokenListSortingUseCase
 import com.tangem.domain.account.status.usecase.ToggleTokenListGroupingUseCase
 import com.tangem.domain.account.status.usecase.ToggleTokenListSortingUseCase
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase

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

@@ -15,7 +15,7 @@ import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.core.ui.utils.parseBigDecimal
 import com.tangem.datasource.local.appsflyer.AppsFlyerStore
 import com.tangem.domain.account.supplier.SingleAccountListSupplier
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.apptheme.GetAppThemeModeUseCase

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/account/AccountDependencies.kt

@@ -4,7 +4,7 @@ import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
 import com.tangem.domain.account.status.supplier.SingleAccountStatusSupplier
 import com.tangem.domain.account.status.utils.ExpandedAccountsHolder
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import javax.inject.Inject
 
 @ModelScoped

features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcConnectionsModel.kt

@@ -19,7 +19,7 @@ import com.tangem.core.ui.message.EventMessageAction
 import com.tangem.core.ui.message.SnackbarMessage
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.domain.account.supplier.MultiAccountListSupplier
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.qrscanning.models.QrResultSource
 import com.tangem.domain.qrscanning.models.SourceType
 import com.tangem.domain.qrscanning.usecases.ListenToQrScanningUseCase

features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcPairModel.kt

@@ -21,7 +21,7 @@ import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.core.ui.message.SnackbarMessage
 import com.tangem.core.ui.message.ToastMessage
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.account.AccountStatus
 import com.tangem.domain.models.network.Network

features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/converter/WcPortfolioNameDelegate.kt

@@ -5,7 +5,7 @@ import com.tangem.common.ui.account.CryptoPortfolioIconConverter
 import com.tangem.common.ui.account.toUM
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.stringReference
-import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.models.account.Account
 import com.tangem.domain.walletconnect.model.WcSession
 import dagger.assisted.Assisted