Updated on 2026-08-14

app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt

@@ -128,18 +128,13 @@ private fun fragmentFactory(screen: AppScreen): Fragment {
         AppScreen.OnboardingTwins -> OnboardingTwinsFragment()
         AppScreen.OnboardingOther -> OnboardingOtherCardsFragment()
         AppScreen.Wallet -> {
-            store.state.daggerGraphState
-                .get(getDependency = DaggerGraphState::walletRouter)
-                .getEntryFragment()
+            store.inject(getDependency = DaggerGraphState::walletRouter).getEntryFragment()
         }
         AppScreen.Send -> {
-            val featureToggles = store.state.daggerGraphState.get(
-                getDependency = DaggerGraphState::sendFeatureToggles,
-            )
+            val featureToggles = store.inject(getDependency = DaggerGraphState::sendFeatureToggles)
+
             if (featureToggles.isRedesignedSendEnabled) {
-                store.state.daggerGraphState
-                    .get(getDependency = DaggerGraphState::sendRouter)
-                    .getEntryFragment()
+                store.inject(getDependency = DaggerGraphState::sendRouter).getEntryFragment()
             } else {
                 SendFragment()
             }
@@ -154,15 +149,11 @@ private fun fragmentFactory(screen: AppScreen): Fragment {
         AppScreen.ManageTokens -> TokensListFragment()
         AppScreen.AddCustomToken -> AddCustomTokenFragment()
         AppScreen.WalletDetails -> {
-            store.state.daggerGraphState
-                .get(getDependency = DaggerGraphState::tokenDetailsRouter)
-                .getEntryFragment()
+            store.inject(getDependency = DaggerGraphState::tokenDetailsRouter).getEntryFragment()
         }
         AppScreen.WalletConnectSessions -> WalletConnectFragment()
         AppScreen.QrScanning -> {
-            store.state.daggerGraphState
-                .get(getDependency = DaggerGraphState::qrScanningRouter)
-                .getEntryFragment()
+            store.inject(getDependency = DaggerGraphState::qrScanningRouter).getEntryFragment()
         }
         AppScreen.ReferralProgram -> ReferralFragment()
         AppScreen.Swap -> SwapFragment()

app/src/main/java/com/tangem/tap/common/extensions/Store.kt

@@ -7,6 +7,7 @@ import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TapError
+import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import kotlinx.coroutines.Dispatchers
@@ -87,4 +88,10 @@ fun Store<*>.dispatchOpenUrl(url: String) {
 
 fun Store<*>.dispatchShare(url: String) {
     dispatch(NavigationAction.Share(url))
+}
+
+inline fun <reified T> Store<AppState>.inject(getDependency: DaggerGraphState.() -> T?): T {
+    return requireNotNull(state.daggerGraphState.getDependency()) {
+        "${T::class.simpleName} isn't initialized "
+    }
 }

app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt

@@ -37,7 +37,7 @@ suspend fun WalletManager.safeUpdate(isDemoCard: Boolean): Result<Wallet> = try
 } catch (exception: Exception) {
     Timber.e(exception)
 
-    val networkConnectionManager = store.state.daggerGraphState.get(DaggerGraphState::networkConnectionManager)
+    val networkConnectionManager = store.inject(DaggerGraphState::networkConnectionManager)
     if (!networkConnectionManager.isOnline) {
         Result.Failure(TapError.NoInternetConnection)
     } else {

app/src/main/java/com/tangem/tap/common/redux/AccessCodeRequestPolicyMiddleware.kt

@@ -1,6 +1,7 @@
 package com.tangem.tap.common.redux
 
 import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.tap.common.extensions.inject
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.preferencesStorage
 import com.tangem.tap.proxy.redux.DaggerGraphState
@@ -20,7 +21,7 @@ class AccessCodeRequestPolicyMiddleware {
     }
 
     private fun updateAccessCodeRequestPolicy(scanResponse: ScanResponse) {
-        store.state.daggerGraphState.get(DaggerGraphState::cardSdkConfigRepository).setAccessCodeRequestPolicy(
+        store.inject(DaggerGraphState::cardSdkConfigRepository).setAccessCodeRequestPolicy(
             isBiometricsRequestPolicy = preferencesStorage.shouldSaveAccessCodes && scanResponse.card.isAccessCodeSet,
         )
     }

app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt

@@ -123,7 +123,7 @@ private fun handleAction(action: Action, appState: () -> AppState?) {
                     primaryRules = CardExchangeRules(cardProvider),
                 )
                 // TODO: for refactoring (after remove old design refactor CurrencyExchangeManager and use 1 instance)
-                store.state.daggerGraphState.get(DaggerGraphState::appStateHolder).exchangeService = exchangeManager
+                store.inject(DaggerGraphState::appStateHolder).exchangeService = exchangeManager
                 store.dispatchOnMain(GlobalAction.ExchangeManager.Init.Success(exchangeManager))
                 store.dispatchOnMain(GlobalAction.ExchangeManager.Update)
             }
@@ -155,7 +155,7 @@ private fun handleAction(action: Action, appState: () -> AppState?) {
             }
         }
         is GlobalAction.UpdateUserWalletsListManager -> {
-            val walletManagersFacade = store.state.daggerGraphState.get(DaggerGraphState::walletManagersFacade)
+            val walletManagersFacade = store.inject(DaggerGraphState::walletManagersFacade)
 
             /*
              * If implementation of the UserWalletsListManager is changed,
@@ -186,7 +186,7 @@ private fun handleAction(action: Action, appState: () -> AppState?) {
 
 private fun restoreAppCurrency() {
     scope.launch {
-        val currency = store.state.daggerGraphState.get(DaggerGraphState::appCurrencyRepository)
+        val currency = store.inject(DaggerGraphState::appCurrencyRepository)
             .getSelectedAppCurrency()
             .firstOrNull()
             ?: AppCurrency.Default

app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt

@@ -3,11 +3,12 @@ package com.tangem.tap.common.redux.global
 import com.tangem.domain.redux.domainStore
 import com.tangem.domain.redux.global.DomainGlobalAction
 import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.inject
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.features.home.redux.HomeAction
 import com.tangem.tap.features.onboarding.OnboardingManager
-import com.tangem.tap.preferencesStorage
 import com.tangem.tap.proxy.AppStateHolder
+import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.tap.store
 import com.tangem.utils.extensions.replaceBy
 import org.rekotlin.Action
@@ -20,8 +21,7 @@ fun globalReducer(action: Action, state: AppState, appStateHolder: AppStateHolde
 
     return when (action) {
         is GlobalAction.Onboarding.Start -> {
-            val usedCardsPrefStorage = preferencesStorage.usedCardsPrefStorage
-            val onboardingManager = OnboardingManager(action.scanResponse, usedCardsPrefStorage)
+            val onboardingManager = OnboardingManager(action.scanResponse)
             globalState.copy(onboardingState = OnboardingState(true, onboardingManager))
         }
         is GlobalAction.Onboarding.StartForUnfinishedBackup -> {
@@ -95,10 +95,17 @@ fun globalReducer(action: Action, state: AppState, appStateHolder: AppStateHolde
             )
         }
         is GlobalAction.UpdateUserWalletsListManager -> {
-            appStateHolder.userWalletsListManager = action.manager
-            globalState.copy(
-                userWalletsListManager = action.manager,
-            )
+            val featureToggles = store.inject(DaggerGraphState::userWalletsListManagerFeatureToggles)
+
+            if (featureToggles.isGeneralManagerEnabled) {
+                val generalUserWalletsListManager = store.inject(DaggerGraphState::generalUserWalletsListManager)
+
+                appStateHolder.userWalletsListManager = generalUserWalletsListManager
+                globalState.copy(userWalletsListManager = generalUserWalletsListManager)
+            } else {
+                appStateHolder.userWalletsListManager = action.manager
+                globalState.copy(userWalletsListManager = action.manager)
+            }
         }
         is GlobalAction.ChangeAppThemeMode -> globalState.copy(
             appThemeMode = action.appThemeMode,