From e5614037b821b444c33907bff7e6c69618bdff04 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Fri, 21 Jun 2024 14:19:22 +0800
Subject: [PATCH 1/3] fix autoFocus

---
 src/pages/User/ChangePasswordPage/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/User/ChangePasswordPage/index.js b/src/pages/User/ChangePasswordPage/index.js
index 6d92c40..27ab1a9 100644
--- a/src/pages/User/ChangePasswordPage/index.js
+++ b/src/pages/User/ChangePasswordPage/index.js
@@ -262,7 +262,7 @@ const Index = () => {
                                             <Grid item xs={12} md={12} lg={12}>
                                                 <TextField
                                                     fullWidth
-                                                    autoFocus
+                                                    // autoFocus
                                                     onChange={(e) => {
                                                         formik.handleChange(e);
                                                         changePassword(e.target.value);

From 13ec88f514b79b091376bf46b3477fe2a9c7f078 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Fri, 21 Jun 2024 17:32:25 +0800
Subject: [PATCH 2/3] update fps second

---
 src/pages/Payment/FPS/FPS.js | 2 +-
 src/translations/en.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Payment/FPS/FPS.js b/src/pages/Payment/FPS/FPS.js
index 9810cec..6e66a3b 100644
--- a/src/pages/Payment/FPS/FPS.js
+++ b/src/pages/Payment/FPS/FPS.js
@@ -382,7 +382,7 @@ const Index = () => {
                                             <FormattedMessage id="fpsQrcodeTitle3"/>
                                             <br />
                                             <FormattedMessage id="fpsQrcodeTitle4"/>
-                                            {timeDownCount}
+                                            {timeDownCount}&nbsp; 
                                             <FormattedMessage id="fpsQrcodeTitle5"/>
                                         </Typography>
                                     }
diff --git a/src/translations/en.json b/src/translations/en.json
index 7d37f30..043eafb 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -454,7 +454,7 @@
   "fpsQrcodeTitle2":"QR code is valid for 3 minutes",
   "fpsQrcodeTitle3":"Please complete the payment process within the specified time",
   "fpsQrcodeTitle4":"Remaining time:",
-  "fpsQrcodeTitle5":"Second",
+  "fpsQrcodeTitle5":"s",
 
   "payDnRemark": "Payment proof (e.g. ATM receipt, internet banking record) to be sent to gld_acct@gld.gov.hk by {date}",
   "payNPGORemark" :"Payment to be completed at Collection Office by {date}",

From 95e1b8c921164547af8ee15c2953598a74c432b8 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Fri, 21 Jun 2024 17:33:50 +0800
Subject: [PATCH 3/3] update

---
 src/pages/Payment/FPS/FPS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Payment/FPS/FPS.js b/src/pages/Payment/FPS/FPS.js
index 6e66a3b..bfa1e8f 100644
--- a/src/pages/Payment/FPS/FPS.js
+++ b/src/pages/Payment/FPS/FPS.js
@@ -381,7 +381,7 @@ const Index = () => {
                                             <br />
                                             <FormattedMessage id="fpsQrcodeTitle3"/>
                                             <br />
-                                            <FormattedMessage id="fpsQrcodeTitle4"/>
+                                            <FormattedMessage id="fpsQrcodeTitle4"/>&nbsp;
                                             {timeDownCount}&nbsp; 
                                             <FormattedMessage id="fpsQrcodeTitle5"/>
                                         </Typography>