Updated on 2026-08-14

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(

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)
     }
 }

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

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)
     }
 }

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

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

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(),
         )
     }

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(

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