From 7bc1381aa9e1fbd547d5d590d9c102c2bc2601a7 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 18 Dec 2024 17:25:13 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 app/src/main/java/com/tangem/tap/LockUserWalletsTimer.kt  | 8 +++++---
 .../com/tangem/feature/swap/viewmodels/SwapViewModel.kt   | 8 ++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/LockUserWalletsTimer.kt b/app/src/main/java/com/tangem/tap/LockUserWalletsTimer.kt
index 18f3cff503..33d7f81b88 100644
--- a/app/src/main/java/com/tangem/tap/LockUserWalletsTimer.kt
+++ b/app/src/main/java/com/tangem/tap/LockUserWalletsTimer.kt
@@ -30,7 +30,7 @@ internal class LockUserWalletsTimer(
         lifecycle.addObserver(this)
     }
 
-    override fun onResume(owner: LifecycleOwner) {
+    override fun onStart(owner: LifecycleOwner) {
         owner.lifecycleScope.launch {
             val wasApplicationStopped = settingsRepository.wasApplicationStopped()
             val shouldOpenWelcomeScreenOnResume = settingsRepository.shouldOpenWelcomeScreenOnResume()
@@ -45,8 +45,6 @@ internal class LockUserWalletsTimer(
 
             settingsRepository.setWasApplicationStopped(value = false)
 
-            start()
-
             if (shouldOpenWelcomeScreenOnResume) {
                 store.dispatchNavigationAction { replaceAll(AppRoute.Welcome()) }
                 settingsRepository.setShouldOpenWelcomeScreenOnResume(value = false)
@@ -54,6 +52,10 @@ internal class LockUserWalletsTimer(
         }
     }
 
+    override fun onResume(owner: LifecycleOwner) {
+        start()
+    }
+
     override fun onStop(owner: LifecycleOwner) {
         Timber.i("Owner stopped")
 
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
index 431017f917..13de36639d 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
@@ -185,6 +185,14 @@ internal class SwapViewModel @Inject constructor(
         }.launchIn(viewModelScope)
     }
 
+    override fun onStart(owner: LifecycleOwner) {
+        startLoadingQuotesFromLastState(true)
+    }
+
+    override fun onStop(owner: LifecycleOwner) {
+        singleTaskScheduler.cancelTask()
+    }
+
     override fun onCleared() {
         singleTaskScheduler.cancelTask()
         super.onCleared()