From c6b2a7d99c6ea8fea8815fd9f6a865f1ce2673b2 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Mon, 30 Oct 2023 18:04:44 +0800
Subject: [PATCH] Update UI

---
 src/pages/PublicNotice/Details_GLD/index.js               | 3 ++-
 .../PublicNotice/Details_GLD/tabTableDetail/TabTable.js   | 8 ++++----
 src/pages/pnspsUserGroupDetailPage/index.js               | 7 +++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/pages/PublicNotice/Details_GLD/index.js b/src/pages/PublicNotice/Details_GLD/index.js
index d23afab..64211ab 100644
--- a/src/pages/PublicNotice/Details_GLD/index.js
+++ b/src/pages/PublicNotice/Details_GLD/index.js
@@ -365,12 +365,13 @@ const PublicNoticeDetail_GLD = () => {
                 </Box>
               </Grid>
               <Grid item xs={12} md={10}>
-                <Box xs={12} ml={4} mt={3}>
+                <Box xs={12} ml={4} mt={3} sx={{ p: 2, border: '3px groove grey', borderRadius: '10px' }}>
                   <TabTableDetail
                     applicationDetailData={applicationDetailData}
                     proofList={proofList}
                   />
                 </Box>
+                <br/>
               </Grid>
             </Grid>
           </Grid>
diff --git a/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js b/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
index 3f0eab0..b5f40e1 100644
--- a/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
+++ b/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
@@ -21,10 +21,10 @@ const ProofTab = Loadable(lazy(() => import('./ProofTab')));
 
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
-const PublicNotice = ({applicationDetailData, proofList}) => {
+const PublicNotice = ({ applicationDetailData, proofList }) => {
     const [_proofList, setProofList] = React.useState([]);
     const [inProgressList,] = React.useState([]);
-    const [onReady,setOnReady] = React.useState(false);
+    const [onReady, setOnReady] = React.useState(false);
     const [selectedTab, setSelectedTab] = React.useState("1");
     // const navigate = useNavigate();
     const [statusHistoryList, setStatusHistoryList] = React.useState([]);
@@ -66,13 +66,13 @@ const PublicNotice = ({applicationDetailData, proofList}) => {
         !onReady ?
             <LoadingComponent />
             :
-            <Grid container sx={{minHeight: '40vh'}}>
+            <Grid container sx={{ minHeight: '40vh' }}>
                 {/*col 2*/}
                 <Grid item xs={12}>
                     <TabContext value={selectedTab}>
                         <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
                             <TabList onChange={handleChange} aria-label="lab API tabs example">
-                                <Tab label={"Proof(" + (_proofList?.length?_proofList?.length:0) + ")"} value="1" />
+                                <Tab label={"Proof(" + (_proofList?.length ? _proofList?.length : 0) + ")"} value="1" />
                                 <Tab label={"Payment(" + inProgressList.length + ")"} value="2" />
                                 <Tab label={"Status History(" + statusHistoryList.length + ")"} value="3" />
                             </TabList>
diff --git a/src/pages/pnspsUserGroupDetailPage/index.js b/src/pages/pnspsUserGroupDetailPage/index.js
index 02cb5c6..7d41484 100644
--- a/src/pages/pnspsUserGroupDetailPage/index.js
+++ b/src/pages/pnspsUserGroupDetailPage/index.js
@@ -25,6 +25,7 @@ const GroupAuthCard = Loadable(lazy(() => import('./GroupAuthCard')));
 const UserGroupInfoCard = Loadable(lazy(() => import('./UserGroupInfoCard')));
 const UserAddCard = Loadable(lazy(() => import('./UserAddCard')));
 import { useNavigate } from "react-router";
+import KeyboardBackspaceOutlinedIcon from '@mui/icons-material/KeyboardBackspaceOutlined';
 import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
 
 const BackgroundHead = {
@@ -176,6 +177,12 @@ const UserMaintainPage = () => {
                         </Stack>
                     </div>
                 </Grid>
+                <Grid item xs={12}>
+                    <Button sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/usergroupSearchview") }}>
+                        <KeyboardBackspaceOutlinedIcon />
+                        <Typography variant="h4">Back</Typography>
+                    </Button>
+                </Grid>
                 {/*col 1*/}
                 <Grid item xs={12} md={5} lg={5}>
                     <Grid container>