iAM Smart login fix

src/pages/iAmSmart/SuccessCallback/index.js

@@ -55,43 +55,44 @@ const Index = () => {
                     <div style={BackgroundHead} width="100%">
                         <Stack direction="row" height='70px'>
                             <Typography ml={15} color='#FFF' variant="h4" sx={{ pt: 2 }}>
-                                <FormattedMessage id={showAccountLinkUpMessages ? 'loginSuccessMessage1' : 'iAmSmartLoginSuccessHeading'} />
+                                <FormattedMessage id={showAccountLinkUpMessages ? 'loginSuccessMessage1' : 'login'} />
                             </Typography>
                         </Stack>
                     </div>
                 </Grid>
                 {/*row 1*/}
-                <Grid item xs={12} md={12} >
-                    <Grid container justifyContent="flex-start" alignItems="center" >
-                        <center>
-                        <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} />
-                            {showAccountLinkUpMessages ? (
-                            <Grid item xs={12} md={12} >
-                                <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>
-                                    <div dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: 'loginSuccessMessage2' }) }} />
-                                </Typography>
-                            </Grid>
-                            ) : null}
-                        </center>
-                    </Grid>
+                <Grid item xs={12} md={12}>
+                    <Stack alignItems="center" sx={{ width: '100%', px: 2 }}>
+                        <CheckCircleOutlineIcon color="success" sx={{ width: '200px', height: '200px' }} />
+                        {showAccountLinkUpMessages ? (
+                            <Typography
+                                component="div"
+                                variant="h3"
+                                sx={{ mt: 4, maxWidth: 900, textAlign: 'center' }}
+                                dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: 'loginSuccessMessage2' }) }}
+                            />
+                        ) : (
+                            <Typography component="div" variant="h3" sx={{ mt: 4, maxWidth: 900, textAlign: 'center' }}>
+                                <FormattedMessage id="iAmSmartLoginSuccessHeading" />
+                            </Typography>
+                        )}
+                    </Stack>
                 </Grid>
                 {/*row 2*/}
-                <Grid item xs={12} md={12} >
-                    <Grid container justifyContent="flex-start" alignItems="center" >
-                        <center>
-                            <Button
-                                component="span"
-                                variant="contained"
-                                size="large"
-                                sx={{ m: 4 }}
-                                onClick={() => {
-                                    navigate("/dashboard");
-                                }}
-                            >
-                                <FormattedMessage id="loginSuccessMessage3" />
-                            </Button>
-                        </center>
-                    </Grid>
+                <Grid item xs={12} md={12}>
+                    <Stack alignItems="center" sx={{ width: '100%' }}>
+                        <Button
+                            component="span"
+                            variant="contained"
+                            size="large"
+                            sx={{ m: 4 }}
+                            onClick={() => {
+                                navigate("/dashboard");
+                            }}
+                        >
+                            <FormattedMessage id="loginSuccessMessage3" />
+                        </Button>
+                    </Stack>
                 </Grid>
             </Grid >
 

src/translations/en.json

@@ -186,7 +186,7 @@
   "loginErrorMessage7":"System is under maintenance, please check back later.",
 
   "pleaseLloginMessage1":"Account already registered",
-  "pleaseLloginMessage2":"The identity you verified with iAM Smart is already linked to an existing PNSPS account. Please go to the login page and sign in—there is no need to register again.",
+  "pleaseLloginMessage2":"The identity verified through iAM Smart is already linked to an existing account in this system. Please proceed to the login page to continue. You may sign in using your registered username and password, or login by iAM Smart. A new registration is not required.",
   "pleaseLloginMessage3":"Go to login page",
 
   "loginSuccessMessage1":"User account link up success",

src/translations/zh-CN.json

@@ -222,7 +222,7 @@
   "loginErrorMessage7":"系统正在维护中，请稍后再查看",
     
   "pleaseLloginMessage1":"账户已注册",
-  "pleaseLloginMessage2":"您通过「智方便」核实的身份已用于注册本系统账户。请前往登录页面登录，无需重新开户。",
+  "pleaseLloginMessage2":"您通过「智方便」核实的身份已与本系统内的现有账户关联，无须重新注册。请前往登录页面；您可使用已登记的用户名称及密码登录，亦可选择以「智方便」方式登录。",
   "pleaseLloginMessage3":"前往登录页面",
 
   "loginSuccessMessage1":"成功连结现有帐户",

src/translations/zh-HK.json

@@ -223,7 +223,7 @@
   "loginErrorMessage7":"系統正在維護中，請稍後再查看",
 
   "pleaseLloginMessage1":"帳戶已註冊",
-  "pleaseLloginMessage2":"你透過「智方便」核實的身分已用於註冊本系統帳戶。請前往登入頁面登入，無須重新開戶。",
+  "pleaseLloginMessage2":"你透過「智方便」核實的身分已與本系統內的現有帳戶連結，無須重新註冊。請前往登入頁面；你可使用已登記的用戶名稱及密碼登入，亦可選擇以「智方便」方式登入。",
   "pleaseLloginMessage3":"前往登入頁面",
 
   "loginSuccessMessage1":"成功連結現有帳戶",