From efc6e028287e57d45e89e2d36d9e9a696a5a3c3f Mon Sep 17 00:00:00 2001
From: Henry Heng <henryheng@flowiseai.com>
Date: Mon, 1 Jul 2024 18:46:10 +0100
Subject: [PATCH] Bugfix/Add showagent message when agentflow (#2749)

add showagent message when agentflow
---
 packages/ui/src/views/chatbot/index.jsx | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/ui/src/views/chatbot/index.jsx b/packages/ui/src/views/chatbot/index.jsx
index a03b01bbc..4f247302c 100644
--- a/packages/ui/src/views/chatbot/index.jsx
+++ b/packages/ui/src/views/chatbot/index.jsx
@@ -76,13 +76,16 @@ const ChatbotFull = () => {
         if (getSpecificChatflowFromPublicApi.data || getSpecificChatflowApi.data) {
             const chatflowData = getSpecificChatflowFromPublicApi.data || getSpecificChatflowApi.data
             setChatflow(chatflowData)
+
+            const chatflowType = chatflowData.type
             if (chatflowData.chatbotConfig) {
+                let parsedConfig = {}
+                if (chatflowType === 'MULTIAGENT') {
+                    parsedConfig.showAgentMessages = true
+                }
+
                 try {
-                    const chatflowType = chatflowData.type
-                    const parsedConfig = JSON.parse(chatflowData.chatbotConfig)
-                    if (chatflowType === 'MULTIAGENT') {
-                        parsedConfig.showAgentMessages = true
-                    }
+                    parsedConfig = { ...parsedConfig, ...JSON.parse(chatflowData.chatbotConfig) }
                     setChatbotTheme(parsedConfig)
                     if (parsedConfig.overrideConfig) {
                         // Generate new sessionId
@@ -93,9 +96,11 @@ const ChatbotFull = () => {
                     }
                 } catch (e) {
                     console.error(e)
-                    setChatbotTheme({})
+                    setChatbotTheme(parsedConfig)
                     setChatbotOverrideConfig({})
                 }
+            } else if (chatflowType === 'MULTIAGENT') {
+                setChatbotTheme({ showAgentMessages: true })
             }
         }
     }, [getSpecificChatflowFromPublicApi.data, getSpecificChatflowApi.data])