From 6ad8b477d143883530a4459df7abe8251d15b41a Mon Sep 17 00:00:00 2001
From: GigiaJ <gigiaboone@yahoo.com>
Date: Mon, 21 Apr 2025 01:38:33 -0400
Subject: [PATCH] fix bug with calls disabling dm and lobby

---
 .../pages/call/PersistentCallContainer.tsx    | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/app/pages/call/PersistentCallContainer.tsx b/src/app/pages/call/PersistentCallContainer.tsx
index 12f7beba..2e119020 100644
--- a/src/app/pages/call/PersistentCallContainer.tsx
+++ b/src/app/pages/call/PersistentCallContainer.tsx
@@ -32,7 +32,7 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
   const mx = useMatrixClient();
   const roomId = useSelectedRoom();
   const clientConfig = useClientConfig();
-  const room = mx.getRoom(roomId);
+  const room = mx.getRoom(roomId) ?? null;
 
   logger.info(room);
 
@@ -145,7 +145,7 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
   return (
     <Page style={containerStyle}>
       <Box direction="Row" grow="Yes" style={{ height: '100%', width: '100%' }}>
-        {activeCallRoomId && roomId && (
+        {activeCallRoomId && roomId && room !== null && (
           <Box
             shrink="No"
             style={{
@@ -153,15 +153,15 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
               overflowY: 'auto',
             }}
           >
-                <PowerLevelsContainer>
-                <PageRoot
-                  nav={
-                    <MobileFriendlyPageNav path={SPACE_PATH}>
-                      <Space />
-                    </MobileFriendlyPageNav>
-                  }
-                />
-                </PowerLevelsContainer>
+            <PowerLevelsContainer>
+              <PageRoot
+                nav={
+                  <MobileFriendlyPageNav path={SPACE_PATH}>
+                    <Space />
+                  </MobileFriendlyPageNav>
+                }
+              />
+            </PowerLevelsContainer>
           </Box>
         )}
 
@@ -169,11 +169,11 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
           direction="Column"
           style={{ position: 'relative', height: '100%', width: '100%', overflow: 'hidden' }}
         >
-          {activeCallRoomId && roomId && (
+          {activeCallRoomId && roomId && room !== null && (
             <Box direction="Column" style={{ width: '100%' }}>
               <PowerLevelsContainer>
-                    <RoomViewHeader />
-                    </PowerLevelsContainer>
+                <RoomViewHeader />
+              </PowerLevelsContainer>
             </Box>
           )}
           <Box grow="Yes" style={{ position: 'relative' }}>
@@ -195,10 +195,10 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
           </Box>
         </Box>
         <Box direction="Column" style={{ position: 'relative' }}>
-          {activeCallRoomId && roomId !== null && (
+          {activeCallRoomId && roomId && room !== null && (
             <PowerLevelsContainer>
-                  <RoomView room={room} eventId={eventId} />
-                  </PowerLevelsContainer>
+              <RoomView room={room} eventId={eventId} />
+            </PowerLevelsContainer>
           )}
         </Box>
       </Box>