From 27208be5d416fa020e32ccabe08da9a9cad23ab7 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 29 Oct 2024 15:25:14 +0800
Subject: [PATCH] =?UTF-8?q?todo:=20Email=E6=B6=88=E6=81=AF,=20=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Conversations/Online/Components/EmailDetail.jsx | 5 ++++-
 src/views/Conversations/Online/Input/EmailEditorPopup.jsx | 2 +-
 src/views/Conversations/Online/MessagesWrapper.jsx        | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/Conversations/Online/Components/EmailDetail.jsx b/src/views/Conversations/Online/Components/EmailDetail.jsx
index b8cdee4..ce23bd9 100644
--- a/src/views/Conversations/Online/Components/EmailDetail.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetail.jsx
@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react'
 import { Button, Divider, Avatar } from 'antd'
 import { ReplyIcon, ShareForwardIcon } from '@/components/Icons'
-import { stringToColour } from '@/utils/commons'
+import { isEmpty, stringToColour } from '@/utils/commons'
 import EmailEditorPopup from '../Input/EmailEditorPopup'
 import DnDModal from '@/components/DndModal'
 import useStyleStore from '@/stores/StyleStore'
@@ -52,6 +52,9 @@ const EmailDetail = ({ open, setOpen, emailMsg, ...props }) => {
 
   const [mailData, setMailData] = useState({info: {}, content: '', attachments: []})
   const getEmailDetail = async () => {
+    if (isEmpty(mai_sn)) {
+      return false;
+    }
     const data = await getEmailDetailAction({ mai_sn })
     console.log('data', data);
 
diff --git a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
index 3511c88..23650b6 100644
--- a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
+++ b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
@@ -71,7 +71,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, reference, quote = {}, ini
           <b>
             <strong >Sent: </strong>
           </b>
-          <span >${quote.sendTime}</span>
+          <span >${quote.sendTime || ''}</span>
         </p>
         <p>
           <b>
diff --git a/src/views/Conversations/Online/MessagesWrapper.jsx b/src/views/Conversations/Online/MessagesWrapper.jsx
index 387666c..466bd36 100644
--- a/src/views/Conversations/Online/MessagesWrapper.jsx
+++ b/src/views/Conversations/Online/MessagesWrapper.jsx
@@ -68,8 +68,8 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
     const loadNextPage = !(data.length === 0 || data.length < MESSAGE_PAGE_SIZE);
     updateCurrentConversation({ lasttime: thisLastTime, loadNextPage });
 
-    // test:
-    data.push(emailItem);
+    // test: 0
+    // data.push(emailItem);
     // data.push(emailReItem);
 
     setMsgLoading(false);