From 1b263fc23482a1adfdba4049b7dcdb03807d52c7 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 1 Dec 2025 16:16:33 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../feature/wallet/child/wallet/WalletComponent.kt |  2 ++
 .../wallet/child/wallet/model/WalletModel.kt       | 14 ++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/WalletComponent.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/WalletComponent.kt
index acd97c7552..da07a45435 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/WalletComponent.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/WalletComponent.kt
@@ -7,6 +7,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.arkivanov.decompose.extensions.compose.subscribeAsState
 import com.arkivanov.decompose.router.slot.childSlot
 import com.arkivanov.decompose.router.slot.dismiss
+import com.arkivanov.essenty.lifecycle.doOnResume
 import com.tangem.common.routing.AppRoute
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.context.child
@@ -48,6 +49,7 @@ internal class WalletComponent @AssistedInject constructor(
 
     init {
         lifecycle.subscribe(model.screenLifecycleProvider)
+        doOnResume { model.onResume() }
         componentScope.launch { model.innerWalletRouter.navigateToFlow.collect { navigate(it) } }
     }
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt
index 2746942333..6080809e6d 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt
@@ -119,13 +119,6 @@ internal class WalletModel @Inject constructor(
     init {
         analyticsEventsHandler.send(WalletScreenAnalyticsEvent.MainScreen.ScreenOpened)
 
-        screenLifecycleProvider.isBackgroundState
-            .onEach { isBackground ->
-                if (isBackground.not()) {
-                    suggestToEnableBiometrics()
-                }
-            }.launchIn(modelScope)
-
         suggestToOpenMarkets()
 
         maybeMigrateNames()
@@ -143,6 +136,12 @@ internal class WalletModel @Inject constructor(
         clickIntents.initialize(innerWalletRouter, modelScope)
     }
 
+    fun onResume() {
+        modelScope.launch(dispatchers.main) {
+            suggestToEnableBiometrics()
+        }
+    }
+
     private fun updateYieldSupplyApy() {
         if (yieldSupplyFeatureToggles.isYieldSupplyFeatureEnabled) {
             modelScope.launch(dispatchers.default) {
@@ -198,7 +197,6 @@ internal class WalletModel @Inject constructor(
     private suspend fun shouldShowAskBiometryBottomSheet(): Boolean {
         return if (hotWalletFeatureToggles.isHotWalletEnabled) {
             userWalletsListRepository.userWalletsSync().any { it is UserWallet.Cold } &&
-                innerWalletRouter.isWalletLastScreen() &&
                 shouldShowAskBiometryUseCase() &&
                 canUseBiometryUseCase()
         } else {