Merge pull request #39 from niscy-eudiw/main

Fixed error state for Service and Credential Selection when RQESService returns error
eu-digital-identity-wallet · Dec 3, 2024 · d493698 · d493698
2 parents 3b419a2 + dddf55c
commit d493698
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Sources/Presentation/UI/CredentialSelection/CredentialSelectionViewModel.swift b/Sources/Presentation/UI/CredentialSelection/CredentialSelectionViewModel.swift
@@ -71,14 +71,16 @@ final class CredentialSelectionViewModel<Router: RouterGraph>: ViewModel<Router,
   }
 
   func nextStep() {
-    onPause()
     openAuthorization()
   }
 
   func openAuthorization() {
     Task {
       do {
+
         let authorizationUrl = try await interactor.openCredentialAuthrorizationURL()
+        self.onPause()
+
         await UIApplication.shared.openURLIfPossible(authorizationUrl) {
           self.setErrorState {
             self.setState { $0.copy(error: nil) }

diff --git a/Sources/Presentation/UI/ServiceSelection/ServiceSelectionViewModel.swift b/Sources/Presentation/UI/ServiceSelection/ServiceSelectionViewModel.swift
@@ -68,7 +68,6 @@ class ServiceSelectionViewModel<Router: RouterGraph>: ViewModel<Router, ServiceS
   }
 
   func nextStep() {
-    onPause()
     openAuthorization()
   }
 
@@ -82,7 +81,9 @@ class ServiceSelectionViewModel<Router: RouterGraph>: ViewModel<Router, ServiceS
             self.setState { $0.copy(error: nil) }
           }
         }
+
         let authorizationUrl = try await interactor.openAuthrorizationURL()
+        self.onPause()
 
         await UIApplication.shared.openURLIfPossible(authorizationUrl) {
           self.setErrorState {