diff --git a/src/renderer/src/components/settings/GeneralUpdateSettingsSection.tsx b/src/renderer/src/components/settings/GeneralUpdateSettingsSection.tsx index 1b325ed47..15677927a 100644 --- a/src/renderer/src/components/settings/GeneralUpdateSettingsSection.tsx +++ b/src/renderer/src/components/settings/GeneralUpdateSettingsSection.tsx @@ -42,8 +42,8 @@ export function GeneralUpdateSettingsSection(): React.JSX.Element { const [appVersion, setAppVersion] = useState(null) const updateCheckHint = getUpdateCheckHint() // Why: channel switching is a power-user escape hatch that can downgrade the app - // onto an unvetted build. Option/Alt-clicking the header reveals it, matching the - // Help menu's hidden admin options rather than shipping it on the default surface. + // onto an unvetted build. Option/Alt-clicking the header reveals it rather than + // shipping it on the default surface. const [channelSwitcherRevealed, setChannelSwitcherRevealed] = useState(false) useEffect(() => { diff --git a/src/renderer/src/components/sidebar/SidebarSettingsHelpMenu.test.tsx b/src/renderer/src/components/sidebar/SidebarSettingsHelpMenu.test.tsx index 7875deea0..b88bc1c10 100644 --- a/src/renderer/src/components/sidebar/SidebarSettingsHelpMenu.test.tsx +++ b/src/renderer/src/components/sidebar/SidebarSettingsHelpMenu.test.tsx @@ -222,9 +222,14 @@ describe('SidebarSettingsHelpMenu', () => { expect(html).not.toContain('Milestones') }) - it('hides the Onboarding admin entry by default', () => { + it('renders the Onboarding menu item by default', () => { const html = renderToStaticMarkup() - expect(html).not.toContain('Onboarding') + expect(html).toContain('Onboarding') + }) + + it('renders Restart Orca by default', () => { + const html = renderToStaticMarkup() + expect(html).toContain('Restart Orca') }) it('renders Docs link', () => { diff --git a/src/renderer/src/components/sidebar/SidebarSettingsHelpMenu.tsx b/src/renderer/src/components/sidebar/SidebarSettingsHelpMenu.tsx index 9fee62dde..fc4975eb4 100644 --- a/src/renderer/src/components/sidebar/SidebarSettingsHelpMenu.tsx +++ b/src/renderer/src/components/sidebar/SidebarSettingsHelpMenu.tsx @@ -95,7 +95,6 @@ export function SidebarSettingsHelpMenu(): React.JSX.Element { const settingsShortcut = useShortcutKeyDetails('app.settings') const [menuOpen, setMenuOpen] = useState(false) const [feedbackOpen, setFeedbackOpen] = useState(false) - const [showAdminOptions, setShowAdminOptions] = useState(false) const [isRestartingOrca, setIsRestartingOrca] = useState(false) const lastShowOnboardingAtRef = React.useRef(0) const updateCheckModifiersRef = React.useRef(NO_UPDATE_CHECK_MODIFIERS) @@ -108,15 +107,6 @@ export function SidebarSettingsHelpMenu(): React.JSX.Element { const handleMenuOpenChange = (open: boolean): void => { setMenuOpen(open) updateCheckModifiersRef.current = NO_UPDATE_CHECK_MODIFIERS - if (!open) { - setShowAdminOptions(false) - } - } - - const revealAdminOptions = (altKey: boolean): void => { - // Why: onboarding replay and restart stay off the default Help menu; holding - // Option/Alt before opening is an intentional power-user affordance. - setShowAdminOptions(altKey) } const handleShowOnboarding = (): void => { @@ -221,8 +211,6 @@ export function SidebarSettingsHelpMenu(): React.JSX.Element { 'Help' )} className="text-muted-foreground" - onPointerDown={(event) => revealAdminOptions(event.altKey)} - onClick={(event) => revealAdminOptions(event.altKey)} > @@ -268,19 +256,17 @@ export function SidebarSettingsHelpMenu(): React.JSX.Element { /> ) : null} - {showAdminOptions ? ( - - - {translate( - 'auto.components.sidebar.SidebarSettingsHelpMenu.b7e4d2a19c', - 'Onboarding' - )} - - ) : null} + + + {translate( + 'auto.components.sidebar.SidebarSettingsHelpMenu.b7e4d2a19c', + 'Onboarding' + )} + - {showAdminOptions ? ( - <> - - - - {translate( - 'auto.components.sidebar.SidebarSettingsHelpMenu.ad3d3ed7f1', - 'Restart Orca' - )} - - - ) : null} + + + + {translate( + 'auto.components.sidebar.SidebarSettingsHelpMenu.ad3d3ed7f1', + 'Restart Orca' + )} +