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

src/pages/authentication/auth-forms/IAmSmartFormWizard.js

@@ -71,8 +71,11 @@ const CustomFormWizard = (props) => {
     const [showId, setshowId] = useState(false);
     const [showComId, setshowComId] = useState(false);
 
+    const [base64Url, setBase64Url] = useState("")
+    const [checkCode, setCheckCode] = useState("")
+
     useEffect(() => {
-        location.state?.responseData ?? {}
+        location.state?.responseData ?? window.location.assign("/login");
         if (captchaImg == "")
             onCaptchaChange();
         responseToData();
@@ -112,8 +115,8 @@ const CustomFormWizard = (props) => {
 
 
     const responseToData = () => {
-        let rd = JSON.parse("{\"emailAddress\":\"[email protected]\",\"postalAddress\":{\"EngPremisesAddress\":{\"EngDistrict\":{\"DcDistrict\":\"KC\",\"Sub-district\":\"TSING YI\"},\"EngEstate\":{\"EstateName\":\"Cheung Hang Estate\",\"EngPhase\":{\"PhaseName\":\"N/A\"}},\"BuildingName\":\"Hang Lai House\",\"EngBlock\":{\"BlockDescriptor\":\"Block\",\"BlockNo\":\"2\"},\"Region\":\"NT\",\"EngStreet\":{\"StreetName\":\"Liu To Road\",\"BuildingNoFrom\":\"6\"},\"Eng3dAddress\":{\"EngFloor\":{\"FloorNum\":\"33\"},\"EngUnit\":{\"UnitDescriptor\":\"Room\",\"UnitNo\":\"3301\"}}}},\"mobileNumber\":{\"CountryCode\":\"852\",\"SubscriberNumber\":\"99999999\"},\"residentialAddress\":{\"ChiPremisesAddress\":{\"Chi3dAddress\":{\"ChiUnit\":{\"UnitDescriptor\":\"室\",\"UnitNo\":\"1010\"},\"ChiFloor\":{\"FloorNum\":\"10\"}},\"ChiBlock\":{\"BlockDescriptor\":\"座\",\"BlockNo\":\"2\"},\"BuildingName\":\"亨麗樓(第2座)\",\"ChiDistrict\":{\"DcDistrict\":\"KC\",\"Sub-district\":\"青衣\"},\"Region\":\"新界\",\"ChiEstate\":{\"EstateName\":\"長亨邨\"},\"ChiStreet\":{\"StreetName\":\"寮肚路\",\"BuildingNoFrom\":\"6\"}}},\"enName\":{\"UnstructuredName\":\"Testing Co One\"},\"idNo\":{\"Identification\":\"G561107\",\"CheckDigit\":\"4\"},\"chName\":{\"ChineseName\":\"測試商一\"}}");
-        //let rd = JSON.parse(location.state?.responseData.data);
+        //let rd = JSON.parse("{\"emailAddress\":\"[email protected]\",\"postalAddress\":{\"EngPremisesAddress\":{\"EngDistrict\":{\"DcDistrict\":\"KC\",\"Sub-district\":\"TSING YI\"},\"EngEstate\":{\"EstateName\":\"Cheung Hang Estate\",\"EngPhase\":{\"PhaseName\":\"N/A\"}},\"BuildingName\":\"Hang Lai House\",\"EngBlock\":{\"BlockDescriptor\":\"Block\",\"BlockNo\":\"2\"},\"Region\":\"NT\",\"EngStreet\":{\"StreetName\":\"Liu To Road\",\"BuildingNoFrom\":\"6\"},\"Eng3dAddress\":{\"EngFloor\":{\"FloorNum\":\"33\"},\"EngUnit\":{\"UnitDescriptor\":\"Room\",\"UnitNo\":\"3301\"}}}},\"mobileNumber\":{\"CountryCode\":\"852\",\"SubscriberNumber\":\"99999999\"},\"residentialAddress\":{\"ChiPremisesAddress\":{\"Chi3dAddress\":{\"ChiUnit\":{\"UnitDescriptor\":\"室\",\"UnitNo\":\"1010\"},\"ChiFloor\":{\"FloorNum\":\"10\"}},\"ChiBlock\":{\"BlockDescriptor\":\"座\",\"BlockNo\":\"2\"},\"BuildingName\":\"亨麗樓(第2座)\",\"ChiDistrict\":{\"DcDistrict\":\"KC\",\"Sub-district\":\"青衣\"},\"Region\":\"新界\",\"ChiEstate\":{\"EstateName\":\"長亨邨\"},\"ChiStreet\":{\"StreetName\":\"寮肚路\",\"BuildingNoFrom\":\"6\"}}},\"enName\":{\"UnstructuredName\":\"Testing Co One\"},\"idNo\":{\"Identification\":\"G561107\",\"CheckDigit\":\"4\"},\"chName\":{\"ChineseName\":\"測試商一\"}}");
+        let rd = JSON.parse(location.state?.responseData.data);
         let data = {
             "enName": rd?.enName?.UnstructuredName ?? "",
             "chName": rd?.chName?.ChineseName ?? "",
@@ -227,6 +230,7 @@ const CustomFormWizard = (props) => {
             params: { width: 130, height: 40, captcha: captchaImg },
             onSuccess: (responseData) => {
                 props.setBase64Url(responseData.base64Url)
+                setBase64Url(responseData.base64Url)
                 localStorage.setItem("base64Url", responseData.base64Url);
                 setCaptchaImage(localStorage.getItem('base64Url'));
             }
@@ -328,7 +332,9 @@ const CustomFormWizard = (props) => {
             type: "IND",
             userFaxNo: JSON.stringify(userFaxNo),
             userMobileNumber: JSON.stringify(userMobileNumber),
-            userAddress: JSON.stringify(userAddress)
+            userAddress: JSON.stringify(userAddress),
+            captcha: base64Url,
+            checkCode: checkCode
         };
 
         if (isValid) {
@@ -925,6 +931,7 @@ const CustomFormWizard = (props) => {
                                                     onChange={(event) => {
                                                         const value = event.target.value;
                                                         props.setCheckCode(event.target.value);
+                                                        setCheckCode(event.target.value);
                                                         formik.setFieldValue("captchaField", value);
                                                     }}
                                                     sx={{ width: '75%' }}

src/translations/en.json

@@ -157,7 +157,7 @@
   "loginErrorMessage5":"Incorrect Username or Password",
   "loginErrorMessage6":"User account not found",
 
-  "loginSuccessMessage1":"User account not found",
+  "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\".",
   "loginSuccessMessage3":"Continue to use e-Service",