From 67168954ed8c76bc75bda836e0a4351e72769c20 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Fri, 15 Dec 2023 17:46:50 +0800
Subject: [PATCH] fix bug

---
 src/pages/Payment/Details_GLD/DataGrid.js | 4 ++--
 src/utils/statusUtils/PaymentStatus.js    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/Payment/Details_GLD/DataGrid.js b/src/pages/Payment/Details_GLD/DataGrid.js
index 4aeee5f..3bc24fd 100644
--- a/src/pages/Payment/Details_GLD/DataGrid.js
+++ b/src/pages/Payment/Details_GLD/DataGrid.js
@@ -29,8 +29,8 @@ export default function SearchPublicNoticeTable({ recordList }) {
             headerName: 'App No.',
             flex: 1,
             renderCell: (params) => {
-                let appNo = params.row.appNo;
-                return <div style={{ margin: 4 }}>{appNo}<br/>{params.row.remarks}</div>
+                let appNo = params?.row?.appNo??"";
+                return <div style={{ margin: 4 }}>{appNo}<br/>{params?.row?.remarks??""}</div>
             },
         },
         {
diff --git a/src/utils/statusUtils/PaymentStatus.js b/src/utils/statusUtils/PaymentStatus.js
index e177d8b..2bf1223 100644
--- a/src/utils/statusUtils/PaymentStatus.js
+++ b/src/utils/statusUtils/PaymentStatus.js
@@ -16,10 +16,11 @@ export function getStatus_Eng(params) {
 }
 
 function getStatus(params) {
-    let status = params.row?params.row.status:params;
+    let status = params?.row?params.row.status:params;
     if(status == "APPR") return APPR;
     if(status == "REJT") return REJT;
     if(status == "CANC") return CANC;
     if(status == "INPR") return INPR;
+    return CANC;
 }