Merge branch 'New_Enhancement' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI into New_Enhancement

src/pages/Payment/FPS/FPS.js

@@ -381,8 +381,8 @@ const Index = () => {
                                             <br />
                                             <FormattedMessage id="fpsQrcodeTitle3"/>
                                             <br />
-                                            <FormattedMessage id="fpsQrcodeTitle4"/>
-                                            {timeDownCount}
+                                            <FormattedMessage id="fpsQrcodeTitle4"/>&nbsp;
+                                            {timeDownCount}&nbsp; 
                                             <FormattedMessage id="fpsQrcodeTitle5"/>
                                         </Typography>
                                     }

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);

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 [email protected] by {date}",
   "payNPGORemark" :"Payment to be completed at Collection Office by {date}",