Updated on 2026-08-14

core/config-toggles/src/main/assets/configs/feature_toggles_config.json

@@ -26,5 +26,9 @@
     {
         "name": "NAVIGATION_REFACTORING",
         "version": "undefined"
+    },
+    {
+        "name": "SWAP_STORIES_ENABLED",
+        "version": "undefined"
     }
 ]

core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesKeys.kt

@@ -113,6 +113,8 @@ object PreferencesKeys {
 
     val WAS_LOG_FILE_CLEARED by lazy { booleanPreferencesKey(name = "wasLogFileCleared") }
 
+    val SHOULD_SHOW_SWAP_STORIES_KEY by lazy { booleanPreferencesKey("shouldShowSwapStories") }
+
     // region Permission
     fun getShouldShowPermission(permission: String) = booleanPreferencesKey("shouldShowPushPermission_$permission")
 

core/ui/src/main/java/com/tangem/core/ui/components/stories/StoriesContainer.kt

@@ -56,15 +56,19 @@ inline fun <reified T : StoryConfig> StoriesContainer(
             onNextStory = storyState::nextStory,
         )
 
+        currentStoryContent(storyState.currentStory, isPaused)
+
         StoriesProgressBar(
             steps = storyState.steps,
             currentStep = storyState.currentIndex.intValue,
             stepDuration = storyState.currentStory.duration,
             paused = isPaused,
-            onStepFinish = storyState::nextStory,
+            onStepFinish = {
+                if (storyState.nextStory()) {
+                    config.onClose()
+                }
+            },
         )
-
-        currentStoryContent(storyState.currentStory, isPaused)
     }
 }
 
@@ -97,6 +101,7 @@ private data class StoryContainerPreviewProviderData(
         StoryConfigPreviewProviderData(title = "Wallet"),
     ),
     override val isRestartable: Boolean = true,
+    override val onClose: () -> Unit = {},
 ) : StoriesContentConfig<StoryConfigPreviewProviderData>
 
 private data class StoryConfigPreviewProviderData(

core/ui/src/main/java/com/tangem/core/ui/components/stories/inner/StoriesProgressBar.kt

@@ -80,6 +80,7 @@ fun StoriesProgressBar(
     Row(
         verticalAlignment = Alignment.CenterVertically,
         modifier = Modifier
+            .statusBarsPadding()
             .padding(
                 start = 16.dp,
                 end = 16.dp,

core/ui/src/main/java/com/tangem/core/ui/components/stories/model/StoriesContentConfig.kt

@@ -11,6 +11,7 @@ import kotlinx.collections.immutable.ImmutableList
 interface StoriesContentConfig<T : StoryConfig> {
     val stories: ImmutableList<T>
     val isRestartable: Boolean
+    val onClose: () -> Unit
 }
 
 interface StoryConfig {