Fixed: not able to pullToRefresh on list&getting all selected in spli…

…tOption&Showed alert when remove user add comment
canopas · Jan 9, 2025 · 315a1ac · 315a1ac
1 parent 2ede7ec
commit 315a1ac
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/Splito/UI/Home/Expense/AddExpenseViewModel.swift b/Splito/UI/Home/Expense/AddExpenseViewModel.swift
@@ -83,8 +83,8 @@ class AddExpenseViewModel: BaseViewModel, ObservableObject {
         do {
             viewState = .loading
             let expense = try await expenseRepository.fetchExpenseBy(groupId: groupId, expenseId: expenseId)
-            await updateViewModelFieldsWithExpense(expense: expense)
             await fetchAndUpdateGroupData(groupId: groupId)
+            await updateViewModelFieldsWithExpense(expense: expense)
             viewState = .initial
             LogD("AddExpenseViewModel: \(#function) Expense details with members fetched successfully.")
         } catch {

diff --git a/Splito/UI/Home/Expense/Expense Detail/ExpenseDetailsView.swift b/Splito/UI/Home/Expense/Expense Detail/ExpenseDetailsView.swift
@@ -70,8 +70,10 @@ struct ExpenseDetailsView: View {
                     }
                 }
 
-                AddCommentTextField(comment: $viewModel.comment, isFocused: $isFocused,
-                                    showLoader: viewModel.showLoader, onSendCommentBtnTap: viewModel.onSendCommentBtnTap)
+                if (viewModel.expense?.isActive ?? false) && (viewModel.group?.isActive ?? false) {
+                    AddCommentTextField(comment: $viewModel.comment, isFocused: $isFocused,
+                                        showLoader: viewModel.showLoader, onSendCommentBtnTap: viewModel.onSendCommentBtnTap)
+                }
             }
         }
         .background(surfaceColor)
@@ -240,9 +242,9 @@ private struct AddCommentTextField: View {
                         .frame(width: 40, height: 40)
                         .foregroundStyle(primaryColor)
                         .padding(.vertical, 12)
-                        .padding(.trailing, 6)
+                        .padding(.trailing, 4)
                 }
-                .disabled(comment.isEmpty)
+                .disabled(comment.trimming(spaces: .leadingAndTrailing).isEmpty)
             }
         }
     }

diff --git a/Splito/UI/Home/Expense/Expense Detail/ExpenseDetailsViewModel.swift b/Splito/UI/Home/Expense/Expense Detail/ExpenseDetailsViewModel.swift
@@ -125,8 +125,12 @@ class ExpenseDetailsViewModel: BaseViewModel, ObservableObject {
     }
 
     func onSendCommentBtnTap() {
-        guard let expense, expense.isActive, let userId = preference.user?.id,
-              let group, group.members.contains(userId) else { return }
+        guard let expense, let group, let userId = preference.user?.id else { return }
+        if !group.members.contains(userId) {
+            showAlertFor(title: "Error",
+                         message: "You do not have permission to add a comment on this expense. Only group members can comment, Sorry!")
+            return
+        }
 
         Task { [weak self] in
             guard let self else { return }

diff --git a/Splito/UI/Home/Groups/GroupListWithDetailView.swift b/Splito/UI/Home/Groups/GroupListWithDetailView.swift
@@ -55,7 +55,6 @@ struct GroupListWithDetailView: View {
                                       perform: viewModel.manageScrollToTopBtnVisibility(offset:))
                     })
                 }
-                .scrollBounceBehavior(.basedOnSize)
                 .refreshable { viewModel.fetchGroupsInitialData() }
                 .overlay(alignment: .bottomTrailing) {
                     if viewModel.showScrollToTopBtn {