From aafe6dfff30725335b2601973b458f25cb6af445 Mon Sep 17 00:00:00 2001 From: talksik Date: Mon, 20 Dec 2021 18:48:02 -0800 Subject: [PATCH] everythings broken and unsmooth --- nirvana-ios/Repositories/FirestoreService.swift | 2 -- nirvana-ios/Views/Contacts/ContactsViewModel.swift | 1 + nirvana-ios/Views/Contacts/FindFriendsView.swift | 3 ++- nirvana-ios/Views/InnerCircle/InnerCircleView.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nirvana-ios/Repositories/FirestoreService.swift b/nirvana-ios/Repositories/FirestoreService.swift index 5716083..cd00ba7 100644 --- a/nirvana-ios/Repositories/FirestoreService.swift +++ b/nirvana-ios/Repositories/FirestoreService.swift @@ -62,8 +62,6 @@ class FirestoreService { completion(nil) } else { if !(querySnapshot?.isEmpty)! { - print("existing user found!!!!: \(querySnapshot?.documents)") - for document in querySnapshot!.documents { let returnedUser = try? document.data(as: User.self) completion(returnedUser) diff --git a/nirvana-ios/Views/Contacts/ContactsViewModel.swift b/nirvana-ios/Views/Contacts/ContactsViewModel.swift index 5968261..ea01d5a 100644 --- a/nirvana-ios/Views/Contacts/ContactsViewModel.swift +++ b/nirvana-ios/Views/Contacts/ContactsViewModel.swift @@ -81,6 +81,7 @@ class ContactsViewModel : ObservableObject { contactVm.sortingProp = "!" // adding for sorting purposes contactVm.user = returnedUser contactVm.isExisting = true + print("existing user: \(contactVm.cnName)") } self?.contacts[contactVm.sortingProp] = contactVm diff --git a/nirvana-ios/Views/Contacts/FindFriendsView.swift b/nirvana-ios/Views/Contacts/FindFriendsView.swift index a537f0d..2bb5542 100644 --- a/nirvana-ios/Views/Contacts/FindFriendsView.swift +++ b/nirvana-ios/Views/Contacts/FindFriendsView.swift @@ -97,11 +97,12 @@ struct ListContactRow: View { } } .alert(self.alertText, isPresented: self.$showAlert) { - Button("Add \(contact.cnName)", role: ButtonRole.cancel) { + Button("Add \(contact.cnName)") { print("adding contact to circle") // call method in vm to get it done, then navigate to the circle self.contactsVM.addOrActivateFriendToCircle(userId: self.authSessionStore.user!.id!, friendId: (contact.user!.id)!) + self.navigationStack.push(InnerCircleView()) } } message: { Text(self.alertMessage) diff --git a/nirvana-ios/Views/InnerCircle/InnerCircleView.swift b/nirvana-ios/Views/InnerCircle/InnerCircleView.swift index 9f7cf3a..fe62572 100644 --- a/nirvana-ios/Views/InnerCircle/InnerCircleView.swift +++ b/nirvana-ios/Views/InnerCircle/InnerCircleView.swift @@ -18,7 +18,7 @@ struct InnerCircleView: View { @EnvironmentObject var authSessionStore: AuthSessionStore @EnvironmentObject var navigationStack: NavigationStack - @State var sheetView: SheetView? = .contacts + @State var sheetView: SheetView? = nil let universalSize = UIScreen.main.bounds