From fa10871df61f4426441e887839772e49f4e03196 Mon Sep 17 00:00:00 2001 From: Tyler <109685178+tlongwell-block@users.noreply.github.com> Date: Sun, 21 Jun 2026 10:03:23 -0400 Subject: [PATCH] fix(desktop): keep channel chrome clear of window controls (#1159) Signed-off-by: npub1jh9wn95s0472h86ahapupaf7m6kx4v9sx2n0atj2hltcfer8k06s5n3pyf <95cae996907d7cab9f5dbf43c0f53edeac6ab0b032a6feae4abfd784e467b3f5@sprout-oss.stage.blox.sqprod.co> Co-authored-by: npub1jh9wn95s0472h86ahapupaf7m6kx4v9sx2n0atj2hltcfer8k06s5n3pyf <95cae996907d7cab9f5dbf43c0f53edeac6ab0b032a6feae4abfd784e467b3f5@sprout-oss.stage.blox.sqprod.co> --- desktop/src/features/chat/ui/ChatHeader.tsx | 5 +++++ desktop/src/features/messages/ui/MessageTimeline.tsx | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/desktop/src/features/chat/ui/ChatHeader.tsx b/desktop/src/features/chat/ui/ChatHeader.tsx index 81a6ce6f0..dae1e3dbe 100644 --- a/desktop/src/features/chat/ui/ChatHeader.tsx +++ b/desktop/src/features/chat/ui/ChatHeader.tsx @@ -15,6 +15,7 @@ import type { ChannelType, ChannelVisibility } from "@/shared/api/types"; import { UpdateIndicator } from "@/features/settings/UpdateIndicator"; import { cn } from "@/shared/lib/cn"; import { channelChrome } from "@/shared/layout/chromeLayout"; +import { useOptionalSidebar } from "@/shared/ui/sidebar"; type ChatHeaderProps = { actions?: React.ReactNode; @@ -94,6 +95,9 @@ export function ChatHeader({ statusBadge, }: ChatHeaderProps) { const trimmedDescription = description?.trim() ?? ""; + const sidebar = useOptionalSidebar(); + const clearCollapsedTopChromeControls = + belowSystemChrome && sidebar?.state === "collapsed" && !sidebar.isMobile; const header = (