From 028dd842f03732b60dbab7555c78724124a2ea1f Mon Sep 17 00:00:00 2001
From: sid597 <sid597athens@gmail.com>
Date: Mon, 25 May 2026 12:01:36 +0530
Subject: [PATCH 1/3] ENG-1575 Hide left sidebar settings tabs when feature
 flag is off

Hide the Personal and Global "Left sidebar" tabs in the Settings dialog
when the "Enable left sidebar" feature flag is disabled, using the same
hidden prop pattern as the Admin tab.
---
 apps/roam/src/components/settings/Settings.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/roam/src/components/settings/Settings.tsx b/apps/roam/src/components/settings/Settings.tsx
index d8f66a3f2..736de9c61 100644
--- a/apps/roam/src/components/settings/Settings.tsx
+++ b/apps/roam/src/components/settings/Settings.tsx
@@ -90,6 +90,7 @@ export const SettingsDialog = ({
   );
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const settings = useMemo(() => bulkReadSettings(), [activeTabId]);
+  const leftSidebarEnabled = settings.featureFlags["Enable left sidebar"];
   const [showAdminPanel, setShowAdminPanel] = useState(
     window.roamAlphaAPI.graph.name === "discourse-graphs" || false,
   );
@@ -202,6 +203,7 @@ export const SettingsDialog = ({
           />
           <Tab
             id="left-sidebar-personal-settings"
+            hidden={!leftSidebarEnabled}
             title="Left sidebar"
             className="overflow-y-auto"
             panel={
@@ -235,6 +237,7 @@ export const SettingsDialog = ({
           />
           <Tab
             id="left-sidebar-global-settings"
+            hidden={!leftSidebarEnabled}
             title="Left sidebar"
             className="overflow-y-auto"
             panel={

From af4196bd1ef14e29936541445bb725736ab31127 Mon Sep 17 00:00:00 2001
From: sid597 <sid597athens@gmail.com>
Date: Mon, 25 May 2026 15:01:00 +0530
Subject: [PATCH 2/3] ENG-1575 Sync left sidebar tab visibility with flag
 changes live

Subscribe to the leftSidebarFlag setting change so the Left sidebar
tabs hide/show immediately when the flag is toggled in the open
settings dialog, matching the live sidebar mount/unmount in index.ts,
instead of waiting for a tab switch or refresh.
---
 apps/roam/src/components/settings/Settings.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/roam/src/components/settings/Settings.tsx b/apps/roam/src/components/settings/Settings.tsx
index 736de9c61..2c9542391 100644
--- a/apps/roam/src/components/settings/Settings.tsx
+++ b/apps/roam/src/components/settings/Settings.tsx
@@ -31,6 +31,7 @@ import { LeftSidebarPersonalSections } from "./LeftSidebarPersonalSettings";
 import { LeftSidebarGlobalSections } from "./LeftSidebarGlobalSettings";
 import posthog from "posthog-js";
 import { bulkReadSettings } from "./utils/accessors";
+import { onSettingChange, settingKeys } from "./utils/settingsEmitter";
 
 type SectionHeaderProps = {
   children: React.ReactNode;
@@ -90,7 +91,14 @@ export const SettingsDialog = ({
   );
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const settings = useMemo(() => bulkReadSettings(), [activeTabId]);
-  const leftSidebarEnabled = settings.featureFlags["Enable left sidebar"];
+  const [leftSidebarEnabled, setLeftSidebarEnabled] = useState(
+    settings.featureFlags["Enable left sidebar"],
+  );
+  useEffect(() => {
+    return onSettingChange(settingKeys.leftSidebarFlag, (newValue) => {
+      setLeftSidebarEnabled(Boolean(newValue));
+    });
+  }, []);
   const [showAdminPanel, setShowAdminPanel] = useState(
     window.roamAlphaAPI.graph.name === "discourse-graphs" || false,
   );

From 53fceae29bc60ff79923cb6532f027f3ff9883b4 Mon Sep 17 00:00:00 2001
From: sid597 <sid597athens@gmail.com>
Date: Mon, 25 May 2026 15:54:22 +0530
Subject: [PATCH 3/3] ENG-1575 Fall back to Home when a hidden left sidebar tab
 is selected

When the flag is off, derive the displayed tab so a left-sidebar tab
that ends up selected (e.g. via a deep link from the command palette)
falls back to the Home tab instead of being rendered as a hidden
selection.
---
 apps/roam/src/components/settings/Settings.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/roam/src/components/settings/Settings.tsx b/apps/roam/src/components/settings/Settings.tsx
index 2c9542391..e39dea0e9 100644
--- a/apps/roam/src/components/settings/Settings.tsx
+++ b/apps/roam/src/components/settings/Settings.tsx
@@ -123,6 +123,13 @@ export const SettingsDialog = ({
     window.addEventListener("keydown", handleKeyPress);
     return () => window.removeEventListener("keydown", handleKeyPress);
   }, []);
+  const leftSidebarTabHidden =
+    !leftSidebarEnabled &&
+    (activeTabId === "left-sidebar-personal-settings" ||
+      activeTabId === "left-sidebar-global-settings");
+  const visibleTabId = leftSidebarTabHidden
+    ? "discourse-graph-home-personal"
+    : activeTabId;
   return (
     <Dialog
       isOpen={isOpen}
@@ -170,7 +177,7 @@ export const SettingsDialog = ({
               tabId: String(id),
             });
           }}
-          selectedTabId={activeTabId}
+          selectedTabId={visibleTabId}
           vertical={true}
           renderActiveTabPanelOnly={true}
         >