Merge pull request #1210 from radixdlt/bugfix/accounts-personas-seed-…

…phrase-missing Accounts personas seed phrase missing dialog
radixdlt · Sep 30, 2024 · e435c82 · e435c82
2 parents af41fe1 + c945c39
commit e435c82
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/app/src/main/java/com/babylon/wallet/android/domain/usecases/BuildDappResponseUseCase.kt b/app/src/main/java/com/babylon/wallet/android/domain/usecases/BuildDappResponseUseCase.kt
@@ -166,7 +166,7 @@ class BuildAuthorizedDappResponseUseCase @Inject constructor(
                             )
                         )
                     }.onFailure {
-                        response = Result.failure(it)
+                        response = Result.failure(RadixWalletException.DappRequestException.FailedToSignAuthChallenge(it))
                     }
                     response
                 }
@@ -305,7 +305,7 @@ class BuildUnauthorizedDappResponseUseCase @Inject constructor(
             ).onSuccess { result ->
                 entitiesWithSignatures = result.signersWithSignatures
             }.onFailure { error ->
-                return Result.failure(error)
+                return Result.failure(RadixWalletException.DappRequestException.FailedToSignAuthChallenge(error))
             }
         }
 

diff --git a/...babylon/wallet/android/presentation/dapp/authorized/login/DAppAuthorizedLoginViewModel.kt b/...babylon/wallet/android/presentation/dapp/authorized/login/DAppAuthorizedLoginViewModel.kt
@@ -264,7 +264,9 @@ class DAppAuthorizedLoginViewModel @Inject constructor(
                     _state.update { it.copy(isNoMnemonicErrorVisible = true) }
                 }
 
-                is RadixWalletException.LedgerCommunicationException, is RadixWalletException.SignatureCancelled -> {}
+                is RadixWalletException.LedgerCommunicationException,
+                is RadixWalletException.SignatureCancelled,
+                is RadixWalletException.DappRequestException.RejectedByUser -> {}
 
                 else -> {
                     respondToIncomingRequestUseCase.respondWithFailure(

diff --git a/...lon/wallet/android/presentation/dapp/unauthorized/login/DAppUnauthorizedLoginViewModel.kt b/...lon/wallet/android/presentation/dapp/unauthorized/login/DAppUnauthorizedLoginViewModel.kt
@@ -136,9 +136,6 @@ class DAppUnauthorizedLoginViewModel @Inject constructor(
     }
 
     private suspend fun handleRequestError(exception: Throwable) {
-        if (exception is RadixWalletException.DappRequestException.RejectedByUser) {
-            return // user rejected/cancelled signing, do not close the request screen
-        }
         if (exception is RadixWalletException.DappRequestException) {
             logNonFatalException(exception)
             when (exception.cause) {
@@ -150,7 +147,9 @@ class DAppUnauthorizedLoginViewModel @Inject constructor(
                     _state.update { it.copy(isNoMnemonicErrorVisible = true) }
                 }
 
-                is RadixWalletException.LedgerCommunicationException, is RadixWalletException.SignatureCancelled -> {}
+                is RadixWalletException.LedgerCommunicationException,
+                is RadixWalletException.SignatureCancelled,
+                is RadixWalletException.DappRequestException.RejectedByUser -> {}
 
                 else -> {
                     respondToIncomingRequestUseCase.respondWithFailure(
@@ -161,10 +160,6 @@ class DAppUnauthorizedLoginViewModel @Inject constructor(
                     _state.update { it.copy(failureDialogState = FailureDialogState.Open(exception)) }
                 }
             }
-        } else {
-            if (exception is ProfileException.NoMnemonic) {
-                _state.update { it.copy(isNoMnemonicErrorVisible = true) }
-            }
         }
     }