diff --git a/src/app/features/room/Room.tsx b/src/app/features/room/Room.tsx index d2fea381..7c755c54 100644 --- a/src/app/features/room/Room.tsx +++ b/src/app/features/room/Room.tsx @@ -14,6 +14,7 @@ import { markAsRead } from '../../../client/action/notifications'; import { useMatrixClient } from '../../hooks/useMatrixClient'; import { useRoomMembers } from '../../hooks/useRoomMembers'; import { CallView } from './CallView'; +import { useCallState } from '../../pages/client/CallProvider'; export function Room() { const { eventId } = useParams(); @@ -22,6 +23,7 @@ export function Room() { const [isDrawer] = useSetting(settingsAtom, 'isPeopleDrawer'); const [hideActivity] = useSetting(settingsAtom, 'hideActivity'); + const { isChatOpen } = useCallState(); const screenSize = useScreenSizeContext(); const powerLevels = usePowerLevels(room); const members = useRoomMembers(mx, room?.roomId); @@ -50,26 +52,27 @@ export function Room() { }} > - - - - + {(!room.isCallRoom() || isChatOpen) && ( + + + + + {screenSize === ScreenSize.Desktop && isDrawer && ( + <> + + + + )} - {screenSize === ScreenSize.Desktop && isDrawer && ( - <> - - - - )} - + )} );