diff --git a/nirvana-ios/Views/Contacts/ContactsViewModel.swift b/nirvana-ios/Views/Contacts/ContactsViewModel.swift index f2e4ac6..1a1d91c 100644 --- a/nirvana-ios/Views/Contacts/ContactsViewModel.swift +++ b/nirvana-ios/Views/Contacts/ContactsViewModel.swift @@ -74,19 +74,19 @@ class ContactsViewModel : ObservableObject { self.firestoreService.getUserByPhoneNumber(phoneNumber: contactNumber) {[weak self] returnedUser in - print(returnedUser) DispatchQueue.main.async { if returnedUser == nil { // do nothing, keep contactsVm object user property nil + contactVm.isExisting = false } else { // adding user details if this contact is existing user contactVm.user = returnedUser + contactVm.isExisting = true } self?.contacts.append(contactVm) } } - } } } catch { @@ -102,4 +102,5 @@ struct ContactsViewModelContact : Identifiable { var user: User? var cnName: String var cnPhoneNumber: String + var isExisting: Bool = false } diff --git a/nirvana-ios/Views/Contacts/FindFriendsView.swift b/nirvana-ios/Views/Contacts/FindFriendsView.swift index 787d87a..8843870 100644 --- a/nirvana-ios/Views/Contacts/FindFriendsView.swift +++ b/nirvana-ios/Views/Contacts/FindFriendsView.swift @@ -22,8 +22,8 @@ struct FindFriendsView: View { NavigationView { // list with search bar List { - ForEach(contactsVM.contacts) { contact in - Text(contact.cnName) + ForEach(contactsVM.contacts.sorted { $0.isExisting && !$1.isExisting }) { contact in + } } .searchable(text: $searchQuery)