Merge pull request #41 from niscy-eudiw/main

Fixed loading state for Credentials and Services selection
eu-digital-identity-wallet · Dec 4, 2024 · 56fed28 · 56fed28
2 parents 52c7756 + 05282fa
commit 56fed28
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Sources/Presentation/UI/CredentialSelection/CredentialSelectionViewModel.swift b/Sources/Presentation/UI/CredentialSelection/CredentialSelectionViewModel.swift
@@ -129,7 +129,6 @@ final class CredentialSelectionViewModel<Router: RouterGraph>: ViewModel<Router,
     if let documentName {
       setState {
         $0.copy(
-          isLoading: false,
           documentName: documentName
         )
         .copy(error: nil)

diff --git a/Sources/Presentation/UI/ServiceSelection/ServiceSelectionViewModel.swift b/Sources/Presentation/UI/ServiceSelection/ServiceSelectionViewModel.swift
@@ -35,7 +35,7 @@ class ServiceSelectionViewModel<Router: RouterGraph>: ViewModel<Router, ServiceS
     super.init(
       router: router,
       initialState: ServiceSelectionState(
-        isLoading: true,
+        isLoading: false,
         services: [],
         error: nil
       )
@@ -49,7 +49,6 @@ class ServiceSelectionViewModel<Router: RouterGraph>: ViewModel<Router, ServiceS
     if !services.isEmpty {
       setState {
         $0.copy(
-          isLoading: false,
           services: services
         )
         .copy(error: nil)
@@ -73,6 +72,11 @@ class ServiceSelectionViewModel<Router: RouterGraph>: ViewModel<Router, ServiceS
 
   func openAuthorization() {
     Task {
+
+      setState {
+        $0.copy(isLoading: true).copy(error: nil)
+      }
+
       do {
         if let selectedItem {
           try await interactor.createRQESService(selectedItem)