From c1c1fc6265f5ca2c682e8be2ad13eebee167ecde Mon Sep 17 00:00:00 2001
From: Debanjum <debanjum@gmail.com>
Date: Thu, 22 May 2025 16:51:01 -0700
Subject: [PATCH] Make send message validation more robust on web app

---
 .../app/components/chatInputArea/chatInputArea.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/interface/web/app/components/chatInputArea/chatInputArea.tsx b/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
index 9c9a6214..e2234701 100644
--- a/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
+++ b/src/interface/web/app/components/chatInputArea/chatInputArea.tsx
@@ -180,13 +180,7 @@ export const ChatInputArea = forwardRef<HTMLTextAreaElement, ChatInputProps>((pr
     }, [props.isResearchModeEnabled]);
 
     function onSendMessage() {
-        if (imageUploaded) {
-            setImageUploaded(false);
-            setImagePaths([]);
-            imageData.forEach((data) => props.sendImage(data));
-        }
-        if (!message.trim()) return;
-
+        if (!message.trim() && imageData.length === 0) return;
         if (!props.isLoggedIn) {
             setLoginRedirectMessage(
                 "Hey there, you need to be signed in to send messages to Khoj AI",
@@ -200,6 +194,12 @@ export const ChatInputArea = forwardRef<HTMLTextAreaElement, ChatInputProps>((pr
             props.setTriggeredAbort(true);
         }
 
+        if (imageUploaded) {
+            setImageUploaded(false);
+            setImagePaths([]);
+            imageData.forEach((data) => props.sendImage(data));
+        }
+
         let messageToSend = message.trim();
         // Check if message starts with an explicit slash command
         const startsWithSlashCommand =