top bar for conversation details

packages/desktop/src/tree/FooterControls.tsx

@@ -123,17 +123,6 @@ export default function FooterControls() {
               ))}
             </AvatarGroup>
 
-            <Tooltip title="Mark priority or not!">
-              <IconButton
-                sx={{
-                  color: 'white',
-                }}
-                size="small"
-              >
-                <FiActivity />
-              </IconButton>
-            </Tooltip>
-
             <Tooltip title="Paste image or link!">
               <IconButton
                 sx={{
@@ -182,6 +171,11 @@ export default function FooterControls() {
         )}
 
         <Stack sx={{ mt: 'auto' }} spacing={1} direction={'column'} alignItems={'center'}>
+          <Divider orientation="horizontal" flexItem />
+          <Tooltip title={'overlay mode'}>
+            <Switch color="secondary" size="small" />
+          </Tooltip>
+
           <Divider orientation="horizontal" flexItem />
 
           <Tooltip title="Media settings and more">
@@ -195,10 +189,6 @@ export default function FooterControls() {
             </IconButton>
           </Tooltip>
 
-          <Tooltip title={'overlay mode'}>
-            <Switch color="secondary" size="small" />
-          </Tooltip>
-
           <Button size={'small'} color={'secondary'} variant="text" onClick={handleFlowState}>
             flow
           </Button>

packages/desktop/src/tree/MainPanel.tsx

@@ -1,7 +1,9 @@
-import { CardMedia, Container, Grid, Typography } from '@mui/material';
+import { CardMedia, Container, Grid, IconButton, Stack, Tooltip, Typography } from '@mui/material';
+import { FiSun, FiUserPlus, FiZap } from 'react-icons/fi';
 import React, { useEffect, useMemo, useRef } from 'react';
 
 import { Box } from '@mui/system';
+import ConversationLabel from '../subcomponents/ConversationLabel';
 import { MasterConversation } from '../util/types';
 // import ConversationDetails from './ConversationDetails';
 import { blueGrey } from '@mui/material/colors';
@@ -47,17 +49,54 @@ export default function MainPanel() {
 
 function ConversationDetails({ masterConversation }: { masterConversation: MasterConversation }) {
   return (
-    <Container maxWidth={'md'}>
+    <Container maxWidth={false} disableGutters>
-      <Grid container>
+      <Stack direction={'column'}>
-        {masterConversation.room &&
+        <Box sx={{ p: 2, boxShadow: 3, zIndex: 10 }}>
-          Object.entries(masterConversation.room).map(([userId, userPeerContents]) => {
+          <Stack direction="row" alignItems="center">
-            return (
+            <IconButton color="primary" size="small">
-              <Grid item key={`userPeerRenderConvoDetails-${userId}`}>
+              <FiSun />
-                <Video stream={userPeerContents.stream} />
+            </IconButton>
-              </Grid>
+            <ConversationLabel
-            );
+              users={masterConversation.members}
-          })}
+              conversationName={masterConversation.name}
-      </Grid>
+              isSelected={true}
+            />
+
+            {/* conversation controls */}
+            <Stack
+              direction="row"
+              alignItems="center"
+              sx={{
+                ml: 'auto',
+              }}
+              spacing={1}
+            >
+              <Tooltip title="Add to priority panel!">
+                <IconButton size="small">
+                  <FiZap />
+                </IconButton>
+              </Tooltip>
+
+              <Tooltip title="Add people to the conversation">
+                <IconButton size="small">
+                  <FiUserPlus />
+                </IconButton>
+              </Tooltip>
+            </Stack>
+          </Stack>
+        </Box>
+
+        <Grid container>
+          {masterConversation.room &&
+            Object.entries(masterConversation.room).map(([userId, userPeerContents]) => {
+              return (
+                <Grid item key={`userPeerRenderConvoDetails-${userId}`}>
+                  <Video stream={userPeerContents.stream} />
+                </Grid>
+              );
+            })}
+        </Grid>
+      </Stack>
     </Container>
   );
 }