From cf97d56b28ef23725037d1a05f38600e3e7289d3 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 5 Mar 2025 10:04:58 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../details/ui/appcurrency/AppCurrencySelectorFragment.kt   | 6 ++++++
 .../features/details/ui/appsettings/AppSettingsFragment.kt  | 3 +++
 .../details/ui/cardsettings/CardSettingsFragment.kt         | 6 ++++++
 3 files changed, 15 insertions(+)

diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorFragment.kt
index e4170e8003..1b64c97cf2 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorFragment.kt
@@ -1,13 +1,17 @@
 package com.tangem.tap.features.details.ui.appcurrency
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.tangem.common.routing.AppRouter
 import com.tangem.core.ui.UiDependencies
 import com.tangem.core.ui.components.NavigationBar3ButtonsScrim
 import com.tangem.core.ui.screen.ComposeFragment
+import com.tangem.tap.common.extensions.dispatchNavigationAction
+import com.tangem.tap.store
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -21,6 +25,8 @@ internal class AppCurrencySelectorFragment : ComposeFragment() {
 
     @Composable
     override fun ScreenContent(modifier: Modifier) {
+        BackHandler { store.dispatchNavigationAction(AppRouter::pop) }
+
         val uiState by viewModel.uiState.collectAsStateWithLifecycle()
         NavigationBar3ButtonsScrim()
         AppCurrencySelectorScreen(
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt
index 9036d7d1fd..b74a994acc 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt
@@ -1,5 +1,6 @@
 package com.tangem.tap.features.details.ui.appsettings
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
@@ -26,6 +27,8 @@ internal class AppSettingsFragment : ComposeFragment() {
 
     @Composable
     override fun ScreenContent(modifier: Modifier) {
+        BackHandler { store.dispatchNavigationAction(AppRouter::pop) }
+
         val viewModel = hiltViewModel<AppSettingsViewModel>().apply {
             LocalLifecycleOwner.current.lifecycle.addObserver(observer = this)
         }
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsFragment.kt
index 328815f377..dad1ac2b82 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsFragment.kt
@@ -1,12 +1,16 @@
 package com.tangem.tap.features.details.ui.cardsettings
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.tangem.common.routing.AppRouter
 import com.tangem.core.ui.UiDependencies
 import com.tangem.core.ui.screen.ComposeFragment
+import com.tangem.tap.common.extensions.dispatchNavigationAction
+import com.tangem.tap.store
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -20,6 +24,8 @@ internal class CardSettingsFragment : ComposeFragment() {
 
     @Composable
     override fun ScreenContent(modifier: Modifier) {
+        BackHandler { store.dispatchNavigationAction(AppRouter::pop) }
+
         val state by viewModel.screenState.collectAsStateWithLifecycle()
 
         CardSettingsScreen(modifier = modifier, state = state)