label and layout update

src/pages/DemandNote/Search/DataGrid.js

@@ -369,7 +369,7 @@ export default function SearchDemandNote({ applySearch, searchCriteria }) {
                                 variant="contained"
                                 onClick={() => setRevokePopUp(true)}
                             >
-                                Revoke as To be Paid
+                                Revoke payment
                             </Button>
                         </Grid>
 

src/pages/Message/Search/DataGrid.js

@@ -41,7 +41,7 @@ export default function MsgTable({ recordList }) {
             id: 'sentDate',
             field: 'sentDate',
             headerName: intl.formatMessage({id: 'date'}),
-            width: 160,
+            width: 170,
             renderCell: (params) => {
                 return DateUtils.datetimeStr(params.row.sentDate);
             },

src/pages/Proof/Payment/Pay_DN.js

@@ -44,12 +44,12 @@ const Index = ({ record }) => {
                     <Grid container justifyContent="flex-start" alignItems="center" >
                         <center>
                             <Grid item xs={12} md={8} >
-                                <Typography variant="h2" sx={{ textAlign: "left", ml: 4, mr: 4, mt: 4, borderBottom: "1px solid black" }}>
+                                <Typography variant="h4" sx={{ textAlign: "left", ml: 4, mr: 4, mt: 4, borderBottom: "1px solid black" }}>
                                     <FormattedMessage id="proofPaymentHeader_demandNote" />
                                 </Typography>
 
 
-                                <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
+                                <Typography variant="h5" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
                                     <div dangerouslySetInnerHTML={{
                                         __html: intl.formatMessage(
                                             {

src/pages/Proof/Payment/Pay_Office.js

@@ -44,12 +44,12 @@ const Index = ({ record }) => {
                     <Grid container justifyContent="flex-start" alignItems="center" >
                         <center>
                             <Grid item xs={12} md={8} >
-                                <Typography variant="h2" sx={{ textAlign: "left", ml: 4, mr: 4, mt: 4, borderBottom: "1px solid black" }}>
+                                <Typography variant="h4" sx={{ textAlign: "left", ml: 4, mr: 4, mt: 4, borderBottom: "1px solid black" }}>
                                     <FormattedMessage id="proofPaymentHeader_office" />
                                 </Typography>
 
 
-                                <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
+                                <Typography variant="h5" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
                                     <div dangerouslySetInnerHTML={{
                                         __html: intl.formatMessage(
                                             {

src/pages/Proof/Payment/Pay_Online.js

@@ -145,11 +145,11 @@ const Index = () => {
                         <Grid container justifyContent="flex-start" alignItems="center" >
                             <center>
                                 <Grid item xs={12} md={8} >
-                                    <Typography variant="h3" sx={{ textAlign: "left", ml: 4, mr: 4, mt: 4, borderBottom: "1px solid black" }}>
+                                    <Typography variant="h4" sx={{ textAlign: "left", ml: 4, mr: 4, mt: 4, borderBottom: "1px solid black" }}>
                                         <FormattedMessage id="proofPaymentHeader_online" />
                                     </Typography>
 
-                                    <Typography variant="h4" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
+                                    <Typography variant="h5" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
                                         <div dangerouslySetInnerHTML={{
                                             __html: intl.formatMessage(
                                                 {

src/pages/PublicNotice/Details_GLD/StatusChangeDialog.js

@@ -49,7 +49,7 @@ const StatusChangeDialog = (props) => {
     }if (props.getStatus == "paid") {
       setDialogTitle("Action Confirm");
       setPrositiveBtnText("Confirm");
-      return getConfirmContent("Do you want to mark as paid.");
+      return getConfirmContent("Are you sure to mark this application as paid?");
     } else {
       setDialogTitle("Action Confirm");
       setPrositiveBtnText("Confirm");

src/pages/dashboard/Public/index.js

@@ -87,7 +87,7 @@ const DashboardDefault = () => {
                 list.push(
                     <Button onClick={()=>{navigate("/msg/details/"+item.id);}} color={item.readTime?"gray":"black"} style={{justifyContent: "flex-start"}} sx={{p:2}}>
                         <Stack direction="column" >
-                            <Typography variant='h4' align="justify"><b>{item.subject}</b></Typography>
+                            <Typography variant='string' align="justify"><b>{item.subject}</b></Typography>
                             <Typography align="justify">{DateUtils.datetimeStr(item.sentDate)}</Typography>
                         </Stack>
                     </Button>
@@ -205,7 +205,7 @@ const DashboardDefault = () => {
                       <FormattedMessage id="viewAllSystemMessage" />
                     </u></Button>
                 </Stack>
-                <Box xs={12} md={12} sx={{ p: 1, border: '3px solid #eee', borderRadius: '10px' }} >
+                <Box xs={12} md={12} sx={{ p: 1, fontSize: 12, border: '3px solid #eee', borderRadius: '10px' }} >
                   <Message 
                     itemList = {itemList}
                   />

src/translations/en.json

@@ -428,7 +428,7 @@
   "paymentDeadline": "Deadline for online confirm proof",
   "confirmingDealine": "Deadline for Confirming Proof",
   "PaymentCoonpletDealine": "Deadline for Payment Completion",
-  "payOnline":"GPNSPS",
+  "payOnline":"Online Payment",
   "payDn":"Pay by issuance of General Demand Note",
   "payNPGO":"Pay at NPGO Collection Office",
   "paymentMeans":"Payment Means",

src/translations/zh-CN.json

@@ -41,7 +41,7 @@
 
     "confirmingDealine": "确认校对的截止日期",
   "PaymentCoonpletDealine": "付款截止日期",
-  "payOnline":"透过此系统 GPNSPS 网上支付",
+  "payOnline":"透过此系统网上支付",
   "payDn":"透过发出一般缴款单付款",
   "payNPGO":"在 NPGO 收款办公室付款",
   "paymentMeans":"付款方式",

src/translations/zh-HK.json

@@ -41,7 +41,7 @@
   
   "confirmingDealine": "確認校對的截止日期",
   "PaymentCoonpletDealine": "付款截止日期",
-  "payOnline":"透過此系統 GPNSPS 網上支付",
+  "payOnline":"透過此系統網上支付",
   "payDn":"透過發出一般繳款單付款",
   "payNPGO":"在 NPGO 收款辦公室付款",
   "paymentMeans":"付款方式",