Merge remote-tracking branch 'refs/remotes/origin/search-for-logs'

Author: cp-nirali-s

Splito/UI/Home/Groups/GroupListViewModel.swift

@@ -103,10 +103,10 @@ class GroupListViewModel: BaseViewModel, ObservableObject {
         }
     }
 
-    func fetchGroupsInitialData(needToReload: Bool = false) {
+    func fetchGroupsInitialData() {
         lastDocument = nil
         Task { [weak self] in
-            await self?.fetchGroups(needToReload: needToReload)
+            await self?.fetchGroups()
         }
     }
 
@@ -157,7 +157,7 @@ class GroupListViewModel: BaseViewModel, ObservableObject {
         }
     }
 
-    private func fetchGroups(needToReload: Bool = false) async {
+    private func fetchGroups() async {
         guard let userId = preference.user?.id else {
             currentViewState = .initial
             return

Splito/UI/Home/Groups/GroupListWithDetailView.swift

@@ -41,9 +41,7 @@ struct GroupListWithDetailView: View {
 
                                 if group.group.id == viewModel.filteredGroups.last?.group.id && viewModel.hasMoreGroups {
                                     ProgressView()
-                                        .onAppear {
-                                            viewModel.loadMoreGroups()
-                                        }
+                                        .onAppear { viewModel.loadMoreGroups() }
                                 }
                             }
 
@@ -57,6 +55,8 @@ struct GroupListWithDetailView: View {
                                       perform: viewModel.manageScrollToTopBtnVisibility(offset:))
                     })
                 }
+                .scrollBounceBehavior(.basedOnSize)
+                .refreshable { viewModel.fetchGroupsInitialData() }
                 .overlay(alignment: .bottomTrailing) {
                     if viewModel.showScrollToTopBtn {
                         ScrollToTopButton {
@@ -65,10 +65,6 @@ struct GroupListWithDetailView: View {
                         .padding([.trailing, .bottom], 16)
                     }
                 }
-                .scrollBounceBehavior(.basedOnSize)
-                .refreshable {
-                    viewModel.fetchGroupsInitialData(needToReload: true)
-                }
             }
         }
         .onTapGesture {