From 084532436e0970b176571d73762c3c6601a2096c Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Tue, 21 May 2024 14:06:30 +0800
Subject: [PATCH] check null

---
 src/pages/Proof/Reply_Public/ApplicationDetails.js | 8 ++++----
 src/pages/Proof/Reply_Public/ProofForm.js          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/Proof/Reply_Public/ApplicationDetails.js b/src/pages/Proof/Reply_Public/ApplicationDetails.js
index 3507368..04aee2f 100644
--- a/src/pages/Proof/Reply_Public/ApplicationDetails.js
+++ b/src/pages/Proof/Reply_Public/ApplicationDetails.js
@@ -238,9 +238,9 @@ const ApplicationDetailCard = ({ formData, }) => {
                                     <Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}>
                                         <Typography variant="h5">&emsp;
                                             {locale === 'en' ?
-                                                `${intl.formatMessage({ id: 'before' })} ${DateUtils.datetimeStr(data.reviseDeadline)} `
+                                                `${intl.formatMessage({ id: 'before' })} ${DateUtils.datetimeStr(data?.reviseDeadline)} `
                                                 :
-                                                `${DateUtils.datetimeStr_Cht(data.reviseDeadline)} ${intl.formatMessage({ id: 'before' })}`
+                                                `${DateUtils.datetimeStr_Cht(data?.reviseDeadline)} ${intl.formatMessage({ id: 'before' })}`
                                             }
                                         </Typography>
                                     </Grid>
@@ -254,9 +254,9 @@ const ApplicationDetailCard = ({ formData, }) => {
                                     <Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}>
                                         <Typography variant="h5">&emsp;
                                             {locale === 'en' ?
-                                                `${intl.formatMessage({ id: 'before' })} ${DateUtils.datetimeStr(data.proofPaymentDeadline)} `
+                                                `${intl.formatMessage({ id: 'before' })} ${DateUtils.datetimeStr(data?.proofPaymentDeadline)} `
                                                 :
-                                                `${DateUtils.datetimeStr_Cht(data.proofPaymentDeadline)} ${intl.formatMessage({ id: 'before' })}`
+                                                `${DateUtils.datetimeStr_Cht(data?.proofPaymentDeadline)} ${intl.formatMessage({ id: 'before' })}`
                                             }
                                         </Typography>
                                     </Grid>
diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js
index 882fce7..3469ae7 100644
--- a/src/pages/Proof/Reply_Public/ProofForm.js
+++ b/src/pages/Proof/Reply_Public/ProofForm.js
@@ -164,7 +164,7 @@ const FormPanel = ({ formData }) => {
     }
 
     const isOverTime = () => {
-        let proofPaymentDeadline = DateUtils.convertToDate(formData.proofPaymentDeadline);
+        let proofPaymentDeadline = DateUtils.convertToDate(formData?.proofPaymentDeadline);
         if (!proofPaymentDeadline) return true;
         let current = new Date();
         return current.getTime() > proofPaymentDeadline;