Updated on 2026-08-14

app/src/main/java/com/tangem/tap/MainActivity.kt

@@ -360,7 +360,6 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
     private fun installActivityDependencies() {
         cardSdkOwner.register(activity = this)
         tangemSdkManager = injectedTangemSdkManager
-        appStateHolder.tangemSdkManager = tangemSdkManager
 
         if (onboardingV2FeatureToggles.isOnboardingV2Enabled) {
             backupServiceHolder.createAndSetService(cardSdkConfigRepository.sdk, this)

app/src/main/java/com/tangem/tap/TangemApplication.kt

@@ -8,7 +8,6 @@ import com.tangem.Log
 import com.tangem.TangemSdkLogger
 import com.tangem.blockchain.network.BlockchainSdkRetrofitBuilder
 import com.tangem.blockchainsdk.BlockchainSDKFactory
-import com.tangem.data.card.TransactionSignerFactory
 import com.tangem.blockchainsdk.utils.ExcludedBlockchains
 import com.tangem.common.routing.AppRouter
 import com.tangem.core.analytics.Analytics
@@ -23,6 +22,7 @@ import com.tangem.core.configtoggle.feature.FeatureTogglesManager
 import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.core.navigation.settings.SettingsManager
 import com.tangem.core.ui.clipboard.ClipboardManager
+import com.tangem.data.card.TransactionSignerFactory
 import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.datasource.api.common.createNetworkLoggingInterceptor
 import com.tangem.datasource.connection.NetworkConnectionManager
@@ -274,7 +274,7 @@ abstract class TangemApplication : Application(), ImageLoaderFactory {
 
     private fun createReduxStore(): Store<AppState> {
         return Store(
-            reducer = { action, state -> appReducer(action, state, appStateHolder) },
+            reducer = { action, state -> appReducer(action, state) },
             middleware = AppState.getMiddleware(),
             state = AppState(
                 daggerGraphState = DaggerGraphState(

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

@@ -10,16 +10,15 @@ import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsReducer
 import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletReducer
 import com.tangem.tap.features.saveWallet.redux.SaveWalletReducer
 import com.tangem.tap.features.welcome.redux.WelcomeReducer
-import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.tap.proxy.redux.DaggerGraphReducer
 import org.rekotlin.Action
 
-fun appReducer(action: Action, state: AppState?, appStateHolder: AppStateHolder): AppState {
+fun appReducer(action: Action, state: AppState?): AppState {
     requireNotNull(state)
     if (action is AppAction.RestoreState) return action.state
 
     return AppState(
-        globalState = globalReducer(action, state, appStateHolder),
+        globalState = globalReducer(action, state),
         homeState = HomeReducer.reduce(action, state),
         onboardingNoteState = OnboardingNoteReducer.reduce(action, state),
         onboardingWalletState = OnboardingWalletReducer.reduce(action, state),

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

@@ -58,8 +58,6 @@ sealed class GlobalAction : Action {
 
     data class SaveScanResponse(val scanResponse: ScanResponse) : GlobalAction()
 
-    data class SetIfCardVerifiedOnline(val verified: Boolean) : GlobalAction()
-
     data class ChangeAppCurrency(val appCurrency: AppCurrency) : GlobalAction()
     object RestoreAppCurrency : GlobalAction() {
         data class Success(val appCurrency: AppCurrency) : GlobalAction()

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

@@ -2,12 +2,11 @@ package com.tangem.tap.common.redux.global
 
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.features.onboarding.OnboardingManager
-import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.utils.extensions.replaceBy
 import org.rekotlin.Action
 
 @Suppress("LongMethod", "ComplexMethod")
-fun globalReducer(action: Action, state: AppState, appStateHolder: AppStateHolder): GlobalState {
+fun globalReducer(action: Action, state: AppState): GlobalState {
     if (action !is GlobalAction) return state.globalState
 
     val globalState = state.globalState
@@ -35,7 +34,6 @@ fun globalReducer(action: Action, state: AppState, appStateHolder: AppStateHolde
             globalState.copy(scanCardFailsCounter = 0)
         }
         is GlobalAction.SaveScanResponse -> {
-            appStateHolder.scanResponse = action.scanResponse
             globalState.copy(scanResponse = action.scanResponse)
         }
         is GlobalAction.ChangeAppCurrency -> {
@@ -72,8 +70,6 @@ fun globalReducer(action: Action, state: AppState, appStateHolder: AppStateHolde
         is GlobalAction.ExchangeManager.Init.Success -> {
             globalState.copy(exchangeManager = action.exchangeManager)
         }
-        is GlobalAction.SetIfCardVerifiedOnline ->
-            globalState.copy(cardVerifiedOnline = action.verified)
         else -> globalState
     }
 }

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

@@ -1,7 +1,6 @@
 package com.tangem.tap.common.redux.global
 
 import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.redux.StateDialog
 import com.tangem.tap.domain.TapWalletManager
@@ -13,15 +12,11 @@ data class GlobalState(
     @Deprecated("Use scan response from selected user wallet")
     val scanResponse: ScanResponse? = null,
     val onboardingState: OnboardingState = OnboardingState(),
-    val cardVerifiedOnline: Boolean = false,
     val tapWalletManager: TapWalletManager = TapWalletManager(),
     val appCurrency: AppCurrency = AppCurrency.Default,
     val scanCardFailsCounter: Int = 0,
     val dialog: StateDialog? = null,
     val exchangeManager: CurrencyExchangeManager = CurrencyExchangeManager.dummy(),
-    @Deprecated("Use GetUserCountryCodeUseCase instead")
-    val userCountryCode: String? = null,
-    val appThemeMode: AppThemeMode = AppThemeMode.DEFAULT,
     val isLastSignWithRing: Boolean = false,
 ) : StateType
 

app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt

@@ -5,7 +5,6 @@ import com.tangem.blockchain.common.Wallet
 import com.tangem.core.analytics.Analytics
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.operations.attestation.Attestation
 import com.tangem.tap.common.extensions.setContext
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
@@ -38,8 +37,6 @@ class TapWalletManager(
     private suspend fun loadUserWalletData(userWallet: UserWallet) {
         Analytics.setContext(userWallet.scanResponse)
         val scanResponse = userWallet.scanResponse
-        val card = scanResponse.card
-        val attestationFailed = card.attestation.status == Attestation.Status.Failed
 
         tangemSdkManager.changeDisplayedCardIdNumbersCount(scanResponse)
 
@@ -47,7 +44,6 @@ class TapWalletManager(
             // Order is important
             store.dispatch(TwinCardsAction.IfTwinsPrepareState(scanResponse))
             store.dispatch(GlobalAction.SaveScanResponse(scanResponse))
-            store.dispatch(GlobalAction.SetIfCardVerifiedOnline(!attestationFailed))
         }
     }
 }

app/src/main/java/com/tangem/tap/domain/card/DefaultDerivationsRepository.kt

@@ -58,7 +58,9 @@ internal class DefaultDerivationsRepository(
     }
 
     override suspend fun derivePublicKeysByNetworks(userWalletId: UserWalletId, networks: List<Network>) {
-        val userWallet = userWalletsStore.getSyncOrNull(userWalletId) ?: error("User wallet not found")
+        val userWallet = withContext(dispatchers.io) {
+            userWalletsStore.getSyncOrNull(userWalletId) ?: error("User wallet not found")
+        }
 
         if (!userWallet.scanResponse.card.settings.isHDWalletAllowed) {
             Timber.d("Nothing to derive")

app/src/main/java/com/tangem/tap/features/demo/DefaultDemoModeDatasource.kt

@@ -1,11 +0,0 @@
-package com.tangem.tap.features.demo
-
-import com.tangem.datasource.demo.DemoModeDatasource
-import com.tangem.tap.proxy.AppStateHolder
-import javax.inject.Inject
-
-class DefaultDemoModeDatasource @Inject constructor(private val appStateHolder: AppStateHolder) : DemoModeDatasource {
-
-    override val isDemoModeActive: Boolean
-        get() = appStateHolder.scanResponse?.let { DemoHelper.isDemoCard(it) } == true
-}

app/src/main/java/com/tangem/tap/features/demo/di/DemoModule.kt

@@ -1,18 +0,0 @@
-package com.tangem.tap.features.demo.di
-
-import com.tangem.datasource.demo.DemoModeDatasource
-import com.tangem.tap.features.demo.DefaultDemoModeDatasource
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-internal interface DemoModule {
-
-    @Binds
-    @Singleton
-    fun bindDemoModeHelper(demoModeHelper: DefaultDemoModeDatasource): DemoModeDatasource
-}

app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt

@@ -1,10 +1,8 @@
 package com.tangem.tap.proxy
 
-import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.redux.ReduxStateHolder
 import com.tangem.domain.redux.StateDialog
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.sdk.api.TangemSdkManager
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.extensions.onUserWalletSelected
@@ -20,10 +18,7 @@ import javax.inject.Inject
  */
 class AppStateHolder @Inject constructor() : ReduxStateHolder {
 
-    @Deprecated("Use scan response from selected user wallet")
-    var scanResponse: ScanResponse? = null
     var mainStore: Store<AppState>? = null
-    var tangemSdkManager: TangemSdkManager? = null
     var exchangeService: ExchangeService? = null
     var buyService: ExchangeService? = null
     var sellService: ExchangeService? = null

app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt

@@ -8,12 +8,15 @@ import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.lib.crypto.UserWalletManager
 import com.tangem.lib.crypto.models.ProxyAmount
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.math.BigDecimal
 
 class UserWalletManagerImpl(
     private val walletManagersFacade: WalletManagersFacade,
     private val userWalletsListManager: UserWalletsListManager,
+    private val dispatchers: CoroutineDispatcherProvider,
 ) : UserWalletManager {
 
     override fun getWalletId(): String {
@@ -61,11 +64,13 @@ class UserWalletManagerImpl(
         val selectedUserWallet = requireNotNull(
             userWalletsListManager.selectedUserWalletSync,
         ) { "userWallet or userWalletsListManager is null" }
-        val walletManager = walletManagersFacade.getOrCreateWalletManager(
-            selectedUserWallet.walletId,
-            blockchain,
-            derivationPath,
-        )
+        val walletManager = withContext(dispatchers.io) {
+            walletManagersFacade.getOrCreateWalletManager(
+                selectedUserWallet.walletId,
+                blockchain,
+                derivationPath,
+            )
+        }
 
         return requireNotNull(walletManager) {
             "No wallet manager found"

app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt

@@ -7,6 +7,7 @@ import com.tangem.lib.crypto.UserWalletManager
 import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.tap.proxy.TransactionManagerImpl
 import com.tangem.tap.proxy.UserWalletManagerImpl
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -28,10 +29,12 @@ internal object ProxyModule {
     fun provideUserWalletManager(
         walletManagersFacade: WalletManagersFacade,
         userWalletsListManager: UserWalletsListManager,
+        dispatchers: CoroutineDispatcherProvider,
     ): UserWalletManager {
         return UserWalletManagerImpl(
             walletManagersFacade = walletManagersFacade,
             userWalletsListManager = userWalletsListManager,
+            dispatchers = dispatchers,
         )
     }