From ce58ab2489a907ad1318be684eb935d43f296cdf Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 17 Oct 2022 23:18:30 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../SaltPayRegistrationErrorConverter.kt | 2 +- .../saltPay/SaltPayRegistrationManager.kt | 2 +- .../saltPay/message/SaltPayModuleMessage.kt | 18 ++++++++++-------- .../redux/OnboardingSaltPayMiddleware.kt | 6 +++--- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/domain/moduleMessage/saltPay/converter/SaltPayRegistrationErrorConverter.kt b/app/src/main/java/com/tangem/tap/domain/moduleMessage/saltPay/converter/SaltPayRegistrationErrorConverter.kt index ecf2f8a28f..10f704f117 100644 --- a/app/src/main/java/com/tangem/tap/domain/moduleMessage/saltPay/converter/SaltPayRegistrationErrorConverter.kt +++ b/app/src/main/java/com/tangem/tap/domain/moduleMessage/saltPay/converter/SaltPayRegistrationErrorConverter.kt @@ -37,7 +37,7 @@ internal class SaltPayRegistrationErrorConverter( } else -> ConvertedDialogMessage( title = context.getString(R.string.common_error), - message = saltPayError::class.java.simpleName, + message = saltPayError.message, ) } diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayRegistrationManager.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayRegistrationManager.kt index b14552983d..b7d5364a16 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayRegistrationManager.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayRegistrationManager.kt @@ -60,7 +60,7 @@ class SaltPayRegistrationManager( return try { if (!registrationResponse.success || registrationResponse.results.isEmpty()) { - throw SaltPayRegistrationError.EmptyResponse + throw SaltPayRegistrationError.EmptyResponse(registrationResponse.error) } Result.Success(registrationResponse.results[0]) } catch (ex: SaltPayRegistrationError) { diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/message/SaltPayModuleMessage.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/message/SaltPayModuleMessage.kt index 1820c2c6e9..f299b0ebda 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/message/SaltPayModuleMessage.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/message/SaltPayModuleMessage.kt @@ -30,16 +30,18 @@ sealed class SaltPayRegistrationError( ) { object Unknown : SaltPayRegistrationError(4) object Empty : SaltPayRegistrationError(4) + + // gnosis object FailedToMakeTxData : SaltPayRegistrationError(1) object FailedToSendTx : SaltPayRegistrationError(2) + object NeedPin : SaltPayRegistrationError(3) - object NoGas : SaltPayRegistrationError(5) - object EmptyResponse : SaltPayRegistrationError(6) - object Card : SaltPayRegistrationError(7) - object CardNotFound : SaltPayRegistrationError(8) - object CardDisabled : SaltPayRegistrationError(9) - object CardNotPassed : SaltPayRegistrationError(10) + object NoGas : SaltPayRegistrationError(5) // + class EmptyResponse(message: String?) : SaltPayRegistrationError(6, message) + class CardNotFound(message: String?) : SaltPayRegistrationError(8, message) + class CardDisabled(message: String?) : SaltPayRegistrationError(9, message) + class CardNotPassed(message: String?) : SaltPayRegistrationError(10, message) object EmptyDynamicAttestResponse : SaltPayRegistrationError(11) - object EmptyBackupCardScanned : SaltPayRegistrationError(12) - object WeakPin : SaltPayRegistrationError(13) + object EmptyBackupCardScanned : SaltPayRegistrationError(12) // + object WeakPin : SaltPayRegistrationError(13) // } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayMiddleware.kt index 1a85b11d76..810272f6a5 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayMiddleware.kt @@ -79,7 +79,7 @@ private fun handleOnboardingSaltPayAction(anyAction: Action, appState: () -> App } if (!attestationResponse.success) { - onError(SaltPayRegistrationError.CardNotFound) + onError(SaltPayRegistrationError.CardNotFound(attestationResponse.error)) return@launch } @@ -256,8 +256,8 @@ private suspend fun checkRegistration( @Throws(SaltPayRegistrationError::class) fun RegistrationResponse.Item.toSaltPayStep(): SaltPayRegistrationStep { return when { - passed != true -> throw SaltPayRegistrationError.CardNotPassed - disabledByAdmin == true -> throw SaltPayRegistrationError.CardDisabled + passed != true -> throw SaltPayRegistrationError.CardNotPassed(this.error) + disabledByAdmin == true -> throw SaltPayRegistrationError.CardDisabled(this.error) // go to success screen active == true -> SaltPayRegistrationStep.Finished