From f9145b6c3ad83e5c3a3fc5ab5b4cfbf5494df9f1 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 3 Dec 2024 16:52:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AFid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/ConversationStore.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/stores/ConversationStore.js b/src/stores/ConversationStore.js
index 0485bee..18a3600 100644
--- a/src/stores/ConversationStore.js
+++ b/src/stores/ConversationStore.js
@@ -345,9 +345,12 @@ const messageSlice = (set, get) => ({
     const targetMsgs = (activeConversations[String(targetId)] || []).map((ele) => {
       // 更新状态
       // * 已读的不再更新状态, 有时候投递结果在已读之后返回
-      if (ele.id === ele.actionId && ele.actionId === message.actionId) {
+      // if (ele.id === ele.actionId && ele.actionId === message.actionId) {
+      if (ele.actionId === message.actionId) {
+        // WABA: 同步返回, 根据actionId 更新消息的id
         return { ...ele, id: message.id, status: ele.status === 'read' ? ele.status : message.status, dateString: message.dateString };
       } else if (String(ele.id) === String(message.id)) {
+        // WABA: 异步的后续状态更新, id已更新为wamid
         // console.log('old msg ele', ele);
         const renderStatus = message?.data?.status ? { status: { ...ele.data.status, loading: 0, download: true } } : {};
         const keepReply = ele.reply ? { reply: ele.reply } : {};