From 73574770802afd35effe4407fa4d65a6a3752e6b Mon Sep 17 00:00:00 2001
From: dougfabris <devfabris@gmail.com>
Date: Tue, 27 Sep 2022 18:39:36 -0300
Subject: [PATCH 1/2] fix: videoconf cam preference on manager

---
 apps/meteor/client/lib/VideoConfManager.ts                   | 2 +-
 .../VideoConfPopup/VideoConfPopupRoomInfo.tsx                | 2 +-
 packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/meteor/client/lib/VideoConfManager.ts b/apps/meteor/client/lib/VideoConfManager.ts
index 8d4507ab8563..23bcf9f1d6ea 100644
--- a/apps/meteor/client/lib/VideoConfManager.ts
+++ b/apps/meteor/client/lib/VideoConfManager.ts
@@ -115,7 +115,7 @@ export const VideoConfManager = new (class VideoConfManager extends Emitter<Vide
 	constructor() {
 		super();
 		this.incomingDirectCalls = new Map<string, IncomingDirectCall>();
-		this._preferences = { mic: true };
+		this._preferences = { mic: true, cam: false };
 		this._capabilities = {};
 	}
 
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/VideoConfPopupRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/VideoConfPopupRoomInfo.tsx
index c5f664a5340a..4dac91e88e2f 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/VideoConfPopupRoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/VideoConfPopupRoomInfo.tsx
@@ -30,7 +30,7 @@ const VideoConfPopupRoomInfo = ({ room }: { room: IRoom }): ReactElement => {
 
 	return (
 		<VideoConfPopupInfo avatar={avatar} icon={<RoomIcon placement='default' room={room} />}>
-			{room.fname}
+			{room.fname || room.name}
 		</VideoConfPopupInfo>
 	);
 };
diff --git a/packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx b/packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx
index be567f494697..f738fd28a89c 100644
--- a/packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx
+++ b/packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx
@@ -1,4 +1,5 @@
 import { Box } from '@rocket.chat/fuselage';
+import colors from '@rocket.chat/fuselage-tokens/colors.json';
 import styled from '@rocket.chat/styled';
 import { forwardRef } from 'react';
 import type { ReactNode, ReactElement, HTMLAttributes, Ref } from 'react';
@@ -7,6 +8,8 @@ export const VideoConfPopupContainer = styled('div', ({ position: _position, ...
 	width: 100%;
 	position: absolute;
 	box-shadow: 0px 4px 32px rgba(0, 0, 0, 0.15);
+	background-color: ${colors.white};
+	border-radius: 0.25rem;
 	top: ${(p): string => (p.position ? `${p.position}px` : '0')};
 	left: -${(p): string => (p.position ? `${p.position}px` : '0')};
 `;
@@ -22,7 +25,7 @@ const VideoConfPopup = forwardRef(function VideoConfPopup(
 ): ReactElement {
 	return (
 		<VideoConfPopupContainer ref={ref} position={position}>
-			<Box p='x24' maxWidth='x276' borderRadius='x4' backgroundColor='white'>
+			<Box p='x24' maxWidth='x276'>
 				{children}
 			</Box>
 		</VideoConfPopupContainer>

From 0fcbc6af27816980980a211cd4d773b47e72baa1 Mon Sep 17 00:00:00 2001
From: dougfabris <devfabris@gmail.com>
Date: Thu, 20 Oct 2022 15:29:33 -0300
Subject: [PATCH 2/2] fix: color name

---
 packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx b/packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx
index f738fd28a89c..ee8c1829e23d 100644
--- a/packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx
+++ b/packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx
@@ -1,5 +1,4 @@
-import { Box } from '@rocket.chat/fuselage';
-import colors from '@rocket.chat/fuselage-tokens/colors.json';
+import { Box, Palette } from '@rocket.chat/fuselage';
 import styled from '@rocket.chat/styled';
 import { forwardRef } from 'react';
 import type { ReactNode, ReactElement, HTMLAttributes, Ref } from 'react';
@@ -8,7 +7,7 @@ export const VideoConfPopupContainer = styled('div', ({ position: _position, ...
 	width: 100%;
 	position: absolute;
 	box-shadow: 0px 4px 32px rgba(0, 0, 0, 0.15);
-	background-color: ${colors.white};
+	background-color: ${Palette.surface['surface-light'].toString()};
 	border-radius: 0.25rem;
 	top: ${(p): string => (p.position ? `${p.position}px` : '0')};
 	left: -${(p): string => (p.position ? `${p.position}px` : '0')};