From 6b8ca67331f93f94f13e6dd02dbcf8b613739c83 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 22 Nov 2024 10:19:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E4=BC=9A=E8=AF=9D:=20?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=8E=B7=E5=8F=96=E5=88=97=E8=A1=A8=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=8E=B7=E5=8F=96=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useConversation.js | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/hooks/useConversation.js b/src/hooks/useConversation.js
index b5947ed..faca9cb 100644
--- a/src/hooks/useConversation.js
+++ b/src/hooks/useConversation.js
@@ -70,7 +70,7 @@ export function useConversationNewItem() {
    */
   const newConversation = async (body) => {
     const { wa_id, remark, opi_sn: opisn, conversationid } = body;
-  const newChat = {
+    const newChat = {
       whatsapp_phone_number: wa_id,
       remark: remark || '',
       guest_email: body.email || '',
@@ -82,21 +82,28 @@ export function useConversationNewItem() {
     const _list = await fetchConversationsList({ opisn });
     addToConversationList(_list);
     if (!body.conversationid) {
-      // const newChat = _list.find((item) => item.sn === createdNew.conversationid)
-      // setCurrentConversation(newChat);
+      const newChat = _list.find((item) => item.sn === createdNew.conversationid)
+      if (isEmpty(newChat)) {
+        setCurrentConversation({
+          ...CHAT_ITEM_RECORD,
+          ...createdNew,
+          sn: createdNew.conversationid,
+          channels: {
+            email: createdNew.guest_email,
+            phone_number: createdNew.guest_phone,
+            whatsapp_phone_number: createdNew.whatsapp_phone_number,
+          },
+          conversation_memo: createdNew.remark,
+          lasttime: createdNew.session_creatime,
+          show_default: createdNew.remark || createdNew.guest_name || createdNew.guest_phone || createdNew.guest_email || createdNew.whatsapp_phone_number || '',
+        })
+        return ;
+      }
       setCurrentConversation({
-        ...CHAT_ITEM_RECORD,
-        ...createdNew,
-        sn: createdNew.conversationid,
-        channels: {
-          email: createdNew.guest_email,
-          phone_number: createdNew.guest_phone,
-          whatsapp_phone_number: createdNew.whatsapp_phone_number,
-        },
-        conversation_memo: createdNew.remark,
-        lasttime: createdNew.session_creatime,
-        show_default: createdNew.remark || createdNew.guest_name || createdNew.guest_phone || createdNew.guest_email || createdNew.whatsapp_phone_number || '',
+        ...newChat,
+        show_default: newChat.conversation_memo || newChat.whatsapp_name || newChat?.channels?.whatsapp_phone_number || newChat?.channels?.phone_number || newChat?.channels?.email || '',
       })
+      return ;
     }
   };