removed ok and change to close, various update

src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js

@@ -410,11 +410,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
                                                             }}><u><FormattedMessage id="viewDetail" /></u></a>
                                                         </td>
                                                         <td style={{ ...tabelStyle, verticalAlign: 'top'}}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"2:00 p.m.":"下午2時"}</td>
-                                                        <td style={{ ...tabelStyle, verticalAlign: 'top'}}>
-                                                            <FormattedMessage id="payOnlineRemark" values={{
-                                                                date: DateUtils.dateFormat(closeDate, dft)
-                                                            }} />
-                                                        </td>
+                                                        <td style={{ ...tabelStyle, verticalAlign: 'top'}}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"2:30 p.m.":"下午2時30分"}</td>
                                                     </tr>
                                                     {!isOnlyOnlinePayment?
                                                         <>

src/pages/Setting/DrImport/index.js

@@ -241,10 +241,10 @@ const Index = () => {
                     </DialogContent>
                     <DialogActions>
                         <Button
-                            aria-label={intl.formatMessage({ id: 'ok' })}
+                            aria-label={intl.formatMessage({ id: 'close' })}
                             onClick={() => { setIsWarningPopUp(false); }}
                         >
-                            <FormattedMessage id="ok" />
+                            <FormattedMessage id="close" />
                         </Button>
                     </DialogActions>
                 </Dialog>

src/pages/authentication/AuthWrapper.js

@@ -96,17 +96,16 @@ const AuthWrapper = ({ children }) => {
             >
               <Grid item xs={12} sx={{ ml: 4,}}>
               {checkPaymentSuspension()?
-                <Typography style={{ textAlign: "flex-start" }}>
+                <Typography style={{ color: 'red', textAlign: "flex-start" }}>
                   <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "suspensionMessageText" }) }} />
                 </Typography>
-              :
-                <Typography style={{ textAlign: "flex-start" }}>
-                  <div
-                    style={{ padding: 12 }}
-                    dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "homePageHeaderMessage" }) }}
-                  />
-                </Typography>
-              }
+              : ""}
+              <Typography style={{ textAlign: "flex-start" }}>
+                <div
+                  style={{ padding: 12 }}
+                  dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "homePageHeaderMessage" }) }}
+                />
+              </Typography>
               </Grid>
               <Grid
                 container

src/pages/authentication/ForgotPassword/ForgotPasswordApplyForm.js

@@ -204,10 +204,10 @@ const ForgotPasswordApplyForm = () => {
                     </DialogContent>
                     <DialogActions>
                         <Button
-                            aria-label={intl.formatMessage({id: 'ok'})}
+                            aria-label={intl.formatMessage({id: 'close'})}
                             onClick={() => setIsWarningPopUp(false)}
                         >
-                            <FormattedMessage id="ok" />
+                            <FormattedMessage id="close" />
                         </Button>
                     </DialogActions>
                 </Dialog>

src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js

@@ -203,10 +203,10 @@ const ForgotUsernameApplyForm = () => {
                     </DialogContent>
                     <DialogActions>
                         <Button
-                            aria-label={intl.formatMessage({id: 'ok'})}
+                            aria-label={intl.formatMessage({id: 'close'})}
                             onClick={() => setIsWarningPopUp(false)}
                         >
-                            <FormattedMessage id="ok" />
+                            <FormattedMessage id="close" />
                         </Button>
                     </DialogActions>
                 </Dialog>

src/pages/dashboard/Public/index.js

@@ -238,13 +238,13 @@ const DashboardDefault = () => {
                   <FormattedMessage id="systemNotice" />
                 </Typography>
               </DialogTitle>
-              <DialogContent style={{ display: 'flex', }}>
+              <DialogContent style={{ color: 'red', display: 'flex', }}>
                   <Typography variant="h5" style={{ padding: '16px' }}>
                     <div dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "suspensionMessageText" }) }} />
                   </Typography>
               </DialogContent>
               <DialogActions>
-                  <Button onClick={() => setIsPopUp(false)}><Typography variant="h5"><FormattedMessage id="ok" /></Typography></Button>
+                  <Button variant="contained" color="error" onClick={() => setIsPopUp(false)}><Typography variant="h5"><FormattedMessage id="close" /></Typography></Button>
               </DialogActions>
             </Dialog>
         </div>

src/translations/en.json

@@ -493,7 +493,6 @@
 
   "payDnRemark": "Payment proof (e.g. ATM receipt, internet banking record) to be sent to gld_acct@gld.gov.hk by {date} 12:30 p.m.",
   "payNPGORemark" :"Payment to be completed at NPGO Collection Office by {date} 12:30 p.m.",
-  "payOnlineRemark" :"Payment to be completed via this system by {date} 2:30 p.m. ",
   "payOnlineRemarkProof" :"Payment to be completed via this system by {date}",
 
   "before": "Before",
@@ -563,7 +562,6 @@
   "dateTo": "Date (To)",
   "of": "of",
   "loading": "Loading...",
-  "ok": "OK",
 
   "organizationProfile": "Organisation Profile",
   "organizationDetails": "Organisation Details",

src/translations/zh-CN.json

@@ -83,7 +83,6 @@
   
   "payDnRemark": "在{date}下午12时30分前将付款证明（例如银行入数纸或网上银行付款记录）电邮至 gld_acct@gld.gov.hk",
   "payNPGORemark" :"在{date}下午12时30分前到北角政府合署收款处完成付款",
-  "payOnlineRemark" :"在{date}下午2时30分前透过此系统完成网上付款",
   "payOnlineRemarkProof" :"在{date}前透过此系统完成网上付款",
   
   "MSG.registerIAmSmart": "你可点击「智方便」按钮，系统会自动输入个人资料，或自行输入个人资料，以即时启动 公共启事提交及缴费系统 帐户。<br/>如欲使用「智方便」提供个人资料，请先下载「智方便」流动应用程式并登记成为「智方便」用户。",
@@ -559,7 +558,6 @@
   "dateTo": "日期 (到)",
   "of": "於",
   "loading": "加载中...",
-  "ok": "关闭",
 
   "organizationProfile": "机构资料",
   "organizationDetails": "机构详情",

src/translations/zh-HK.json

@@ -83,7 +83,6 @@
 
   "payDnRemark": "在{date}下午12時30分前將付款證明（例如銀行入數紙或網上銀行付款記錄）電郵至 gld_acct@gld.gov.hk",
   "payNPGORemark" :"在{date}下午12時30分前到北角政府合署收款處完成付款",
-  "payOnlineRemark" :"在{date}下午2時30分前透過此系統完成網上付款",
   "payOnlineRemarkProof" :"在{date}前透過此系統完成網上付款",
 
   "MSG.registerIAmSmart": "你可點擊「智方便」按鈕，系統會自動輸入個人資料，或自行輸入個人資料，以即時啟動 公共啟事提交及繳費系統 帳戶。<br/>如欲使用「智方便」提供個人資料，請先下載「智方便」流動應用程式並登記成為「智方便」用戶。",
@@ -560,8 +559,7 @@
   "dateTo": "日期 (到)",
   "of": "於",
   "loading": "加載中...",
-  "ok": "關閉",
-
+  
   "organizationProfile": "機構資料",
   "organizationDetails": "機構詳情",
   "brNo": "商業登記證號碼",