From e16913447fc9d80a1cd3e668fcc80e395171eeb0 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Wed, 29 Nov 2023 15:00:48 +0800
Subject: [PATCH] fix payment UI, proof to payment bugs

---
 src/pages/Payment/Details_GLD/DataGrid.js                   | 2 +-
 src/pages/Payment/Details_Public/DataGrid.js                | 2 +-
 src/pages/Proof/Payment/Pay.js                              | 2 +-
 src/pages/PublicNotice/ListPanel/PendingPaymentTab.js       | 2 +-
 src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/Payment/Details_GLD/DataGrid.js b/src/pages/Payment/Details_GLD/DataGrid.js
index b9458a8..4aeee5f 100644
--- a/src/pages/Payment/Details_GLD/DataGrid.js
+++ b/src/pages/Payment/Details_GLD/DataGrid.js
@@ -45,7 +45,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
     ];
 
     return (
-        <div style={{ height: 400, width: '100%' }}>
+        <div style={{ minHeight: 400, width: '100%' }}>
 
             <FiDataGrid
                 rowHeight={80}
diff --git a/src/pages/Payment/Details_Public/DataGrid.js b/src/pages/Payment/Details_Public/DataGrid.js
index 77b5469..34ef9dc 100644
--- a/src/pages/Payment/Details_Public/DataGrid.js
+++ b/src/pages/Payment/Details_Public/DataGrid.js
@@ -45,7 +45,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
     ];
 
     return (
-        <div style={{ height: 400, width: '100%' }}>
+        <div style={{ minHeight:400, width: '100%' }}>
 
             <FiDataGrid
                 rowHeight={80}
diff --git a/src/pages/Proof/Payment/Pay.js b/src/pages/Proof/Payment/Pay.js
index 2838c98..b4fec8a 100644
--- a/src/pages/Proof/Payment/Pay.js
+++ b/src/pages/Proof/Payment/Pay.js
@@ -69,7 +69,7 @@ const Index = () => {
 
     function doPayment() {
         setIsPopUp(false);
-        navigate('/paymentPage', { state: { amount: fee, appIdList: [record.id] } });
+        navigate('/paymentPage', { state: { amount: fee, appIdList: [record?.appId] } });
     }
 
     return (
diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
index ed40d9e..902f584 100644
--- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
+++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
@@ -152,7 +152,7 @@ export default function SubmittedTab({ rows }) {
                     columns={columns}
                     initialState={{
                         pagination: {
-                            paginationModel: { page: 0, pageSize: 5 },
+                            paginationModel: { page: 0, pageSize: 20 },
                         },
                     }}
                     onRowSelectionModelChange={(newSelection) => {
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
index 87bedfd..7c9c192 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
@@ -101,7 +101,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
                 columns={columns}
                 initialState={{
                     pagination: {
-                        paginationModel: { page: 0, pageSize: 10 },
+                        paginationModel: { page: 0, pageSize: 20 },
                     },
                 }}
                 onRowDoubleClick={handleRowDoubleClick}