Merge pull request #1024 from radixdlt/fix/proper-screen-reject-when-…

…authorized-login Fix request handled on rejection at Login screen
radixdlt · Jul 2, 2024 · 4b75b67 · 4b75b67
2 parents dedb23a + 0162ef0
commit 4b75b67
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/...babylon/wallet/android/presentation/dapp/authorized/login/DAppAuthorizedLoginViewModel.kt b/...babylon/wallet/android/presentation/dapp/authorized/login/DAppAuthorizedLoginViewModel.kt
@@ -584,11 +584,11 @@ class DAppAuthorizedLoginViewModel @Inject constructor(
 
  fun onAbortDappLogin(walletWalletErrorType: DappWalletInteractionErrorType = DappWalletInteractionErrorType.REJECTED_BY_USER) {
  viewModelScope.launch {
+ sendEvent(Event.CloseLoginFlow)
  incomingRequestRepository.requestHandled(request.interactionId)
  if (!request.isInternal) {
  respondToIncomingRequestUseCase.respondWithFailure(request, walletWalletErrorType)
  }
- sendEvent(Event.CloseLoginFlow)
  }
  }
 

diff --git a/.../java/com/babylon/wallet/android/presentation/mobileconnect/MobileConnectLinkViewModel.kt b/.../java/com/babylon/wallet/android/presentation/mobileconnect/MobileConnectLinkViewModel.kt
@@ -15,7 +15,6 @@ import com.babylon.wallet.android.presentation.common.OneOffEventHandlerImpl
 import com.babylon.wallet.android.presentation.common.StateViewModel
 import com.babylon.wallet.android.presentation.common.UiMessage
 import com.babylon.wallet.android.presentation.common.UiState
-import com.babylon.wallet.android.presentation.dapp.authorized.login.Event
 import com.babylon.wallet.android.utils.AppEvent
 import com.babylon.wallet.android.utils.AppEventBus
 import com.radixdlt.sargon.DappWalletInteractionErrorType