Merge pull request #7 from YoJames2019/fix/room-header-cleanup-1

group duplicate conditions into one

src/app/features/room/RoomViewHeader.tsx

@@ -268,7 +268,7 @@ export function RoomViewHeader() {
   const { isChatOpen, toggleChat } = useCallState();
   const pinnedEvents = useRoomPinnedEvents(room);
   const encryptionEvent = useStateEvent(room, StateEvent.RoomEncryption);
-  const ecryptedRoom = !!encryptionEvent;
+  const encryptedRoom = !!encryptionEvent;
   const avatarMxc = useRoomAvatar(room, direct);
   const name = useRoomName(room);
   const topic = useRoomTopic(room);
@@ -371,7 +371,9 @@ export function RoomViewHeader() {
         </Box>
 
         <Box shrink="No">
-          {!ecryptedRoom && (!room.isCallRoom() || isChatOpen) && (
+          {(!room.isCallRoom() || isChatOpen) && (
+            <>
+              {!encryptedRoom && (
                 <TooltipProvider
                   position="Bottom"
                   offset={4}
@@ -388,7 +390,6 @@ export function RoomViewHeader() {
                   )}
                 </TooltipProvider>
               )}
-          {(!room.isCallRoom() || isChatOpen) && (
               <TooltipProvider
                 position="Bottom"
                 offset={4}
@@ -427,8 +428,6 @@ export function RoomViewHeader() {
                   </IconButton>
                 )}
               </TooltipProvider>
-          )}
-          {(!room.isCallRoom() || isChatOpen) && (
               <PopOut
                 anchor={pinMenuAnchor}
                 position="Bottom"
@@ -448,6 +447,7 @@ export function RoomViewHeader() {
                   </FocusTrap>
                 }
               />
+            </>
           )}
 
           {!room.isCallRoom() && screenSize === ScreenSize.Desktop && (