From d90c90dd92cd475dbddceeb62c7f7842f4ccea86 Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Wed, 11 Sep 2024 14:35:50 -0700
Subject: [PATCH] simplify unnecessary display logic (#2406)

---
 web/src/app/chat/ChatPage.tsx | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/web/src/app/chat/ChatPage.tsx b/web/src/app/chat/ChatPage.tsx
index d51e708ff..40e4368a5 100644
--- a/web/src/app/chat/ChatPage.tsx
+++ b/web/src/app/chat/ChatPage.tsx
@@ -1965,21 +1965,16 @@ export function ChatPage({
                               const parentMessage = message.parentMessageId
                                 ? messageMap.get(message.parentMessageId)
                                 : null;
-
-                              if (
-                                (currentSessionRegenerationState?.regenerating &&
-                                  message.messageId >
-                                    currentSessionRegenerationState?.finalMessageIndex!) ||
-                                (currentSessionChatState == "loading" &&
-                                  ((i >= messageHistory.length - 2 &&
-                                    message.type == "user") ||
-                                    (i >= messageHistory.length - 1 &&
-                                      !currentSessionRegenerationState?.regenerating)))
-                              ) {
-                                return <></>;
-                              }
-
                               if (message.type === "user") {
+                                if (
+                                  (currentSessionChatState == "loading" &&
+                                    i == messageHistory.length - 1) ||
+                                  (currentSessionRegenerationState?.regenerating &&
+                                    message.messageId >=
+                                      currentSessionRegenerationState?.finalMessageIndex!)
+                                ) {
+                                  return <></>;
+                                }
                                 return (
                                   <div
                                     id={`message-${message.messageId}`}
@@ -2052,10 +2047,11 @@ export function ChatPage({
                                     : null;
 
                                 if (
-                                  currentSessionRegenerationState?.regenerating &&
-                                  currentSessionChatState == "loading" &&
-                                  (i == messageHistory.length - 1 ||
-                                    currentSessionRegenerationState?.regenerating)
+                                  (currentSessionChatState == "loading" &&
+                                    i > messageHistory.length - 1) ||
+                                  (currentSessionRegenerationState?.regenerating &&
+                                    message.messageId >
+                                      currentSessionRegenerationState?.finalMessageIndex!)
                                 ) {
                                   return <></>;
                                 }