From 78ece9d243676329c66a09fa3515824245eb9eaf Mon Sep 17 00:00:00 2001
From: talksik <patel.arjun50@gmial.com>
Date: Mon, 20 Dec 2021 22:57:45 -0800
Subject: [PATCH] chanaging size of profile avatar selectionbecause just too
 big on smaller screens

and fixed bug with the list of contacts not showing all existing users from my contacts
---
 .../Views/AddBasicInfo/AddBasicInfoView.swift        |  2 +-
 nirvana-ios/Views/Contacts/ContactsViewModel.swift   | 12 +++++-------
 nirvana-ios/Views/Contacts/FindFriendsView.swift     |  3 +++
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/nirvana-ios/Views/AddBasicInfo/AddBasicInfoView.swift b/nirvana-ios/Views/AddBasicInfo/AddBasicInfoView.swift
index d4bf5fd..ece9842 100644
--- a/nirvana-ios/Views/AddBasicInfo/AddBasicInfoView.swift
+++ b/nirvana-ios/Views/AddBasicInfo/AddBasicInfoView.swift
@@ -66,7 +66,7 @@ struct AddBasicInfoView: View {
                             Image(Avatars.avatarSystemNames[index])                                
                                 .resizable()
                                 .scaledToFit()
-                                .frame(width: 100, height: 100, alignment: .center)
+                                .frame(width: 50, height: 50, alignment: .center)
                                 .blur(radius: self.selectedAvatarIndex == index ? 0 : 1)
                                 .scaleEffect(self.selectedAvatarIndex == index ? 1.3 : 1)
                                 .padding()
diff --git a/nirvana-ios/Views/Contacts/ContactsViewModel.swift b/nirvana-ios/Views/Contacts/ContactsViewModel.swift
index ea01d5a..9ded3e2 100644
--- a/nirvana-ios/Views/Contacts/ContactsViewModel.swift
+++ b/nirvana-ios/Views/Contacts/ContactsViewModel.swift
@@ -21,10 +21,6 @@ class ContactsViewModel : ObservableObject {
                                    CNContactEmailAddressesKey as CNKeyDescriptor,
                                    CNContactFormatter.descriptorForRequiredKeys(for: .fullName)]
     
-    init() {
-        self.fetchContacts()
-    }
-    
     func openSettings() {
             guard let settingsURL = URL(string: UIApplication.openSettingsURLString) else { return }
             if UIApplication.shared.canOpenURL(settingsURL) { UIApplication.shared.open(settingsURL)}
@@ -52,7 +48,7 @@ class ContactsViewModel : ObservableObject {
         fetchRequest.sortOrder = .userDefault
         
         do {
-            try store.enumerateContacts(with: fetchRequest) {(contact, stop) in
+            try store.enumerateContacts(with: fetchRequest) {[weak self](contact, stop) in
                 // only checking if american number or not for now
                 var cnPhoneNumber = contact.phoneNumbers.first?.value.stringValue
                 let contactDisplayName = contact.givenName + " " + contact.familyName
@@ -70,7 +66,7 @@ class ContactsViewModel : ObservableObject {
                     var contactVm = ContactsViewModelContact(cnName: contactDisplayName, cnPhoneNumber: contactNumber, sortingProp: contactDisplayName)
                     
                     // check if the contact is an existing user by phone number
-                    self.firestoreService.getUserByPhoneNumber(phoneNumber: contactNumber) {[weak self] returnedUser in
+                    self?.firestoreService.getUserByPhoneNumber(phoneNumber: contactNumber) {[weak self] returnedUser in
                         DispatchQueue.main.async {
                             if returnedUser == nil {
                                 // do nothing, keep contactsVm object user property nil
@@ -78,13 +74,15 @@ class ContactsViewModel : ObservableObject {
                                 contactVm.sortingProp = contactVm.cnName
                             } else {
                                 // adding user details if this contact is existing user
-                                contactVm.sortingProp = "!" // adding for sorting purposes
+                                // TODO: BUGGGG replaces each existing contact this way...need to keep the key for the dict unique
+                                contactVm.sortingProp = "!" + contactVm.cnName // adding for sorting purposes
                                 contactVm.user = returnedUser
                                 contactVm.isExisting = true
                                 print("existing user: \(contactVm.cnName)")
                             }
                             
                             self?.contacts[contactVm.sortingProp] = contactVm
+                            print(self?.contacts)
                         }
                     }
                 }
diff --git a/nirvana-ios/Views/Contacts/FindFriendsView.swift b/nirvana-ios/Views/Contacts/FindFriendsView.swift
index 2bb5542..611c05a 100644
--- a/nirvana-ios/Views/Contacts/FindFriendsView.swift
+++ b/nirvana-ios/Views/Contacts/FindFriendsView.swift
@@ -37,6 +37,9 @@ struct FindFriendsView: View {
                 Text("Cancel")
             }))
         }
+        .onAppear {
+            self.contactsVM.fetchContacts()
+        }
     }
     
     var searchItems: [String] {