From 55f4d98d7972aa1ff7f6d833348449eee8293529 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 19 Mar 2024 15:56:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/MessagesWrapper.jsx            | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/views/Conversations/Components/MessagesWrapper.jsx b/src/views/Conversations/Components/MessagesWrapper.jsx
index fc217e4..1595428 100644
--- a/src/views/Conversations/Components/MessagesWrapper.jsx
+++ b/src/views/Conversations/Components/MessagesWrapper.jsx
@@ -25,21 +25,28 @@ const MessagesWrapper = () => {
   const [longListLoading, setLongListLoading] = useState(false);
   const [shouldScrollBottom, setShouldScrollBottom] = useState(true);
   useEffect(() => {
-    setLongList(activeMessages);
-    setShouldScrollBottom(true);
     if (currentConversation.sn && activeMessages.length < 20) {
       getFirstPageMessages(currentConversation);
     }
-    if (currentConversation.opi_sn && currentConversation.whatsapp_phone_number && activeMessages.length > 0) {
-      fetchCleanUnreadMsgCount({ opisn: currentConversation.opi_sn, whatsappid: currentConversation.whatsapp_phone_number });
-      refreshTotalNotify();
-    }
+    setShouldScrollBottom(true);
+    return () => {};
+  }, [currentConversation.sn]);
+
+  useEffect(() => {
+    setLongList(activeMessages);
     const thisLastTime = activeMessages.length > 0 ? activeMessages[0].orgmsgtime : '';
     const loadNextPage = !(activeMessages.length === 0 || activeMessages.length < MESSAGE_PAGE_SIZE);
     updateCurrentConversation({ lasttime: thisLastTime, loadNextPage });
+    return () => {};
+  }, [activeMessages]);
 
+  useEffect(() => {
+    if (currentConversation.opi_sn && currentConversation.whatsapp_phone_number && activeMessages.length > 0) {
+      fetchCleanUnreadMsgCount({ opisn: currentConversation.opi_sn, whatsappid: currentConversation.whatsapp_phone_number });
+      refreshTotalNotify();
+    }
     return () => {};
-  }, [activeMessages, currentConversation.sn]);
+  }, [activeMessages.length]);
 
 
   const getFirstPageMessages = async (item) => {