| @@ -70,7 +70,12 @@ const Index = () => { | |||||
| // } | // } | ||||
| // } | // } | ||||
| dispatch(handleLogin(data)) | dispatch(handleLogin(data)) | ||||
| navigate('/iamsmart/loginSucess', {state:{loginMethod:"iAmSmart"}}); | |||||
| navigate('/iamsmart/loginSucess', { | |||||
| state: { | |||||
| loginMethod: 'iAmSmart', | |||||
| iAmSmartNewlyLinked: responseData.iAmSmartNewlyLinked === true, | |||||
| }, | |||||
| }); | |||||
| }, | }, | ||||
| onFail: (response)=>{ | onFail: (response)=>{ | ||||
| console.log("onFail"); | console.log("onFail"); | ||||
| @@ -31,6 +31,7 @@ const Index = () => { | |||||
| const location = useLocation(); | const location = useLocation(); | ||||
| const navigate = useNavigate() | const navigate = useNavigate() | ||||
| const [onReady, setOnReady] = React.useState(false); | const [onReady, setOnReady] = React.useState(false); | ||||
| const showAccountLinkUpMessages = location?.state?.iAmSmartNewlyLinked === true; | |||||
| React.useEffect(() => { | React.useEffect(() => { | ||||
| if ("iAmSmart" == location?.state?.loginMethod) { | if ("iAmSmart" == location?.state?.loginMethod) { | ||||
| @@ -54,7 +55,7 @@ const Index = () => { | |||||
| <div style={BackgroundHead} width="100%"> | <div style={BackgroundHead} width="100%"> | ||||
| <Stack direction="row" height='70px'> | <Stack direction="row" height='70px'> | ||||
| <Typography ml={15} color='#FFF' variant="h4" sx={{ pt: 2 }}> | <Typography ml={15} color='#FFF' variant="h4" sx={{ pt: 2 }}> | ||||
| <FormattedMessage id="loginSuccessMessage1" /> | |||||
| <FormattedMessage id={showAccountLinkUpMessages ? 'loginSuccessMessage1' : 'iAmSmartLoginSuccessHeading'} /> | |||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| </div> | </div> | ||||
| @@ -64,11 +65,13 @@ const Index = () => { | |||||
| <Grid container justifyContent="flex-start" alignItems="center" > | <Grid container justifyContent="flex-start" alignItems="center" > | ||||
| <center> | <center> | ||||
| <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} /> | <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} /> | ||||
| {showAccountLinkUpMessages ? ( | |||||
| <Grid item xs={12} md={12} > | <Grid item xs={12} md={12} > | ||||
| <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}> | <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}> | ||||
| <div dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: 'loginSuccessMessage2' }) }} /> | <div dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: 'loginSuccessMessage2' }) }} /> | ||||
| </Typography> | </Typography> | ||||
| </Grid> | </Grid> | ||||
| ) : null} | |||||
| </center> | </center> | ||||
| </Grid> | </Grid> | ||||
| </Grid> | </Grid> | ||||
| @@ -192,6 +192,7 @@ | |||||
| "loginSuccessMessage1":"User account link up success", | "loginSuccessMessage1":"User account link up success", | ||||
| "loginSuccessMessage2":"You are our existing user and successfully linked your existing account.<br/>From now on, you can log in through \"iAM Smart\".", | "loginSuccessMessage2":"You are our existing user and successfully linked your existing account.<br/>From now on, you can log in through \"iAM Smart\".", | ||||
| "loginSuccessMessage3":"Continue to use e-Service", | "loginSuccessMessage3":"Continue to use e-Service", | ||||
| "iAmSmartLoginSuccessHeading":"Logged in with iAM Smart successfully.", | |||||
| "oldPassword": "Old Password", | "oldPassword": "Old Password", | ||||
| "newPassword": "New Password", | "newPassword": "New Password", | ||||
| @@ -228,6 +228,7 @@ | |||||
| "loginSuccessMessage1":"成功连结现有帐户", | "loginSuccessMessage1":"成功连结现有帐户", | ||||
| "loginSuccessMessage2":"你是我们的现有客户,已成功连结现有帐户。<br/>以后可以透过「智方便」登入。", | "loginSuccessMessage2":"你是我们的现有客户,已成功连结现有帐户。<br/>以后可以透过「智方便」登入。", | ||||
| "loginSuccessMessage3":"继续使用e-Service", | "loginSuccessMessage3":"继续使用e-Service", | ||||
| "iAmSmartLoginSuccessHeading":"已成功以「智方便」登录。", | |||||
| "oldPassword": "旧密码", | "oldPassword": "旧密码", | ||||
| "newPassword": "新密码", | "newPassword": "新密码", | ||||
| @@ -229,6 +229,7 @@ | |||||
| "loginSuccessMessage1":"成功連結現有帳戶", | "loginSuccessMessage1":"成功連結現有帳戶", | ||||
| "loginSuccessMessage2":"你是我們的現有客戶,已成功連結現有帳戶。<br/>以後可以透過「智方便」登入。", | "loginSuccessMessage2":"你是我們的現有客戶,已成功連結現有帳戶。<br/>以後可以透過「智方便」登入。", | ||||
| "loginSuccessMessage3":"繼續使用e-Service", | "loginSuccessMessage3":"繼續使用e-Service", | ||||
| "iAmSmartLoginSuccessHeading":"已成功以「智方便」登入。", | |||||
| "oldPassword": "舊密碼", | "oldPassword": "舊密碼", | ||||
| "newPassword": "新密碼", | "newPassword": "新密碼", | ||||