working third person can now join the channel

nirvana-ios/Views/Convos/ConvoViewModel.swift

@@ -200,17 +200,13 @@ class ConvoViewModel: NSObject, ObservableObject {
     /**
     Allow user to join an active convo
      */
-    func joinConvo() {
+    func joinConvo(convoId: String) {
         // ensure the convo is active and includes 2 people in it currently...shouldn't be shown if not anyway
         
-        // ensure that this user leaves all other channels
+        // ensure that this user leaves all other channels        
-        if self.isInCall() {
-            print("can't join another call, already in one")
-            return
-        }
         
         let convo = self.relevantConvos.first {convo in
-            convo.id == self.selectedConvoId
+            convo.id == convoId
         }
         
         if convo == nil {

nirvana-ios/Views/Convos/ConvosView.swift

@@ -52,7 +52,7 @@ struct ConvosView: View {
                         // if not in a call already
                         if !self.vm.isInCall() {
                             self.vm.selectedConvoId = self.vm.relevantConvos[index].id!
-                            self.vm.joinConvo()
+                            self.vm.joinConvo(convoId: currConvo.id!)
                             
                             return
                         }

nirvana-ios/Views/InnerCircle/CircleGridView.swift

@@ -115,13 +115,19 @@ struct CircleGridView: View {
                         .onTapGesture {
                             // if not in a call already
                             if !self.convoVM.isInCall() {
-                                self.convoVM.selectedConvoId = self.convoVM.relevantConvos[value].id!
+                                print("joining convo now")
-                                self.convoVM.joinConvo()
                                 
-                                // if had selected an individual, don't want them in here anymore
+                                if let convoId = currConvo.id {
-                                self.selectedFriendIndex = nil
+                                    self.convoVM.selectedConvoId = convoId
+                                    self.convoVM.joinConvo(convoId: convoId)
+                                    
+                                    // if had selected an individual, don't want them selected here anymore
+                                    self.selectedFriendIndex = nil
+                                }
+                                else {
+                                    print("no convo id to join")
+                                }
                                 
-                                return
                             }
                         }
                         .animation(