update comment from Matt

src/layout/MainLayout/Header/index.js

@@ -601,7 +601,7 @@ function Header(props) {
                 justifyContent="flex-start"
                 alignItems="center"
                 spacing={0}
-                sx={{ width: { xs: '100%', md: '46%' } }}
+                sx={{ width: { xs: '100%', md: '25%' } }}
               >
                 <Box sx={{ width: '450px', flexGrow: 1, display: { xs: 'none', sm: 'none', md: 'block' } }}>
                   <Stack direction="row" justifyContent="flex-start" alignItems="center">
@@ -699,7 +699,7 @@ function Header(props) {
               alignItems="center"
               spacing={0}
               // width="100%"
-              sx={{ width: { xs: '100%', md: '35%' } }}
+              sx={{ width: { xs: '100%', md: '25%' } }}
             >
               <Box sx={{ flexGrow: 1, display: { xs: 'none', sm: 'none', md: 'block' } }}>
                 <Stack direction="row" justifyContent="flex-start" alignItems="center" >

src/pages/DemandNote/Export/DataGrid.js

@@ -140,7 +140,7 @@ export default function SearchPublicNoticeTable({ searchCriteria,}) {
         {
             id: 'fee',
             field: 'fee',
-            headerName: 'Amount(HK$)',
+            headerName: 'Amount($)',
             flex: 1,
             minWidth: 100,
             valueGetter: (params) => {

src/pages/Organization/DetailPage/OrganizationCard.js

@@ -521,7 +521,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                             {FieldUtils.getComboField({
                                 label: FieldUtils.notNullFieldLabel("Country:"),
                                 valueName: "country",
-                                disabled: (!editMode && !createMode),
+                                disabled: true,
                                 dataList: ComboData.country,
                                 getOptionLabel: (option) => option.type ? intl.formatMessage({ id: option.type }) : "",
                                 form: formik

src/pages/Organization/DetailPage/OrganizationPubCard.js

@@ -293,7 +293,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                             {FieldUtils.getComboField({
                                 label: FieldUtils.notNullFieldLabel(intl.formatMessage({ id: 'country' }) + ":"),
                                 valueName: "country",
-                                disabled: (!editMode && !createMode),
+                                disabled: true,
                                 dataList: ComboData.country,
                                 getOptionLabel: (option) => option.type ? intl.formatMessage({ id: option.type }) : "",
                                 form: formik

src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js

@@ -314,6 +314,7 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => {
                                 {FieldUtils.getComboField({
                                     label: FieldUtils.notNullFieldLabel("Country:"),
                                     valueName: "country",
+                                    disabled: true,
                                     dataList: ComboData.country,
                                     getOptionLabel: (option) => option.type ? intl.formatMessage({ id: option.type }) : "",
                                     form: formik

src/pages/Payment/Details_Public/DataGrid.js

@@ -81,7 +81,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
         {
             id: 'fee',
             field: 'fee',
-            headerName: intl.formatMessage({id: 'currencyAmount'}) + ' ($)',
+            headerName: intl.formatMessage({id: 'currencyAmount'}),
             width: 200,
             valueGetter: (params) => {
                 return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : "";

src/pages/Payment/MultiPaymentWindow.js

@@ -382,7 +382,7 @@ const MultiPaymentWindow = (props) => {
                             <Grid container >
                                 <Grid item>
                                     <Typography variant="h5" sx={{ color: "#000000", textAlign: "left" }}>
-                                      <FormattedMessage id="payTotal"/>&nbsp;(HK$):&nbsp;
+                                      <FormattedMessage id="payTotal"/>&nbsp;($):&nbsp;
                                     </Typography>
                                 </Grid>
                                 <Grid item>

src/pages/Payment/Search_Public/DataGrid.js

@@ -94,7 +94,7 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
         {
             id: 'payAmount',
             field: 'payAmount',
-            headerName: intl.formatMessage({id: 'currencyAmount'}) + ' ($)',
+            headerName: intl.formatMessage({id: 'currencyAmount'}),
             width: 150,
             valueGetter: (params) => {
                 return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : "";

src/pages/Proof/Payment/Pay.js

@@ -181,7 +181,7 @@ const Index = ({ record }) => {
                         <DialogContent style={{ display: 'flex', }}>
                             <Stack direction="column" justifyContent="space-between">
                                 <Typography variant="h4">
-                                    <FormattedMessage id="totalAmount" /> (HK$): {FormatUtils.currencyFormat(record.fee)}
+                                    <FormattedMessage id="totalAmount" /> ($): {FormatUtils.currencyFormat(record.fee)}
                                 </Typography>
                             </Stack>
                         </DialogContent>

src/pages/Proof/Payment/Pay_Online.js

@@ -238,7 +238,7 @@ const Index = () => {
                             <DialogContent style={{ display: 'flex', }}>
                                 <Stack direction="column" justifyContent="space-between">
                                     <Typography variant="h4">
-                                        <FormattedMessage id="totalAmount" /> (HK$): {FormatUtils.currencyFormat(fee)}
+                                        <FormattedMessage id="totalAmount" /> ($): {FormatUtils.currencyFormat(fee)}
                                     </Typography>
                                 </Stack>
                             </DialogContent>

src/pages/Proof/Reply_Public/ProofForm.js

@@ -525,7 +525,7 @@ const FormPanel = ({ formData }) => {
                                                                         <br /><a href="#payOnlineDetails" color='#fff' onClick={() => {
                                                                             setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" }))
                                                                             setWarningText(
-                                                                                <><FormattedMessage id="paymentMethodMeans" /> :
+                                                                                <><FormattedMessage id="paymentMethodMeans" />:
                                                                                     <ul>
                                                                                         <li><FormattedMessage id="cheque" /></li>
                                                                                         <li><FormattedMessage id="drafts" /></li>

src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js

@@ -730,7 +730,7 @@ const ApplicationDetailCard = (
                             <DialogContent style={{ display: 'flex', }}>
                                 <Stack direction="column" justifyContent="space-between">
                                     <Typography variant="h4">
-                                        <FormattedMessage id="totalAmount" /> (HK$): {FormatUtils.currencyFormat(fee)}
+                                        <FormattedMessage id="totalAmount" /> ($): {FormatUtils.currencyFormat(fee)}
                                     </Typography>
                                 </Stack>
                             </DialogContent>

src/pages/PublicNotice/ListPanel/PendingPaymentTab.js

@@ -291,7 +291,7 @@ export default function SubmittedTab({ setCount, url }) {
             totalAmount += datas[i].fee;
         }
         content.push(<Typography variant="h5">
-            <FormattedMessage id="totalAmount" /> (HK$): {FormatUtils.currencyFormat(totalAmount)}
+            <FormattedMessage id="totalAmount" /> ($): {FormatUtils.currencyFormat(totalAmount)}
             <br /><br />
         </Typography>);
         return content;

src/pages/PublicNotice/Search_Mark_As_Paid_GLD/DataGrid.js

@@ -113,7 +113,7 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
         {
             id: 'fee',
             field: 'fee',
-            headerName: 'Amount(HK$)',
+            headerName: 'Amount($)',
             flex: 1,
             minWidth: 100,
             valueGetter: (params) => {

src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js

@@ -579,7 +579,7 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => {
                                     valueName: "country",
                                     getOptionLabel: (option) => option.type ? intl.formatMessage({ id: option.type }) : "",
                                     dataList: ComboData.country,
-                                    disabled: (!editMode),
+                                    disabled: true,
                                     form: formik
                                 })}
                             </Grid>

src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js

@@ -334,7 +334,7 @@ const UserInformationCard_Individual_Pub = ({ formData, loadDataFun }) => {
                                     valueName: "country",
                                     getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type }) : "",
                                     dataList: ComboData.country,
-                                    disabled: (!editMode),
+                                    disabled: true,
                                     form: formik
                                 })}
                             </Grid>

src/pages/authentication/auth-forms/BusCustomFormWizard.js

@@ -1020,6 +1020,7 @@ const BusCustomFormWizard = (props) => {
                                             id="address5-combo"
                                             value={selectedAddress5}
                                             options={address5ComboList}
+                                            disabled= {true}
                                             getOptionLabel={(option) => option.type? intl.formatMessage({ id: option.type }) : ""}
                                             onChange={(event, newValue) => {
                                                 if (newValue !== null) {

src/pages/authentication/auth-forms/CustomFormWizard.js

@@ -1263,6 +1263,7 @@ const CustomFormWizard = (props) => {
                                             id="address5-combo"
                                             value={selectedAddress5}
                                             options={ComboData.country}
+                                            disabled= {true}
                                             getOptionLabel={(option) => option.type ? intl.formatMessage({ id: option.type }) : ""}
                                             onChange={(event, newValue) => {
                                                 if (newValue !== null) {

src/pages/authentication/auth-forms/IAmSmartFormWizard.js

@@ -596,6 +596,7 @@ const CustomFormWizard = (props) => {
                                             id="address5-combo"
                                             value={selectedAddress5}
                                             options={address5ComboList}
+                                            disabled= {true}
                                             getOptionLabel={(option) => option.type ? intl.formatMessage({ id: option.type }) : ""}
                                             onChange={(event, newValue) => {
                                                 if (newValue !== null) {

src/translations/en.json

@@ -9,8 +9,8 @@
   "paymentMethodDatetimeStrFormat": "DD MMMM YYYY h:mm a",
   "datetimeFormate": "DD MMMM YYYY h:mm a",
   
-  "PNSPS": "Gazette Public Notice Submission and Payment System",
-  "PNSPS_fullname": "Gazette Public Notice Submission and Payment System",
+  "PNSPS": "PNSPS",
+  "PNSPS_fullname": "Public Notice Submission and Payment System",
   "HKSARGOV": "The Government of the Hong Kong Special Administrative Region",
   "HKGLD": "Government Logistics Department",
   "importantNotice": "Important Notice",
@@ -21,7 +21,7 @@
   "gazetteSampleName": "Gazette Supplement No. 6",
   "reason": "Reason",
 
-  "payInstantly": "Instant online payment",
+  "payInstantly": "Pay now",
   "payLater": "Pay later",
   "backToNoticePage": "Return to \"My Public Notices\"",
   "pleaseClickToPay": "Please select options below to complete payment",
@@ -81,13 +81,13 @@
 
   "MSG.proofOutOfTime": "Proofing timed out.  Please apply again.",
   "MSG.overReviseDeadline": "Deadline for online manuscript revision is over. Please apply again as necessary.",
-  "MSG.plzSelectPaymentMethod": "Please select payment means",
+  "MSG.plzSelectPaymentMethod": "Please select payment methods",
   "MSG.plzSelectApp": "Please select application",
   "MSG.actionFail": "Action failed",
   "MSG.paymentHolded": "Payment for Application Number {appNo} is being processed. In case of unsuccessful payment, please try again after 30 minutes. We apologise for any inconvenience caused.",
   "MSG.pay_credity1": "We have received your confirmed application for proofreading and printing instructions regarding application number {appNo}. We will arrange for its publication with in the Year {year},  Volume {issueVolume}, Issue {issueNo} of the Gazette.",
   "MSG.pay_credity2": "A General Demand Note will be issued to you 14 calendar days after the publication of the public notice in the Gazette.  Please follow the payment instructions on the Demand Note and settle the payment promptly.",
-  "MSG.plzonlinePayment": "Please select the application with payment means as \"Online Payment\".",
+  "MSG.plzonlinePayment": "Please select the application with payment methods as \"Online Payment\".",
 
   "registerTitle1": "Become",
   "registerTitle2": "Gazette Public Notice Submission and Payment System",
@@ -118,15 +118,15 @@
   "publicNoticePaymentProofInfo": "Public Notice: Proofreading",
 
   "proofPaymentHeader_demandNote": "Public Notice: Proofreading Completed and Payment Means Selected",
-  "proofPaymentBody_demandNote": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}<br/><br/>You have selected to make payment by General Demand Note.",
+  "proofPaymentBody_demandNote": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}<br/><br/>You have selected to Pay by General Demand Note.",
   "proofPaymentBody_demandNote2": "The General Demand Note will be sent to the following email address within one working day, but not later than {closingDateOff} 9:00 p.m. : <br/>{email}",
   "proofPaymentBody_demandNote3": "Please make payment and return the payment proof (e.g. ATM receipt, internet banking record) with the application number to [email protected] by {paymentDeadline} 12:30 p.m.",
   "proofPaymentBody_demandNote4": "We will process the publication after receiving the payment proof.",
 
   "proofPaymentHeader_office": "Public Notice: Proofreading Completed and Payment Means Selected",
   "proofPaymentBody_office": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}",
-  "proofPaymentBody_office2": "You have selected to make payment at North Point Government Offices Collection Office:<center><br/>Collection Office at Accounts Section<br/>10/F North Point Government Offices<br/>333 Java Road North Point</center>",
-  "proofPaymentBody_office3": "The office hours of the Collection Office is from Monday to Friday: 8:30 a.m. to 1 p.m., 2 p.m. to 5 p.m., except public holidays.",
+  "proofPaymentBody_office2": "You have selected to pay at North Point Government Offices Collection Office:<center><br/>Collection Office at Accounts Section, Government Logistics Department<br/>10/F North Point Government Offices<br/>333 Java Road North Point, Hong Kong</center>",
+  "proofPaymentBody_office3": "The office hours of the Collection Office is from: 8:30 a.m. to 1 p.m., 2 p.m. to 5 p.m., Monday to Friday, except public holidays.",
   "proofPaymentBody_office4": "Cheques, drafts or cashier’s orders should be made payable to “The Government of the Hong Kong Special Administrative Region” or “The Government of the HKSAR” and crossed.",
   "proofPaymentBody_office5": "Please print out this page or present your application details on screen at our Collection Office, and complete the payment by {paymentDeadline} 12:30 p.m.",
   "proofPaymentBody_office6": "We will process the publication after receiving the payment.",
@@ -380,9 +380,9 @@
   "payDeatail": "Total Payment Amount",
   "payTotal": "Total Payment Amount",
   "payDetail": "Payment Details",
-  "payMethod": "Payment means",
+  "payMethod": "Payment methods",
   "epayMethod": " e-Payment Method",
-  "selectPaymentMethod": "Please select a payment means",
+  "selectPaymentMethod": "Please select a payment methods",
   "payReceipt": "Payment receipt",
   "contactPerson": "Contact Person",
   "requireContactPerson": "Please enter contact person",
@@ -392,7 +392,7 @@
   "cancel": "Cancel",
   "cancelApp": "Cancel Application",
   "extraMark": "Other Remarks",
-  "totalAmount": "Total Amount",
+  "totalAmount": "Total Payment Amount",
   "close": "Close",
   "confirm": "Confirm",
   "particulars": "Particulars",
@@ -435,13 +435,13 @@
   "applicationPublishDate": "Publish Date",
   "pleaseCheckReminder": "Please download the following printed manuscript file and proofread it carefully",
   "payAnd": "Pay and ",
-  "commentDeadline": "Deadline for online manuscript revision",
+  "commentDeadline": "Deadline for Online Manuscript Revision",
   "paymentDeadline": "Deadline for online confirm proof",
   "confirmingDealine": "Deadline for Confirming Proof",
   "PaymentCoonpletDealine": "Deadline for Payment Completion",
   "payOnline":"Pay online via this system",
   "payDn":"Pay by General Demand Note",
-  "payNPGO":"Pay at NPGO Collection Office",
+  "payNPGO":"Pay at North Point Government Offices (NPGO) Collection Office",
   "payNPGOPopUpTitle":"Pay at North Point Government Offices (NPGO) Collection Office",
   "paymentMeans":"Payment Means",
   "paymentMethodMeans":"Payment Methods Available",
@@ -459,7 +459,7 @@
   "cash":"Cash",
   "drafts":"Drafts",
   "cashierOrders":"Cashier’s orders",
-  "paymentMethodAndDeadLine":"Payment Means / Deadline",
+  "paymentMethodAndDeadLine":"Payment Methods / Deadline",
   "payOnlineMethod":"Online Payment",
   "payDnMethod":"General Demand Note Payment",
   "payNPGOMethod":"Collection Office Payment",
@@ -472,7 +472,7 @@
 
   "payDnRemark": "Payment proof (e.g. ATM receipt, internet banking record) to be sent to [email protected] 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 at NPGO Collection Office by {date} 12:30 p.m. ",
+  "payOnlineRemark" :"Payment to be completed via this system by {date} 2:30 p.m. ",
 
   "before": "Before",
   "page": "Page",
@@ -541,7 +541,7 @@
   "dateTo": "Date (To)",
   "of": "of",
   "loading": "Loading...",
-  "ok": "Ok",
+  "ok": "OK",
 
   "organizationProfile": "Organisation Profile",
   "organizationDetails": "Organisation Details",

src/translations/zh-CN.json

@@ -10,7 +10,7 @@
   "datetimeFormate": "YYYY年MM月DD日 ah时mm分",
 
   "PNSPS": "宪报公共启事提交及缴费系统",
-  "PNSPS_fullname": "宪报公共启事提交及缴费系统",
+  "PNSPS_fullname": "公共启事提交及缴费系统",
   "HKSARGOV": "香港特别行政区政府",
   "HKGLD": "政府物流服务署",
   "importantNotice": "重要告示",
@@ -430,7 +430,7 @@
   "confirm": "确认",
   "particulars": "项目",
   "currencyPrice": "金额 (港元)",
-  "currencyAmount": "金额 (港元)",
+  "currencyAmount": "金额 ($)",
   "currencyAmountTitle": "金额 (港元):",
   "transactionRefNo": "交易参考编号",
   "selectedPaymentMethod": "已选择付款方法",

src/translations/zh-HK.json

@@ -10,7 +10,7 @@
   "datetimeFormate": "YYYY年MM月DD日 ah時mm分",
 
   "PNSPS": "憲報公共啟事提交及繳費系統",
-  "PNSPS_fullname": "憲報公共啟事提交及繳費系統",
+  "PNSPS_fullname": "公共啟事提交及繳費系統",
   "HKSARGOV": "香港特別行政區政府",
   "HKGLD": "政府物流服務署",
   "importantNotice": "重要告示",
@@ -431,7 +431,7 @@
   "confirm": "確認",
   "particulars": "項目",
   "currencyPrice": "金額 (港元)",
-  "currencyAmount": "金額 (港元)",
+  "currencyAmount": "金額 ($)",
   "currencyAmountTitle": "金額 (港元):",
   "transactionRefNo": "交易參考編號",
   "selectedPaymentMethod": "已選擇付款方法",