From 6319b7de5b295ef4934e0d44ecfbac2820647656 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 20 Dec 2024 10:52:27 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=B6=88=E6=81=AF=E6=B0=94=E6=B3=A1?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E5=90=8D=E7=A7=B0;=20fix:=20?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=B6=88=E6=81=AF=E7=9A=84waba=E8=B4=A6?=
 =?UTF-8?q?=E6=88=B7=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/channel/bubbleMsgUtils.js                          | 2 +-
 src/views/Conversations/Online/Input/InputComposer.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/channel/bubbleMsgUtils.js b/src/channel/bubbleMsgUtils.js
index 0e8a18c..e719e83 100644
--- a/src/channel/bubbleMsgUtils.js
+++ b/src/channel/bubbleMsgUtils.js
@@ -650,7 +650,7 @@ export const parseRenderMessageItem = (msg) => {
     dateString: dayjs(msg?.sendTime || msg.createTime).format('MM-DD HH:mm'),
     from: msg.from,
     sender: msg.from,
-    senderName: msg?.customerProfile?.name || msg?.fromName || msg?.from || 'me',
+    senderName: msg.msg_direction === 'outbound' ? 'me' : msg?.customerProfile?.name || msg?.fromName || msg?.from || '',
     customer_name: msg?.customerProfile?.name || '',
     whatsapp_name: msg?.customerProfile?.name || '',
     whatsapp_phone_number: isEmpty(msg?.customerProfile) ? msg.to : msg.from,
diff --git a/src/views/Conversations/Online/Input/InputComposer.jsx b/src/views/Conversations/Online/Input/InputComposer.jsx
index 2521987..87a874c 100644
--- a/src/views/Conversations/Online/Input/InputComposer.jsx
+++ b/src/views/Conversations/Online/Input/InputComposer.jsx
@@ -267,7 +267,7 @@ const InputComposer = ({ channel, currentActive }) => {
 
   useEffect(() => {
     if (currentActive) focusInput();
-    if (!isEmpty(referenceMsg) && referenceMsg.waba !== fromIM.replace('+', '')) {
+    if (!isEmpty(referenceMsg) && referenceMsg.waba.replace('+', '') !== fromIM.replace('+', '')) {
       setWabaWarning('注意: 回复的消息与当前使用的WABA账户不一致. 请到个人资料页面切换WABA商业号身份.')
     } else {
       setWabaWarning('');