Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

fix(ux): spamming cmd + , no longer stack opening settings (#2757)

James143b9c928001
diff --git a/apps/web/src/components/AppSidebarLayout.tsx b/apps/web/src/components/AppSidebarLayout.tsx
index 455cc9199..aefa9ab9f 100644
--- a/apps/web/src/components/AppSidebarLayout.tsx
+++ b/apps/web/src/components/AppSidebarLayout.tsx
@@ -1,6 +1,6 @@
import { useAtomValue } from "@effect/atom-react";
-import { useEffect, useState, type CSSProperties, type ReactNode } from "react";
-import { useNavigate } from "@tanstack/react-router";
+import { useEffect, useRef, useState, type CSSProperties, type ReactNode } from "react";
+import { useLocation, useNavigate } from "@tanstack/react-router";
import { isElectron } from "../env";
import { resolveShortcutCommand, shortcutLabelForCommand } from "../keybindings";
@@ -55,6 +55,9 @@ function SidebarControl() {
export function AppSidebarLayout({ children }: { children: ReactNode }) {
const navigate = useNavigate();
+ const pathname = useLocation({ select: (location) => location.pathname });
+ const pathnameRef = useRef(pathname);
+ pathnameRef.current = pathname;
const isMacosDesktop = isElectron && isMacPlatform(navigator.platform);
const [isWindowFullscreen, setIsWindowFullscreen] = useState(() => {
const getWindowFullscreenState = window.desktopBridge?.getWindowFullscreenState;
@@ -92,7 +95,10 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) {
const unsubscribe = onMenuAction((action) => {
if (action === "open-settings") {
- void navigate({ to: "/settings" });
+ const isSettingsRoute = /^\/settings(\/|$)/.test(pathnameRef.current);
+ if (!isSettingsRoute) {
+ void navigate({ to: "/settings" });
+ }
}
});