From fb9ca31a43ba2e99d10cc86d767bfea16755d989 Mon Sep 17 00:00:00 2001
From: Gimle Larpes <97182804+GimleLarpes@users.noreply.github.com>
Date: Thu, 31 Jul 2025 20:36:16 +0200
Subject: [PATCH] Update Room.tsx to accomodate restructuring of Room, RoomView
 and CallView

---
 src/app/features/room/Room.tsx | 58 +++++++++-------------------------
 1 file changed, 15 insertions(+), 43 deletions(-)

diff --git a/src/app/features/room/Room.tsx b/src/app/features/room/Room.tsx
index 24f378b4..e4ecaae7 100644
--- a/src/app/features/room/Room.tsx
+++ b/src/app/features/room/Room.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable no-nested-ternary */
 import React, { useCallback } from 'react';
 import { Box, Line } from 'folds';
 import { useParams } from 'react-router-dom';
@@ -15,7 +14,6 @@ import { markAsRead } from '../../../client/action/notifications';
 import { useMatrixClient } from '../../hooks/useMatrixClient';
 import { useRoomMembers } from '../../hooks/useRoomMembers';
 import { CallView } from '../call/CallView';
-import { useCallState } from '../../pages/client/call/CallProvider';
 import { RoomViewHeader } from './RoomViewHeader';
 
 export function Room() {
@@ -25,7 +23,6 @@ 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);
@@ -44,48 +41,23 @@ export function Room() {
 
   return (
     <PowerLevelsContextProvider value={powerLevels}>
-      <Box
-        grow="Yes"
-        style={{
-          width: '100%',
-          height: '100%',
-          display: 'flex',
-          flexDirection: 'column',
-        }}
-      >
-        {room.isCallRoom() && <RoomViewHeader />}
-        <Box
-          grow="Yes"
-          style={{
-            width: '100%',
-            height: '100%',
-            display: 'flex',
-            flexDirection: 'row',
-          }}
-        >
-          <CallView room={room} />
-          {(!room.isCallRoom() || isChatOpen) && (
-            <Box
-              grow="Yes"
-              style={{
-                width: room.isCallRoom() ? (isChatOpen ? '40%' : '0%') : '100%',
-                height: '100%',
-                display: 'flex',
-                flexDirection: 'column',
-              }}
-            >
-              <Box style={{ flex: 1, minHeight: 0, overflowY: 'auto', background: '#fff' }}>
-                <RoomView room={room} eventId={eventId} />
-              </Box>
-            </Box>
-          )}
-          {screenSize === ScreenSize.Desktop && !room.isCallRoom() && isDrawer && (
-            <>
+      <Box grow="Yes">
+        <Box grow="Yes" direction="Column">
+          <RoomViewHeader />
+          <Box grow="Yes">
+            <CallView room={room} />
+            {room.isCallRoom() && screenSize === ScreenSize.Desktop && (
               <Line variant="Background" direction="Vertical" size="300" />
-              <MembersDrawer key={room.roomId} room={room} members={members} />
-            </>
-          )}
+            )}
+            <RoomView room={room} eventId={eventId} />
+          </Box>
         </Box>
+        {!room.isCallRoom() && screenSize === ScreenSize.Desktop && isDrawer && (
+          <>
+            <Line variant="Background" direction="Vertical" size="300" />
+            <MembersDrawer key={room.roomId} room={room} members={members} />
+          </>
+        )}
       </Box>
     </PowerLevelsContextProvider>
   );