From af42d9d9fd67ee877142cb18f6945430a8f94ae8 Mon Sep 17 00:00:00 2001
From: Marco Beretta <81851188+berry-13@users.noreply.github.com>
Date: Fri, 27 Mar 2026 00:06:25 +0100
Subject: [PATCH] refactor(shortcuts): use data-testid selectors for reliable
 targeting

Add data-testid="nav-settings" to the Settings menu item in
AccountSettings so the open-settings shortcut no longer relies on
fragile text-content matching ('Settings' but not 'Keyboard').
---
 client/src/components/Nav/AccountSettings.tsx | 6 +++++-
 client/src/hooks/useKeyboardShortcuts.ts      | 9 ++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/client/src/components/Nav/AccountSettings.tsx b/client/src/components/Nav/AccountSettings.tsx
index 529ab1b87d..401c301a7f 100644
--- a/client/src/components/Nav/AccountSettings.tsx
+++ b/client/src/components/Nav/AccountSettings.tsx
@@ -89,7 +89,11 @@ function AccountSettings({ collapsed = false }: { collapsed?: boolean }) {
           <Keyboard className="icon-md" aria-hidden="true" />
           {localize('com_shortcut_keyboard_shortcuts')}
         </Menu.MenuItem>
-        <Menu.MenuItem onClick={() => setShowSettings(true)} className="select-item text-sm">
+        <Menu.MenuItem
+          onClick={() => setShowSettings(true)}
+          className="select-item text-sm"
+          data-testid="nav-settings"
+        >
           <GearIcon className="icon-md" aria-hidden="true" />
           {localize('com_nav_settings')}
         </Menu.MenuItem>
diff --git a/client/src/hooks/useKeyboardShortcuts.ts b/client/src/hooks/useKeyboardShortcuts.ts
index 75cb5025b7..a52537f8ee 100644
--- a/client/src/hooks/useKeyboardShortcuts.ts
+++ b/client/src/hooks/useKeyboardShortcuts.ts
@@ -269,13 +269,8 @@ export default function useKeyboardShortcuts() {
     }
     btn.click();
     setTimeout(() => {
-      const items = document.querySelectorAll<HTMLElement>('[role="menuitem"]');
-      for (const item of items) {
-        if (item.textContent?.includes('Settings') && !item.textContent?.includes('Keyboard')) {
-          item.click();
-          return;
-        }
-      }
+      const settingsItem = document.querySelector<HTMLElement>('[data-testid="nav-settings"]');
+      settingsItem?.click();
     }, 150);
   }, []);