Updated on 2026-08-14

app/src/main/java/com/tangem/tap/routing/RootContent.kt

@@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat.startActivity
-import com.arkivanov.decompose.extensions.compose.jetpack.stack.Children
+import com.arkivanov.decompose.extensions.compose.stack.Children
 import com.arkivanov.decompose.router.stack.ChildStack
 import com.tangem.common.routing.AppRoute
 import com.tangem.core.ui.UiDependencies

app/src/main/java/com/tangem/tap/routing/component/impl/DefaultRoutingComponent.kt

@@ -4,11 +4,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import com.arkivanov.decompose.ComponentContext
-import com.arkivanov.decompose.extensions.compose.jetpack.subscribeAsState
+import com.arkivanov.decompose.extensions.compose.subscribeAsState
 import com.arkivanov.decompose.router.stack.ChildStack
 import com.arkivanov.decompose.router.stack.childStack
 import com.arkivanov.decompose.value.Value
-import com.arkivanov.decompose.value.observe
+import com.arkivanov.decompose.value.subscribe
 import com.arkivanov.essenty.backhandler.BackCallback
 import com.arkivanov.essenty.lifecycle.doOnDestroy
 import com.google.android.material.snackbar.Snackbar
@@ -64,7 +64,7 @@ internal class DefaultRoutingComponent @AssistedInject constructor(
             appRouterConfig.componentRouter = router
             appRouterConfig.snackbarHandler = this
 
-            stack.observe(lifecycle) { stack ->
+            stack.subscribe(lifecycle) { stack ->
                 val stackItems = stack.items.map { it.configuration }
 
                 if (appRouterConfig.stack != stackItems) {

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

@@ -2,8 +2,8 @@ package com.tangem.tap.routing.utils
 
 import com.tangem.common.routing.AppRoute
 import com.tangem.core.decompose.context.AppComponentContext
-import com.tangem.feature.qrscanning.QrScanningRouter
-import com.tangem.feature.referral.ReferralFragment
+import com.tangem.feature.qrscanning.QrScanningComponent
+import com.tangem.feature.referral.api.ReferralComponent
 import com.tangem.feature.stories.api.StoriesComponent
 import com.tangem.feature.walletsettings.component.WalletSettingsComponent
 import com.tangem.features.details.component.DetailsComponent
@@ -13,21 +13,21 @@ import com.tangem.features.managetokens.component.ManageTokensSource
 import com.tangem.features.markets.details.MarketsTokenDetailsComponent
 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.StakingComponent
+import com.tangem.features.pushnotifications.api.PushNotificationsComponent
+import com.tangem.features.send.api.SendComponent
 import com.tangem.features.swap.SwapComponent
+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
-import com.tangem.tap.features.details.ui.appcurrency.AppCurrencySelectorFragment
-import com.tangem.tap.features.details.ui.appsettings.AppSettingsFragment
-import com.tangem.tap.features.details.ui.cardsettings.CardSettingsFragment
-import com.tangem.tap.features.details.ui.cardsettings.coderecovery.AccessCodeRecoveryFragment
-import com.tangem.tap.features.details.ui.resetcard.ResetCardFragment
-import com.tangem.tap.features.details.ui.securitymode.SecurityModeFragment
-import com.tangem.tap.features.details.ui.walletconnect.WalletConnectFragment
-import com.tangem.tap.features.home.HomeFragment
+import com.tangem.features.tokendetails.TokenDetailsComponent
+import com.tangem.features.wallet.WalletEntryComponent
+import com.tangem.tap.features.details.ui.appcurrency.api.AppCurrencySelectorComponent
+import com.tangem.tap.features.details.ui.appsettings.api.AppSettingsComponent
+import com.tangem.tap.features.details.ui.cardsettings.api.CardSettingsComponent
+import com.tangem.tap.features.details.ui.cardsettings.coderecovery.api.AccessCodeRecoveryComponent
+import com.tangem.tap.features.details.ui.resetcard.api.ResetCardComponent
+import com.tangem.tap.features.details.ui.securitymode.api.SecurityModeComponent
+import com.tangem.tap.features.details.ui.walletconnect.api.WalletConnectComponent
+import com.tangem.tap.features.home.api.HomeComponent
 import com.tangem.tap.features.onboarding.products.note.OnboardingNoteFragment
 import com.tangem.tap.features.onboarding.products.otherCards.OnboardingOtherCardsFragment
 import com.tangem.tap.features.onboarding.products.twins.ui.OnboardingTwinsFragment
@@ -58,14 +58,23 @@ internal class ChildFactory @Inject constructor(
     private val onboardingEntryComponentFactory: OnboardingEntryComponent.Factory,
     private val welcomeComponentFactory: WelcomeComponent.Factory,
     private val storiesComponentFactory: StoriesComponent.Factory,
+    private val sendComponentFactory: SendComponent.Factory,
     private val stakingComponentFactory: StakingComponent.Factory,
     private val swapComponentFactory: SwapComponent.Factory,
-    private val sendRouter: SendRouter,
-    private val tokenDetailsRouter: TokenDetailsRouter,
-    private val walletRouter: WalletRouter,
-    private val qrScanningRouter: QrScanningRouter,
+    private val homeComponentFactory: HomeComponent.Factory,
+    private val tokenDetailsComponentFactory: TokenDetailsComponent.Factory,
+    private val walletConnectComponentFactory: WalletConnectComponent.Factory,
+    private val qrScanningComponentFactory: QrScanningComponent.Factory,
+    private val accessCodeRecoveryComponentFactory: AccessCodeRecoveryComponent.Factory,
+    private val cardSettingsComponentFactory: CardSettingsComponent.Factory,
+    private val appCurrencySelectorComponentFactory: AppCurrencySelectorComponent.Factory,
+    private val appSettingsComponentFactory: AppSettingsComponent.Factory,
+    private val securityModeComponentFactory: SecurityModeComponent.Factory,
+    private val resetCardComponentFactory: ResetCardComponent.Factory,
+    private val referralComponentFactory: ReferralComponent.Factory,
+    private val pushNotificationsComponentFactory: PushNotificationsComponent.Factory,
+    private val walletComponentFactory: WalletEntryComponent.Factory,
     private val testerRouter: TesterRouter,
-    private val pushNotificationRouter: PushNotificationsRouter,
     private val routingFeatureToggles: RoutingFeatureToggles,
 ) {
 
@@ -213,6 +222,16 @@ internal class ChildFactory @Inject constructor(
                     componentFactory = storiesComponentFactory,
                 )
             }
+            is AppRoute.CurrencyDetails -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = TokenDetailsComponent.Params(
+                        userWalletId = route.userWalletId,
+                        currency = route.currency,
+                    ),
+                    componentFactory = tokenDetailsComponentFactory,
+                )
+            }
             is AppRoute.Staking -> {
                 createComponentChild(
                     contextProvider = contextProvider(route, contextFactory),
@@ -237,25 +256,119 @@ internal class ChildFactory @Inject constructor(
                     componentFactory = swapComponentFactory,
                 )
             }
-            is AppRoute.AccessCodeRecovery,
-            is AppRoute.AppCurrencySelector,
+            is AppRoute.Send -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = SendComponent.Params(
+                        userWalletId = route.userWalletId,
+                        currency = route.currency,
+                        transactionId = route.transactionId,
+                        amount = route.amount,
+                        tag = route.tag,
+                        destinationAddress = route.destinationAddress,
+                    ),
+                    componentFactory = sendComponentFactory,
+                )
+            }
+            is AppRoute.Home -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = homeComponentFactory,
+                )
+            }
+            is AppRoute.WalletConnectSessions -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = walletConnectComponentFactory,
+                )
+            }
+            is AppRoute.QrScanning -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = QrScanningComponent.Params(
+                        source = route.source,
+                        networkName = route.networkName,
+                    ),
+                    componentFactory = qrScanningComponentFactory,
+                )
+            }
+            is AppRoute.AccessCodeRecovery -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = accessCodeRecoveryComponentFactory,
+                )
+            }
+            is AppRoute.CardSettings -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = CardSettingsComponent.Params(userWalletId = route.userWalletId),
+                    componentFactory = cardSettingsComponentFactory,
+                )
+            }
+            is AppRoute.AppCurrencySelector -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = appCurrencySelectorComponentFactory,
+                )
+            }
+            is AppRoute.AppSettings -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = appSettingsComponentFactory,
+                )
+            }
+            is AppRoute.DetailsSecurity -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = SecurityModeComponent.Params(
+                        userWalletId = route.userWalletId,
+                    ),
+                    componentFactory = securityModeComponentFactory,
+                )
+            }
+            is AppRoute.ResetToFactory -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = ResetCardComponent.Params(
+                        userWalletId = route.userWalletId,
+                        cardId = route.cardId,
+                        isActiveBackupStatus = route.isActiveBackupStatus,
+                        backupCardsCount = route.backupCardsCount,
+                    ),
+                    componentFactory = resetCardComponentFactory,
+                )
+            }
+            is AppRoute.ReferralProgram -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = ReferralComponent.Params(route.userWalletId),
+                    componentFactory = referralComponentFactory,
+                )
+            }
+            is AppRoute.PushNotification -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = pushNotificationsComponentFactory,
+                )
+            }
+            is AppRoute.Wallet -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = walletComponentFactory,
+                )
+            }
             is AppRoute.SaveWallet,
-            is AppRoute.Send,
-            is AppRoute.AppSettings,
-            is AppRoute.CardSettings,
-            is AppRoute.DetailsSecurity,
-            is AppRoute.Home,
             is AppRoute.OnboardingNote,
             is AppRoute.OnboardingOther,
             is AppRoute.OnboardingTwins,
             is AppRoute.OnboardingWallet,
-            is AppRoute.QrScanning,
-            is AppRoute.ReferralProgram,
-            is AppRoute.ResetToFactory,
-            is AppRoute.Wallet,
-            is AppRoute.WalletConnectSessions,
-            is AppRoute.CurrencyDetails,
-            is AppRoute.PushNotification,
             -> error("Unsupported route: $route")
         }
         // endregion
@@ -271,22 +384,49 @@ internal class ChildFactory @Inject constructor(
                 Child.Initial
             }
             is AppRoute.AccessCodeRecovery -> {
-                route.asFragmentChild(Provider { AccessCodeRecoveryFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = accessCodeRecoveryComponentFactory,
+                )
             }
             is AppRoute.AppCurrencySelector -> {
-                route.asFragmentChild(Provider { AppCurrencySelectorFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = appCurrencySelectorComponentFactory,
+                )
             }
             is AppRoute.SaveWallet -> {
                 route.asFragmentChild(Provider { SaveWalletBottomSheetFragment() })
             }
             is AppRoute.Send -> {
-                route.asFragmentChild(Provider { sendRouter.getEntryFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = SendComponent.Params(
+                        userWalletId = route.userWalletId,
+                        currency = route.currency,
+                        transactionId = route.transactionId,
+                        amount = route.amount,
+                        tag = route.tag,
+                        destinationAddress = route.destinationAddress,
+                    ),
+                    componentFactory = sendComponentFactory,
+                )
             }
             is AppRoute.AppSettings -> {
-                route.asFragmentChild(Provider { AppSettingsFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = appSettingsComponentFactory,
+                )
             }
             is AppRoute.CardSettings -> {
-                route.asFragmentChild(Provider { CardSettingsFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = CardSettingsComponent.Params(userWalletId = route.userWalletId),
+                    componentFactory = cardSettingsComponentFactory,
+                )
             }
             is AppRoute.Details -> {
                 route.asComponentChild(
@@ -296,7 +436,13 @@ internal class ChildFactory @Inject constructor(
                 )
             }
             is AppRoute.DetailsSecurity -> {
-                route.asFragmentChild(Provider { SecurityModeFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = SecurityModeComponent.Params(
+                        userWalletId = route.userWalletId,
+                    ),
+                    componentFactory = securityModeComponentFactory,
+                )
             }
             is AppRoute.Disclaimer -> {
                 route.asComponentChild(
@@ -306,7 +452,11 @@ internal class ChildFactory @Inject constructor(
                 )
             }
             is AppRoute.Home -> {
-                route.asFragmentChild(Provider { HomeFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = homeComponentFactory,
+                )
             }
             is AppRoute.ManageTokens -> {
                 val source = when (route.source) {
@@ -334,13 +484,33 @@ internal class ChildFactory @Inject constructor(
                 route.asFragmentChild(Provider { OnboardingWalletFragment() })
             }
             is AppRoute.QrScanning -> {
-                route.asFragmentChild(Provider { qrScanningRouter.getEntryFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = QrScanningComponent.Params(
+                        source = route.source,
+                        networkName = route.networkName,
+                    ),
+                    componentFactory = qrScanningComponentFactory,
+                )
             }
             is AppRoute.ReferralProgram -> {
-                route.asFragmentChild(Provider { ReferralFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = ReferralComponent.Params(route.userWalletId),
+                    componentFactory = referralComponentFactory,
+                )
             }
             is AppRoute.ResetToFactory -> {
-                route.asFragmentChild(Provider { ResetCardFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = ResetCardComponent.Params(
+                        userWalletId = route.userWalletId,
+                        cardId = route.cardId,
+                        isActiveBackupStatus = route.isActiveBackupStatus,
+                        backupCardsCount = route.backupCardsCount,
+                    ),
+                    componentFactory = resetCardComponentFactory,
+                )
             }
             is AppRoute.Swap -> {
                 route.asComponentChild(
@@ -356,13 +526,28 @@ internal class ChildFactory @Inject constructor(
                 )
             }
             is AppRoute.Wallet -> {
-                route.asFragmentChild(Provider { walletRouter.getEntryFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = walletComponentFactory,
+                )
             }
             is AppRoute.WalletConnectSessions -> {
-                route.asFragmentChild(Provider { WalletConnectFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = walletConnectComponentFactory,
+                )
             }
             is AppRoute.CurrencyDetails -> {
-                route.asFragmentChild(Provider { tokenDetailsRouter.getEntryFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = TokenDetailsComponent.Params(
+                        userWalletId = route.userWalletId,
+                        currency = route.currency,
+                    ),
+                    componentFactory = tokenDetailsComponentFactory,
+                )
             }
             is AppRoute.Welcome -> {
                 route.asFragmentChild(Provider { WelcomeFragment() })
@@ -382,7 +567,11 @@ internal class ChildFactory @Inject constructor(
                 )
             }
             is AppRoute.PushNotification -> {
-                route.asFragmentChild(Provider { pushNotificationRouter.entryFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = pushNotificationsComponentFactory,
+                )
             }
             is AppRoute.WalletSettings -> {
                 route.asComponentChild(