From e5469aad5c5bcec3b5a52619aba13a0a9036de7c Mon Sep 17 00:00:00 2001 From: Lei OT Date: Thu, 1 Feb 2024 09:47:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/actions/ConversationActions.js | 4 +--- src/views/Conversations/Components/ConversationsList.jsx | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/actions/ConversationActions.js b/src/actions/ConversationActions.js index 19deebb..1439b3d 100644 --- a/src/actions/ConversationActions.js +++ b/src/actions/ConversationActions.js @@ -86,9 +86,7 @@ export const fetchTemplates = async () => { export const fetchConversationsList = async (opisn) => { const { result: data } = await fetchJSON(`${API_HOST}/getconversations`, { opisn }); - const _data = []; - // const _data = testConversations; - const list = [..._data, ...data.map((ele) => ({ ...ele, customer_name: ele.whatsapp_name.trim() }))]; + const list = data.map((ele) => ({ ...ele, customer_name: ele.whatsapp_name.trim() })); return list; }; diff --git a/src/views/Conversations/Components/ConversationsList.jsx b/src/views/Conversations/Components/ConversationsList.jsx index e69721b..33c29e4 100644 --- a/src/views/Conversations/Components/ConversationsList.jsx +++ b/src/views/Conversations/Components/ConversationsList.jsx @@ -53,6 +53,9 @@ const Conversations = (() => { const getCustomerProfile = async (colisn) => { const data = await fetchCustomerProfile(colisn); dispatch(receivedCustomerProfile(data)); + if (isEmpty(data)) { + return false; + } if (!isEmpty(data.conversation)) { dispatch(addConversationList(data.conversations)); dispatch(setCurrentConversation(data.conversation[0]));