Updated on 2026-08-14

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/WalletFragment.kt

@@ -3,8 +3,6 @@ package com.tangem.feature.wallet.presentation
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 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.wallet.presentation.router.InnerWalletRouter
 import com.tangem.features.managetokens.navigation.ManageTokensUi
@@ -37,11 +35,6 @@ internal class WalletFragment : ComposeFragment() {
 
     @Composable
     override fun ScreenContent(modifier: Modifier) {
-        val systemBarsColor = TangemTheme.colors.background.secondary
-        SystemBarsEffect {
-            setSystemBarsColor(systemBarsColor)
-        }
-
         _walletRouter.Initialize(
             onFinish = requireActivity()::finish,
             manageTokensUi = manageTokensUi,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt

@@ -16,11 +16,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -28,6 +27,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.components.BottomFade
 import com.tangem.core.ui.components.PrimaryButton
 import com.tangem.core.ui.components.SecondaryButton
 import com.tangem.core.ui.components.buttons.actions.ActionButtonConfig
@@ -36,6 +36,7 @@ import com.tangem.core.ui.event.EventEffect
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
+import com.tangem.core.ui.utils.WindowInsetsZero
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.common.WalletPreviewData
 import com.tangem.feature.wallet.presentation.common.component.DraggableNetworkGroupItem
@@ -57,8 +58,12 @@ internal fun OrganizeTokensScreen(state: OrganizeTokensState, modifier: Modifier
     Scaffold(
         modifier = modifier,
         topBar = {
-            TopBar(state.header, tokensListState)
+            TopBar(
+                config = state.header,
+                tokensListState = tokensListState,
+            )
         },
+        contentWindowInsets = WindowInsetsZero,
         content = { paddingValues ->
             TokenList(
                 modifier = Modifier
@@ -72,7 +77,9 @@ internal fun OrganizeTokensScreen(state: OrganizeTokensState, modifier: Modifier
         },
         floatingActionButtonPosition = FabPosition.Center,
         floatingActionButton = {
-            Actions(state.actions)
+            Box(modifier = Modifier.navigationBarsPadding()) {
+                Actions(state.actions)
+            }
         },
         containerColor = TangemTheme.colors.background.secondary,
     )
@@ -104,9 +111,11 @@ private fun TokenList(
             onDragEnd = onDragEnd,
         )
 
+        val bottomBarHeight = with(LocalDensity.current) { WindowInsets.systemBars.getBottom(this).toDp() }
+
         val listContentPadding = PaddingValues(
             top = TangemTheme.dimens.spacing4,
-            bottom = TangemTheme.dimens.spacing92,
+            bottom = TangemTheme.dimens.spacing92 + bottomBarHeight,
             start = TangemTheme.dimens.spacing16,
             end = TangemTheme.dimens.spacing16,
         )
@@ -140,7 +149,7 @@ private fun TokenList(
             }
         }
 
-        BottomGradient(modifier = Modifier.align(Alignment.BottomCenter))
+        BottomFade(modifier = Modifier.align(Alignment.BottomCenter))
     }
 }
 
@@ -191,23 +200,6 @@ private fun LazyItemScope.DraggableItem(
     }
 }
 
-@Composable
-private fun BottomGradient(modifier: Modifier = Modifier) {
-    Box(
-        modifier = modifier
-            .fillMaxWidth()
-            .height(TangemTheme.dimens.size116)
-            .background(
-                brush = Brush.verticalGradient(
-                    colors = listOf(
-                        Color.Transparent,
-                        TangemTheme.colors.background.secondary,
-                    ),
-                ),
-            ),
-    )
-}
-
 @Composable
 private fun TopBar(
     config: OrganizeTokensState.HeaderConfig,
@@ -228,6 +220,7 @@ private fun TopBar(
         modifier = modifier
             .shadow(elevation)
             .background(TangemTheme.colors.background.secondary)
+            .statusBarsPadding()
             .padding(horizontal = TangemTheme.dimens.spacing16)
             .fillMaxWidth(),
     ) {

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt

@@ -1,9 +1,7 @@
 package com.tangem.feature.wallet.presentation.router
 
 import android.annotation.SuppressLint
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.Fragment
@@ -86,7 +84,6 @@ internal class DefaultWalletRouter(
                 val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
                 OrganizeTokensScreen(
-                    modifier = Modifier.statusBarsPadding(),
                     state = uiState,
                 )
             }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt

@@ -20,6 +20,7 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
@@ -33,16 +34,13 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
-import com.tangem.core.ui.components.Keyboard
-import com.tangem.core.ui.components.PrimaryButton
-import com.tangem.core.ui.components.SystemBarsEffect
+import com.tangem.core.ui.components.*
 import com.tangem.core.ui.components.atoms.Hand
 import com.tangem.core.ui.components.atoms.handComposableComponentHeight
 import com.tangem.core.ui.components.bottomsheets.chooseaddress.ChooseAddressBottomSheet
 import com.tangem.core.ui.components.bottomsheets.chooseaddress.ChooseAddressBottomSheetConfig
 import com.tangem.core.ui.components.bottomsheets.tokenreceive.TokenReceiveBottomSheet
 import com.tangem.core.ui.components.bottomsheets.tokenreceive.TokenReceiveBottomSheetConfig
-import com.tangem.core.ui.components.keyboardAsState
 import com.tangem.core.ui.components.snackbar.CopiedTextSnackbar
 import com.tangem.core.ui.components.snackbar.TangemSnackbar
 import com.tangem.core.ui.components.transactions.state.TxHistoryState
@@ -50,6 +48,7 @@ import com.tangem.core.ui.event.StateEvent
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.test.TestTags
+import com.tangem.core.ui.utils.WindowInsetsZero
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.common.preview.WalletScreenPreviewData.walletScreenState
 import com.tangem.feature.wallet.presentation.wallet.state.model.*
@@ -112,7 +111,7 @@ internal fun WalletScreen(
     )
 }
 
-@Suppress("LongMethod", "LongParameterList")
+@Suppress("LongMethod", "LongParameterList", "CyclomaticComplexMethod")
 @Composable
 private fun WalletContent(
     state: WalletScreenState,
@@ -144,12 +143,14 @@ private fun WalletContent(
             .padding(top = betweenItemsPadding)
             .padding(horizontal = horizontalPadding)
 
+        val bottomBarHeight = with(LocalDensity.current) { WindowInsets.systemBars.getBottom(this).toDp() }
+
         LazyColumn(
             modifier = Modifier
                 .fillMaxSize()
                 .testTag(TestTags.WALLET_SCREEN),
             contentPadding = PaddingValues(
-                bottom = TangemTheme.dimens.spacing92,
+                bottom = TangemTheme.dimens.spacing92 + bottomBarHeight,
             ),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
@@ -330,7 +331,7 @@ private fun BaseScaffoldManageTokenRedesign(
                 coroutineScope.launch { bottomSheetState.partialExpand() }
             }
         },
-        content = { paddingValues ->
+        content = { _ ->
             val pullRefreshState = rememberPullRefreshState(
                 refreshing = selectedWallet.pullToRefreshConfig.isRefreshing,
                 onRefresh = {
@@ -338,9 +339,7 @@ private fun BaseScaffoldManageTokenRedesign(
                 },
             )
 
-            Column(
-                modifier = Modifier.padding(paddingValues),
-            ) {
+            Column {
                 WalletTopBar(config = state.topBarConfig)
                 Box(
                     modifier = Modifier.pullRefresh(pullRefreshState),
@@ -392,7 +391,7 @@ private fun BottomSheetScrim(color: Color, visible: Boolean, onDismissRequest: (
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
-@Suppress("CyclomaticComplexMethod")
+@Suppress("CyclomaticComplexMethod", "MagicNumber")
 @Composable
 private fun BottomSheetStateEffects(
     bottomSheetState: SheetState,
@@ -425,19 +424,29 @@ private fun BottomSheetStateEffects(
 
     val systemUiController = rememberSystemUiController()
     val navigationBarColor = TangemTheme.colors.background.primary
-    val navigationBarColorWithout = TangemTheme.colors.background.secondary
 
-    SystemBarsEffect {
-        if (showManageTokensBottomSheet) {
-            setNavigationBarColor(navigationBarColor)
+    LaunchedEffect(key1 = bottomSheetState.targetValue, navigationBarColor) {
+        when (bottomSheetState.targetValue) {
+            SheetValue.Hidden,
+            SheetValue.Expanded,
+            -> systemUiController.setNavigationBarColor(
+                color = Color.Transparent,
+                darkIcons = navigationBarColor.luminance() > 0.5f,
+                navigationBarContrastEnforced = true,
+            )
+            SheetValue.PartiallyExpanded,
+            -> systemUiController.setNavigationBarColor(navigationBarColor)
         }
     }
-    DisposableEffect(
-        showManageTokensBottomSheet,
-    ) {
+
+    DisposableEffect(showManageTokensBottomSheet) {
         onDispose {
             if (showManageTokensBottomSheet) {
-                systemUiController.setNavigationBarColor(navigationBarColorWithout)
+                systemUiController.setNavigationBarColor(
+                    color = Color.Transparent,
+                    darkIcons = navigationBarColor.luminance() > 0.5f,
+                    navigationBarContrastEnforced = false,
+                )
             }
         }
     }
@@ -506,6 +515,7 @@ private fun BaseScaffold(
 ) {
     Scaffold(
         topBar = { WalletTopBar(config = state.topBarConfig) },
+        contentWindowInsets = WindowInsetsZero,
         snackbarHost = {
             WalletSnackbarHost(
                 snackbarHostState = snackbarHostState,
@@ -520,7 +530,12 @@ private fun BaseScaffold(
                 )
             }
 
-            manageTokensButtonConfig?.let { ManageTokensButton(onClick = it.onClick) }
+            manageTokensButtonConfig?.let {
+                ManageTokensButton(
+                    modifier = Modifier.navigationBarsPadding(),
+                    onClick = it.onClick,
+                )
+            }
         },
         floatingActionButtonPosition = FabPosition.Center,
         containerColor = TangemTheme.colors.background.secondary,
@@ -544,6 +559,8 @@ private fun BaseScaffold(
                     state = pullRefreshState,
                     modifier = Modifier.align(Alignment.TopCenter),
                 )
+
+                BottomFade(Modifier.align(Alignment.BottomCenter))
             }
         },
     )
@@ -565,11 +582,11 @@ private fun WalletSnackbarHost(
 }
 
 @Composable
-private fun ManageTokensButton(onClick: () -> Unit) {
+private fun ManageTokensButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
     PrimaryButton(
         text = stringResource(id = R.string.main_manage_tokens),
         onClick = onClick,
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth()
             .padding(horizontal = TangemTheme.dimens.spacing16),
     )