From bbd81c7c856740868745fcb1f1c96e7a8c4f9c97 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 3 Dec 2021 14:54:27 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../product/ResetToFactorySettingsTask.kt     |  2 +-
 .../redux/OnboardingWalletMiddleware.kt       | 23 ++++++++++++-------
 .../wallet/redux/OnboardingWalletReducer.kt   |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/ResetToFactorySettingsTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/ResetToFactorySettingsTask.kt
index f475ef12ef..444a7b3971 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ResetToFactorySettingsTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ResetToFactorySettingsTask.kt
@@ -40,7 +40,7 @@ class ResetToFactorySettingsTask() : CardSessionRunnable<Card> {
     ) {
 
         val backupStatus = session.environment.card?.backupStatus
-        if (backupStatus == null && backupStatus == Card.BackupStatus.NoBackup) {
+        if (backupStatus == null || backupStatus == Card.BackupStatus.NoBackup) {
             callback(CompletionResult.Success(session.environment.card!!))
             return
         }
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
index f0c695ebd0..c4ecaf3a6d 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
@@ -112,11 +112,18 @@ private fun handleWalletAction(action: Action) {
             store.dispatch(newAction)
         }
         OnboardingWalletAction.OnBackPressed -> {
-            if (walletState.backupState.backupStep is BackupStep.WriteBackupCard ||
-                walletState.backupState.backupStep is BackupStep.WritePrimaryCard) {
-                store.dispatch(GlobalAction.ShowDialog(BackupDialog.BackupInProgress))
-            } else {
-                store.dispatch(NavigationAction.PopBackTo())
+            when (walletState.backupState.backupStep) {
+                BackupStep.InitBackup, BackupStep.Finished -> store.dispatch(NavigationAction.PopBackTo())
+                BackupStep.ScanOriginCard, BackupStep.AddBackupCards, BackupStep.EnterAccessCode,
+                BackupStep.ReenterAccessCode, BackupStep.SetAccessCode,
+                -> {
+                    store.dispatch(BackupAction.DiscardBackup)
+                    store.dispatch(NavigationAction.PopBackTo())
+                }
+                is BackupStep.WriteBackupCard, BackupStep.WritePrimaryCard ->
+                    store.dispatch(GlobalAction.ShowDialog(BackupDialog.BackupInProgress))
+
+
             }
         }
     }
@@ -188,9 +195,9 @@ class BackupMiddleware {
                         backupService.proceedBackup { result ->
                             when (result) {
                                 is CompletionResult.Success -> {
-                                        store.dispatchOnMain(
-                                            BackupAction.PrepareToWriteBackupCard(1)
-                                        )
+                                    store.dispatchOnMain(
+                                        BackupAction.PrepareToWriteBackupCard(1)
+                                    )
                                 }
                                 is CompletionResult.Failure -> {
                                 }
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
index 4069f04a22..982d4e127b 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
@@ -39,7 +39,7 @@ class BackupReducer {
         ): BackupState {
 
             return when (action) {
-                BackupAction.IntroduceBackup -> state.copy(backupStep = BackupStep.InitBackup)
+                BackupAction.IntroduceBackup -> BackupState(backupStep = BackupStep.InitBackup)
 
                 BackupAction.StartBackup -> state.copy(backupStep = BackupStep.ScanOriginCard)