Fixes #1950 - Show a loading indicator while searching for people to … (#2158)

* Fixes #1950 - Show a loading indicator while searching for people to invite

* Address PR comments

ElementX/Sources/Screens/InviteUsersScreen/InviteUsersScreenModels.swift

@@ -41,12 +41,10 @@ struct InviteUsersScreenViewState: BindableState {
     var selectedUsers: [UserProfileProxy] = []
     var membershipState: [String: MembershipState] = .init()
     
-    var isSearching: Bool {
+    var isSearching = false
-        !bindings.searchQuery.isEmpty
-    }
     
     var hasEmptySearchResults: Bool {
-        isSearching && usersSection.type == .searchResult && usersSection.users.isEmpty
+        !isSearching && usersSection.type == .searchResult && usersSection.users.isEmpty
     }
     
     var scrollToLastID: String?

ElementX/Sources/Screens/InviteUsersScreen/InviteUsersScreenViewModel.swift

@@ -134,6 +134,8 @@ class InviteUsersScreenViewModel: InviteUsersScreenViewModelType, InviteUsersScr
             fetchSuggestions()
             return
         }
+        
+        state.isSearching = true
         fetchUsersTask = Task {
             let result = await userDiscoveryService.searchProfiles(with: searchQuery)
             guard !Task.isCancelled else { return }
@@ -146,6 +148,8 @@ class InviteUsersScreenViewModel: InviteUsersScreenViewModelType, InviteUsersScr
             state.usersSection = .init(type: .suggestions, users: [])
             return
         }
+        
+        state.isSearching = true
         fetchUsersTask = Task {
             let result = await userDiscoveryService.fetchSuggestions()
             guard !Task.isCancelled else { return }
@@ -154,6 +158,8 @@ class InviteUsersScreenViewModel: InviteUsersScreenViewModelType, InviteUsersScr
     }
     
     private func handleResult(for sectionType: UserDiscoverySectionType, result: Result<[UserProfileProxy], UserDiscoveryErrorType>) {
+        state.isSearching = false
+        
         switch result {
         case .success(let users):
             state.usersSection = .init(type: sectionType, users: users)

ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift

@@ -40,15 +40,22 @@ struct InviteUsersScreen: View {
     
     private var mainContent: some View {
         Form {
-            if !context.viewState.selectedUsers.isEmpty {
+            // this is a fix for having the carousel not clipped, and inside the form, so when the search is dismissed, it wont break the design
-                // this is a fix for having the carousel not clipped, and inside the form, so when the search is dismissed, it wont break the design
+            Section {
-                Section {
+                EmptyView()
-                    EmptyView()
+            } header: {
-                } header: {
+                VStack(spacing: 8) {
                     selectedUsersSection
                         .textCase(.none)
+                    
+                    if context.viewState.isSearching {
+                        ProgressView()
+                            .frame(maxWidth: .infinity, alignment: .center)
+                            .listRowBackground(Color.clear)
+                    }
                 }
             }
+            
             if context.viewState.hasEmptySearchResults {
                 noResultsContent
             } else {

changelog.d/1950.change

@@ -0,0 +1 @@
+Show a loading indicator while searching for people to invite