Updated on 2026-08-14

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

@@ -65,7 +65,6 @@ import com.tangem.features.onboarding.v2.OnboardingV2FeatureToggles
 import com.tangem.features.pushnotifications.api.navigation.PushNotificationsRouter
 import com.tangem.features.pushnotifications.api.utils.PUSH_PERMISSION
 import com.tangem.features.send.api.navigation.SendRouter
-import com.tangem.features.staking.api.navigation.StakingRouter
 import com.tangem.features.tokendetails.navigation.TokenDetailsRouter
 import com.tangem.features.wallet.navigation.WalletRouter
 import com.tangem.google.GoogleServicesHelper
@@ -178,9 +177,6 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
     @Inject
     lateinit var emailSender: EmailSender
 
-    @Inject
-    lateinit var stakingRouter: StakingRouter
-
     @Inject
     @RootAppComponentContext
     internal lateinit var rootComponentContext: AppComponentContext

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

@@ -1,6 +1,5 @@
 package com.tangem.tap.di.domain
 
-import com.tangem.domain.tokens.*
 import com.tangem.domain.txhistory.repository.TxHistoryRepository
 import com.tangem.domain.txhistory.usecase.GetExplorerTransactionUrlUseCase
 import com.tangem.domain.txhistory.usecase.GetFixedTxHistoryItemsUseCase
@@ -9,27 +8,23 @@ import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ViewModelComponent
-import dagger.hilt.android.scopes.ViewModelScoped
+import dagger.hilt.components.SingletonComponent
 
 @Module
-@InstallIn(ViewModelComponent::class)
+@InstallIn(SingletonComponent::class)
 internal object TxHistoryDomainModule {
 
     @Provides
-    @ViewModelScoped
     fun provideGetTxHistoryItemsCountUseCase(txHistoryRepository: TxHistoryRepository): GetTxHistoryItemsCountUseCase {
         return GetTxHistoryItemsCountUseCase(repository = txHistoryRepository)
     }
 
     @Provides
-    @ViewModelScoped
     fun provideGetTxHistoryItemsUseCase(txHistoryRepository: TxHistoryRepository): GetTxHistoryItemsUseCase {
         return GetTxHistoryItemsUseCase(repository = txHistoryRepository)
     }
 
     @Provides
-    @ViewModelScoped
     fun providesGetExplorerTransactionUrlUseCase(
         txHistoryRepository: TxHistoryRepository,
     ): GetExplorerTransactionUrlUseCase {
@@ -37,7 +32,6 @@ internal object TxHistoryDomainModule {
     }
 
     @Provides
-    @ViewModelScoped
     fun providesGetFixedTxHistoryItemsUseCase(txHistoryRepository: TxHistoryRepository): GetFixedTxHistoryItemsUseCase {
         return GetFixedTxHistoryItemsUseCase(repository = txHistoryRepository)
     }

app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt

@@ -1,7 +1,6 @@
 package com.tangem.tap.proxy.redux
 
 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.decompose.ui.UiMessageSender
@@ -9,6 +8,7 @@ import com.tangem.core.navigation.settings.SettingsManager
 import com.tangem.core.navigation.share.ShareManager
 import com.tangem.core.navigation.url.UrlOpener
 import com.tangem.core.ui.clipboard.ClipboardManager
+import com.tangem.data.card.TransactionSignerFactory
 import com.tangem.datasource.connection.NetworkConnectionManager
 import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
 import com.tangem.datasource.local.config.issuers.IssuersConfigStorage
@@ -34,7 +34,6 @@ import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.features.onboarding.v2.OnboardingV2FeatureToggles
 import com.tangem.features.onramp.OnrampFeatureToggles
 import com.tangem.features.pushnotifications.api.navigation.PushNotificationsRouter
-import com.tangem.features.staking.api.navigation.StakingRouter
 import com.tangem.tap.domain.scanCard.CardScanningFeatureToggles
 import com.tangem.tap.domain.walletconnect2.domain.LegacyWalletConnectRepository
 import com.tangem.tap.domain.walletconnect2.domain.WalletConnectInteractor
@@ -65,7 +64,6 @@ data class DaggerGraphState(
     val sendFeedbackEmailUseCase: SendFeedbackEmailUseCase? = null,
     val getCardInfoUseCase: GetCardInfoUseCase? = null,
     val issuersConfigStorage: IssuersConfigStorage? = null,
-    val stakingRouter: StakingRouter? = null,
     val urlOpener: UrlOpener? = null,
     val shareManager: ShareManager? = null,
     val appRouter: AppRouter? = null,

app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt

@@ -16,7 +16,7 @@ import com.tangem.features.onboarding.v2.entry.OnboardingEntryComponent
 import com.tangem.features.onramp.component.*
 import com.tangem.features.pushnotifications.api.navigation.PushNotificationsRouter
 import com.tangem.features.send.api.navigation.SendRouter
-import com.tangem.features.staking.api.navigation.StakingRouter
+import com.tangem.features.staking.api.StakingComponent
 import com.tangem.features.tester.api.TesterRouter
 import com.tangem.features.tokendetails.navigation.TokenDetailsRouter
 import com.tangem.features.wallet.navigation.WalletRouter
@@ -58,11 +58,11 @@ internal class ChildFactory @Inject constructor(
     private val onboardingEntryComponentFactory: OnboardingEntryComponent.Factory,
     private val welcomeComponentFactory: WelcomeComponent.Factory,
     private val storiesComponentFactory: StoriesComponent.Factory,
+    private val stakingComponentFactory: StakingComponent.Factory,
     private val sendRouter: SendRouter,
     private val tokenDetailsRouter: TokenDetailsRouter,
     private val walletRouter: WalletRouter,
     private val qrScanningRouter: QrScanningRouter,
-    private val stakingRouter: StakingRouter,
     private val testerRouter: TesterRouter,
     private val pushNotificationRouter: PushNotificationsRouter,
     private val routingFeatureToggles: RoutingFeatureToggles,
@@ -211,6 +211,17 @@ internal class ChildFactory @Inject constructor(
                     componentFactory = storiesComponentFactory,
                 )
             }
+            is AppRoute.Staking -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = StakingComponent.Params(
+                        userWalletId = route.userWalletId,
+                        cryptoCurrencyId = route.cryptoCurrencyId,
+                        yield = route.yield,
+                    ),
+                    componentFactory = stakingComponentFactory,
+                )
+            }
             is AppRoute.AccessCodeRecovery,
             is AppRoute.AppCurrencySelector,
             is AppRoute.SaveWallet,
@@ -230,7 +241,6 @@ internal class ChildFactory @Inject constructor(
             is AppRoute.Wallet,
             is AppRoute.WalletConnectSessions,
             is AppRoute.CurrencyDetails,
-            is AppRoute.Staking,
             is AppRoute.PushNotification,
             -> error("Unsupported route: $route")
         }
@@ -337,7 +347,15 @@ internal class ChildFactory @Inject constructor(
                 Child.LegacyIntent(testerRouter.getEntryIntent())
             }
             is AppRoute.Staking -> {
-                route.asFragmentChild(Provider { stakingRouter.getEntryFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = StakingComponent.Params(
+                        userWalletId = route.userWalletId,
+                        cryptoCurrencyId = route.cryptoCurrencyId,
+                        yield = route.yield,
+                    ),
+                    componentFactory = stakingComponentFactory,
+                )
             }
             is AppRoute.PushNotification -> {
                 route.asFragmentChild(Provider { pushNotificationRouter.entryFragment() })