Voice-to-text dictation app with local (Nvidia Parakeet/Whisper) and cloud models (BYOK). Privacy-first and available cross-platform.
JavaScript aianthropiccross-platformgeminigroqlinuxmacosnvidiaopen-sourceopenaiparakeetspeech-to-texttranscribewhisperwindows
fix(settings): move the org-managed notice under the account identity (#2275)
clarkmaan6a49caa7cacb
diff --git a/src/components/SettingsModal.tsx b/src/components/SettingsModal.tsxindex a11f0fe82..e51317c5e 100644--- a/src/components/SettingsModal.tsx+++ b/src/components/SettingsModal.tsx@@ -181,12 +181,13 @@ export default function SettingsModal({ open, onOpenChange, initialSection }: Se) : undefined}notice={- policyManaged ? (- <>- <ShieldCheck className="h-4 w-4 shrink-0" />- {t("settingsModal.managedByOrg")}- </>- ) : undefined+ policyManaged+ ? {+ icon: <ShieldCheck className="h-3.5 w-3.5 shrink-0" />,+ label: t("settingsModal.managedAccount"),+ description: t("settingsModal.managedByOrg"),+ }+ : undefined}><SettingsPagediff --git a/src/components/ui/SidebarModal.tsx b/src/components/ui/SidebarModal.tsxindex af8387a51..a2efe81e6 100644--- a/src/components/ui/SidebarModal.tsx+++ b/src/components/ui/SidebarModal.tsx@@ -31,8 +31,12 @@ interface SidebarModalProps<T extends string> {version?: string;/** Rendered above the nav (hidden in compact mode), e.g. account identity. */header?: React.ReactNode;- /** Full-width banner above every section, e.g. an organization-managed notice. */- notice?: React.ReactNode;+ /**+ * Account-level notice, e.g. an organization-managed policy. Sits under the+ * header in the sidebar; when the sidebar is compact it collapses to an icon+ * badge beside the close button with `description` as its tooltip.+ */+ notice?: { icon: React.ReactNode; label: string; description: string };}export default function SidebarModal<T extends string>({@@ -139,10 +143,18 @@ export default function SidebarModal<T extends string>({className="fixed left-[50%] top-[50%] z-50 max-h-[85vh] w-[90vw] max-w-4xl translate-x-[-50%] translate-y-[-50%] rounded-xl p-0 overflow-hidden outline-none bg-background border border-border shadow-[0_25px_50px_-12px_rgba(0,0,0,0.25)] dark:bg-surface-1 dark:border-border-subtle dark:shadow-[0_25px_60px_-12px_rgba(0,0,0,0.5),0_0_0_1px_rgba(255,255,255,0.05)] duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-98 data-[state=open]:zoom-in-98"><div className="relative h-full max-h-[85vh] overflow-hidden">- <DialogPrimitive.Close className="absolute end-4 top-4 z-10 rounded-md p-1.5 opacity-40 ring-offset-background transition-[opacity,background-color] hover:opacity-100 bg-transparent hover:bg-muted dark:hover:bg-surface-raised outline-none focus-visible:ring-2 focus-visible:ring-ring/30 focus-visible:ring-offset-1">- <X className="h-3.5 w-3.5 text-muted-foreground" />- <span className="sr-only">{t("common.close")}</span>- </DialogPrimitive.Close>+ <div className="absolute end-4 top-4 z-10 flex items-center gap-2">+ {notice && isCompact && (+ <InfoBox title={notice.description} className="rounded-md p-1.25 text-primary">+ {notice.icon}+ <span className="sr-only">{notice.description}</span>+ </InfoBox>+ )}+ <DialogPrimitive.Close className="rounded-md p-1.5 opacity-40 ring-offset-background transition-[opacity,background-color] hover:opacity-100 bg-transparent hover:bg-muted dark:hover:bg-surface-raised outline-none focus-visible:ring-2 focus-visible:ring-ring/30 focus-visible:ring-offset-1">+ <X className="h-3.5 w-3.5 text-muted-foreground" />+ <span className="sr-only">{t("common.close")}</span>+ </DialogPrimitive.Close>+ </div><div ref={containerRef} className="flex h-[85vh]"><DialogPrimitive.Title className="sr-only">{title}</DialogPrimitive.Title>@@ -153,6 +165,19 @@ export default function SidebarModal<T extends string>({>{/* Identity / custom header */}{header && !isCompact && <div className="px-4 pt-5 pb-1">{header}</div>}+ {notice && !isCompact && (+ <div className="flex justify-center px-4 pb-1">+ <span+ aria-hidden="true"+ title={notice.description}+ className="inline-flex items-center gap-1.5 text-center text-[11px] text-primary"+ >+ {notice.icon}+ {notice.label}+ </span>+ <span className="sr-only">{notice.description}</span>+ </div>+ )}{/* Navigation */}<nav@@ -249,19 +274,9 @@ export default function SidebarModal<T extends string>({{/* Main Content */}<div className="flex-1 overflow-y-auto bg-background dark:bg-surface-1"><SettingsLayoutProvider value={{ isCompact }}>- <div className={isCompact ? "p-4" : "p-6"}>- {/* Starts just below the close button, which floats over this column's top corner. */}- {notice && (- <InfoBox- className={`mb-6 flex items-center gap-2.5 rounded-lg px-4 py-3 text-sm text-primary ${- isCompact ? "mt-8" : "mt-6"- }`}- >- {notice}- </InfoBox>- )}- {children}- </div>+ {/* The close button (and compact notice badge) float over this column's top corner+ (top-4, 26px tall); pt-[22px] centres a text-xs heading (line-height 1.15) on that row. */}+ <div className={`${isCompact ? "p-4" : "p-6"} pt-[22px]`}>{children}</div></SettingsLayoutProvider></div></div>diff --git a/src/locales/ar/translation.json b/src/locales/ar/translation.jsonindex 0e4add601..0ed16a4d6 100644--- a/src/locales/ar/translation.json+++ b/src/locales/ar/translation.json@@ -4466,6 +4466,7 @@},"settingsModal": {"managedByOrg": "تتم إدارة بعض الإعدادات بواسطة مؤسستك.",+ "managedAccount": "حساب مُدار","groups": {"account": "الحساب","app": "التطبيق",diff --git a/src/locales/de/translation.json b/src/locales/de/translation.jsonindex b854a00ce..330e98320 100644--- a/src/locales/de/translation.json+++ b/src/locales/de/translation.json@@ -1586,6 +1586,7 @@},"settingsModal": {"managedByOrg": "Einige Einstellungen werden von Ihrer Organisation verwaltet.",+ "managedAccount": "Verwaltetes Konto","groups": {"account": "Konto","app": "App",diff --git a/src/locales/en/translation.json b/src/locales/en/translation.jsonindex 3e7ed007c..6fa140e5c 100644--- a/src/locales/en/translation.json+++ b/src/locales/en/translation.json@@ -1586,6 +1586,7 @@},"settingsModal": {"managedByOrg": "Some settings are managed by your organization.",+ "managedAccount": "Managed account","groups": {"account": "Account","app": "App",diff --git a/src/locales/es/translation.json b/src/locales/es/translation.jsonindex 818f1b2b6..7c5aff6e1 100644--- a/src/locales/es/translation.json+++ b/src/locales/es/translation.json@@ -1544,6 +1544,7 @@},"settingsModal": {"managedByOrg": "Algunos ajustes están gestionados por tu organización.",+ "managedAccount": "Cuenta gestionada","groups": {"account": "Cuenta","app": "Aplicación",diff --git a/src/locales/fr/translation.json b/src/locales/fr/translation.jsonindex f2aafa64e..139fe0827 100644--- a/src/locales/fr/translation.json+++ b/src/locales/fr/translation.json@@ -1586,6 +1586,7 @@},"settingsModal": {"managedByOrg": "Certains paramètres sont gérés par votre organisation.",+ "managedAccount": "Compte géré","groups": {"account": "Compte","app": "Application",diff --git a/src/locales/it/translation.json b/src/locales/it/translation.jsonindex ceaaf1f55..f4dc7250b 100644--- a/src/locales/it/translation.json+++ b/src/locales/it/translation.json@@ -1491,6 +1491,7 @@},"settingsModal": {"managedByOrg": "Alcune impostazioni sono gestite dalla tua organizzazione.",+ "managedAccount": "Account gestito","groups": {"account": "Account","app": "App",diff --git a/src/locales/ja/translation.json b/src/locales/ja/translation.jsonindex 87b0666aa..44c51eb19 100644--- a/src/locales/ja/translation.json+++ b/src/locales/ja/translation.json@@ -1491,6 +1491,7 @@},"settingsModal": {"managedByOrg": "一部の設定は組織によって管理されています。",+ "managedAccount": "管理対象アカウント","groups": {"account": "アカウント","app": "アプリ",diff --git a/src/locales/pt/translation.json b/src/locales/pt/translation.jsonindex a8861415f..d4cdf088c 100644--- a/src/locales/pt/translation.json+++ b/src/locales/pt/translation.json@@ -1470,6 +1470,7 @@},"settingsModal": {"managedByOrg": "Algumas configurações são gerenciadas pela sua organização.",+ "managedAccount": "Conta gerenciada","groups": {"account": "Conta","app": "Aplicativo",diff --git a/src/locales/ru/translation.json b/src/locales/ru/translation.jsonindex 2d049f197..77d18cb2f 100644--- a/src/locales/ru/translation.json+++ b/src/locales/ru/translation.json@@ -1491,6 +1491,7 @@},"settingsModal": {"managedByOrg": "Некоторые настройки управляются вашей организацией.",+ "managedAccount": "Управляемый аккаунт","groups": {"account": "Аккаунт","app": "Приложение",diff --git a/src/locales/zh-CN/translation.json b/src/locales/zh-CN/translation.jsonindex 4aa84bbfb..461138547 100644--- a/src/locales/zh-CN/translation.json+++ b/src/locales/zh-CN/translation.json@@ -1491,6 +1491,7 @@},"settingsModal": {"managedByOrg": "部分设置由您的组织管理。",+ "managedAccount": "受管理的账户","groups": {"account": "账户","app": "应用",diff --git a/src/locales/zh-TW/translation.json b/src/locales/zh-TW/translation.jsonindex 1121d0649..77b1b118b 100644--- a/src/locales/zh-TW/translation.json+++ b/src/locales/zh-TW/translation.json@@ -1491,6 +1491,7 @@},"settingsModal": {"managedByOrg": "部分設定由您的組織管理。",+ "managedAccount": "受管理的帳戶","groups": {"account": "帳戶","app": "應用程式",