From 341e3cd44354a2debce27e9126dd215237eb9587 Mon Sep 17 00:00:00 2001
From: YoJames2019 <yobiscuit0@gmail.com>
Date: Tue, 17 Feb 2026 16:08:09 -0500
Subject: [PATCH 1/2] fix: group duplicate conditions into one

---
 src/app/features/room/RoomViewHeader.tsx | 146 +++++++++++------------
 1 file changed, 73 insertions(+), 73 deletions(-)

diff --git a/src/app/features/room/RoomViewHeader.tsx b/src/app/features/room/RoomViewHeader.tsx
index 5c430268..09fd337b 100644
--- a/src/app/features/room/RoomViewHeader.tsx
+++ b/src/app/features/room/RoomViewHeader.tsx
@@ -371,83 +371,83 @@ export function RoomViewHeader() {
         </Box>
 
         <Box shrink="No">
-          {!ecryptedRoom && (!room.isCallRoom() || isChatOpen) && (
-            <TooltipProvider
-              position="Bottom"
-              offset={4}
-              tooltip={
-                <Tooltip>
-                  <Text>Search</Text>
-                </Tooltip>
-              }
-            >
-              {(triggerRef) => (
-                <IconButton fill="None" ref={triggerRef} onClick={handleSearchClick}>
-                  <Icon size="400" src={Icons.Search} />
-                </IconButton>
-              )}
-            </TooltipProvider>
-          )}
           {(!room.isCallRoom() || isChatOpen) && (
-            <TooltipProvider
-              position="Bottom"
-              offset={4}
-              tooltip={
-                <Tooltip>
-                  <Text>Pinned Messages</Text>
-                </Tooltip>
-              }
-            >
-              {(triggerRef) => (
-                <IconButton
-                  fill="None"
-                  style={{ position: 'relative' }}
-                  onClick={handleOpenPinMenu}
-                  ref={triggerRef}
-                  aria-pressed={!!pinMenuAnchor}
+            <>
+              {!ecryptedRoom && (
+                <TooltipProvider
+                  position="Bottom"
+                  offset={4}
+                  tooltip={
+                    <Tooltip>
+                      <Text>Search</Text>
+                    </Tooltip>
+                  }
                 >
-                  {pinnedEvents.length > 0 && (
-                    <Badge
-                      style={{
-                        position: 'absolute',
-                        left: toRem(3),
-                        top: toRem(3),
-                      }}
-                      variant="Secondary"
-                      size="400"
-                      fill="Solid"
-                      radii="Pill"
-                    >
-                      <Text as="span" size="L400">
-                        {pinnedEvents.length}
-                      </Text>
-                    </Badge>
+                  {(triggerRef) => (
+                    <IconButton fill="None" ref={triggerRef} onClick={handleSearchClick}>
+                      <Icon size="400" src={Icons.Search} />
+                    </IconButton>
                   )}
-                  <Icon size="400" src={Icons.Pin} filled={!!pinMenuAnchor} />
-                </IconButton>
+                </TooltipProvider>
               )}
-            </TooltipProvider>
-          )}
-          {(!room.isCallRoom() || isChatOpen) && (
-            <PopOut
-              anchor={pinMenuAnchor}
-              position="Bottom"
-              content={
-                <FocusTrap
-                  focusTrapOptions={{
-                    initialFocus: false,
-                    returnFocusOnDeactivate: false,
-                    onDeactivate: () => setPinMenuAnchor(undefined),
-                    clickOutsideDeactivates: true,
-                    isKeyForward: (evt: KeyboardEvent) => evt.key === 'ArrowDown',
-                    isKeyBackward: (evt: KeyboardEvent) => evt.key === 'ArrowUp',
-                    escapeDeactivates: stopPropagation,
-                  }}
-                >
-                  <RoomPinMenu room={room} requestClose={() => setPinMenuAnchor(undefined)} />
-                </FocusTrap>
-              }
-            />
+              <TooltipProvider
+                position="Bottom"
+                offset={4}
+                tooltip={
+                  <Tooltip>
+                    <Text>Pinned Messages</Text>
+                  </Tooltip>
+                }
+              >
+                {(triggerRef) => (
+                  <IconButton
+                    fill="None"
+                    style={{ position: 'relative' }}
+                    onClick={handleOpenPinMenu}
+                    ref={triggerRef}
+                    aria-pressed={!!pinMenuAnchor}
+                  >
+                    {pinnedEvents.length > 0 && (
+                      <Badge
+                        style={{
+                          position: 'absolute',
+                          left: toRem(3),
+                          top: toRem(3),
+                        }}
+                        variant="Secondary"
+                        size="400"
+                        fill="Solid"
+                        radii="Pill"
+                      >
+                        <Text as="span" size="L400">
+                          {pinnedEvents.length}
+                        </Text>
+                      </Badge>
+                    )}
+                    <Icon size="400" src={Icons.Pin} filled={!!pinMenuAnchor} />
+                  </IconButton>
+                )}
+              </TooltipProvider>
+              <PopOut
+                anchor={pinMenuAnchor}
+                position="Bottom"
+                content={
+                  <FocusTrap
+                    focusTrapOptions={{
+                      initialFocus: false,
+                      returnFocusOnDeactivate: false,
+                      onDeactivate: () => setPinMenuAnchor(undefined),
+                      clickOutsideDeactivates: true,
+                      isKeyForward: (evt: KeyboardEvent) => evt.key === 'ArrowDown',
+                      isKeyBackward: (evt: KeyboardEvent) => evt.key === 'ArrowUp',
+                      escapeDeactivates: stopPropagation,
+                    }}
+                  >
+                    <RoomPinMenu room={room} requestClose={() => setPinMenuAnchor(undefined)} />
+                  </FocusTrap>
+                }
+              />
+            </>
           )}
 
           {!room.isCallRoom() && screenSize === ScreenSize.Desktop && (

From cee53961a08dfb6dc15aa7bd33620d2a5152e263 Mon Sep 17 00:00:00 2001
From: YoJames2019 <yobiscuit0@gmail.com>
Date: Tue, 17 Feb 2026 16:10:24 -0500
Subject: [PATCH 2/2] fix: typo

---
 src/app/features/room/RoomViewHeader.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/features/room/RoomViewHeader.tsx b/src/app/features/room/RoomViewHeader.tsx
index 09fd337b..ac7a5aa3 100644
--- a/src/app/features/room/RoomViewHeader.tsx
+++ b/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);
@@ -373,7 +373,7 @@ export function RoomViewHeader() {
         <Box shrink="No">
           {(!room.isCallRoom() || isChatOpen) && (
             <>
-              {!ecryptedRoom && (
+              {!encryptedRoom && (
                 <TooltipProvider
                   position="Bottom"
                   offset={4}