diff --git a/src/pages/Proof/Reply_Public/ApplicationDetails.js b/src/pages/Proof/Reply_Public/ApplicationDetails.js
index 04aee2f..4d64ca8 100644
--- a/src/pages/Proof/Reply_Public/ApplicationDetails.js
+++ b/src/pages/Proof/Reply_Public/ApplicationDetails.js
@@ -231,16 +231,16 @@ const ApplicationDetailCard = ({ formData, }) => {
-
+
:
{locale === 'en' ?
- `${intl.formatMessage({ id: 'before' })} ${DateUtils.datetimeStr(data?.reviseDeadline)} `
+ `${intl.formatMessage({ id: 'before' })} ${DateUtils.dateFormat(data?.reviseDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} `
:
- `${DateUtils.datetimeStr_Cht(data?.reviseDeadline)} ${intl.formatMessage({ id: 'before' })}`
+ `${DateUtils.dateFormat(data?.reviseDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} ${intl.formatMessage({ id: 'before' })}`
}
@@ -254,9 +254,9 @@ const ApplicationDetailCard = ({ formData, }) => {
{locale === 'en' ?
- `${intl.formatMessage({ id: 'before' })} ${DateUtils.datetimeStr(data?.proofPaymentDeadline)} `
+ `${intl.formatMessage({ id: 'before' })} ${DateUtils.dateFormat(data?.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} `
:
- `${DateUtils.datetimeStr_Cht(data?.proofPaymentDeadline)} ${intl.formatMessage({ id: 'before' })}`
+ `${DateUtils.dateFormat(data?.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} ${intl.formatMessage({ id: 'before' })}`
}
diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js
index 697c682..9843318 100644
--- a/src/pages/Proof/Reply_Public/ProofForm.js
+++ b/src/pages/Proof/Reply_Public/ProofForm.js
@@ -424,8 +424,8 @@ const FormPanel = ({ formData }) => {
setIsWarningPopUp(true);
}}>
-
{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} 2:00 p.m. |
- {DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} 2:30 p.m. |
+ {DateUtils.dateFormat(formData.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} |
+ {DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} |
diff --git a/src/translations/en.json b/src/translations/en.json
index 7bd2638..4cd5653 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -6,6 +6,7 @@
"iamsmartLink": "https://www.iamsmart.gov.hk/en/",
"dateStrFormat": "YYYY-MM-DD",
"datetimeStrFormat": "YYYY-MM-DD HH:mm:ss",
+ "paymentMethodDatetimeStrFormat": "YYYY-MM-DD h:mm a",
"PNSPS": "PNSPS",
"HKSARGOV": "HKSAR Government",
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index 208afc0..4124171 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -6,6 +6,7 @@
"iamsmartLink": "https://www.iamsmart.gov.hk/sc/",
"dateStrFormat": "YYYY年MM月DD日",
"datetimeStrFormat": "YYYY年MM月DD日 HH:mm:ss",
+ "paymentMethodDatetimeStrFormat": "YYYY年MM月DD日 h:mm a",
"PNSPS": "公共启事提交及缴费系统",
"HKSARGOV": "香港特别行政区政府",
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index 3f9698a..7d186af 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -6,6 +6,7 @@
"iamsmartLink": "https://www.iamsmart.gov.hk/tc/",
"dateStrFormat": "YYYY年MM月DD日",
"datetimeStrFormat": "YYYY年MM月DD日 HH:mm:ss",
+ "paymentMethodDatetimeStrFormat": "YYYY年MM月DD日 h:mm a",
"PNSPS": "公共啟事提交及繳費系統",
"HKSARGOV": "香港特別行政區政府",
|