From 9fbcdf7a5f51d16d51f0c9fde110804d309ca3c5 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Thu, 21 May 2026 18:19:30 +0200
Subject: [PATCH] fix: hide mail sidebar header in Pro shell

---
 components/layout/sidebar.tsx | 51 ++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/components/layout/sidebar.tsx b/components/layout/sidebar.tsx
index 0b395750..f397a9ae 100644
--- a/components/layout/sidebar.tsx
+++ b/components/layout/sidebar.tsx
@@ -930,32 +930,35 @@ export function Sidebar({
         className
       )}
     >
-      {/* Header */}
-      <div className={cn("flex items-center border-b border-border", isCollapsed ? "justify-center px-2 py-2" : "gap-1 px-2 py-2")}>
-        <Button
-          variant="ghost"
-          size="icon"
-          onClick={onSidebarClose}
-          className="lg:hidden h-9 w-9 flex-shrink-0"
-          aria-label={t("close")}
-        >
-          <X className="w-5 h-5" />
-        </Button>
+      {/* Header — hidden in the Pro shell, which owns its own chrome and
+          would otherwise render an empty strip (no collapse, no switcher). */}
+      {!isEmbedded && (
+        <div className={cn("flex items-center border-b border-border", isCollapsed ? "justify-center px-2 py-2" : "gap-1 px-2 py-2")}>
+          <Button
+            variant="ghost"
+            size="icon"
+            onClick={onSidebarClose}
+            className="lg:hidden h-9 w-9 flex-shrink-0"
+            aria-label={t("close")}
+          >
+            <X className="w-5 h-5" />
+          </Button>
 
-        <Button
-          variant="ghost"
-          size="icon"
-          onClick={toggleSidebarCollapsed}
-          className="hidden lg:flex h-8 w-8 flex-shrink-0"
-          title={isCollapsed ? t("expand_tooltip") : t("collapse_tooltip")}
-        >
-          {isCollapsed ? <ChevronsRight className="w-4 h-4" /> : <ChevronsLeft className="w-4 h-4" />}
-        </Button>
+          <Button
+            variant="ghost"
+            size="icon"
+            onClick={toggleSidebarCollapsed}
+            className="hidden lg:flex h-8 w-8 flex-shrink-0"
+            title={isCollapsed ? t("expand_tooltip") : t("collapse_tooltip")}
+          >
+            {isCollapsed ? <ChevronsRight className="w-4 h-4" /> : <ChevronsLeft className="w-4 h-4" />}
+          </Button>
 
-        {!isCollapsed && !hideAccountSwitcher && (
-          <AccountSwitcher variant="expanded" className="flex-1" />
-        )}
-      </div>
+          {!isCollapsed && !hideAccountSwitcher && (
+            <AccountSwitcher variant="expanded" className="flex-1" />
+          )}
+        </div>
+      )}
 
       {!isCollapsed && <DemoBanner />}
       {!isCollapsed && <VacationBanner />}