From 4db916928c29c9dab94d2ee6fff49bdf711adcec Mon Sep 17 00:00:00 2001
From: Ed McConnell <ed.mcconnell@sqyer.com>
Date: Sat, 14 Dec 2024 09:56:51 -0500
Subject: [PATCH] merge main

---
 app/commit.json                  | 2 +-
 app/components/chat/BaseChat.tsx | 6 ++++--
 app/lib/stores/workbench.ts      | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/commit.json b/app/commit.json
index 2b7141c..1b5212f 100644
--- a/app/commit.json
+++ b/app/commit.json
@@ -1 +1 @@
-{ "commit": "6ffcdd8b3c54e2560b327ca1b4f4eb33ba54c0db" }
+{ "commit": "7a31db904d19e75a68d6a6db8f72fe7949a6f19b" }
diff --git a/app/components/chat/BaseChat.tsx b/app/components/chat/BaseChat.tsx
index db4e435..09f3c16 100644
--- a/app/components/chat/BaseChat.tsx
+++ b/app/components/chat/BaseChat.tsx
@@ -436,15 +436,17 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
                         }
 
                         event.preventDefault();
-                        
+
                         if (isStreaming) {
                           handleStop?.();
                           return;
                         }
+
                         // ignore if using input method engine
                         if (event.nativeEvent.isComposing) {
-                          return
+                          return;
                         }
+
                         handleSendMessage?.(event);
                       }
                     }}
diff --git a/app/lib/stores/workbench.ts b/app/lib/stores/workbench.ts
index bbd537d..0d46057 100644
--- a/app/lib/stores/workbench.ts
+++ b/app/lib/stores/workbench.ts
@@ -297,7 +297,6 @@ export class WorkbenchStore {
 
     const action = artifact.runner.actions.get()[data.actionId];
 
-
     if (!action || action.executed) {
       return;
     }