Updated on 2026-08-14

features/swap/presentation/build.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
     implementation(projects.core.navigation)
     implementation(projects.core.utils)
     implementation(projects.core.ui)
-    implementation(projects.common)
+    implementation(projects.common.routing)
 
     /** Domain modules **/
     implementation(projects.domain.appCurrency)

features/swap/presentation/src/main/java/com/tangem/feature/swap/presentation/SwapFragment.kt

@@ -2,12 +2,13 @@ package com.tangem.feature.swap.presentation
 
 import android.os.Bundle
 import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.background
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.fragment.app.viewModels
-import com.tangem.core.navigation.ReduxNavController
+import com.tangem.common.routing.AppRouter
+
 import com.tangem.core.ui.UiDependencies
-import com.tangem.core.ui.components.SystemBarsEffect
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.screen.ComposeFragment
 import com.tangem.feature.swap.router.CustomTabsManager
@@ -28,7 +29,7 @@ class SwapFragment : ComposeFragment() {
     override lateinit var uiDependencies: UiDependencies
 
     @Inject
-    lateinit var reduxNavController: ReduxNavController
+    lateinit var appRouter: AppRouter
 
     private val viewModel by viewModels<SwapViewModel>()
 
@@ -37,9 +38,8 @@ class SwapFragment : ComposeFragment() {
         lifecycle.addObserver(viewModel)
         viewModel.setRouter(
             SwapRouter(
-                fragmentManager = WeakReference(parentFragmentManager),
                 customTabsManager = CustomTabsManager(WeakReference(context)),
-                reduxNavController = reduxNavController,
+                router = appRouter,
             ),
         )
     }
@@ -47,17 +47,17 @@ class SwapFragment : ComposeFragment() {
     @Composable
     override fun ScreenContent(modifier: Modifier) {
         viewModel.onScreenOpened()
-
-        val backgroundColor = TangemTheme.colors.background.secondary
-        SystemBarsEffect { setSystemBarsColor(backgroundColor) }
-
         ScreenContent(viewModel = viewModel)
     }
 
     @Suppress("TopLevelComposableFunctions")
     @Composable
     private fun ScreenContent(viewModel: SwapViewModel) {
-        Crossfade(targetState = viewModel.currentScreen, label = "") { screen ->
+        Crossfade(
+            modifier = Modifier.background(TangemTheme.colors.background.secondary),
+            targetState = viewModel.currentScreen,
+            label = "",
+        ) { screen ->
             when (screen) {
                 SwapNavScreen.Main -> SwapScreen(stateHolder = viewModel.uiState)
                 SwapNavScreen.Success -> {
@@ -84,8 +84,4 @@ class SwapFragment : ComposeFragment() {
         lifecycle.removeObserver(viewModel)
         super.onDestroy()
     }
-
-    companion object {
-        const val CURRENCY_BUNDLE_KEY = "swap_currency"
-    }
 }

features/swap/presentation/src/main/java/com/tangem/feature/swap/router/SwapRouter.kt

@@ -3,20 +3,14 @@ package com.tangem.feature.swap.router
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.core.os.bundleOf
-import androidx.fragment.app.FragmentManager
-import com.tangem.core.navigation.AppScreen
-import com.tangem.core.navigation.NavigationAction
-import com.tangem.core.navigation.ReduxNavController
+import com.tangem.common.routing.AppRoute
+import com.tangem.common.routing.AppRouter
 import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.wallets.models.UserWalletId
-import com.tangem.features.tokendetails.navigation.TokenDetailsRouter
-import java.lang.ref.WeakReference
 
 internal class SwapRouter(
-    private val fragmentManager: WeakReference<FragmentManager>,
     private val customTabsManager: CustomTabsManager,
-    private val reduxNavController: ReduxNavController,
+    private val router: AppRouter,
 ) {
 
     var currentScreen by mutableStateOf(SwapNavScreen.Main)
@@ -30,7 +24,7 @@ internal class SwapRouter(
         if (currentScreen == SwapNavScreen.SelectToken) {
             currentScreen = SwapNavScreen.Main
         } else {
-            fragmentManager.get()?.popBackStack()
+            router.pop()
         }
     }
 
@@ -39,13 +33,10 @@ internal class SwapRouter(
     }
 
     fun openTokenDetails(userWalletId: UserWalletId, currency: CryptoCurrency) {
-        reduxNavController.navigate(
-            action = NavigationAction.NavigateTo(
-                screen = AppScreen.WalletDetails,
-                bundle = bundleOf(
-                    TokenDetailsRouter.USER_WALLET_ID_KEY to userWalletId.stringValue,
-                    TokenDetailsRouter.CRYPTO_CURRENCY_KEY to currency,
-                ),
+        router.push(
+            AppRoute.CurrencyDetails(
+                userWalletId = userWalletId,
+                currency = currency,
             ),
         )
     }

features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt

@@ -8,6 +8,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import com.tangem.core.ui.components.appbar.AppBarWithBackButton
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.utils.WindowInsetsZero
 import com.tangem.feature.swap.models.SwapStateHolder
 import com.tangem.feature.swap.models.states.ChooseFeeBottomSheetConfig
 import com.tangem.feature.swap.models.states.ChooseProviderBottomSheetConfig
@@ -28,7 +29,7 @@ internal fun SwapScreen(stateHolder: SwapStateHolder) {
                 iconRes = R.drawable.ic_close_24,
             )
         },
-        contentWindowInsets = WindowInsets(left = 0, top = 0, right = 0, bottom = 0),
+        contentWindowInsets = WindowInsetsZero,
         containerColor = TangemTheme.colors.background.secondary,
     ) { scaffoldPaddings ->
 

features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt

@@ -23,7 +23,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.constraintlayout.compose.ConstraintLayout
-import com.tangem.common.Strings.STARS
 import com.tangem.core.ui.components.*
 import com.tangem.core.ui.components.notifications.Notification
 import com.tangem.core.ui.components.notifications.NotificationConfig
@@ -38,6 +37,7 @@ import com.tangem.feature.swap.models.*
 import com.tangem.feature.swap.models.states.FeeItemState
 import com.tangem.feature.swap.models.states.ProviderState
 import com.tangem.feature.swap.presentation.R
+import com.tangem.utils.Strings.STARS
 
 @Suppress("LongMethod")
 @Composable

features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt

@@ -18,7 +18,6 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
-import com.tangem.common.Strings
 import com.tangem.core.ui.components.*
 import com.tangem.core.ui.components.appbar.ExpandableSearchView
 import com.tangem.core.ui.components.currency.tokenicon.TokenIcon
@@ -30,6 +29,7 @@ import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.feature.swap.models.*
 import com.tangem.feature.swap.presentation.R
+import com.tangem.utils.Strings
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 

features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt

@@ -1,11 +1,14 @@
 package com.tangem.feature.swap.viewmodels
 
+import android.os.Bundle
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.*
 import arrow.core.Either
 import arrow.core.getOrElse
+import com.tangem.common.routing.AppRoute
+import com.tangem.common.routing.bundle.unbundle
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.analytics.models.Basic
@@ -32,7 +35,6 @@ import com.tangem.feature.swap.domain.models.domain.*
 import com.tangem.feature.swap.domain.models.formatToUIRepresentation
 import com.tangem.feature.swap.domain.models.ui.*
 import com.tangem.feature.swap.models.*
-import com.tangem.feature.swap.presentation.SwapFragment
 import com.tangem.feature.swap.router.SwapNavScreen
 import com.tangem.feature.swap.router.SwapRouter
 import com.tangem.feature.swap.ui.StateBuilder
@@ -70,8 +72,10 @@ internal class SwapViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
 ) : ViewModel(), DefaultLifecycleObserver {
 
-    private val initialCryptoCurrency: CryptoCurrency =
-        savedStateHandle[SwapFragment.CURRENCY_BUNDLE_KEY] ?: error("no expected parameter CryptoCurrency found`")
+    private val initialCryptoCurrency: CryptoCurrency = savedStateHandle.get<Bundle>(AppRoute.Swap.CURRENCY_BUNDLE_KEY)
+        ?.let { it.unbundle(CryptoCurrency.serializer()) }
+        ?: error("no expected parameter CryptoCurrency found`")
+
     private lateinit var initialCryptoCurrencyStatus: CryptoCurrencyStatus
 
     private var isBalanceHidden = true