From b387f02337b022f88558d0cf5ef44c1d3a107a65 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 12 Dec 2024 10:40:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=9A=E8=AF=9D=E5=88=97=E8=A1=A8:=20?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=90=8E,=20=E5=BD=93=E5=89=8D=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9D=E7=9A=84=E6=B6=88=E6=81=AF=E8=A2=AB=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?,=20=E5=BD=93=E5=89=8D=E4=B8=8D=E5=9C=A8=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E9=A1=B5=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/ConversationStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/ConversationStore.js b/src/stores/ConversationStore.js
index 20e7270..e1b0453 100644
--- a/src/stores/ConversationStore.js
+++ b/src/stores/ConversationStore.js
@@ -263,7 +263,7 @@ const conversationSlice = (set, get) => ({
       topList: mergedListMapped[1] || [],
       pageList: mergedListMapped[0] || [],
       conversationsList: mergedList,
-      activeConversations: { ...activeConversations, ...newConversationsMapped },
+      activeConversations: { ...newConversationsMapped, ...activeConversations,  },
       totalNotify: refreshTotalNotify,
       // totalNotify: state.totalNotify + newConversations.map((ele) => ele.unread_msg_count).reduce((acc, cur) => acc + (cur || 0), 0),
     }));