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 b4e4fa28f8..f9465751c3 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
@@ -145,129 +145,138 @@ class BackupMiddleware {
     val backupMiddleware: Middleware<AppState> = { dispatch, state ->
         { next ->
             { action ->
-                val backupState = state()?.onboardingWalletState?.backupState
-                when (action) {
-                    is BackupAction.StartBackup -> {
-                        backupService.discardSavedBackup()
-                    }
-                    is BackupAction.ScanPrimaryCard -> {
-                        backupService.readPrimaryCard { result ->
-                            when (result) {
-                                is CompletionResult.Success -> {
-                                    store.dispatchOnMain(BackupAction.StartAddingBackupCards)
-                                }
-                                is CompletionResult.Failure -> {
-                                }
-                            }
-                        }
-                    }
-                    is BackupAction.AddBackupCard -> {
-                        backupService.addBackupCard { result ->
-                            when (result) {
-                                is CompletionResult.Success -> {
-                                    store.dispatchOnMain(BackupAction.AddBackupCard.Success)
-                                }
-                                is CompletionResult.Failure -> {
-
-                                }
-                            }
-                        }
-                    }
-                    is BackupAction.GoToShop -> {
-                        store.dispatchOpenUrl(BUY_WALLET_URL)
-                    }
-                    is BackupAction.FinishAddingBackupCards -> {
-                        if (backupService.addedBackupCardsCount == 1) {
-                            store.dispatchOnMain(GlobalAction.ShowDialog(BackupDialog.AddMoreBackupCards))
-                        }
-                        if (backupService.addedBackupCardsCount == 2) {
-                            store.dispatchOnMain(BackupAction.ShowAccessCodeInfoScreen)
-                        }
-                    }
-                    is BackupAction.CheckAccessCode -> {
-                        if (action.accessCode.length < 4) {
-                            store.dispatch(BackupAction.SetAccessCodeError(
-                                AccessCodeError.CodeTooShort
-                            ))
-                        } else {
-                            store.dispatch(BackupAction.SaveFirstAccessCode(action.accessCode))
-                        }
-                    }
-                    is BackupAction.SaveAccessCodeConfirmation -> {
-                        if (action.accessCodeConfirmation == backupState?.accessCode) {
-                            backupService.setAccessCode(action.accessCodeConfirmation)
-                            store.dispatch(BackupAction.PrepareToWritePrimaryCard)
-                        } else {
-                            store.dispatch(BackupAction.SetAccessCodeError(
-                                AccessCodeError.CodesDoNotMatch
-                            ))
-                        }
-                    }
-                    is BackupAction.WritePrimaryCard -> {
-                        backupService.proceedBackup { result ->
-                            when (result) {
-                                is CompletionResult.Success -> {
-                                    store.dispatchOnMain(
-                                        BackupAction.PrepareToWriteBackupCard(1)
-                                    )
-                                }
-                                is CompletionResult.Failure -> {
-                                }
-                            }
-                        }
-                    }
-                    is BackupAction.WriteBackupCard -> {
-                        backupService.proceedBackup { result ->
-                            when (result) {
-                                is CompletionResult.Success -> {
-                                    if (backupService.currentState == BackupService.State.Finished) {
-                                        store.dispatchOnMain(BackupAction.FinishBackup)
-                                    } else {
-                                        store.dispatchOnMain(
-                                            BackupAction.PrepareToWriteBackupCard(action.cardNumber + 1)
-                                        )
-                                    }
-                                }
-                                is CompletionResult.Failure -> {
-
-                                }
-                            }
-                        }
-                    }
-                    is BackupAction.FinishBackup -> {
-                        (listOf(backupState?.primaryCardId,
-                            store.state.globalState.onboardingState.onboardingManager?.scanResponse?.card?.cardId) +
-                                backupState?.backupCardIds as List<String>)
-                            .distinct().filterNotNull()
-                            .forEach { cardId ->
-                                preferencesStorage.usedCardsPrefStorage.activationFinished(cardId)
-                            }
-                    }
-                    is BackupAction.DiscardBackup -> {
-                        backupService.discardSavedBackup()
-                    }
-                    is BackupAction.DiscardSavedBackup -> {
-                        backupService.primaryCardId?.let {
-                            preferencesStorage.usedCardsPrefStorage.activationFinished(it)
-                        }
-                        backupService.discardSavedBackup()
-                    }
-                    is BackupAction.CheckForUnfinishedBackup -> {
-                        if (backupService.hasIncompletedBackup) {
-                            store.dispatch(GlobalAction.ShowDialog(BackupDialog.UnfinishedBackupFound))
-                        }
-                    }
-                    is BackupAction.ResumeBackup -> {
-                        store.dispatch(GlobalAction.Onboarding.Start(null, true))
-                        store.dispatch(OnboardingWalletAction.ProceedBackup)
-                        store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingWallet))
-                    }
-                    is BackupAction.DismissBackup -> {
-                        store.dispatch(BackupAction.FinishBackup)
-                    }
-                }
+                if (action is BackupAction) handleBackupAction(action)
                 next(action)
             }
         }
     }
+}
+
+private fun handleBackupAction(action: BackupAction) {
+    val backupState = store.state.onboardingWalletState.backupState
+
+    val globalState = store.state.globalState
+    val onboardingManager = globalState.onboardingState.onboardingManager
+
+    val scanResponse = onboardingManager?.scanResponse
+    val card = scanResponse?.card
+
+    when (action) {
+        is BackupAction.StartBackup -> {
+            backupService.discardSavedBackup()
+        }
+        is BackupAction.ScanPrimaryCard -> {
+            backupService.readPrimaryCard(cardId = card?.cardId) { result ->
+                when (result) {
+                    is CompletionResult.Success -> {
+                        store.dispatchOnMain(BackupAction.StartAddingBackupCards)
+                    }
+                    is CompletionResult.Failure -> {
+                    }
+                }
+            }
+        }
+        is BackupAction.AddBackupCard -> {
+            backupService.addBackupCard { result ->
+                when (result) {
+                    is CompletionResult.Success -> {
+                        store.dispatchOnMain(BackupAction.AddBackupCard.Success)
+                    }
+                    is CompletionResult.Failure -> {
+
+                    }
+                }
+            }
+        }
+        is BackupAction.GoToShop -> {
+            store.dispatchOpenUrl(BUY_WALLET_URL)
+        }
+        is BackupAction.FinishAddingBackupCards -> {
+            if (backupService.addedBackupCardsCount == 1) {
+                store.dispatchOnMain(GlobalAction.ShowDialog(BackupDialog.AddMoreBackupCards))
+            }
+            if (backupService.addedBackupCardsCount == 2) {
+                store.dispatchOnMain(BackupAction.ShowAccessCodeInfoScreen)
+            }
+        }
+        is BackupAction.CheckAccessCode -> {
+            if (action.accessCode.length < 4) {
+                store.dispatch(BackupAction.SetAccessCodeError(
+                    AccessCodeError.CodeTooShort
+                ))
+            } else {
+                store.dispatch(BackupAction.SaveFirstAccessCode(action.accessCode))
+            }
+        }
+        is BackupAction.SaveAccessCodeConfirmation -> {
+            if (action.accessCodeConfirmation == backupState.accessCode) {
+                backupService.setAccessCode(action.accessCodeConfirmation)
+                store.dispatch(BackupAction.PrepareToWritePrimaryCard)
+            } else {
+                store.dispatch(BackupAction.SetAccessCodeError(
+                    AccessCodeError.CodesDoNotMatch
+                ))
+            }
+        }
+        is BackupAction.WritePrimaryCard -> {
+            backupService.proceedBackup { result ->
+                when (result) {
+                    is CompletionResult.Success -> {
+                        store.dispatchOnMain(
+                            BackupAction.PrepareToWriteBackupCard(1)
+                        )
+                    }
+                    is CompletionResult.Failure -> {
+                    }
+                }
+            }
+        }
+        is BackupAction.WriteBackupCard -> {
+            backupService.proceedBackup { result ->
+                when (result) {
+                    is CompletionResult.Success -> {
+                        if (backupService.currentState == BackupService.State.Finished) {
+                            store.dispatchOnMain(BackupAction.FinishBackup)
+                        } else {
+                            store.dispatchOnMain(
+                                BackupAction.PrepareToWriteBackupCard(action.cardNumber + 1)
+                            )
+                        }
+                    }
+                    is CompletionResult.Failure -> {
+
+                    }
+                }
+            }
+        }
+        is BackupAction.FinishBackup -> {
+            (listOf(backupState.primaryCardId, card?.cardId) + backupState.backupCardIds)
+                .distinct().filterNotNull()
+                .forEach { cardId ->
+                    preferencesStorage.usedCardsPrefStorage.activationFinished(cardId)
+                }
+        }
+        is BackupAction.DiscardBackup -> {
+            backupService.discardSavedBackup()
+        }
+        is BackupAction.DiscardSavedBackup -> {
+            backupService.primaryCardId?.let {
+                preferencesStorage.usedCardsPrefStorage.activationFinished(it)
+            }
+            backupService.discardSavedBackup()
+        }
+        is BackupAction.CheckForUnfinishedBackup -> {
+            if (backupService.hasIncompletedBackup) {
+                store.dispatch(GlobalAction.ShowDialog(BackupDialog.UnfinishedBackupFound))
+            }
+        }
+        is BackupAction.ResumeBackup -> {
+            store.dispatch(GlobalAction.Onboarding.Start(null, true))
+            store.dispatch(OnboardingWalletAction.ProceedBackup)
+            store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingWallet))
+        }
+        is BackupAction.DismissBackup -> {
+            store.dispatch(BackupAction.FinishBackup)
+        }
+    }
 }
\ No newline at end of file