diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
index b3e337e2bf..9cfcf4182c 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
@@ -97,7 +97,6 @@ fun globalReducer(action: Action, state: AppState, appStateHolder: AppStateHolde
         is GlobalAction.UpdateUserWalletsListManager -> {
             val generalUserWalletsListManager = store.inject(DaggerGraphState::generalUserWalletsListManager)
 
-            appStateHolder.userWalletsListManager = generalUserWalletsListManager
             globalState.copy(userWalletsListManager = generalUserWalletsListManager)
         }
         is GlobalAction.ChangeAppThemeMode -> globalState.copy(
diff --git a/app/src/main/java/com/tangem/tap/data/RuntimeUserWalletsStore.kt b/app/src/main/java/com/tangem/tap/data/RuntimeUserWalletsStore.kt
index 87b5944231..bd50b28faf 100644
--- a/app/src/main/java/com/tangem/tap/data/RuntimeUserWalletsStore.kt
+++ b/app/src/main/java/com/tangem/tap/data/RuntimeUserWalletsStore.kt
@@ -1,7 +1,7 @@
 package com.tangem.tap.data
 
 import com.tangem.datasource.local.userwallet.UserWalletsStore
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.models.UserWalletId
 import kotlinx.coroutines.flow.firstOrNull
@@ -9,26 +9,24 @@ import kotlinx.coroutines.flow.firstOrNull
 // FIXME: Workaround, remove it once the normal UserWalletsStore has been implemented
 // [REDACTED_JIRA]
 internal class RuntimeUserWalletsStore(
-    private val walletsStateHolder: WalletsStateHolder,
+    private val userWalletsListManager: UserWalletsListManager,
 ) : UserWalletsStore {
 
     override val selectedUserWalletOrNull: UserWallet?
-        get() = walletsStateHolder.userWalletsListManager?.selectedUserWalletSync
+        get() = userWalletsListManager.selectedUserWalletSync
 
     override suspend fun getSyncOrNull(key: UserWalletId): UserWallet? {
-        return walletsStateHolder.userWalletsListManager
-            ?.userWallets
-            ?.firstOrNull()
+        return userWalletsListManager
+            .userWallets
+            .firstOrNull()
             ?.singleOrNull { it.walletId == key }
     }
 
     override suspend fun getAllSyncOrNull(): List<UserWallet>? {
-        return walletsStateHolder.userWalletsListManager
-            ?.userWallets
-            ?.firstOrNull()
+        return userWalletsListManager.userWallets.firstOrNull()
     }
 
     override suspend fun update(userWalletId: UserWalletId, update: suspend (UserWallet) -> UserWallet) {
-        walletsStateHolder.userWalletsListManager?.update(userWalletId, update)
+        userWalletsListManager.update(userWalletId, update)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/AppStateHolderModule.kt b/app/src/main/java/com/tangem/tap/di/AppStateHolderModule.kt
index e1bf363dd7..c6e0267c6b 100644
--- a/app/src/main/java/com/tangem/tap/di/AppStateHolderModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/AppStateHolderModule.kt
@@ -2,7 +2,6 @@ package com.tangem.tap.di
 
 import com.tangem.core.navigation.ReduxNavController
 import com.tangem.domain.redux.ReduxStateHolder
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
 import com.tangem.tap.proxy.AppStateHolder
 import dagger.Binds
 import dagger.Module
@@ -14,10 +13,6 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 internal interface AppStateHolderModule {
 
-    @Binds
-    @Singleton
-    fun bindsWalletsStateHolder(appStateHolder: AppStateHolder): WalletsStateHolder
-
     @Binds
     @Singleton
     fun bindsNavigationStateHolder(appStateHolder: AppStateHolder): ReduxNavController
diff --git a/app/src/main/java/com/tangem/tap/di/data/UserWalletsStoreModule.kt b/app/src/main/java/com/tangem/tap/di/data/UserWalletsStoreModule.kt
index 6aeaad1dcf..b2a04f9d52 100644
--- a/app/src/main/java/com/tangem/tap/di/data/UserWalletsStoreModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/data/UserWalletsStoreModule.kt
@@ -1,7 +1,7 @@
 package com.tangem.tap.di.data
 
 import com.tangem.datasource.local.userwallet.UserWalletsStore
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.tap.data.RuntimeUserWalletsStore
 import dagger.Module
 import dagger.Provides
@@ -15,7 +15,7 @@ internal object UserWalletsStoreModule {
 
     @Provides
     @Singleton
-    fun provideUserWalletsStore(walletsStateHolder: WalletsStateHolder): UserWalletsStore {
-        return RuntimeUserWalletsStore(walletsStateHolder)
+    fun provideUserWalletsStore(userWalletsListManager: UserWalletsListManager): UserWalletsStore {
+        return RuntimeUserWalletsStore(userWalletsListManager = userWalletsListManager)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt
index 6d9b682e61..4434311a95 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt
@@ -6,7 +6,7 @@ import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.card.repository.DerivationsRepository
 import com.tangem.domain.demo.DemoConfig
 import com.tangem.domain.demo.IsDemoCardUseCase
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.usecase.IsNeedToBackupUseCase
 import dagger.Module
 import dagger.Provides
@@ -58,8 +58,8 @@ internal object CardDomainModule {
 
     @Provides
     @ViewModelScoped
-    fun provideIsNeedToBackupUseCase(walletStateHolder: WalletsStateHolder): IsNeedToBackupUseCase {
-        return IsNeedToBackupUseCase(walletStateHolder)
+    fun provideIsNeedToBackupUseCase(userWalletsListManager: UserWalletsListManager): IsNeedToBackupUseCase {
+        return IsNeedToBackupUseCase(userWalletsListManager = userWalletsListManager)
     }
 
     @Provides
diff --git a/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt
index c7f58a8226..de5aa6d294 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt
@@ -2,7 +2,7 @@ package com.tangem.tap.di.domain
 
 import com.tangem.domain.redux.ReduxStateHolder
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.repository.WalletAddressServiceRepository
 import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.domain.wallets.usecase.*
@@ -19,32 +19,34 @@ internal object WalletsDomainModule {
 
     @Provides
     @ViewModelScoped
-    fun providesGetWalletsUseCase(walletsStateHolder: WalletsStateHolder): GetWalletsUseCase {
-        return GetWalletsUseCase(walletsStateHolder = walletsStateHolder)
+    fun providesGetWalletsUseCase(userWalletsListManager: UserWalletsListManager): GetWalletsUseCase {
+        return GetWalletsUseCase(userWalletsListManager = userWalletsListManager)
     }
 
     @Provides
     @ViewModelScoped
-    fun providesGetUserWalletUseCase(walletsStateHolder: WalletsStateHolder): GetUserWalletUseCase {
-        return GetUserWalletUseCase(walletsStateHolder = walletsStateHolder)
+    fun providesGetUserWalletUseCase(userWalletsListManager: UserWalletsListManager): GetUserWalletUseCase {
+        return GetUserWalletUseCase(userWalletsListManager = userWalletsListManager)
     }
 
     @Provides
     @ViewModelScoped
-    fun providesGetSelectedWalletSyncUseCase(walletsStateHolder: WalletsStateHolder): GetSelectedWalletSyncUseCase {
-        return GetSelectedWalletSyncUseCase(walletsStateHolder = walletsStateHolder)
+    fun providesGetSelectedWalletSyncUseCase(
+        userWalletsListManager: UserWalletsListManager,
+    ): GetSelectedWalletSyncUseCase {
+        return GetSelectedWalletSyncUseCase(userWalletsListManager = userWalletsListManager)
     }
 
     @Provides
     @ViewModelScoped
-    fun providesGetSelectedWalletUseCase(walletsStateHolder: WalletsStateHolder): GetSelectedWalletUseCase {
-        return GetSelectedWalletUseCase(walletsStateHolder = walletsStateHolder)
+    fun providesGetSelectedWalletUseCase(userWalletsListManager: UserWalletsListManager): GetSelectedWalletUseCase {
+        return GetSelectedWalletUseCase(userWalletsListManager = userWalletsListManager)
     }
 
     @Provides
     @ViewModelScoped
-    fun providesSaveWalletUseCase(walletsStateHolder: WalletsStateHolder): SaveWalletUseCase {
-        return SaveWalletUseCase(walletsStateHolder = walletsStateHolder)
+    fun providesSaveWalletUseCase(userWalletsListManager: UserWalletsListManager): SaveWalletUseCase {
+        return SaveWalletUseCase(userWalletsListManager = userWalletsListManager)
     }
 
     @Provides
@@ -55,29 +57,29 @@ internal object WalletsDomainModule {
 
     @Provides
     @ViewModelScoped
-    fun providesUnlockWalletUseCase(walletsStateHolder: WalletsStateHolder): UnlockWalletsUseCase {
-        return UnlockWalletsUseCase(walletsStateHolder = walletsStateHolder)
+    fun providesUnlockWalletUseCase(userWalletsListManager: UserWalletsListManager): UnlockWalletsUseCase {
+        return UnlockWalletsUseCase(userWalletsListManager = userWalletsListManager)
     }
 
     @Provides
     @ViewModelScoped
     fun providesSelectWalletUseCase(
-        walletsStateHolder: WalletsStateHolder,
+        userWalletsListManager: UserWalletsListManager,
         reduxStateHolder: ReduxStateHolder,
     ): SelectWalletUseCase {
-        return SelectWalletUseCase(walletsStateHolder, reduxStateHolder)
+        return SelectWalletUseCase(userWalletsListManager = userWalletsListManager, reduxStateHolder = reduxStateHolder)
     }
 
     @Provides
     @ViewModelScoped
-    fun providesUpdateWalletUseCase(walletsStateHolder: WalletsStateHolder): UpdateWalletUseCase {
-        return UpdateWalletUseCase(walletsStateHolder = walletsStateHolder)
+    fun providesUpdateWalletUseCase(userWalletsListManager: UserWalletsListManager): UpdateWalletUseCase {
+        return UpdateWalletUseCase(userWalletsListManager = userWalletsListManager)
     }
 
     @Provides
     @ViewModelScoped
-    fun providesDeleteWalletUseCase(walletsStateHolder: WalletsStateHolder): DeleteWalletUseCase {
-        return DeleteWalletUseCase(walletsStateHolder = walletsStateHolder)
+    fun providesDeleteWalletUseCase(userWalletsListManager: UserWalletsListManager): DeleteWalletUseCase {
+        return DeleteWalletUseCase(userWalletsListManager = userWalletsListManager)
     }
 
     @Provides
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect2/di/WalletConnectInteractorModule.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect2/di/WalletConnectInteractorModule.kt
index 4fed4bf821..faaa951d2e 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect2/di/WalletConnectInteractorModule.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect2/di/WalletConnectInteractorModule.kt
@@ -8,7 +8,7 @@ import com.tangem.datasource.di.SdkMoshi
 import com.tangem.datasource.files.FileReader
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.tap.domain.walletconnect.WalletConnectSdkHelper
 import com.tangem.tap.domain.walletconnect2.app.TangemWcBlockchainHelper
 import com.tangem.tap.domain.walletconnect2.app.WalletConnectEventsHandlerImpl
@@ -40,7 +40,7 @@ internal object WalletConnectInteractorModule {
         walletConnectFeatureToggles: WalletConnectFeatureToggles,
         currenciesRepository: CurrenciesRepository,
         walletManagersFacade: WalletManagersFacade,
-        walletsStateHolder: WalletsStateHolder,
+        userWalletsListManager: UserWalletsListManager,
     ): WalletConnectInteractor {
         return WalletConnectInteractor(
             handler = WalletConnectEventsHandlerImpl(),
@@ -50,7 +50,7 @@ internal object WalletConnectInteractorModule {
             blockchainHelper = TangemWcBlockchainHelper(walletConnectFeatureToggles),
             currenciesRepository = currenciesRepository,
             walletManagersFacade = walletManagersFacade,
-            walletsStateHolder = walletsStateHolder,
+            userWalletsListManager = userWalletsListManager,
             dispatchers = AppCoroutineDispatcherProvider(),
         )
     }
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/WalletConnectInteractor.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/WalletConnectInteractor.kt
index d7b74b884b..e2e43d4975 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/WalletConnectInteractor.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/WalletConnectInteractor.kt
@@ -6,7 +6,7 @@ import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.usecase.GetSelectedWalletUseCase
 import com.tangem.tap.common.extensions.filterNotNull
@@ -31,12 +31,12 @@ class WalletConnectInteractor(
     private val dispatchers: CoroutineDispatcherProvider,
     private val walletManagersFacade: WalletManagersFacade,
     private val currenciesRepository: CurrenciesRepository,
-    private val walletsStateHolder: WalletsStateHolder,
+    private val userWalletsListManager: UserWalletsListManager,
     val blockchainHelper: WcBlockchainHelper,
 ) {
 
     private val getSelectedWalletUseCase by lazy(LazyThreadSafetyMode.NONE) {
-        GetSelectedWalletUseCase(walletsStateHolder)
+        GetSelectedWalletUseCase(userWalletsListManager)
     }
 
     private val wcScope = CoroutineScope(
diff --git a/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt b/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
index d3965fa2cf..5faa769457 100644
--- a/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
@@ -6,8 +6,6 @@ import com.tangem.core.navigation.ReduxNavController
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.redux.ReduxStateHolder
-import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchWithMain
@@ -15,8 +13,6 @@ import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.domain.sdk.TangemSdkManager
 import com.tangem.tap.network.exchangeServices.ExchangeService
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
 import org.rekotlin.Action
 import org.rekotlin.Store
 import javax.inject.Inject
@@ -25,18 +21,7 @@ import javax.inject.Inject
  * Holds objects from old modules, that missing in DI graph.
  * Object sets manually to use in new modules and [AppStateHolder] proxies its to DI.
  */
-class AppStateHolder @Inject constructor() : WalletsStateHolder, ReduxNavController, ReduxStateHolder {
-
-    override var userWalletsListManager: UserWalletsListManager? = null
-        set(value) {
-            field = value
-            _userWalletsListManagerFlow.value = value
-        }
-
-    override val userWalletListManagerFlow: Flow<UserWalletsListManager?>
-        get() = _userWalletsListManagerFlow
-
-    private val _userWalletsListManagerFlow = MutableStateFlow<UserWalletsListManager?>(null)
+class AppStateHolder @Inject constructor() : ReduxNavController, ReduxStateHolder {
 
     @Deprecated("Use scan response from selected user wallet")
     var scanResponse: ScanResponse? = null
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UseCaseUtils.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UseCaseUtils.kt
deleted file mode 100644
index ee7de756db..0000000000
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UseCaseUtils.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.tangem.domain.wallets.legacy
-
-import arrow.core.raise.Raise
-import arrow.core.raise.ensureNotNull
-
-internal inline fun <Error> Raise<Error>.ensureUserWalletListManagerNotNull(
-    walletsStateHolder: WalletsStateHolder,
-    raise: (Throwable) -> Error,
-): UserWalletsListManager {
-    return ensureNotNull(
-        value = walletsStateHolder.userWalletsListManager,
-        raise = {
-            raise(IllegalStateException("User wallets list manager not initialized"))
-        },
-    )
-}
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/WalletsStateHolder.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/WalletsStateHolder.kt
deleted file mode 100644
index 37f6644beb..0000000000
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/WalletsStateHolder.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.tangem.domain.wallets.legacy
-
-import kotlinx.coroutines.flow.Flow
-
-// TODO: will be remove in this task [REDACTED_JIRA]
-@Deprecated(message = "Provide UserWalletsListManager using DI", level = DeprecationLevel.WARNING)
-interface WalletsStateHolder {
-
-    val userWalletsListManager: UserWalletsListManager?
-
-    val userWalletListManagerFlow: Flow<UserWalletsListManager?>
-}
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/DeleteWalletError.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/models/DeleteWalletError.kt
index 29669fa19e..d58c220ac3 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/DeleteWalletError.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/models/DeleteWalletError.kt
@@ -2,7 +2,5 @@ package com.tangem.domain.wallets.models
 
 sealed interface DeleteWalletError {
 
-    object DataError : DeleteWalletError
-
-    object UnableToDelete : DeleteWalletError
+    data object UnableToDelete : DeleteWalletError
 }
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/GetUserWalletError.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/models/GetUserWalletError.kt
index 50d1bea262..3e7e62a562 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/GetUserWalletError.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/models/GetUserWalletError.kt
@@ -2,7 +2,5 @@ package com.tangem.domain.wallets.models
 
 sealed class GetUserWalletError {
 
-    data class DataError(val cause: Throwable) : GetUserWalletError()
-
-    object UserWalletNotFound : GetUserWalletError()
+    data object UserWalletNotFound : GetUserWalletError()
 }
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/SelectWalletError.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/models/SelectWalletError.kt
index a357f06ca9..e2aeab608f 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/SelectWalletError.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/models/SelectWalletError.kt
@@ -2,7 +2,5 @@ package com.tangem.domain.wallets.models
 
 sealed interface SelectWalletError {
 
-    object DataError : SelectWalletError
-
     object UnableToSelectUserWallet : SelectWalletError
 }
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/DeleteWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/DeleteWalletUseCase.kt
index 2b43096bf4..59084184cc 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/DeleteWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/DeleteWalletUseCase.kt
@@ -6,27 +6,21 @@ import arrow.core.raise.either
 import arrow.core.right
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnSuccess
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
-import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.DeleteWalletError
 import com.tangem.domain.wallets.models.UserWalletId
 
 /**
  * Use case for updating user wallet
  *
- * @property walletsStateHolder state holder for getting static initialized 'userWalletsListManager'
+ * @property userWalletsListManager user wallets list manager
  *
 [REDACTED_AUTHOR]
  */
-class DeleteWalletUseCase(private val walletsStateHolder: WalletsStateHolder) {
+class DeleteWalletUseCase(private val userWalletsListManager: UserWalletsListManager) {
 
     suspend operator fun invoke(userWalletId: UserWalletId): Either<DeleteWalletError, Unit> {
         return either {
-            val userWalletsListManager = ensureUserWalletListManagerNotNull(
-                walletsStateHolder = walletsStateHolder,
-                raise = { DeleteWalletError.DataError },
-            )
-
             userWalletsListManager.delete(userWalletIds = listOf(userWalletId))
                 .doOnSuccess { return Unit.right() }
                 .doOnFailure { return DeleteWalletError.UnableToDelete.left() }
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt
index 7cd6ffa8a2..e9f51327a6 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt
@@ -3,8 +3,7 @@ package com.tangem.domain.wallets.usecase
 import arrow.core.Either
 import arrow.core.raise.either
 import arrow.core.raise.ensureNotNull
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
-import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.GetUserWalletError
 import com.tangem.domain.wallets.models.UserWallet
 
@@ -12,19 +11,14 @@ import com.tangem.domain.wallets.models.UserWallet
  * Use case for getting selected wallet.
  * Important! If all wallets is locked, use case returns a error.
  *
- * @property walletsStateHolder state holder for getting static initialized 'userWalletsListManager'
+ * @property userWalletsListManager user wallets list manager
  *
 [REDACTED_AUTHOR]
  */
-class GetSelectedWalletSyncUseCase(private val walletsStateHolder: WalletsStateHolder) {
+class GetSelectedWalletSyncUseCase(private val userWalletsListManager: UserWalletsListManager) {
 
     operator fun invoke(): Either<GetUserWalletError, UserWallet> {
         return either {
-            val userWalletsListManager = ensureUserWalletListManagerNotNull(
-                walletsStateHolder = walletsStateHolder,
-                raise = GetUserWalletError::DataError,
-            )
-
             ensureNotNull(
                 value = userWalletsListManager.selectedUserWalletSync,
                 raise = { GetUserWalletError.UserWalletNotFound },
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt
index ee23723206..bda3c953ee 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt
@@ -2,8 +2,7 @@ package com.tangem.domain.wallets.usecase
 
 import arrow.core.Either
 import arrow.core.raise.either
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
-import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.GetUserWalletError
 import com.tangem.domain.wallets.models.UserWallet
 import kotlinx.coroutines.flow.Flow
@@ -11,19 +10,14 @@ import kotlinx.coroutines.flow.Flow
 /**
  * Use case for getting flow of selected wallet.
  *
- * @property walletsStateHolder state holder for getting static initialized 'userWalletsListManager'
+ * @property userWalletsListManager user wallets list manager
  *
 [REDACTED_AUTHOR]
  */
-class GetSelectedWalletUseCase(private val walletsStateHolder: WalletsStateHolder) {
+class GetSelectedWalletUseCase(private val userWalletsListManager: UserWalletsListManager) {
 
     operator fun invoke(): Either<GetUserWalletError, Flow<UserWallet>> {
         return either {
-            val userWalletsListManager = ensureUserWalletListManagerNotNull(
-                walletsStateHolder = walletsStateHolder,
-                raise = GetUserWalletError::DataError,
-            )
-
             userWalletsListManager.selectedUserWallet
         }
     }
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt
index 2b9c40ae27..5d3d60350f 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt
@@ -3,21 +3,15 @@ package com.tangem.domain.wallets.usecase
 import arrow.core.Either
 import arrow.core.raise.either
 import arrow.core.raise.ensureNotNull
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
-import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.GetUserWalletError
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.models.UserWalletId
 import kotlinx.coroutines.flow.firstOrNull
 
-class GetUserWalletUseCase(private val walletsStateHolder: WalletsStateHolder) {
+class GetUserWalletUseCase(private val userWalletsListManager: UserWalletsListManager) {
 
     suspend operator fun invoke(userWalletId: UserWalletId): Either<GetUserWalletError, UserWallet> = either {
-        val userWalletsListManager = ensureUserWalletListManagerNotNull(
-            walletsStateHolder = walletsStateHolder,
-            raise = GetUserWalletError::DataError,
-        )
-
         val userWallets = userWalletsListManager.userWallets.firstOrNull().orEmpty()
 
         ensureNotNull(userWallets.firstOrNull { it.walletId == userWalletId }) {
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletsUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletsUseCase.kt
index 3c589f1bcd..76872f50ff 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletsUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletsUseCase.kt
@@ -1,20 +1,18 @@
 package com.tangem.domain.wallets.usecase
 
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.UserWallet
 import kotlinx.coroutines.flow.Flow
 
 /**
  * Use case for getting list of user wallets
  *
- * @property walletsStateHolder state holder for getting static initialized 'userWalletsListManager'
+ * @property userWalletsListManager user wallets list manager
  *
 [REDACTED_AUTHOR]
  */
-class GetWalletsUseCase(private val walletsStateHolder: WalletsStateHolder) {
+class GetWalletsUseCase(private val userWalletsListManager: UserWalletsListManager) {
 
     @Throws(IllegalArgumentException::class)
-    operator fun invoke(): Flow<List<UserWallet>> {
-        return requireNotNull(walletsStateHolder.userWalletsListManager).userWallets
-    }
+    operator fun invoke(): Flow<List<UserWallet>> = userWalletsListManager.userWallets
 }
\ No newline at end of file
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsNeedToBackupUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsNeedToBackupUseCase.kt
index 24fdc5a232..e403101dd5 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsNeedToBackupUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsNeedToBackupUseCase.kt
@@ -1,19 +1,19 @@
 package com.tangem.domain.wallets.usecase
 
 import com.tangem.domain.models.scan.CardDTO
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.UserWalletId
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
 /**
  * Use case that checks if wallet need backup cards
+ *
+ * @property userWalletsListManager user wallets list manager
  */
-class IsNeedToBackupUseCase(private val walletsStateHolder: WalletsStateHolder) {
+class IsNeedToBackupUseCase(private val userWalletsListManager: UserWalletsListManager) {
 
     operator fun invoke(id: UserWalletId): Flow<Boolean> {
-        val userWalletsListManager = requireNotNull(walletsStateHolder.userWalletsListManager)
-
         return userWalletsListManager.userWallets
             .map { wallets ->
                 val wallet = wallets.firstOrNull { it.walletId == id }
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SaveWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SaveWalletUseCase.kt
index 8e25c40c1e..0f3becefc0 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SaveWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SaveWalletUseCase.kt
@@ -7,27 +7,21 @@ import arrow.core.right
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnSuccess
 import com.tangem.domain.wallets.legacy.UserWalletsListError
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
-import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.SaveWalletError
 import com.tangem.domain.wallets.models.UserWallet
 
 /**
  * Use case for saving user wallet
  *
- * @property walletsStateHolder state holder for getting static initialized 'userWalletsListManager'
+ * @property userWalletsListManager user wallets list manager
  *
 [REDACTED_AUTHOR]
  */
-class SaveWalletUseCase(private val walletsStateHolder: WalletsStateHolder) {
+class SaveWalletUseCase(private val userWalletsListManager: UserWalletsListManager) {
 
     suspend operator fun invoke(userWallet: UserWallet, canOverride: Boolean = false): Either<SaveWalletError, Unit> {
         return either {
-            val userWalletsListManager = ensureUserWalletListManagerNotNull(
-                walletsStateHolder = walletsStateHolder,
-                raise = { SaveWalletError.DataError },
-            )
-
             userWalletsListManager.save(userWallet, canOverride)
                 .doOnSuccess { return Unit.right() }
                 .doOnFailure {
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SelectWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SelectWalletUseCase.kt
index 84303de548..da446a2a40 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SelectWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SelectWalletUseCase.kt
@@ -5,8 +5,7 @@ import arrow.core.raise.either
 import arrow.core.right
 import com.tangem.common.CompletionResult
 import com.tangem.domain.redux.ReduxStateHolder
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
-import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.SelectWalletError
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.models.UserWalletId
@@ -14,22 +13,18 @@ import com.tangem.domain.wallets.models.UserWalletId
 /**
  * Use case for selecting wallet
  *
- * @property walletsStateHolder state holder for getting static initialized 'userWalletsListManager'
+ * @property userWalletsListManager user wallets list manager
+ * @property reduxStateHolder       redux state holder
  *
 [REDACTED_AUTHOR]
  */
 class SelectWalletUseCase(
-    private val walletsStateHolder: WalletsStateHolder,
+    private val userWalletsListManager: UserWalletsListManager,
     private val reduxStateHolder: ReduxStateHolder,
 ) {
 
     suspend operator fun invoke(userWalletId: UserWalletId): Either<SelectWalletError, UserWallet> {
         return either {
-            val userWalletsListManager = ensureUserWalletListManagerNotNull(
-                walletsStateHolder = walletsStateHolder,
-                raise = { SelectWalletError.DataError },
-            )
-
             return when (val result = userWalletsListManager.select(userWalletId)) {
                 is CompletionResult.Failure -> raise(SelectWalletError.UnableToSelectUserWallet)
                 is CompletionResult.Success -> {
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UnlockWalletsUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UnlockWalletsUseCase.kt
index 9b6bdf4997..4d46212807 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UnlockWalletsUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UnlockWalletsUseCase.kt
@@ -5,23 +5,23 @@ import arrow.core.raise.either
 import arrow.core.raise.ensureNotNull
 import com.tangem.common.doOnFailure
 import com.tangem.domain.wallets.legacy.UserWalletsListError
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.legacy.UserWalletsListManager.Lockable.UnlockType
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
 import com.tangem.domain.wallets.legacy.asLockable
 import com.tangem.domain.wallets.models.UnlockWalletsError
 
 /**
  * Unlock wallets use case
  *
- * @property walletsStateHolder wallets state holder
+ * @property userWalletsListManager user wallets list manager
  *
 [REDACTED_AUTHOR]
  */
-class UnlockWalletsUseCase(private val walletsStateHolder: WalletsStateHolder) {
+class UnlockWalletsUseCase(private val userWalletsListManager: UserWalletsListManager) {
 
     suspend operator fun invoke(type: UnlockType = UnlockType.ANY): Either<UnlockWalletsError, Unit> = either {
         val userWalletsListManager = ensureNotNull(
-            value = walletsStateHolder.userWalletsListManager?.asLockable(),
+            value = userWalletsListManager.asLockable(),
             raise = {
                 UnlockWalletsError.DataError(
                     cause = IllegalStateException("The lockable user wallets list manager could not be found"),
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UpdateWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UpdateWalletUseCase.kt
index 3a97779a39..b060418b2e 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UpdateWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UpdateWalletUseCase.kt
@@ -6,8 +6,7 @@ import arrow.core.raise.either
 import arrow.core.right
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnSuccess
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
-import com.tangem.domain.wallets.legacy.ensureUserWalletListManagerNotNull
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.UpdateWalletError
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.models.UserWalletId
@@ -15,22 +14,17 @@ import com.tangem.domain.wallets.models.UserWalletId
 /**
  * Use case for updating user wallet
  *
- * @property walletsStateHolder state holder for getting static initialized 'userWalletsListManager'
+ * @property userWalletsListManager user wallets list manager
  *
 [REDACTED_AUTHOR]
  */
-class UpdateWalletUseCase(private val walletsStateHolder: WalletsStateHolder) {
+class UpdateWalletUseCase(private val userWalletsListManager: UserWalletsListManager) {
 
     suspend operator fun invoke(
         userWalletId: UserWalletId,
         update: suspend (UserWallet) -> UserWallet,
     ): Either<UpdateWalletError, UserWallet> {
         return either {
-            val userWalletsListManager = ensureUserWalletListManagerNotNull(
-                walletsStateHolder = walletsStateHolder,
-                raise = { UpdateWalletError.DataError },
-            )
-
             userWalletsListManager.update(userWalletId, update)
                 .doOnSuccess { return it.right() }
                 .doOnFailure { return UpdateWalletError.DataError.left() }
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
index 783ba7da25..66ff152f20 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
@@ -24,7 +24,7 @@ import com.tangem.datasource.crypto.DataSignatureVerifier
 import com.tangem.domain.common.util.derivationStyleProvider
 import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.feature.swap.converters.*
 import com.tangem.feature.swap.domain.api.SwapRepository
@@ -48,7 +48,7 @@ internal class DefaultSwapRepository @Inject constructor(
     private val tangemExpressApi: TangemExpressApi,
     private val coroutineDispatcher: CoroutineDispatcherProvider,
     private val walletManagersFacade: WalletManagersFacade,
-    private val walletsStateHolder: WalletsStateHolder,
+    private val userWalletsListManager: UserWalletsListManager,
     private val errorsDataConverter: ErrorsDataConverter,
     private val dataSignatureVerifier: DataSignatureVerifier,
     moshi: Moshi,
@@ -389,8 +389,8 @@ internal class DefaultSwapRepository @Inject constructor(
                 blockchain = blockchain,
                 extraDerivationPath = null,
                 derivationStyleProvider = requireNotNull(
-                    walletsStateHolder.userWalletsListManager
-                        ?.selectedUserWalletSync
+                    userWalletsListManager
+                        .selectedUserWalletSync
                         ?.scanResponse
                         ?.derivationStyleProvider,
                 ),
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt
index 95b8469b2a..98881e9a09 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt
@@ -8,7 +8,7 @@ import com.tangem.datasource.crypto.DataSignatureVerifier
 import com.tangem.datasource.di.NetworkMoshi
 import com.tangem.datasource.local.preferences.AppPreferencesStore
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.feature.swap.DefaultSwapRepository
 import com.tangem.feature.swap.DefaultSwapTransactionRepository
 import com.tangem.feature.swap.converters.ErrorsDataConverter
@@ -33,7 +33,7 @@ internal class SwapDataModule {
         coroutineDispatcher: CoroutineDispatcherProvider,
         dataSignature: DataSignatureVerifier,
         walletManagerFacade: WalletManagersFacade,
-        walletsStateHolder: WalletsStateHolder,
+        userWalletsListManager: UserWalletsListManager,
         errorsDataConverter: ErrorsDataConverter,
         @NetworkMoshi moshi: Moshi,
     ): SwapRepository {
@@ -42,7 +42,7 @@ internal class SwapDataModule {
             tangemExpressApi = tangemExpressApi,
             coroutineDispatcher = coroutineDispatcher,
             walletManagersFacade = walletManagerFacade,
-            walletsStateHolder = walletsStateHolder,
+            userWalletsListManager = userWalletsListManager,
             errorsDataConverter = errorsDataConverter,
             dataSignatureVerifier = dataSignature,
             moshi = moshi,
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/di/SwapDomainModule.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/di/SwapDomainModule.kt
index f7ccce976e..a4b2c646ab 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/di/SwapDomainModule.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/di/SwapDomainModule.kt
@@ -13,7 +13,7 @@ import com.tangem.domain.tokens.repository.QuotesRepository
 import com.tangem.domain.transaction.TransactionRepository
 import com.tangem.domain.transaction.usecase.SendTransactionUseCase
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.domain.wallets.legacy.WalletsStateHolder
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.feature.swap.domain.*
 import com.tangem.feature.swap.domain.api.SwapRepository
@@ -79,8 +79,8 @@ class SwapDomainModule {
     @SwapScope
     @Provides
     @Singleton
-    fun providesGetSelectedWalletUseCase(walletsStateHolder: WalletsStateHolder): GetSelectedWalletSyncUseCase {
-        return GetSelectedWalletSyncUseCase(walletsStateHolder = walletsStateHolder)
+    fun providesGetSelectedWalletUseCase(userWalletsListManager: UserWalletsListManager): GetSelectedWalletSyncUseCase {
+        return GetSelectedWalletSyncUseCase(userWalletsListManager = userWalletsListManager)
     }
 
     @Provides