From de3c71517ff0ef846f039e576efbaf83c4aada04 Mon Sep 17 00:00:00 2001 From: talksik Date: Mon, 20 Jun 2022 10:38:03 -0500 Subject: [PATCH] Update MainPanel.tsx --- packages/desktop/src/tree/MainPanel.tsx | 29 ++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/packages/desktop/src/tree/MainPanel.tsx b/packages/desktop/src/tree/MainPanel.tsx index f01ca76..76ce0fe 100644 --- a/packages/desktop/src/tree/MainPanel.tsx +++ b/packages/desktop/src/tree/MainPanel.tsx @@ -82,7 +82,7 @@ function ConversationDetails({ masterConversation }: { masterConversation: Maste sx={{ maxHeight: '100vh', display: 'flex', flexDirection: 'column' }} > {/* conversation header details and controls */} - + @@ -121,6 +121,19 @@ function ConversationDetails({ masterConversation }: { masterConversation: Maste + + {/* live video and screenshares */} + + {masterConversation.room && + Object.entries(masterConversation.room).map(([userId, userPeerContents]) => { + return ( + @@ -156,20 +169,6 @@ function ConversationDetails({ masterConversation }: { masterConversation: Maste - - - - {masterConversation.room && - Object.entries(masterConversation.room).map(([userId, userPeerContents]) => { - return ( - - );