g4borg/cinny
1
0
Fork 0
forked from github/cinny
Code Pull Requests Packages Wiki Activity

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

Browse Source 
group duplicate conditions into one
This commit is contained in:
haz
2026-02-19 20:15:29 +01:00
committed by GitHub
parent c037af4c52 cee53961a0
commit c97fba71fa
1 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/features/room/RoomViewHeader.tsx
View File

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