From 7212b2eb9ff2358b84d9fd8faf900860c3d920c1 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 27 Jul 2022 12:31:05 +0300
Subject: [PATCH 1/2] Updated on 2026-08-14

---
 .../tap/features/home/compose/StoriesScreen.kt  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
index 7e840f5592..f1230a2fc1 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesScreen.kt
@@ -12,16 +12,17 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -79,10 +80,10 @@ fun StoriesScreen(
 
     val hideContent = remember { mutableStateOf(true) }
 
-    SideEffect {
+    LaunchedEffect(key1 = isDarkBackground) {
         systemUiController.setSystemBarsColor(
             color = Color.Transparent,
-            darkIcons = false,
+            darkIcons = !isDarkBackground,
         )
     }
 
@@ -140,12 +141,12 @@ fun StoriesScreen(
             )
         }
 
-        val insets = WindowInsets.systemBars
+        val statusBarInsets = WindowInsets.statusBars
             .union(WindowInsets(top = 32.dp))
 
         Column(
             modifier = Modifier
-                .windowInsetsPadding(insets)
+                .windowInsetsPadding(statusBarInsets)
                 .fillMaxSize(),
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
@@ -179,8 +180,9 @@ fun StoriesScreen(
         }
         Column(
             modifier = Modifier
+                .navigationBarsPadding()
                 .align(Alignment.BottomCenter)
-                .fillMaxWidth()
+                .fillMaxWidth(),
         ) {
             if (currentStep.value == 4) Button(
                 onClick = onSearchTokensClick,
@@ -213,7 +215,6 @@ fun StoriesScreen(
                 onShopButtonClick = onShopButtonClick
             )
         }
-
     }
 }
 

From e015082be55c438a710a827a65d15d78596ce401 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 27 Jul 2022 12:36:43 +0300
Subject: [PATCH 2/2] Updated on 2026-08-14

---
 app/src/main/java/com/tangem/tap/MainActivity.kt          | 6 ++++--
 .../java/com/tangem/tap/features/home/HomeFragment.kt     | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt
index 78d55638ca..b4d66ff10e 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -86,8 +86,10 @@ class MainActivity : AppCompatActivity(), SnackbarHandler {
 
     private fun systemActions() {
         WindowCompat.setDecorFitsSystemWindows(window, false)
-        WindowInsetsControllerCompat(window, binding.root)
-            .isAppearanceLightStatusBars = true
+
+        val windowInsetsController = WindowInsetsControllerCompat(window, binding.root)
+        windowInsetsController.isAppearanceLightStatusBars = true
+        windowInsetsController.isAppearanceLightNavigationBars = true
 
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
     }
diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
index f1b3fa3f55..27953640ea 100644
--- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
@@ -96,12 +96,14 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
 
     /*
     * !!! Workaround !!!
-    * Used to roll back the color of icons in the status bar after the stories screen
+    * Used to roll back the color of icons in the system bars after the stories screen
     * */
     private fun rollbackStatusBarIconsColor() {
-        WindowInsetsControllerCompat(
+        val windowInsetsController = WindowInsetsControllerCompat(
             activity?.window ?: return,
             view ?: return,
-        ).isAppearanceLightStatusBars = true
+        )
+        windowInsetsController.isAppearanceLightStatusBars = true
+        windowInsetsController.isAppearanceLightNavigationBars = true
     }
 }
\ No newline at end of file