From bad5c0ed637236e0c7423d620de1fa71f3b5e0d1 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 22 Feb 2023 13:17:16 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt | 5 ++++-
 .../java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt     | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
index 04ece1204a..c5f9ded2ff 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.CircleShape
@@ -51,6 +52,9 @@ fun SwapSelectTokenScreen(
 ) {
     TangemTheme {
         Scaffold(
+            modifier = Modifier
+                .systemBarsPadding()
+                .background(color = TangemTheme.colors.background.secondary),
             content = { padding ->
                 ListOfTokens(state = state, Modifier.padding(padding))
             },
@@ -66,7 +70,6 @@ fun SwapSelectTokenScreen(
                     icon = painterResource(id = getActiveIconRes(state.network.blockchainId)),
                 )
             },
-            modifier = Modifier.background(color = TangemTheme.colors.background.secondary),
         )
     }
 }
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
index a1c9b8c17f..d8ad3e646a 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
@@ -1,6 +1,7 @@
 package com.tangem.feature.swap.ui
 
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.material.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -19,6 +20,7 @@ import com.tangem.feature.swap.presentation.R
 fun SwapSuccessScreen(state: SwapSuccessStateHolder, onBack: () -> Unit) {
     TangemTheme {
         Scaffold(
+            modifier = Modifier.systemBarsPadding(),
             content = { padding ->
                 ResultScreenContent(
                     resultMessage = makeSuccessMessage(