fix: fix empty message (#82 #248) (#251)

epam · Nov 28, 2023 · e5ad904 · e5ad904
1 parent d3f0d64
commit e5ad904
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/components/Chat/ChatMessage.tsx b/src/components/Chat/ChatMessage.tsx
@@ -384,16 +384,16 @@ export const ChatMessage: FC<Props> = memo(
                     </div>
                   </div>
                 ) : (
-                  message.content && (
-                    <div className="mr-2 flex w-full flex-col gap-5">
+                  <div className="mr-2 flex w-full flex-col gap-5">
+                    {message.content && (
                       <div className="prose flex-1 whitespace-pre-wrap dark:prose-invert">
                         {message.content}
                       </div>
-                      <MessageAttachments
-                        attachments={message.custom_content?.attachments}
-                      />
-                    </div>
-                  )
+                    )}
+                    <MessageAttachments
+                      attachments={message.custom_content?.attachments}
+                    />
+                  </div>
                 )}
 
                 {!isPlayback && !isEditing && (

diff --git a/src/store/conversations/conversations.reducers.ts b/src/store/conversations/conversations.reducers.ts
@@ -601,7 +601,12 @@ const selectIsLastAssistantMessageEmpty = createSelector(
       const lastMessage = conv.messages[lastMessageIndex];
 
       return (
-        lastMessage.role === Role.Assistant && lastMessage.content.length === 0
+        lastMessage.role === Role.Assistant &&
+        lastMessage.content.length === 0 &&
+        (!lastMessage.custom_content?.attachments ||
+          lastMessage.custom_content?.attachments.length === 0) &&
+        (!lastMessage.custom_content?.stages ||
+          lastMessage.custom_content?.stages.length === 0)
       );
     });
   },