From 48355b66a56c6e251e6c2354afd63b96703590e9 Mon Sep 17 00:00:00 2001
From: talksik <patel.arjun50@gmail.com>
Date: Sun, 19 Jun 2022 11:12:32 -0500
Subject: [PATCH] video showing on one end

---
 packages/desktop/package.json                           | 4 ++--
 packages/desktop/src/providers/ConversationProvider.tsx | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 19e5ff7..d7eff65 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -42,8 +42,8 @@
         [
           "@electron-forge/plugin-webpack",
           {
-            "port": "4001",
-            "loggerPort": "9001",
+            "port": "4000",
+            "loggerPort": "9000",
             "mainConfig": "./webpack.main.config.js",
             "devContentSecurityPolicy": "default-src * self blob: data: gap:; style-src * self 'unsafe-inline' blob: data: gap:; script-src * 'self' 'unsafe-eval' 'unsafe-inline' blob: data: gap:; object-src * 'self' blob: data: gap:; img-src * self 'unsafe-inline' blob: data: gap:; connect-src self * 'unsafe-inline' blob: data: gap:; frame-src * self blob: data: gap:;",
             "renderer": {
diff --git a/packages/desktop/src/providers/ConversationProvider.tsx b/packages/desktop/src/providers/ConversationProvider.tsx
index a7bd670..207fa46 100644
--- a/packages/desktop/src/providers/ConversationProvider.tsx
+++ b/packages/desktop/src/providers/ConversationProvider.tsx
@@ -447,6 +447,8 @@ function Room({
         audio: true,
       });
 
+      console.log(localMediaStream);
+
       setUserLocalStream(localMediaStream);
 
       // ?will there be race condition where this room component is rendered but we don't have the latest
@@ -460,8 +462,6 @@ function Room({
         );
         toast.success('calling bunch of people');
 
-        setUserLocalStream(localMediaStream);
-
         // for each person, create peer object
         allOtherUserIds.forEach((otherUserId) => {
           const connectingToast = toast.loading('calling peer for a snappy experience');
@@ -643,7 +643,7 @@ function Room({
 
       // find our local connection to this peer in the room contents
       setConversationMap((draft) => {
-        const localPeerForMasterAndMe = draft[res.lineId]?.room[res.lineId];
+        const localPeerForMasterAndMe = draft[res.lineId]?.room[res.masterUserId];
 
         if (localPeerForMasterAndMe) {
           localPeerForMasterAndMe.peer.signal(res.simplePeerSignal);
@@ -655,7 +655,7 @@ function Room({
       $ws.removeAllListeners(mastersAnswerReceivedChannelNameForRoom);
       $ws.removeAllListeners(someoneJoinedChannelNameForRoom);
     };
-  });
+  }, [userLocalStream]);
 
   // go through all of the peers and destroy and update conversation map
   useUnmount(() => {