From eeb13bcc56d0323cb8e223094fc6d63ce3189a18 Mon Sep 17 00:00:00 2001
From: Patrick Alvin Alcala <patrick_alv@yahoo.com>
Date: Mon, 30 Mar 2026 14:54:03 +0800
Subject: [PATCH] Fixed notifications

---
 src/pages/AssessorPage/Assessor.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/AssessorPage/Assessor.tsx b/src/pages/AssessorPage/Assessor.tsx
index 1896fa5..bc17281 100644
--- a/src/pages/AssessorPage/Assessor.tsx
+++ b/src/pages/AssessorPage/Assessor.tsx
@@ -190,6 +190,7 @@ export default () => {
 
   const closeNotification = async () => {
     setPrinted(false)
+    setVoidNotification(false)
     await checkDivision()
     if (isBuilding()) await getListForPrinting('building')
     if (isOccupancy()) await getListForPrinting('occupancy')
@@ -394,7 +395,7 @@ export default () => {
         return
       }
 
-      setLoadingText('Processing for Re-approval')
+      setLoadingText('Processing for Re-approval Status')
       if (division === 'electrical') {
         await setNewStatus(division, 'ELECTRICAL ORDER OF PAYMENT VOIDED', '173', 'ELECOPVOIDED', 1)
         await setNewStatus(division, 'FOR ELECTRICAL ORDER OF PAYMENT APPROVAL', '94', 'ELECOPAPPROVE', 0)
@@ -403,15 +404,13 @@ export default () => {
         if (checkOpPrinting) {
           await updateDocflow(division, application, 'FOR ELECTRICAL ORDER OF PAYMENT PRINTING')
         }
-
-        setLoadingText('Processing for Re-approval')
         const checkOrValidation = await checkDocflow(division, application, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION')
         if (checkOrValidation) {
           await updateDocflow(division, application, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION')
         }
         // await updateDocflow(division, application, 'FOR ELECTRICAL OFFICIAL RECEIPT VALIDATION')
         await updateOpForApproval(division, application)
-        setLoadingText('Processing for Re-approval')
+        setLoadingText('Clearing transactions and locked data')
         await clearEsignTransactions(application)
         await clearEsignLock(application)
       } else if (division === 'occupancy') {
@@ -420,12 +419,13 @@ export default () => {
         await updateDocflow(division, application, 'APPROVED FOR PRINTING OF BUREAU OF FIRE AND ORDER OF PAYMENT')
       }
 
+      setLoadingText('Voiding POPS record')
       const successVoid = BACKEND.includes('localhost') ? await voidPopsOpLocal(application) : await voidPopsOp(application)
       if (successVoid) {
         await postTransaction(application)
-        setIsLoading(false)
         setPrintedApplication(application)
         setVoidNotification(true)
+        setIsLoading(false)
       } else {
         setIsLoading(false)
       }
@@ -1186,7 +1186,7 @@ export default () => {
         </Modal>
       </div>
 
-      <div onClick={() => setVoidNotification(false)}>
+      <div onClick={closeNotification}>
         <Modal trigger={voidNotification() === true} background="#123220ff" color="#cdfbe1f0" opacity={0.8}>
           <Padding top={1} bottom={1} left={2} right={2}>
             <Column>