Skip to content
Snippets Groups Projects
Unverified Commit 0c6871e9 authored by Douglas Fabris's avatar Douglas Fabris Committed by GitHub
Browse files

[FIX] starting conferences with mic and cam on their default states do not...

[FIX] starting conferences with mic and cam on their default states do not sync the state with the provider (#26966)
parent 5c875870
No related branches found
No related tags found
No related merge requests found
......@@ -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 = {};
}
......
......@@ -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>
);
};
......
import { Box } from '@rocket.chat/fuselage';
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';
......@@ -7,6 +7,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: ${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')};
`;
......@@ -22,7 +24,7 @@ const VideoConfPopup = forwardRef(function VideoConfPopup(
): ReactElement {
return (
<VideoConfPopupContainer ref={ref} position={position}>
<Box p='x24' maxWidth='x276' backgroundColor='white'>
<Box p='x24' maxWidth='x276'>
{children}
</Box>
</VideoConfPopupContainer>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment