Merge branch 'develop' of github_p2p:p2p-org/key-app-android into fea…

…ture/PWN-8969-striga-sms-errors-handling
p2p-org · Jun 26, 2023 · e4144ce · e4144ce
2 parents cbb533e + 579a286
commit e4144ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/src/main/java/org/p2p/wallet/settings/ui/devices/DevicesPresenter.kt b/app/src/main/java/org/p2p/wallet/settings/ui/devices/DevicesPresenter.kt
@@ -103,6 +103,7 @@ class DevicesPresenter(
             if (restoreWalletInteractor.getUserEnterPhoneNumberTriesCount() >= MAX_PHONE_NUMBER_TRIES) {
                 restoreWalletInteractor.resetUserEnterPhoneNumberTriesCount()
                 view?.navigateToAccountBlocked(DEFAULT_BLOCK_TIME_IN_MINUTES.minutes.inWholeSeconds)
+                restoreWalletInteractor.resetUserPhoneNumber()
             } else {
                 restoreWalletInteractor.startRestoreCustomShare(userPhoneNumber = phoneNumber)
                 view?.navigateToSmsInput()
@@ -119,13 +120,13 @@ class DevicesPresenter(
     }
 
     private fun handleGatewayServiceError(gatewayServiceError: PushServiceError) {
-        // TODO PWN-8827 fix error handling!
         when (val gatewayHandledResult = gatewayServiceErrorHandler.handle(gatewayServiceError)) {
             is GatewayHandledState.CriticalError -> {
                 view?.showUiKitSnackBar(gatewayHandledResult.errorCode.toString())
             }
             is GatewayHandledState.TimerBlockError -> {
                 view?.navigateToAccountBlocked(gatewayHandledResult.cooldownTtl)
+                restoreWalletInteractor.resetUserPhoneNumber()
             }
             is GatewayHandledState.TitleSubtitleError -> {
                 view?.showUiKitSnackBar(gatewayHandledResult.title)

diff --git a/app/src/main/java/org/p2p/wallet/smsinput/updatedevice/UpdateDeviceSmsInputPresenter.kt b/app/src/main/java/org/p2p/wallet/smsinput/updatedevice/UpdateDeviceSmsInputPresenter.kt
@@ -76,6 +76,7 @@ class UpdateDeviceSmsInputPresenter(
             }
             is GatewayHandledState.TimerBlockError -> {
                 view?.navigateToSmsInputBlocked(gatewayHandledResult.error, gatewayHandledResult.cooldownTtl)
+                restoreWalletInteractor.resetUserPhoneNumber()
             }
             is GatewayHandledState.TitleSubtitleError -> {
                 view?.navigateToGatewayErrorScreen(gatewayHandledResult)