From 27d05620baf5fa61e7ff5ab97d3b20751c239360 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 12 Mar 2024 21:20:47 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=9A=E8=AF=9D=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E6=98=B5=E7=A7=B0null=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/ConversationActions.js                       | 2 +-
 src/views/ChatHistory.jsx                                | 6 +++---
 src/views/Conversations/Components/ConversationsList.jsx | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/actions/ConversationActions.js b/src/actions/ConversationActions.js
index 382e76c..3db9841 100644
--- a/src/actions/ConversationActions.js
+++ b/src/actions/ConversationActions.js
@@ -18,7 +18,7 @@ export const fetchTemplates = async () => {
  */
 export const fetchConversationsList = async (params) => {
   const { result: data } = await fetchJSON(`${API_HOST}/getconversations`, params);
-  const list = (data || []).map((ele) => ({ ...ele, customer_name: `${ele.whatsapp_name}`.trim() }));
+  const list = (data || []).map((ele) => ({ ...ele, customer_name: `${ele.whatsapp_name || ''}`.trim(), whatsapp_name: `${ele.whatsapp_name || ''}`.trim() }));
   return list;
 };
 
diff --git a/src/views/ChatHistory.jsx b/src/views/ChatHistory.jsx
index b7653a0..f1c9d96 100644
--- a/src/views/ChatHistory.jsx
+++ b/src/views/ChatHistory.jsx
@@ -194,9 +194,9 @@ function ChatHistory() {
                 {...item}
                 key={item.sn}
                 id={item.sn}
-                letterItem={{ id: item.whatsapp_name.trim() || item.whatsapp_phone_number, letter: (item.whatsapp_name.trim() || item.whatsapp_phone_number).slice(0, 5) }}
-                alt={`${item.whatsapp_name.trim()}`}
-                title={item.whatsapp_name.trim() || item.whatsapp_phone_number}
+                letterItem={{ id: item.whatsapp_name || item.whatsapp_phone_number, letter: (item.whatsapp_name || item.whatsapp_phone_number).slice(0, 5) }}
+                alt={`${item.whatsapp_name}`}
+                title={item.whatsapp_name || item.whatsapp_phone_number}
                 subtitle={item.coli_id}
                 date={item.last_received_time}
                 className={String(item.sn) === String(selectedConversation.sn) ? '__active text-primary bg-neutral-100' : ''}
diff --git a/src/views/Conversations/Components/ConversationsList.jsx b/src/views/Conversations/Components/ConversationsList.jsx
index 0f74928..556a82d 100644
--- a/src/views/Conversations/Components/ConversationsList.jsx
+++ b/src/views/Conversations/Components/ConversationsList.jsx
@@ -186,9 +186,9 @@ const Conversations = () => {
               {...item}
               key={item.sn}
               id={item.sn}
-              letterItem={{ id: `${item.whatsapp_name || ''}`.trim() || item.whatsapp_phone_number, letter: (`${item.whatsapp_name || ''}`.trim() || item.whatsapp_phone_number).slice(0, 5) }}
-              alt={`${item.whatsapp_name || ''}`.trim()}
-              title={`${item.whatsapp_name || ''}`.trim() || item.whatsapp_phone_number}
+              letterItem={{ id: item.whatsapp_name || item.whatsapp_phone_number, letter: (item.whatsapp_name || item.whatsapp_phone_number).slice(0, 5) }}
+              alt={item.whatsapp_name}
+              title={item.whatsapp_name || item.whatsapp_phone_number}
               subtitle={item.coli_id}
               date={item.last_received_time}
               unread={item.unread_msg_count}