From 37f35806a6ed29f94fe1e99fcb9b63f7bac55ebc Mon Sep 17 00:00:00 2001
From: anovazzi1 <otavio2204@gmail.com>
Date: Thu, 5 Oct 2023 17:55:44 -0300
Subject: [PATCH] fix(formModal/index.tsx): update updateLastMessage function
 to include prompt value when data.type is "end" fix(formModal/index.tsx):
 update template.current value when data.type is "prompt" and data.prompt is
 provided fix(formModal/index.tsx): remove unnecessary updateLastMessage call
 when data.type is "stream" and isStream is true

---
 src/frontend/src/modals/formModal/index.tsx | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/frontend/src/modals/formModal/index.tsx b/src/frontend/src/modals/formModal/index.tsx
index 9de968ff8..2c7fa53fe 100644
--- a/src/frontend/src/modals/formModal/index.tsx
+++ b/src/frontend/src/modals/formModal/index.tsx
@@ -261,7 +261,11 @@ export default function FormModal({
     }
     if (data.type === "end") {
       if (data.message) {
-        updateLastMessage({ str: data.message, end: true });
+        updateLastMessage({
+          str: data.message,
+          end: true,
+          prompt: template.current,
+        });
       }
       if (data.intermediate_steps) {
         updateLastMessage({
@@ -276,19 +280,14 @@ export default function FormModal({
           files: data.files,
         });
       }
-      if (data.type === "prompt" && data.prompt) {
-        template.current = data.prompt;
-      }
-
       setLockChat(false);
       isStream = false;
     }
+    if (data.type == "prompt" && data.prompt) {
+      template.current = data.prompt;
+    }
     if (data.type === "stream" && isStream) {
-      if (data.prompt) {
-        updateLastMessage({ prompt: data.prompt });
-      } else {
-        updateLastMessage({ str: data.message });
-      }
+      updateLastMessage({ str: data.message });
     }
   }