From f9b3e3e21106df92a3b5b63a9ce80306c9957b6e Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Tue, 18 Aug 2026 19:29:00 -0700
Subject: [PATCH 1/3] refactor(consent): fold cookie preferences into General >
 Privacy

The consent settings were a top-level tab of their own, which is the wrong
weight for something a user opens once. They are now a sub-view of General,
reached from the Privacy section that already held the telemetry toggle, and
that toggle moves with them so one page owns everything Sim collects.

Cookies render only on the hosted service, the only deployment that sets them;
telemetry renders everywhere, so the sub-view is useful on a self-hosted
deployment too. Each cookie switch commits on change rather than staging behind
a Save, matching the telemetry switch directly above it -- one interaction
model per page, and no unsaved-consent state. saveConsents('custom') reads
selectedConsents from the store at call time and the switch's write is
synchronous, so the value a toggle stages is the value it commits.

The open sub-view lives in the URL, so it is linkable and Back closes it.
---
 .../_shell/consent/consent-preferences.tsx    |  21 ++-
 .../settings/[section]/settings.tsx           |   9 +-
 .../components/cookie-preferences.test.tsx    |  58 +++++++
 .../general/components/cookie-preferences.tsx |  59 +++++++
 .../general/components/privacy-view.tsx       |  71 +++++++++
 .../settings/components/general/general.tsx   |  46 +++---
 .../components/general/search-params.ts       |  17 ++
 .../components/privacy/privacy.test.tsx       | 146 ------------------
 .../settings/components/privacy/privacy.tsx   |  93 -----------
 .../[workspaceId]/settings/navigation.test.ts |   2 -
 .../components/settings/navigation.test.ts    |   1 -
 apps/sim/components/settings/navigation.ts    |  12 --
 12 files changed, 240 insertions(+), 295 deletions(-)
 create mode 100644 apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.test.tsx
 create mode 100644 apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.tsx
 create mode 100644 apps/sim/app/workspace/[workspaceId]/settings/components/general/components/privacy-view.tsx
 create mode 100644 apps/sim/app/workspace/[workspaceId]/settings/components/general/search-params.ts
 delete mode 100644 apps/sim/app/workspace/[workspaceId]/settings/components/privacy/privacy.test.tsx
 delete mode 100644 apps/sim/app/workspace/[workspaceId]/settings/components/privacy/privacy.tsx

diff --git a/apps/sim/app/_shell/consent/consent-preferences.tsx b/apps/sim/app/_shell/consent/consent-preferences.tsx
index 36946c22814..cdff59b40e0 100644
--- a/apps/sim/app/_shell/consent/consent-preferences.tsx
+++ b/apps/sim/app/_shell/consent/consent-preferences.tsx
@@ -42,15 +42,23 @@ const CONSENT_CATEGORY_COPY: Record<string, ConsentCategoryCopy | undefined> = {
   },
 } satisfies Record<ConsentCategory, ConsentCategoryCopy>
 
+interface ConsentPreferencesProps {
+  /**
+   * Called after a switch stages its new value, for a surface that commits per
+   * toggle. The banner omits it and commits from its own footer instead.
+   */
+  onChange?: () => void
+}
+
 /**
  * The per-category consent switches, shared by the two surfaces that offer
  * them: the banner's expanded state and the Privacy settings page. Both write
- * to `selectedConsents`; committing is the caller's, since the banner saves
- * from its own footer and settings saves from the shell's header.
+ * to `selectedConsents`; whether that is then committed is the caller's, via
+ * {@link ConsentPreferencesProps.onChange}.
  *
- * Must be rendered inside a `ConsentManagerProvider`.
+ * Must be rendered inside a `ConsentStoreProvider`.
  */
-export function ConsentPreferences() {
+export function ConsentPreferences({ onChange }: ConsentPreferencesProps) {
   const { consents, selectedConsents, setSelectedConsent, getDisplayedConsents } =
     useConsentManager()
 
@@ -78,7 +86,10 @@ export function ConsentPreferences() {
               id={inputId}
               checked={selectedConsents[type.name] ?? consents[type.name] ?? false}
               disabled={type.disabled}
-              onCheckedChange={(checked) => setSelectedConsent(type.name, checked)}
+              onCheckedChange={(checked) => {
+                setSelectedConsent(type.name, checked)
+                onChange?.()
+              }}
             />
           </li>
         )
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
index feaccc33dd8..9ba369ef92a 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
@@ -4,7 +4,6 @@ import { useEffect } from 'react'
 import dynamic from 'next/dynamic'
 import { usePostHog } from 'posthog-js/react'
 import { useSession } from '@/lib/auth/auth-client'
-import { isHosted } from '@/lib/core/config/env-flags'
 import { captureEvent } from '@/lib/posthog/client'
 import { useWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider'
 import { General } from '@/app/workspace/[workspaceId]/settings/components/general/general'
@@ -105,9 +104,6 @@ const DataRetentionSettings = dynamic(() =>
 const DataDrainsSettings = dynamic(() =>
   import('@/ee/data-drains/components/data-drains-settings').then((m) => m.DataDrainsSettings)
 )
-const Privacy = dynamic(() =>
-  import('@/app/workspace/[workspaceId]/settings/components/privacy/privacy').then((m) => m.Privacy)
-)
 const Desktop = dynamic(() =>
   import('@/app/workspace/[workspaceId]/settings/components/desktop/desktop').then((m) => m.Desktop)
 )
@@ -146,9 +142,7 @@ export function SettingsPage({ section }: SettingsPageProps) {
         ? 'general'
         : normalizedSection === 'mothership' && !sessionLoading && !isAdminRole
           ? 'general'
-          : normalizedSection === 'privacy' && !isHosted
-            ? 'general'
-            : normalizedSection
+          : normalizedSection
   const organizationId = hostContext.hostOrganizationId
   const meta = getSettingsSectionMeta(effectiveSection)
 
@@ -163,7 +157,6 @@ export function SettingsPage({ section }: SettingsPageProps) {
   return (
     <SettingsSectionProvider section={effectiveSection} meta={meta ?? undefined}>
       {effectiveSection === 'general' && <General />}
-      {effectiveSection === 'privacy' && <Privacy />}
       {effectiveSection === 'desktop' && <Desktop />}
       {effectiveSection === 'browser' && <Browser />}
       {effectiveSection === 'terminal' && <Terminal />}
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.test.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.test.tsx
new file mode 100644
index 00000000000..de586b01dc1
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.test.tsx
@@ -0,0 +1,58 @@
+/**
+ * @vitest-environment jsdom
+ */
+import type { ReactNode } from 'react'
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { mockUseConsentManager, mockSaveConsents } = vi.hoisted(() => ({
+  mockUseConsentManager: vi.fn(),
+  mockSaveConsents: vi.fn(),
+}))
+
+vi.mock('@sim/emcn', () => ({ toast: { success: vi.fn(), error: vi.fn() } }))
+vi.mock('@c15t/nextjs/headless', () => ({ useConsentManager: mockUseConsentManager }))
+vi.mock('@/app/_shell/consent/consent-store-provider', () => ({
+  ConsentStoreProvider: ({ children }: { children: ReactNode }) => children,
+}))
+vi.mock('@/app/_shell/consent/consent-preferences', () => ({
+  CONSENT_LINK_CLASS: 'link',
+  ConsentPreferences: ({ onChange }: { onChange?: () => void }) => (
+    <button type='button' data-testid='toggle' onClick={onChange} />
+  ),
+}))
+
+import { CookiePreferences } from '@/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences'
+
+let root: Root | null = null
+
+beforeEach(() => {
+  mockUseConsentManager.mockReturnValue({
+    saveConsents: mockSaveConsents.mockResolvedValue(undefined),
+  })
+})
+
+afterEach(() => {
+  act(() => root?.unmount())
+  root = null
+  vi.clearAllMocks()
+})
+
+describe('CookiePreferences', () => {
+  it('commits on every toggle, matching the telemetry switch beside it', () => {
+    ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
+    const container = document.createElement('div')
+    document.body.appendChild(container)
+    root = createRoot(container)
+    act(() => root?.render(<CookiePreferences />))
+
+    expect(mockSaveConsents).not.toHaveBeenCalled()
+    act(() => container.querySelector<HTMLButtonElement>('[data-testid="toggle"]')?.click())
+
+    // `saveConsents('custom')` reads `selectedConsents` from the store at call
+    // time and the switch's `setSelectedConsent` write is synchronous, so the
+    // value this toggle staged is the one committed.
+    expect(mockSaveConsents).toHaveBeenCalledWith('custom', { uiSource: 'settings' })
+  })
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.tsx
new file mode 100644
index 00000000000..3d3799461a1
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.tsx
@@ -0,0 +1,59 @@
+'use client'
+
+import { useConsentManager } from '@c15t/nextjs/headless'
+import { toast } from '@sim/emcn'
+import { getErrorMessage } from '@sim/utils/errors'
+import Link from 'next/link'
+import { CONSENT_LINK_CLASS, ConsentPreferences } from '@/app/_shell/consent/consent-preferences'
+import { ConsentStoreProvider } from '@/app/_shell/consent/consent-store-provider'
+import { SettingsSection } from '@/app/workspace/[workspaceId]/settings/components/settings-section/settings-section'
+
+/**
+ * Body of the cookies section, split out because it reads the consent store,
+ * which only exists below the provider.
+ */
+function CookiePreferencesBody() {
+  const { saveConsents } = useConsentManager()
+
+  /**
+   * Each toggle commits, matching the telemetry switch directly above it — one
+   * interaction model on the page, and no "unsaved consent" state to reason
+   * about. The banner stages instead, because its footer owns the commit.
+   */
+  const commit = async () => {
+    try {
+      await saveConsents('custom', { uiSource: 'settings' })
+    } catch (error) {
+      toast.error(getErrorMessage(error, 'Could not save your cookie preferences'))
+    }
+  }
+
+  return (
+    <SettingsSection label='Cookies'>
+      <div className='flex flex-col gap-3'>
+        <ConsentPreferences onChange={commit} />
+        <p className='text-[var(--text-muted)] text-small'>
+          Your choice applies to this browser and is kept for 365 days. The{' '}
+          <Link
+            href='/cookie-policy'
+            target='_blank'
+            rel='noopener noreferrer'
+            className={CONSENT_LINK_CLASS}
+          >
+            Cookie Policy
+          </Link>{' '}
+          lists what each category covers.
+        </p>
+      </div>
+    </SettingsSection>
+  )
+}
+
+/** The cookies section, with the store it reads. */
+export function CookiePreferences() {
+  return (
+    <ConsentStoreProvider>
+      <CookiePreferencesBody />
+    </ConsentStoreProvider>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/privacy-view.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/privacy-view.tsx
new file mode 100644
index 00000000000..c61567d7aad
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/privacy-view.tsx
@@ -0,0 +1,71 @@
+'use client'
+
+import { ArrowLeft, Label, Switch } from '@sim/emcn'
+import { requestJson } from '@/lib/api/client/request'
+import { telemetryContract } from '@/lib/api/contracts/telemetry'
+import { isHosted } from '@/lib/core/config/env-flags'
+import { CookiePreferences } from '@/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences'
+import { SettingsPanel } from '@/app/workspace/[workspaceId]/settings/components/settings-panel'
+import { SettingsSection } from '@/app/workspace/[workspaceId]/settings/components/settings-section/settings-section'
+import { useGeneralSettings, useUpdateGeneralSetting } from '@/hooks/queries/general-settings'
+
+interface PrivacyViewProps {
+  onBack: () => void
+}
+
+/**
+ * Privacy sub-view of General — the one place a signed-in user changes what Sim
+ * may collect.
+ *
+ * A detail sub-view rather than its own settings tab: the nav is already long,
+ * and a tab a user opens once and never returns to is the wrong weight for it.
+ * Telemetry shows everywhere; cookies only on the hosted service, which is the
+ * only deployment that sets them.
+ */
+export function PrivacyView({ onBack }: PrivacyViewProps) {
+  const { data: settings } = useGeneralSettings()
+  const updateSetting = useUpdateGeneralSetting()
+
+  const handleTelemetryToggle = async (checked: boolean) => {
+    if (checked === settings?.telemetryEnabled || updateSetting.isPending) return
+
+    await updateSetting.mutateAsync({ key: 'telemetryEnabled', value: checked })
+
+    if (checked && typeof window !== 'undefined') {
+      requestJson(telemetryContract, {
+        body: {
+          category: 'consent',
+          action: 'enable_from_settings',
+          timestamp: new Date().toISOString(),
+        },
+      }).catch(() => {})
+    }
+  }
+
+  return (
+    <SettingsPanel
+      back={{ text: 'General', icon: ArrowLeft, onSelect: onBack }}
+      title='Privacy'
+      description='Control what Sim collects about how you use it.'
+    >
+      <SettingsSection label='Telemetry'>
+        <div className='flex flex-col gap-3'>
+          <div className='flex items-center justify-between'>
+            <Label htmlFor='telemetry'>Allow anonymous telemetry</Label>
+            <Switch
+              id='telemetry'
+              checked={settings?.telemetryEnabled ?? true}
+              onCheckedChange={handleTelemetryToggle}
+            />
+          </div>
+          <p className='text-[var(--text-muted)] text-small'>
+            We use OpenTelemetry to collect anonymous usage data to improve Sim. You can opt-out at
+            any time.
+          </p>
+        </div>
+      </SettingsSection>
+
+      {isHosted && <CookiePreferences />}
+    </SettingsPanel>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx
index 13a85bc3d9e..abf1deafae0 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx
@@ -20,14 +20,18 @@ import { Camera, Check, CircleInfo, Pencil } from '@sim/emcn/icons'
 import { createLogger } from '@sim/logger'
 import Image from 'next/image'
 import { useRouter } from 'next/navigation'
-import { requestJson } from '@/lib/api/client/request'
-import { telemetryContract } from '@/lib/api/contracts/telemetry'
+import { useQueryState } from 'nuqs'
 import { signOut, useSession } from '@/lib/auth/auth-client'
 import { ANONYMOUS_USER_ID } from '@/lib/auth/constants'
 import { isHosted } from '@/lib/core/config/env-flags'
 import { getBrowserTimezone, getTimezoneOptions } from '@/lib/core/utils/timezone'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { DeleteAccountModal } from '@/app/workspace/[workspaceId]/settings/components/general/components/delete-account-modal'
+import { PrivacyView } from '@/app/workspace/[workspaceId]/settings/components/general/components/privacy-view'
+import {
+  generalViewParam,
+  generalViewUrlKeys,
+} from '@/app/workspace/[workspaceId]/settings/components/general/search-params'
 import type { SettingsAction } from '@/app/workspace/[workspaceId]/settings/components/settings-header/settings-header'
 import { SettingsPanel } from '@/app/workspace/[workspaceId]/settings/components/settings-panel'
 import { SettingsSection } from '@/app/workspace/[workspaceId]/settings/components/settings-section/settings-section'
@@ -92,6 +96,10 @@ export function General() {
     setName(profile.name)
   }
 
+  const [view, setView] = useQueryState(generalViewParam.key, {
+    ...generalViewParam.parser,
+    ...generalViewUrlKeys,
+  })
   const [showResetPasswordModal, setShowResetPasswordModal] = useState(false)
   const resetPassword = useResetPassword()
 
@@ -246,30 +254,16 @@ export function General() {
     }
   }
 
-  const handleTelemetryToggle = async (checked: boolean) => {
-    if (checked !== settings?.telemetryEnabled && !updateSetting.isPending) {
-      await updateSetting.mutateAsync({ key: 'telemetryEnabled', value: checked })
-
-      if (checked) {
-        if (typeof window !== 'undefined') {
-          requestJson(telemetryContract, {
-            body: {
-              category: 'consent',
-              action: 'enable_from_settings',
-              timestamp: new Date().toISOString(),
-            },
-          }).catch(() => {})
-        }
-      }
-    }
-  }
-
   const imageUrl = profilePictureUrl || profile?.image || brandConfig.logoUrl
 
   if (isLoading) {
     return null
   }
 
+  if (view === 'privacy') {
+    return <PrivacyView onBack={() => setView(null)} />
+  }
+
   const actions: SettingsAction[] = [
     ...(isHosted
       ? [
@@ -563,16 +557,12 @@ export function General() {
         <SettingsSection label='Privacy'>
           <div className='flex flex-col gap-3'>
             <div className='flex items-center justify-between'>
-              <Label htmlFor='telemetry'>Allow anonymous telemetry</Label>
-              <Switch
-                id='telemetry'
-                checked={settings?.telemetryEnabled ?? true}
-                onCheckedChange={handleTelemetryToggle}
-              />
+              <Label>Privacy settings</Label>
+              <Chip onClick={() => setView('privacy')}>Manage</Chip>
             </div>
             <p className='text-[var(--text-muted)] text-small'>
-              We use OpenTelemetry to collect anonymous usage data to improve Sim. You can opt-out
-              at any time.
+              Choose what Sim may collect about how you use it — anonymous telemetry, and which
+              cookies this browser allows.
             </p>
           </div>
         </SettingsSection>
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/search-params.ts b/apps/sim/app/workspace/[workspaceId]/settings/components/general/search-params.ts
new file mode 100644
index 00000000000..93a3fa7316c
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/general/search-params.ts
@@ -0,0 +1,17 @@
+import { parseAsStringLiteral } from 'nuqs/server'
+
+/**
+ * The sub-view open inside General. Only `privacy` exists today; the literal
+ * parser means an unknown value from an old link falls back to General rather
+ * than rendering an empty detail pane.
+ */
+export const generalViewParam = {
+  key: 'view',
+  parser: parseAsStringLiteral(['privacy'] as const),
+} as const
+
+/** Opening the sub-view is a destination — Back should return to General. */
+export const generalViewUrlKeys = {
+  history: 'push',
+  clearOnDefault: true,
+} as const
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/privacy/privacy.test.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/privacy/privacy.test.tsx
deleted file mode 100644
index 9b9567de481..00000000000
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/privacy/privacy.test.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * @vitest-environment jsdom
- */
-import type { ReactNode } from 'react'
-import { act } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const {
-  mockUseConsentManager,
-  mockSaveConsents,
-  mockSetSelectedConsent,
-  mockActions,
-  mockGuard,
-  mockToastSuccess,
-} = vi.hoisted(() => ({
-  mockUseConsentManager: vi.fn(),
-  mockSaveConsents: vi.fn(),
-  mockSetSelectedConsent: vi.fn(),
-  mockActions: vi.fn(),
-  mockGuard: vi.fn(),
-  mockToastSuccess: vi.fn(),
-}))
-
-vi.mock('@sim/emcn', () => ({
-  toast: { success: mockToastSuccess, error: vi.fn() },
-}))
-
-vi.mock('@c15t/nextjs/headless', () => ({ useConsentManager: mockUseConsentManager }))
-
-vi.mock('@/app/_shell/consent/consent-store-provider', () => ({
-  ConsentStoreProvider: ({ children }: { children: ReactNode }) => children,
-}))
-
-vi.mock('@/app/_shell/consent/consent-preferences', () => ({
-  CONSENT_LINK_CLASS: 'link',
-  ConsentPreferences: () => <span data-testid='preferences' />,
-}))
-
-vi.mock('@/app/workspace/[workspaceId]/settings/components/settings-panel', () => ({
-  SettingsPanel: ({ actions, children }: { actions: unknown; children: ReactNode }) => {
-    mockActions(actions)
-    return <div>{children}</div>
-  },
-}))
-
-vi.mock('@/components/settings/use-settings-unsaved-guard', () => ({
-  useSettingsUnsavedGuard: mockGuard,
-}))
-
-import { Privacy } from '@/app/workspace/[workspaceId]/settings/components/privacy/privacy'
-
-let root: Root | null = null
-
-function render() {
-  ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
-  const container = document.createElement('div')
-  document.body.appendChild(container)
-  root = createRoot(container)
-  act(() => root?.render(<Privacy />))
-  return container
-}
-
-/** The Save action the shell was handed on the latest render. */
-function actionById(id: string) {
-  const actions = (mockActions.mock.calls.at(-1)?.[0] ?? []) as {
-    id: string
-    disabled?: boolean
-    onSelect: () => void
-  }[]
-  return actions.find((action) => action.id === id)
-}
-
-beforeEach(() => {
-  mockUseConsentManager.mockReturnValue({
-    consents: { necessary: true, measurement: false, marketing: false },
-    selectedConsents: { necessary: true, measurement: false, marketing: false },
-    setSelectedConsent: mockSetSelectedConsent,
-    saveConsents: mockSaveConsents,
-  })
-})
-
-afterEach(() => {
-  act(() => root?.unmount())
-  root = null
-  vi.clearAllMocks()
-})
-
-describe('Privacy settings', () => {
-  it('disables Save and reports clean while the staged consents match the saved ones', () => {
-    render()
-
-    expect(actionById('save')?.disabled).toBe(true)
-    expect(actionById('discard')).toBeUndefined()
-    expect(mockGuard).toHaveBeenLastCalledWith({ isDirty: false })
-  })
-
-  it('enables Save and reports dirty once a category is staged differently', () => {
-    mockUseConsentManager.mockReturnValue({
-      consents: { necessary: true, measurement: false, marketing: false },
-      selectedConsents: { necessary: true, measurement: true, marketing: false },
-      setSelectedConsent: mockSetSelectedConsent,
-      saveConsents: mockSaveConsents,
-    })
-    render()
-
-    expect(actionById('save')?.disabled).toBe(false)
-    expect(actionById('discard')).toBeDefined()
-    expect(mockGuard).toHaveBeenLastCalledWith({ isDirty: true })
-  })
-
-  it('saves the staged selection as a custom choice', async () => {
-    mockUseConsentManager.mockReturnValue({
-      consents: { necessary: true, measurement: false, marketing: false },
-      selectedConsents: { necessary: true, measurement: true, marketing: false },
-      setSelectedConsent: mockSetSelectedConsent,
-      saveConsents: mockSaveConsents.mockResolvedValue(undefined),
-    })
-    render()
-
-    const save = actionById('save')
-    // Awaited inside `act` so the save's own state updates settle here rather
-    // than leaking a render into the next test.
-    await act(async () => {
-      await save?.onSelect()
-    })
-
-    expect(mockSaveConsents).toHaveBeenCalledWith('custom', { uiSource: 'settings' })
-  })
-
-  it('discards by replaying the saved value onto only the changed categories', () => {
-    mockUseConsentManager.mockReturnValue({
-      consents: { necessary: true, measurement: false, marketing: false },
-      selectedConsents: { necessary: true, measurement: true, marketing: false },
-      setSelectedConsent: mockSetSelectedConsent,
-      saveConsents: mockSaveConsents,
-    })
-    render()
-
-    const discard = actionById('discard')
-    act(() => discard?.onSelect())
-
-    expect(mockSetSelectedConsent).toHaveBeenCalledTimes(1)
-    expect(mockSetSelectedConsent).toHaveBeenCalledWith('measurement', false)
-  })
-})
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/privacy/privacy.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/privacy/privacy.tsx
deleted file mode 100644
index 2b8da0c96b7..00000000000
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/privacy/privacy.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { useConsentManager } from '@c15t/nextjs/headless'
-import { toast } from '@sim/emcn'
-import { getErrorMessage } from '@sim/utils/errors'
-import Link from 'next/link'
-import { saveDiscardActions } from '@/components/settings/save-discard-actions'
-import { useSettingsUnsavedGuard } from '@/components/settings/use-settings-unsaved-guard'
-import { CONSENT_LINK_CLASS, ConsentPreferences } from '@/app/_shell/consent/consent-preferences'
-import { ConsentStoreProvider } from '@/app/_shell/consent/consent-store-provider'
-import { SettingsPanel } from '@/app/workspace/[workspaceId]/settings/components/settings-panel'
-import { SettingsSection } from '@/app/workspace/[workspaceId]/settings/components/settings-section/settings-section'
-
-/**
- * Body of the Privacy page, split from {@link Privacy} because it reads the
- * consent store, which only exists below the provider.
- */
-function PrivacySettings() {
-  const { consents, selectedConsents, setSelectedConsent, saveConsents } = useConsentManager()
-  const [saving, setSaving] = useState(false)
-
-  /**
-   * `selectedConsents` is the runtime's staging copy of `consents`, so the two
-   * diverging is exactly what "unsaved" means here.
-   */
-  const changed = (Object.keys(selectedConsents) as (keyof typeof selectedConsents)[]).filter(
-    (name) => selectedConsents[name] !== consents[name]
-  )
-  useSettingsUnsavedGuard({ isDirty: changed.length > 0 })
-
-  const save = async () => {
-    setSaving(true)
-    try {
-      await saveConsents('custom', { uiSource: 'settings' })
-      toast.success('Cookie preferences saved')
-    } catch (error) {
-      toast.error(getErrorMessage(error, 'Could not save your cookie preferences'))
-    } finally {
-      setSaving(false)
-    }
-  }
-
-  /** The store has no reset, so discard replays the saved value per changed category. */
-  const discard = () => {
-    for (const name of changed) {
-      setSelectedConsent(name, consents[name])
-    }
-  }
-
-  return (
-    <SettingsPanel
-      actions={saveDiscardActions({
-        dirty: changed.length > 0,
-        saving,
-        onSave: save,
-        onDiscard: discard,
-      })}
-    >
-      <SettingsSection label='Cookies'>
-        <ConsentPreferences />
-      </SettingsSection>
-      <p className='text-[var(--text-muted)] text-small'>
-        Your choice applies to this browser and is kept for 365 days. The{' '}
-        <Link
-          href='/cookie-policy'
-          target='_blank'
-          rel='noopener noreferrer'
-          className={CONSENT_LINK_CLASS}
-        >
-          Cookie Policy
-        </Link>{' '}
-        lists what each category covers.
-      </p>
-    </SettingsPanel>
-  )
-}
-
-/**
- * Privacy settings — where a signed-in user reviews and changes the cookie
- * choice they made in the banner.
- *
- * Shares the banner's store through {@link ConsentStoreProvider}. The banner
- * does not mount inside the workspace, so this is the product's only consent
- * surface.
- */
-export function Privacy() {
-  return (
-    <ConsentStoreProvider>
-      <PrivacySettings />
-    </ConsentStoreProvider>
-  )
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/navigation.test.ts b/apps/sim/app/workspace/[workspaceId]/settings/navigation.test.ts
index 444692135f8..9cdae3dcb08 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/navigation.test.ts
+++ b/apps/sim/app/workspace/[workspaceId]/settings/navigation.test.ts
@@ -21,7 +21,6 @@ describe('unified settings navigation', () => {
   it('keeps account, workspace, organization, and platform settings in one catalog', () => {
     expect(allNavigationItems.map(({ id, label, section }) => ({ id, label, section }))).toEqual([
       { id: 'general', label: 'General', section: 'account' },
-      { id: 'privacy', label: 'Privacy', section: 'account' },
       { id: 'desktop', label: 'Desktop', section: 'account' },
       { id: 'browser', label: 'Browser', section: 'account' },
       { id: 'terminal', label: 'Terminal', section: 'account' },
@@ -66,7 +65,6 @@ describe('unified settings navigation', () => {
       'desktop',
       'browser',
       'terminal',
-      'privacy',
     ])
     expect(idsForSection('workspace')).toEqual([
       'teammates',
diff --git a/apps/sim/components/settings/navigation.test.ts b/apps/sim/components/settings/navigation.test.ts
index 6eb3e7fda2b..c6afcf93ca2 100644
--- a/apps/sim/components/settings/navigation.test.ts
+++ b/apps/sim/components/settings/navigation.test.ts
@@ -40,7 +40,6 @@ describe('settings navigation boundaries', () => {
   it('preserves the order of all four settings catalogs', () => {
     expect(buildUnifiedSettingsNavigation().map(({ id }) => id)).toEqual([
       'general',
-      'privacy',
       'desktop',
       'browser',
       'terminal',
diff --git a/apps/sim/components/settings/navigation.ts b/apps/sim/components/settings/navigation.ts
index 0adf2e147a5..f70cc4193d1 100644
--- a/apps/sim/components/settings/navigation.ts
+++ b/apps/sim/components/settings/navigation.ts
@@ -97,7 +97,6 @@ export interface SettingsNavigationItem<Section extends string = string> {
 
 export type UnifiedSettingsSection =
   | 'general'
-  | 'privacy'
   | 'desktop'
   | 'browser'
   | 'terminal'
@@ -372,17 +371,6 @@ export const SETTINGS_SECTION_REGISTRY: readonly SettingsSectionRegistryEntry[]
       selfhost: { id: 'general', group: 'account', order: 0 },
     },
   },
-  {
-    label: 'Privacy',
-    icon: Lock,
-    unified: {
-      id: 'privacy',
-      description: 'Choose which cookies Sim may use in this browser.',
-      group: 'account',
-      order: 5,
-      requiresHosted: true,
-    },
-  },
   {
     label: 'Desktop',
     icon: PanelLeft,

From 0b5157d7c72ed49840dd78c6c408c8c1efb33188 Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Tue, 18 Aug 2026 19:34:40 -0700
Subject: [PATCH 2/3] fix(consent): keep the old /settings/privacy link working

The section moved into General, so the path no longer resolves. Redirect it to
the replacement view through TOP_LEVEL_REDIRECTS, which the route already uses
for the integrations and skills moves.
---
 .../sim/app/workspace/[workspaceId]/settings/[section]/page.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/sim/app/workspace/[workspaceId]/settings/[section]/page.tsx b/apps/sim/app/workspace/[workspaceId]/settings/[section]/page.tsx
index 1a64d6206a7..2d98d12c5d4 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/[section]/page.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/[section]/page.tsx
@@ -44,6 +44,8 @@ const SECTION_ALIASES: Readonly<Record<string, SettingsSection>> = {
 const TOP_LEVEL_REDIRECTS: Readonly<Record<string, (workspaceId: string) => string>> = {
   integrations: (workspaceId) => `/workspace/${workspaceId}/integrations`,
   skills: (workspaceId) => `/workspace/${workspaceId}/skills`,
+  // Cookie preferences moved into General; keep old links working.
+  privacy: (workspaceId) => `/workspace/${workspaceId}/settings/general?view=privacy`,
 }
 
 const WORKSPACE_SECTION_MAP: Partial<Record<SettingsSection, WorkspaceSettingsSection>> = {

From 88cffc31a08ae3ee23a33cff2e4bb8e98ab9adfd Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Tue, 18 Aug 2026 19:59:22 -0700
Subject: [PATCH 3/3] fix(consent): stop two cookie toggles from racing, and
 revert a failed one

Each save sends the whole selectedConsents snapshot, so two quick toggles could
finish out of order and land the older choice. The switches now lock while a
commit is in flight, exactly as the telemetry switch does on its own mutation,
and a failed commit puts the switch back instead of showing a preference that
was never recorded.

Also stop the General blurb promising cookie controls on a self-hosted
deployment, where the sub-view only carries telemetry.
---
 .../_shell/consent/consent-preferences.tsx    |  19 +++-
 .../components/cookie-preferences.test.tsx    | 103 +++++++++++++++---
 .../general/components/cookie-preferences.tsx |  16 ++-
 .../settings/components/general/general.tsx   |   5 +-
 4 files changed, 116 insertions(+), 27 deletions(-)

diff --git a/apps/sim/app/_shell/consent/consent-preferences.tsx b/apps/sim/app/_shell/consent/consent-preferences.tsx
index cdff59b40e0..faf620b1767 100644
--- a/apps/sim/app/_shell/consent/consent-preferences.tsx
+++ b/apps/sim/app/_shell/consent/consent-preferences.tsx
@@ -42,12 +42,18 @@ const CONSENT_CATEGORY_COPY: Record<string, ConsentCategoryCopy | undefined> = {
   },
 } satisfies Record<ConsentCategory, ConsentCategoryCopy>
 
+/** The runtime's category union, without re-declaring it. */
+type ConsentCategoryName = Parameters<ReturnType<typeof useConsentManager>['setSelectedConsent']>[0]
+
 interface ConsentPreferencesProps {
   /**
    * Called after a switch stages its new value, for a surface that commits per
-   * toggle. The banner omits it and commits from its own footer instead.
+   * toggle. `revert` puts the category back, for a commit that then fails. The
+   * banner omits this and commits from its own footer instead.
    */
-  onChange?: () => void
+  onChange?: (change: { name: ConsentCategoryName; revert: () => void }) => void
+  /** Locks every switch, e.g. while a commit is in flight. */
+  disabled?: boolean
 }
 
 /**
@@ -58,7 +64,7 @@ interface ConsentPreferencesProps {
  *
  * Must be rendered inside a `ConsentStoreProvider`.
  */
-export function ConsentPreferences({ onChange }: ConsentPreferencesProps) {
+export function ConsentPreferences({ onChange, disabled = false }: ConsentPreferencesProps) {
   const { consents, selectedConsents, setSelectedConsent, getDisplayedConsents } =
     useConsentManager()
 
@@ -85,10 +91,13 @@ export function ConsentPreferences({ onChange }: ConsentPreferencesProps) {
             <Switch
               id={inputId}
               checked={selectedConsents[type.name] ?? consents[type.name] ?? false}
-              disabled={type.disabled}
+              disabled={type.disabled || disabled}
               onCheckedChange={(checked) => {
                 setSelectedConsent(type.name, checked)
-                onChange?.()
+                onChange?.({
+                  name: type.name,
+                  revert: () => setSelectedConsent(type.name, !checked),
+                })
               }}
             />
           </li>
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.test.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.test.tsx
index de586b01dc1..c45862f166e 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.test.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.test.tsx
@@ -6,31 +6,72 @@ import { act } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-const { mockUseConsentManager, mockSaveConsents } = vi.hoisted(() => ({
-  mockUseConsentManager: vi.fn(),
-  mockSaveConsents: vi.fn(),
-}))
+const { mockUseConsentManager, mockSaveConsents, mockToastError, mockRevert, lastProps } =
+  vi.hoisted(() => ({
+    mockUseConsentManager: vi.fn(),
+    mockSaveConsents: vi.fn(),
+    mockToastError: vi.fn(),
+    mockRevert: vi.fn(),
+    lastProps: vi.fn(),
+  }))
 
-vi.mock('@sim/emcn', () => ({ toast: { success: vi.fn(), error: vi.fn() } }))
+vi.mock('@sim/emcn', () => ({ toast: { success: vi.fn(), error: mockToastError } }))
 vi.mock('@c15t/nextjs/headless', () => ({ useConsentManager: mockUseConsentManager }))
 vi.mock('@/app/_shell/consent/consent-store-provider', () => ({
   ConsentStoreProvider: ({ children }: { children: ReactNode }) => children,
 }))
 vi.mock('@/app/_shell/consent/consent-preferences', () => ({
   CONSENT_LINK_CLASS: 'link',
-  ConsentPreferences: ({ onChange }: { onChange?: () => void }) => (
-    <button type='button' data-testid='toggle' onClick={onChange} />
-  ),
+  ConsentPreferences: (props: {
+    onChange?: (change: { name: string; revert: () => void }) => void
+    disabled?: boolean
+  }) => {
+    lastProps(props)
+    return (
+      <button
+        type='button'
+        data-testid='toggle'
+        disabled={props.disabled}
+        onClick={() => props.onChange?.({ name: 'measurement', revert: mockRevert })}
+      />
+    )
+  },
 }))
 
 import { CookiePreferences } from '@/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences'
 
 let root: Root | null = null
 
+/** The props the switch list was last rendered with. */
+function props() {
+  return lastProps.mock.calls.at(-1)?.[0] as { disabled?: boolean }
+}
+
+function render() {
+  ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
+  const container = document.createElement('div')
+  document.body.appendChild(container)
+  root = createRoot(container)
+  act(() => root?.render(<CookiePreferences />))
+  return container
+}
+
+/** Resolves the pending save on demand, so the in-flight state is observable. */
+function deferredSave() {
+  let resolve!: () => void
+  let reject!: (error: Error) => void
+  mockSaveConsents.mockReturnValue(
+    new Promise<void>((res, rej) => {
+      resolve = res
+      reject = rej
+    })
+  )
+  return { resolve, reject }
+}
+
 beforeEach(() => {
-  mockUseConsentManager.mockReturnValue({
-    saveConsents: mockSaveConsents.mockResolvedValue(undefined),
-  })
+  mockUseConsentManager.mockReturnValue({ saveConsents: mockSaveConsents })
+  mockSaveConsents.mockResolvedValue(undefined)
 })
 
 afterEach(() => {
@@ -40,19 +81,45 @@ afterEach(() => {
 })
 
 describe('CookiePreferences', () => {
-  it('commits on every toggle, matching the telemetry switch beside it', () => {
-    ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
-    const container = document.createElement('div')
-    document.body.appendChild(container)
-    root = createRoot(container)
-    act(() => root?.render(<CookiePreferences />))
+  it('commits on every toggle, matching the telemetry switch beside it', async () => {
+    const container = render()
 
     expect(mockSaveConsents).not.toHaveBeenCalled()
-    act(() => container.querySelector<HTMLButtonElement>('[data-testid="toggle"]')?.click())
+    await act(async () => {
+      container.querySelector<HTMLButtonElement>('[data-testid="toggle"]')?.click()
+    })
 
     // `saveConsents('custom')` reads `selectedConsents` from the store at call
     // time and the switch's `setSelectedConsent` write is synchronous, so the
     // value this toggle staged is the one committed.
     expect(mockSaveConsents).toHaveBeenCalledWith('custom', { uiSource: 'settings' })
   })
+
+  it('locks the switches while a commit is in flight, so two toggles cannot race', async () => {
+    const pending = deferredSave()
+    const container = render()
+
+    act(() => {
+      container.querySelector<HTMLButtonElement>('[data-testid="toggle"]')?.click()
+    })
+    expect(props().disabled).toBe(true)
+
+    await act(async () => {
+      pending.resolve()
+    })
+    expect(props().disabled).toBe(false)
+  })
+
+  it('puts the switch back when the commit fails', async () => {
+    mockSaveConsents.mockRejectedValue(new Error('network down'))
+    const container = render()
+
+    await act(async () => {
+      container.querySelector<HTMLButtonElement>('[data-testid="toggle"]')?.click()
+    })
+
+    expect(mockRevert).toHaveBeenCalledTimes(1)
+    expect(mockToastError).toHaveBeenCalled()
+    expect(props().disabled).toBe(false)
+  })
 })
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.tsx
index 3d3799461a1..db83b86bc30 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.tsx
@@ -1,5 +1,6 @@
 'use client'
 
+import { useState } from 'react'
 import { useConsentManager } from '@c15t/nextjs/headless'
 import { toast } from '@sim/emcn'
 import { getErrorMessage } from '@sim/utils/errors'
@@ -14,24 +15,35 @@ import { SettingsSection } from '@/app/workspace/[workspaceId]/settings/componen
  */
 function CookiePreferencesBody() {
   const { saveConsents } = useConsentManager()
+  const [saving, setSaving] = useState(false)
 
   /**
    * Each toggle commits, matching the telemetry switch directly above it — one
    * interaction model on the page, and no "unsaved consent" state to reason
    * about. The banner stages instead, because its footer owns the commit.
+   *
+   * The switches lock while a commit is in flight, as the telemetry switch does
+   * on its own mutation. Without that, two quick toggles race: each save sends
+   * the whole `selectedConsents` snapshot, so the slower request can land last
+   * and overwrite the newer choice. A failed commit puts the switch back rather
+   * than leaving it showing a preference that was never recorded.
    */
-  const commit = async () => {
+  const commit = async ({ revert }: { revert: () => void }) => {
+    setSaving(true)
     try {
       await saveConsents('custom', { uiSource: 'settings' })
     } catch (error) {
+      revert()
       toast.error(getErrorMessage(error, 'Could not save your cookie preferences'))
+    } finally {
+      setSaving(false)
     }
   }
 
   return (
     <SettingsSection label='Cookies'>
       <div className='flex flex-col gap-3'>
-        <ConsentPreferences onChange={commit} />
+        <ConsentPreferences onChange={commit} disabled={saving} />
         <p className='text-[var(--text-muted)] text-small'>
           Your choice applies to this browser and is kept for 365 days. The{' '}
           <Link
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx
index abf1deafae0..4c60d6859ea 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx
@@ -561,8 +561,9 @@ export function General() {
               <Chip onClick={() => setView('privacy')}>Manage</Chip>
             </div>
             <p className='text-[var(--text-muted)] text-small'>
-              Choose what Sim may collect about how you use it — anonymous telemetry, and which
-              cookies this browser allows.
+              {isHosted
+                ? 'Choose what Sim may collect about how you use it — anonymous telemetry, and which cookies this browser allows.'
+                : 'Choose what Sim may collect about how you use it.'}
             </p>
           </div>
         </SettingsSection>