diff --git a/client/src/components/Main/TextChat.jsx b/client/src/components/Main/TextChat.jsx index aeae024c2..4459645d2 100644 --- a/client/src/components/Main/TextChat.jsx +++ b/client/src/components/Main/TextChat.jsx @@ -43,7 +43,6 @@ export default function TextChat({ messages }) { }, [convo?.conversationId]); const messageHandler = (data, currentState, currentMsg) => { - const { messages, _currentMsg, message, sender, isRegenerate } = currentState; if (isRegenerate) @@ -79,9 +78,32 @@ export default function TextChat({ messages }) { const { messages, _currentMsg, message, sender, isRegenerate } = currentState; if (isRegenerate) - dispatch(setMessages([...messages, { sender, text: data, parentMessageId: message?.overrideParentMessageId, messageId: message?.overrideParentMessageId + '_', cancelled: true }])); + dispatch( + setMessages([ + ...messages, + { + sender, + text: data, + parentMessageId: message?.overrideParentMessageId, + messageId: message?.overrideParentMessageId + '_', + cancelled: true + } + ]) + ); else - dispatch(setMessages([...messages, currentMsg, { sender, text: data, parentMessageId: currentMsg?.messageId, messageId: currentMsg?.messageId + '_', cancelled: true }])); + dispatch( + setMessages([ + ...messages, + currentMsg, + { + sender, + text: data, + parentMessageId: currentMsg?.messageId, + messageId: currentMsg?.messageId + '_', + cancelled: true + } + ]) + ); }; const createdHandler = (data, currentState, currentMsg) => { @@ -100,14 +122,8 @@ export default function TextChat({ messages }) { const { messages, _currentMsg, message, isCustomModel, sender, isRegenerate } = currentState; const { model, chatGptLabel, promptPrefix } = message; - if (isRegenerate) - dispatch( - setMessages([...messages, responseMessage,]) - ); - else - dispatch( - setMessages([...messages, requestMessage, responseMessage,]) - ); + if (isRegenerate) dispatch(setMessages([...messages, responseMessage])); + else dispatch(setMessages([...messages, requestMessage, responseMessage])); dispatch(setSubmitState(false)); const isBing = model === 'bingai' || model === 'sydney'; @@ -211,7 +227,7 @@ export default function TextChat({ messages }) { let currentMsg = { ...currentState.message }; let latestResponseText = ''; - + const { server, payload } = createPayload(submission); const onMessage = (e) => { if (stopStream) { @@ -271,8 +287,8 @@ export default function TextChat({ messages }) { const isCancelled = events.readyState <= 1; events.close(); if (isCancelled) { - const e = new Event("cancel"); - events.dispatchEvent(e) + const e = new Event('cancel'); + events.dispatchEvent(e); } }; }, [submission]); @@ -328,11 +344,11 @@ export default function TextChat({ messages }) { }; return ( -
-
+
+
- - {isSubmitting? + + {isSubmitting ? ( - :(latestMessage&&!latestMessage?.isCreatedByUser)? - - :null - } + ) : latestMessage && !latestMessage?.isCreatedByUser ? ( + + ) : null}
+ -