From 6ba21b185f89bf9b9ae21bd442d2438a83d64373 Mon Sep 17 00:00:00 2001
From: Deokhaeng Lee <l.deokhaeng@gmail.com>
Date: Tue, 22 Jul 2025 21:07:34 -0700
Subject: [PATCH 1/2] chat-shortcut-fix

---
 .../right-panel/components/chat/chat-input.tsx    |  5 +++--
 .../toolbar/buttons/chat-panel-button.tsx         | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx b/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx
index 49c9bdf811..a8e1347bf3 100644
--- a/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx
+++ b/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx
@@ -123,10 +123,11 @@ export function ChatInput(
         {entityId
           ? (
             <Badge
-              className="mr-2 bg-white text-black border border-border inline-flex items-center gap-1 hover:bg-neutral-100 cursor-pointer"
+              className="mr-2 bg-white text-black border border-border inline-flex items-center gap-1 hover:bg-neutral-100 cursor-pointer max-w-48"
               onClick={onNoteBadgeClick}
             >
-              {getBadgeIcon()} {entityTitle}
+              {getBadgeIcon()} 
+              <span className="truncate">{entityTitle}</span>
             </Badge>
           )
           : <div></div>}
diff --git a/apps/desktop/src/components/toolbar/buttons/chat-panel-button.tsx b/apps/desktop/src/components/toolbar/buttons/chat-panel-button.tsx
index a1184c8b8d..6edc2f16af 100644
--- a/apps/desktop/src/components/toolbar/buttons/chat-panel-button.tsx
+++ b/apps/desktop/src/components/toolbar/buttons/chat-panel-button.tsx
@@ -25,6 +25,21 @@ function ChatPanelButtonBase() {
     return () => clearInterval(animationInterval);
   }, []);
 
+  useEffect(() => {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key === 'j' && (event.metaKey || event.ctrlKey)) {
+        event.preventDefault();
+        togglePanel("chat");
+      }
+    };
+
+    document.addEventListener('keydown', handleKeyDown);
+    
+    return () => {
+      document.removeEventListener('keydown', handleKeyDown);
+    };
+  }, [togglePanel]);
+
   const handleClick = () => {
     togglePanel("chat");
   };

From 0441e08f061df8cbc8f6d31dee9cf78eb45bf46a Mon Sep 17 00:00:00 2001
From: Deokhaeng Lee <l.deokhaeng@gmail.com>
Date: Tue, 22 Jul 2025 21:08:11 -0700
Subject: [PATCH 2/2] ran tests

---
 .../components/right-panel/components/chat/chat-input.tsx | 2 +-
 .../src/components/toolbar/buttons/chat-panel-button.tsx  | 8 ++++----
 apps/desktop/src/locales/en/messages.po                   | 2 +-
 apps/desktop/src/locales/ko/messages.po                   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx b/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx
index a8e1347bf3..d929ddf656 100644
--- a/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx
+++ b/apps/desktop/src/components/right-panel/components/chat/chat-input.tsx
@@ -126,7 +126,7 @@ export function ChatInput(
               className="mr-2 bg-white text-black border border-border inline-flex items-center gap-1 hover:bg-neutral-100 cursor-pointer max-w-48"
               onClick={onNoteBadgeClick}
             >
-              {getBadgeIcon()} 
+              {getBadgeIcon()}
               <span className="truncate">{entityTitle}</span>
             </Badge>
           )
diff --git a/apps/desktop/src/components/toolbar/buttons/chat-panel-button.tsx b/apps/desktop/src/components/toolbar/buttons/chat-panel-button.tsx
index 6edc2f16af..3c027d538e 100644
--- a/apps/desktop/src/components/toolbar/buttons/chat-panel-button.tsx
+++ b/apps/desktop/src/components/toolbar/buttons/chat-panel-button.tsx
@@ -27,16 +27,16 @@ function ChatPanelButtonBase() {
 
   useEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.key === 'j' && (event.metaKey || event.ctrlKey)) {
+      if (event.key === "j" && (event.metaKey || event.ctrlKey)) {
         event.preventDefault();
         togglePanel("chat");
       }
     };
 
-    document.addEventListener('keydown', handleKeyDown);
-    
+    document.addEventListener("keydown", handleKeyDown);
+
     return () => {
-      document.removeEventListener('keydown', handleKeyDown);
+      document.removeEventListener("keydown", handleKeyDown);
     };
   }, [togglePanel]);
 
diff --git a/apps/desktop/src/locales/en/messages.po b/apps/desktop/src/locales/en/messages.po
index 456eea0db5..e01779538f 100644
--- a/apps/desktop/src/locales/en/messages.po
+++ b/apps/desktop/src/locales/en/messages.po
@@ -1187,7 +1187,7 @@ msgstr "This is the name of the company you work for."
 msgid "Today"
 msgstr "Today"
 
-#: src/components/toolbar/buttons/chat-panel-button.tsx:52
+#: src/components/toolbar/buttons/chat-panel-button.tsx:67
 msgid "Toggle chat panel"
 msgstr "Toggle chat panel"
 
diff --git a/apps/desktop/src/locales/ko/messages.po b/apps/desktop/src/locales/ko/messages.po
index 22ae7f2fde..892cafe67b 100644
--- a/apps/desktop/src/locales/ko/messages.po
+++ b/apps/desktop/src/locales/ko/messages.po
@@ -1187,7 +1187,7 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
-#: src/components/toolbar/buttons/chat-panel-button.tsx:52
+#: src/components/toolbar/buttons/chat-panel-button.tsx:67
 msgid "Toggle chat panel"
 msgstr ""