diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js
index 9e836c6..882fce7 100644
--- a/src/pages/Proof/Reply_Public/ProofForm.js
+++ b/src/pages/Proof/Reply_Public/ProofForm.js
@@ -78,10 +78,10 @@ const FormPanel = ({ formData }) => {
                 return;
             }
             let pm = paymentMethod;
-            if(pm=="demandNote"){
-                pm = isOverDnReviseDeadline()?"":pm;
-            }else if(pm=="office"){
-                pm = isOverNpgoReviseDeadline()?"":pm;
+            if (pm == "demandNote") {
+                pm = isOverDnReviseDeadline() ? "" : pm;
+            } else if (pm == "office") {
+                pm = isOverNpgoReviseDeadline() ? "" : pm;
             }
 
             if (actionValue == false && isOverReviseDeadline()) {
@@ -89,7 +89,7 @@ const FormPanel = ({ formData }) => {
                 setIsWarningPopUp(true);
                 return;
             }
-            else if(formData.creditor == false && pm == "") {
+            else if (formData.creditor == false && pm == "") {
                 setWarningText(intl.formatMessage({ id: 'MSG.plzSelectPaymentMethod' }));
                 setIsWarningPopUp(true);
                 return;
@@ -164,18 +164,18 @@ const FormPanel = ({ formData }) => {
     }
 
     const isOverTime = () => {
-        let proofPaymentDeadline = DateUtils.convertToDate(formik.values?.proofPaymentDeadline);
+        let proofPaymentDeadline = DateUtils.convertToDate(formData.proofPaymentDeadline);
         if (!proofPaymentDeadline) return true;
         let current = new Date();
         return current.getTime() > proofPaymentDeadline;
     }
 
     const isOverReviseDeadline = () => {
-        if (paymentMethod == "dn") return isOverDnReviseDeadline();
-        if (paymentMethod == "npgo") return isOverNpgoReviseDeadline();
+        // if (paymentMethod == "demandNote") return isOverDnReviseDeadline();
+        // if (paymentMethod == "office") return isOverNpgoReviseDeadline();
         //online payment
-        let reviseDeadline = DateUtils.convertToDate(formik.values?.reviseDeadline);
-        reviseDeadline?.setTime(reviseDeadline?.getTime() + (14 * 60 * 60 * 1000));// 14:00
+        let reviseDeadline = DateUtils.convertToDate(formData.reviseDeadline);
+        // reviseDeadline?.setTime(reviseDeadline?.getTime() + (14 * 60 * 60 * 1000));// 14:00
         if (!reviseDeadline) return true;
         let current = new Date();
         return current.getTime() > reviseDeadline;
@@ -190,7 +190,7 @@ const FormPanel = ({ formData }) => {
     }
 
     const isOverNpgoReviseDeadline = () => {
-        let reviseDeadline = DateUtils.convertToDate(formik.values?.reviseDeadline);
+        let reviseDeadline = DateUtils.convertToDate(formData.closingDate);
         reviseDeadline?.setTime(reviseDeadline?.getTime() + (12 * 60 * 60 * 1000));// 12:00
         if (!reviseDeadline) return true;
         let current = new Date();
@@ -311,12 +311,15 @@ const FormPanel = ({ formData }) => {
                                                         </tr>
                                                         <tr>
                                                             <td style={tabelStyle}>
-                                                                <Checkbox
-                                                                    checked={paymentMethod == "demandNote"}
-                                                                    onChange={() => {
-                                                                        set_paymentMethod("demandNote")
-                                                                    }}
-                                                                />
+                                                                {isOverDnReviseDeadline() ?
+                                                                    <></> :
+                                                                    <Checkbox
+                                                                        checked={paymentMethod == "demandNote"}
+                                                                        onChange={() => {
+                                                                            set_paymentMethod("demandNote")
+                                                                        }}
+                                                                    />
+                                                                }
                                                             </td>
                                                             <td style={tabelStyle}><FormattedMessage id="payDn" /></td>
                                                             <td style={tabelStyle}>
@@ -341,12 +344,16 @@ const FormPanel = ({ formData }) => {
                                                         </tr>
                                                         <tr>
                                                             <td style={tabelStyle}>
-                                                                <Checkbox
-                                                                    checked={paymentMethod == "office"}
-                                                                    onChange={() => {
-                                                                        set_paymentMethod("office")
-                                                                    }}
-                                                                />
+                                                                {
+                                                                    isOverNpgoReviseDeadline() ?
+                                                                        <></> :
+                                                                        <Checkbox
+                                                                            checked={paymentMethod == "office"}
+                                                                            onChange={() => {
+                                                                                set_paymentMethod("office")
+                                                                            }}
+                                                                        />
+                                                                }
                                                             </td>
                                                             <td style={tabelStyle}><FormattedMessage id="payNPGO" /></td>
                                                             <td style={tabelStyle}>