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 df9ee2e6b7..6ad91766cb 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 @@ -586,7 +586,7 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction) } is BackupAction.DiscardSavedBackup -> { mainScope.launch { - backupService.primaryCardId?.let { + backupService.primaryCardId?.let { // always null for onboarding v2 Analytics.send(Onboarding.Finished()) store.state.globalState.onboardingState.onboardingManager?.finishActivation(it) } @@ -597,7 +597,12 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction) if (isOnboardingV2Enabled) { val onboardingRepository = store.inject(DaggerGraphState::onboardingRepository) + val cardRepository = store.inject(DaggerGraphState::cardRepository) + val unfinishedBackup = onboardingRepository.getUnfinishedFinalizeOnboarding() ?: return@launch + + cardRepository.finishCardActivation(unfinishedBackup.card.cardId) onboardingRepository.clearUnfinishedFinalizeOnboarding() + Analytics.send(Onboarding.Finished()) } } }