diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingSaltPayHelper.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingSaltPayHelper.kt index 209fc789eb..8c88cc7a84 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingSaltPayHelper.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingSaltPayHelper.kt @@ -20,14 +20,14 @@ class OnboardingSaltPayHelper { manager: SaltPayActivationManager, ): Result { return try { - var updatedStep = manager.update(SaltPayActivationStep.None, null).successOr { return it } + val updatedStep = manager.update(SaltPayActivationStep.None, null).successOr { return it } val cardStorage = preferencesStorage.usedCardsPrefStorage val activationIsFinished = cardStorage.isActivationFinished(scanResponse.card.cardId) - if (updatedStep == SaltPayActivationStep.Success && activationIsFinished) { - updatedStep = SaltPayActivationStep.Finished + if (updatedStep == SaltPayActivationStep.Success && !activationIsFinished) { + cardStorage.activationFinished(scanResponse.card.cardId) } - val isActivationCase = updatedStep != SaltPayActivationStep.Finished + val isActivationCase = updatedStep != SaltPayActivationStep.Success val isBackupCase = scanResponse.card.backupStatus?.isActive == false Result.Success(isActivationCase || isBackupCase) } catch (ex: Exception) { diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt index 4e3cad3657..314d4ea06b 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt @@ -60,7 +60,7 @@ data class OnboardingWalletState( -> 9 SaltPayActivationStep.Claim -> 10 SaltPayActivationStep.ClaimInProgress -> 11 - SaltPayActivationStep.ClaimSuccess, SaltPayActivationStep.Success, SaltPayActivationStep.Finished, + SaltPayActivationStep.ClaimSuccess, SaltPayActivationStep.Success, -> getMaxProgress() } } diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayState.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayState.kt index 9bedb49011..7b68518634 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayState.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayState.kt @@ -43,5 +43,4 @@ enum class SaltPayActivationStep { ClaimInProgress, ClaimSuccess, Success, - Finished; } \ No newline at end of file