From 706e8e9c7876149d6e86e0735878f4345ec1705d Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Fri, 29 Sep 2023 15:11:36 +0700
Subject: [PATCH] chore: fix trimmed end break line

---
 web/app/_components/ChatBody/renderChatMessage.tsx | 4 ++--
 web/app/_hooks/useSendChatMessage.ts               | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/app/_components/ChatBody/renderChatMessage.tsx b/web/app/_components/ChatBody/renderChatMessage.tsx
index 7d797b6cc..cebaa62ee 100644
--- a/web/app/_components/ChatBody/renderChatMessage.tsx
+++ b/web/app/_components/ChatBody/renderChatMessage.tsx
@@ -48,7 +48,7 @@ export default function renderChatMessage({
           avatarUrl={senderAvatarUrl}
           senderName={senderName}
           createdAt={createdAt}
-          text={htmlText ?? text}
+          text={htmlText && htmlText.trim().length > 0 ? htmlText : text}
         />
       ) : (
         <StreamTextMessage
@@ -57,7 +57,7 @@ export default function renderChatMessage({
           avatarUrl={senderAvatarUrl}
           senderName={senderName}
           createdAt={createdAt}
-          text={htmlText ?? text}
+          text={htmlText && htmlText.trim().length > 0 ? htmlText : text}
         />
       );
     default:
diff --git a/web/app/_hooks/useSendChatMessage.ts b/web/app/_hooks/useSendChatMessage.ts
index a6312e570..c7e402aab 100644
--- a/web/app/_hooks/useSendChatMessage.ts
+++ b/web/app/_hooks/useSendChatMessage.ts
@@ -116,7 +116,7 @@ export default function useSendChatMessage() {
           const data = JSON.parse(line.replace("data: ", ""));
           answer += data.choices[0]?.delta?.content ?? "";
           if (answer.startsWith("assistant: ")) {
-            answer = answer.replace("assistant: ", "").trim();
+            answer = answer.replace("assistant: ", "");
           }
           updateStreamMessage({
             ...responseChatMessage,
@@ -133,11 +133,11 @@ export default function useSendChatMessage() {
     updateMessage(
       responseChatMessage.id,
       responseChatMessage.conversationId,
-      answer
+      answer.trimEnd()
     );
     await executeSerial(DataService.UPDATE_MESSAGE, {
       ...newResponse,
-      message: answer,
+      message: answer.trimEnd(),
       updated_at: new Date()
         .toISOString()
         .replace("T", " ")