From 5e7572bae04a736176f1db9aad62ec0194732dc4 Mon Sep 17 00:00:00 2001
From: Ahmet Kilinc <akx9@icloud.com>
Date: Wed, 6 Aug 2025 00:58:19 +0100
Subject: [PATCH] fix: hotkeys for categories

---
 apps/mail/components/mail/mail.tsx | 38 +++++++++---------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/apps/mail/components/mail/mail.tsx b/apps/mail/components/mail/mail.tsx
index 5a92e32d43..77b1ca0865 100644
--- a/apps/mail/components/mail/mail.tsx
+++ b/apps/mail/components/mail/mail.tsx
@@ -678,34 +678,18 @@ function CategoryDropdown({ isMultiSelectMode }: CategoryDropdownProps) {
   const folder = params?.folder ?? 'inbox';
   const [isOpen, setIsOpen] = useState(false);
 
-  categorySettings.forEach((category, index) => {
-    if (index < 9) {
-      const keyNumber = (index + 1).toString();
-      useHotkeys(
-        keyNumber,
-        () => {
-          const isCurrentlyActive = labels.includes(category.searchValue);
-
-          if (isCurrentlyActive) {
-            setLabels(labels.filter((label) => label !== category.searchValue));
-          } else {
-            setLabels([...labels, category.searchValue]);
-          }
-        },
-        {
-          scopes: ['mail-list'],
-          preventDefault: true,
-          enableOnFormTags: false,
-        },
-        [category.searchValue, labels, setLabels], // Dependencies
-      );
-    }
-  });
-
   useHotkeys(
-    '0',
-    () => {
-      setLabels([]);
+    ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'],
+    (key) => {
+      const category = categorySettings[Number(key.key) - 1];
+      if (!category) return;
+      const isCurrentlyActive = labels.includes(category.searchValue);
+
+      if (isCurrentlyActive) {
+        setLabels(labels.filter((label) => label !== category.searchValue));
+      } else {
+        setLabels([...labels, category.searchValue]);
+      }
     },
     {
       scopes: ['mail-list'],