@acuteinfo/common-screens 1.0.59 → 1.0.61

package/dist/index.js

@@ -1,7 +1,7 @@
 import 'regenerator-runtime/runtime';
 import './assets/index~NFLKLAwc.css';
 import { jsx, jsxs, Fragment as Fragment$1 } from 'react/jsx-runtime';
-import { TextField, GradientButton, utilFunction, ClearCacheProvider, queryClient, Alert, GridWrapper, SearchBar } from '@acuteinfo/common-base';
+import { TextField, GradientButton, utilFunction, usePopupContext, ClearCacheProvider, queryClient, Alert, GridWrapper, SearchBar } from '@acuteinfo/common-base';
 import { useState, useRef, useEffect, Fragment, useMemo, useReducer, useCallback } from 'react';
 import { makeStyles } from '@mui/styles';
 import Visibility from '@mui/icons-material/Visibility';
@@ -376,9 +376,11 @@ const OTPModel = ({ classes, OTPResendRequest, open, handleClose, loginState, Ve
     };
     const handleResendClick = async () => {
         setResendotpLoading(true);
-        const { status, data, message } = await OTPResendRequest(resendFlag === "FORGET_PW" || resendFlag === "FORGT_TOTP"
-            ? loginState?.requestCd
-            : loginState?.transactionID, loginState?.username, resendFlag, loginState.auth_data?.[0]?.company_ID, loginState.auth_data?.[0]?.branch_cd);
+        const { status, data, message } = await OTPResendRequest(
+        // resendFlag === "FORGET_PW" || resendFlag === "FORGT_TOTP"
+        //   ? loginState?.requestCd
+        //   : loginState?.transactionID,
+        loginState?.comapanyCD, loginState?.branchCD, loginState?.contactUser, resendFlag, loginState?.otpValidFor, loginState?.username);
         setResendotpLoading(false);
         if (status === "0") {
             setNewRequestID(data?.TRAN_CD);
@@ -406,7 +408,10 @@ const OTPModel = ({ classes, OTPResendRequest, open, handleClose, loginState, Ve
         if (loginState?.otpmodelClose ?? false) {
             handleCloseEvent();
         }
-    }, [loginState.otpmodelClose]);
+        else if (Boolean(OTPError)) {
+            setOTP("");
+        }
+    }, [loginState.otpmodelClose, OTPError]);
     return (jsx(Fragment, { children: jsx(Container, { maxWidth: "sm", children: jsx(Grid, { alignItems: "center", marginTop: "4em", children: jsxs("div", { 
                     // className={classes.formWrap}
                     style: {
@@ -424,34 +429,42 @@ const OTPModel = ({ classes, OTPResendRequest, open, handleClose, loginState, Ve
                                 fontStyle: "normal",
                                 lineHeight: "150%",
                                 marginBottom: "10px",
-                            }, children: t("otp.OTPAuthentication") }), jsx("div", { style: {
+                            }, children: loginState?.authType === "OTP"
+                                ? t("otp.OTPAuthentication")
+                                : loginState?.authType === "TOTP"
+                                    ? t("otp.TOTPAuthentication")
+                                    : null }), jsx("div", { style: {
                                 color: "#949597",
                                 fontSize: "16px",
                                 fontWeight: "400",
                                 alignItems: "center",
                                 fontStyle: "normal",
                                 lineHeight: "33px",
-                            }, children: t("otp.EnterOTP") }), jsxs("div", { className: classes.OTPalignName, children: [t("otp.Hello"), " ", loginState?.username
+                            }, children: loginState?.authType === "OTP"
+                                ? t("otp.EnterOTPsentToMobile")
+                                : loginState?.authType === "TOTP"
+                                    ? t("otp.PleaseEnterOTP")
+                                    : null }), jsxs("div", { className: classes.OTPalignName, children: [t("otp.Hello"), " ", loginState?.username
                                     ? loginState.username.charAt(0).toUpperCase() +
                                         loginState.username.slice(1)
-                                    : null, jsx(ResendOTP
+                                    : null, loginState?.authType === "OTP" && (jsx(ResendOTP
                                 // onResendClick={() => setbtnshow(false)}
                                 , { 
                                     // onResendClick={() => setbtnshow(false)}
                                     onResendClick: handleResendClick, 
                                     // onTimerComplete={() => setbtnshow(true)}
-                                    renderButton: renderButton, renderTime: renderTime, maxTime: loginState?.otpValidFor ?? 60, className: classes.resendOTPalign })] }), jsxs("div", { className: classes.divflex, onKeyDown: (e) => {
+                                    renderButton: renderButton, renderTime: renderTime, maxTime: loginState?.otpValidFor ?? 60, className: classes.resendOTPalign }))] }), jsxs("div", { className: classes.divflex, onKeyDown: (e) => {
                                 if (e.key === "Enter") {
                                     inputButtonRef?.current?.click?.();
                                 }
-                            }, children: [jsx(OTPInput, { value: OTP, onChange: setOTP, autoFocus: true, OTPLength: 6, otpType: "number", disabled: false, secure: !showPassword, className: classes.otpinputpadding }), jsx(IconButton$1, { "aria-label": "toggle password visibility", onClick: () => {
+                            }, children: [jsx(OTPInput, { value: OTP, onChange: setOTP, autoFocus: true, OTPLength: 6, otpType: "number", disabled: loginState.otploading || loginState.loading, secure: !showPassword, className: classes.otpinputpadding }), jsx(IconButton$1, { "aria-label": "toggle password visibility", onClick: () => {
                                         if (!showPassword) {
                                             setShowPasswordTime(Date.now() + 5000);
                                             timerRef.current = setTimeout(() => forceUpdate(Date.now()), 5000);
                                         }
                                         else if (showPassword)
                                             setShowPasswordTime(0);
-                                    }, onMouseDown: (e) => e.preventDefault(), disabled: loginState.otploading, className: classes.ibtnvisible, children: showPassword ? jsx(Visibility, {}) : jsx(VisibilityOff, {}) })] }), Boolean(OTPError) ? (jsx(FormHelperText, { style: { color: "red" }, children: OTPError })) : null, jsxs("div", { style: {
+                                    }, onMouseDown: (e) => e.preventDefault(), disabled: loginState.otploading, className: classes.ibtnvisible, children: showPassword ? jsx(Visibility, {}) : jsx(VisibilityOff, {}) })] }), Boolean(OTPError) ? (jsx(FormHelperText, { style: { color: "red" }, children: OTPError })) : null, loginState?.authType === "TOTP" ? (jsx("div", { style: { flex: "auto" }, children: jsx("a", { href: "forgot-totp", style: { color: "var(--theme-color3)" }, children: "Forgot TOTP" }) })) : (jsx(Fragment$1, {})), jsxs("div", { style: {
                                 display: "flex",
                                 gap: "10px",
                                 margin: "42px 0 0 42px",
@@ -460,13 +473,16 @@ const OTPModel = ({ classes, OTPResendRequest, open, handleClose, loginState, Ve
                                 // fullWidth
                                 , { 
                                     // fullWidth
-                                    disabled: loginState.otploading, onClick: () => {
+                                    disabled: loginState.otploading || loginState.loading, onClick: () => {
                                         previousStep(false, "");
                                     }, className: classes.otpButtons, textColor: "var(--theme-color3)", sx: {
-                                        border: "var(--theme-color3)1px solid",
+                                        border: "var(--theme-color3) 1px solid",
                                         minWidth: "50%",
                                         background: "var(--white)",
                                         borderRadius: "10px",
+                                        "&:disabled": {
+                                            color: "var(-theme-color3) !important",
+                                        },
                                         "&:hover": {
                                             background: "var(--white) !important",
                                         },
@@ -508,9 +524,12 @@ const OTPModelForm = ({ classes, OTPResendRequest, handleClose, loginState, Veri
     };
     const handleResendClick = async () => {
         setResendotpLoading(true);
-        const { status, data, message } = await OTPResendRequest(resendFlag === "FORGET_PW"
-            ? loginState?.requestCd
-            : loginState?.transactionID, loginState?.username, resendFlag, loginState?.company_ID, loginState?.branch_cd);
+        const { status, data, message } = await OTPResendRequest(
+        // resendFlag === "FORGET_PW"
+        //   ? loginState?.requestCd
+        //   : loginState?.transactionID,
+        // resendFlag,
+        loginState?.company_ID, loginState?.branch_cd, loginState?.contactUser, resendFlag, loginState?.otpValidFor, loginState?.username);
         setResendotpLoading(false);
         if (status === "0") {
             setNewRequestID(data?.TRAN_CD);
@@ -559,19 +578,19 @@ const OTPModelForm = ({ classes, OTPResendRequest, handleClose, loginState, Veri
                             if (e.key === "Enter") {
                                 inputButtonRef?.current?.click?.();
                             }
-                        }, children: [jsx(OTPInput, { value: OTP, onChange: setOTP, autoFocus: true, OTPLength: 6, otpType: "number", disabled: false, secure: !showPassword, className: classes.otpinputpadding }), jsx(IconButton$1, { "aria-label": "toggle password visibility", onClick: () => {
+                        }, children: [jsx(OTPInput, { value: OTP, onChange: setOTP, autoFocus: true, OTPLength: 6, otpType: "number", disabled: loginState.otploading || loginState.loading, secure: !showPassword, className: classes.otpinputpadding }), jsx(IconButton$1, { "aria-label": "toggle password visibility", onClick: () => {
                                     if (!showPassword) {
                                         setShowPasswordTime(Date.now() + 5000);
                                         timerRef.current = setTimeout(() => forceUpdate(Date.now()), 5000);
                                     }
                                     else if (showPassword)
                                         setShowPasswordTime(0);
-                                }, onMouseDown: (e) => e.preventDefault(), disabled: loginState.otploading, className: classes.ibtnvisible, children: showPassword ? jsx(Visibility, {}) : jsx(VisibilityOff, {}) })] }), Boolean(OTPError) ? (jsx(FormHelperText, { style: { color: "red" }, children: OTPError })) : null, loginState?.auth_type === "TOTP" ? (jsx("div", { style: { flex: "auto" }, children: jsx("a", { href: "forgot-totp", style: { color: "var(--theme-color3)" }, children: "Forgot TOTP" }) })) : (jsx(Fragment$1, {})), jsxs("div", { style: {
+                                }, onMouseDown: (e) => e.preventDefault(), disabled: loginState.otploading, className: classes.ibtnvisible, children: showPassword ? jsx(Visibility, {}) : jsx(VisibilityOff, {}) })] }), Boolean(OTPError) ? (jsx(FormHelperText, { style: { color: "red" }, children: OTPError })) : null, jsxs("div", { style: {
                             display: "flex",
                             gap: "10px",
                             margin: "42px 0 0 42px",
                             width: "60%",
-                        }, children: [jsx(GradientButton, { fullWidth: true, disabled: loginState.otploading, onClick: handleCloseEvent, className: classes.otpButtons, starticon: "West", textColor: "var(--white) !important", sx: {
+                        }, children: [jsx(GradientButton, { fullWidth: true, disabled: loginState.otploading || loginState.loading, onClick: handleCloseEvent, className: classes.otpButtons, starticon: "West", textColor: "var(--white) !important", sx: {
                                     "&:disabled": {
                                         color: "var(-theme-color3) !important",
                                     },
@@ -824,7 +843,7 @@ const BankDetails = ({ bannerDetails }) => {
                     }, children: jsxs(Container, { maxWidth: "sm", children: [jsxs("div", { className: "text", style: {
                                     color: "white",
                                     fontStyle: "normal",
-                                    fontSize: "35px",
+                                    fontSize: "31px",
                                     paddingTop: "30px",
                                 }, children: [banner?.bannerTitle ?? "", jsx("span", { style: { marginLeft: "8px", fontWeight: "900" } })] }), jsx("div", { style: {
                                     lineHeight: "27px",
@@ -836,7 +855,7 @@ const BankDetails = ({ bannerDetails }) => {
                                 }, children: banner?.bannerNote ?? "" })] }) })] }) }));
 };
 
-const PasswordRotation = ({ classes, ResetPassword, open, username, accessToken, tokenType, handleClose, }) => {
+const PasswordRotation = ({ classes, ResetPassword, open, username, accessToken, tokenType, handleClose, validatePasswordFn }) => {
     const inputButtonRef = useRef(null);
     const { enqueueSnackbar } = useSnackbar();
     const { t } = useTranslation();
@@ -873,6 +892,7 @@ const PasswordRotation = ({ classes, ResetPassword, open, username, accessToken,
             isconfirmnewpwdError: false,
             confirmnewpassworderror: "",
         };
+        // Local validation
         if (!Boolean(input.oldpassword)) {
             setPwdData.isoldPwdError = true;
             setPwdData.oldpassworderror = "Current Password is required.";
@@ -888,8 +908,7 @@ const PasswordRotation = ({ classes, ResetPassword, open, username, accessToken,
             Boolean(input.password) &&
             input.oldpassword === input.password) {
             setPwdData.isnewpwdError = true;
-            setPwdData.newpassworderror =
-                "The new password cannot be the same as the old password";
+            setPwdData.newpassworderror = "The new password cannot be the same as the old password";
             isError = true;
         }
         if (!Boolean(input.confirmpassword)) {
@@ -900,29 +919,46 @@ const PasswordRotation = ({ classes, ResetPassword, open, username, accessToken,
         else if (Boolean(input.password) &&
             input.password !== input.confirmpassword) {
             setPwdData.isconfirmnewpwdError = true;
-            setPwdData.confirmnewpassworderror =
-                "New Password and Confirm Password did not matched";
+            setPwdData.confirmnewpassworderror = "New Password and Confirm Password did not match";
             isError = true;
         }
         if (isError) {
             setPasswordReset(setPwdData);
-        }
-        else {
-            setPasswordReset((values) => ({ ...values, isLoading: true }));
-            let response = await ResetPassword(input.userName, input.oldpassword, input.password, accessToken, tokenType);
-            setPasswordReset((values) => ({ ...values, isLoading: false }));
-            if (response.status === "0") {
-                enqueueSnackbar("Password successfully changed.", {
-                    variant: "success",
-                });
-                handleClose("0");
-            }
-            else {
-                setPasswordReset((values) => ({
-                    ...values,
-                    isError: true,
-                    errorMessage: response.message,
-                }));
+            return;
+        }
+        // API validation
+        setPasswordReset((values) => ({ ...values, isLoading: true }));
+        const { validateStatus, validateData } = await validatePasswordFn({
+            USER_ID: input.userName,
+            PASSWORD: input.password,
+            SCREEN_REF: "LOGIN"
+        });
+        setPasswordReset((values) => ({ ...values, isLoading: false }));
+        if (validateStatus === "0") {
+            switch (validateData?.O_STATUS) {
+                case "999":
+                    setPwdData.isnewpwdError = true;
+                    setPwdData.newpassworderror = validateData?.O_MESSAGE;
+                    setPasswordReset(setPwdData);
+                    return;
+                case "0":
+                    let response = await ResetPassword(input.userName, input.oldpassword, input.password, accessToken, tokenType);
+                    setPasswordReset((values) => ({ ...values, isLoading: true }));
+                    if (response.status === "0") {
+                        enqueueSnackbar("Password successfully changed.", {
+                            variant: "success",
+                        });
+                        handleClose("0");
+                        setPasswordReset((values) => ({ ...values, isLoading: false }));
+                    }
+                    else {
+                        setPasswordReset((values) => ({
+                            ...values,
+                            isError: true,
+                            errorMessage: response.message,
+                        }));
+                    }
+                    break;
             }
         }
     };
@@ -1003,14 +1039,14 @@ const inititalState$1 = {
     userMessageforusername: "",
     currentFlow: "username",
     transactionID: "",
+    comapanyCD: "",
+    branchCD: "",
+    contactUser: "",
     access_token: "",
     token_type: "",
     otpmodelClose: false,
     authType: "",
     isScanning: false,
-    auth_data: [],
-    company_ID: "",
-    Branch_CD: "",
     auth_type: "O",
     otpValidFor: 60,
 };
@@ -1045,6 +1081,9 @@ const reducer$1 = (state, action) => {
                 userMessageforusername: action?.payload?.errorUsername,
                 username: "",
                 transactionID: "",
+                comapanyCD: "",
+                branchCD: "",
+                contactUser: ""
             };
         }
         case "passwordVerificationFailure":
@@ -1059,6 +1098,8 @@ const reducer$1 = (state, action) => {
                 userMessageforpassword: action?.payload?.errorPassword,
                 username: "",
                 transactionID: "",
+                comapanyCD: "",
+                branchCD: ""
             };
         case "usernameVerificationFailure": {
             return {
@@ -1072,6 +1113,9 @@ const reducer$1 = (state, action) => {
                 userMessageforusername: action?.payload?.errorUsername,
                 username: "",
                 transactionID: "",
+                comapanyCD: "",
+                branchCD: "",
+                contactUser: ""
             };
         }
         case "inititatePasswordVerification": {
@@ -1088,6 +1132,9 @@ const reducer$1 = (state, action) => {
                 username: "",
                 transactionID: "",
                 access_token: "",
+                comapanyCD: "",
+                branchCD: "",
+                contactUser: ""
             };
         }
         case "passwordRotation": {
@@ -1112,6 +1159,9 @@ const reducer$1 = (state, action) => {
                 loading: false,
                 otploading: false,
                 transactionID: action?.payload?.transactionID,
+                comapanyCD: action?.payload?.comapanyCD,
+                branchCD: action?.payload?.branchCD,
+                contactUser: action?.payload?.contactUser,
                 username: action?.payload?.username,
                 auth_type: action?.payload?.auth_type,
                 OtpuserMessage: "",
@@ -1122,7 +1172,6 @@ const reducer$1 = (state, action) => {
                 authType: action?.payload?.authType,
                 auth_data: action?.payload?.auth_data,
                 otpValidFor: action?.payload?.otpValidFor,
-                company_ID: action?.paylod?.company_ID,
             };
         }
         case "inititatebiometricVerification": {
@@ -1187,7 +1236,7 @@ const reducer$1 = (state, action) => {
         }
     }
 };
-const AuthControllerWrapper = ({ bannerDetails, logoUrl, logoTitle, loginFn, veirfyUsernameandPassword, verifyOTP, OTPResendRequest, ResetPassword, LanguageComponent, forgotPasswordEndpoint, }) => {
+const AuthControllerWrapper = ({ bannerDetails, logoUrl, logoTitle, loginFn, veirfyUsernameandPassword, validatePasswordFn, verifyOTP, OTPResendRequest, ResetPassword, LanguageComponent, forgotPasswordEndpoint, }) => {
     const classes = useStyles$3();
     const [loginState, dispath] = useReducer(reducer$1, inititalState$1);
     const [openpwdreset, setOpenPwdReset] = useState(false);
@@ -1196,6 +1245,7 @@ const AuthControllerWrapper = ({ bannerDetails, logoUrl, logoTitle, loginFn, vei
     const urlObj = useRef(null);
     const { t } = useTranslation();
     const otpResendRef = useRef(1);
+    const { MessageBox } = usePopupContext();
     useEffect(() => {
         if (Boolean(logoUrl)) {
             if (isBase64(logoUrl)) {
@@ -1231,20 +1281,26 @@ const AuthControllerWrapper = ({ bannerDetails, logoUrl, logoTitle, loginFn, vei
                     dispath({
                         type: "passwordVerificationSuccessful",
                         payload: {
+                            comapanyCD: data?.BASE_COMP_CD,
+                            branchCD: data?.BASE_BRANCH_CD,
+                            contactUser: data?.CONTACT2,
                             transactionID: data?.REQUEST_CD,
                             username: username,
                             access_token: access_token?.access_token,
                             token_type: access_token?.token_type,
                             authType: data?.AUTH_TYPE,
-                            auth_data: [
-                                {
-                                    company_ID: data?.BASE_COMP_CD ?? "",
-                                    branch_cd: data?.BASE_BRANCH_CD,
-                                },
-                            ],
+                            auth_data: data?.AUTH_DATA,
                             otpValidFor: data?.OTP_VALID,
                         },
                     });
+                    if (data?.STATUS === "0") {
+                        for (let i = 0; i < data?.ALERT_MSG_LIST.length; i++) {
+                            await MessageBox({
+                                messageTitle: "Password Alert",
+                                message: data?.ALERT_MSG_LIST[i],
+                            });
+                        }
+                    }
                 }
                 else {
                     dispath({
@@ -1417,7 +1473,7 @@ const AuthControllerWrapper = ({ bannerDetails, logoUrl, logoTitle, loginFn, vei
             });
         }
     };
-    return (jsx(Fragment$1, { children: jsxs(Grid, { container: true, style: { height: "100vh", overflow: "hidden" }, children: [jsx(BankDetails, { bannerDetails: bannerDetails }), jsxs(Grid, { item: true, xs: 11, md: 6, lg: 6, sm: 6, children: [logoUrl ? (jsx(Grid, { container: true, direction: "row", justifyContent: "flex-end", alignItems: "center", padding: "25px", maxWidth: "210px", ml: "auto", children: jsx(Tooltip, { describeChild: true, title: logoTitle ?? "", children: jsx("img", { src: Boolean(dashboardLogoURL) ? dashboardLogoURL : "", alt: "Logo", width: "100%" }) }) })) : null, LanguageComponent ? (jsx(Grid, { container: true, direction: "row", justifyContent: "flex-end", alignItems: "center", padding: "0 35px 0 0", maxWidth: "180px", ml: "auto", children: jsx(LanguageComponent, {}) })) : null, openpwdreset ? (jsx(PasswordRotation, { classes: classes, ResetPassword: ResetPassword, open: openpwdreset, username: loginState.username, accessToken: loginState.access_token, tokenType: loginState.token_type, handleClose: handlePasswordRotationClose })) : (jsx(Fragment$1, { children: loginState.currentFlow === "username" ? (jsx(UsernamePasswordField, { classes: classes, loginState: loginState, verifyUsernamePassword: verifyUsernamePassword, forgotPasswordEndpoint: forgotPasswordEndpoint }, "username")) : (jsx(Fragment$1, { children: loginState.authType === "OTP" ? (jsx(OTPModel, { OTPResendRequest: OTPResendRequest, classes: classes, loginState: loginState, VerifyOTP: VerifyOTP, previousStep: changeUserName, OTPError: t(loginState?.OtpuserMessage ?? ""), setOTPError: (error) => {
+    return (jsx(Fragment$1, { children: jsxs(Grid, { container: true, style: { height: "100vh", overflow: "hidden" }, children: [jsx(BankDetails, { bannerDetails: bannerDetails }), jsxs(Grid, { item: true, xs: 11, md: 6, lg: 6, sm: 6, children: [logoUrl ? (jsx(Grid, { container: true, direction: "row", justifyContent: "flex-end", alignItems: "center", padding: "25px", maxWidth: "210px", ml: "auto", children: jsx(Tooltip, { describeChild: true, title: logoTitle ?? "", children: jsx("img", { src: Boolean(dashboardLogoURL) ? dashboardLogoURL : "", alt: "Logo", width: "100%" }) }) })) : null, LanguageComponent ? (jsx(Grid, { container: true, direction: "row", justifyContent: "flex-end", alignItems: "center", padding: "0 35px 0 0", maxWidth: "180px", ml: "auto", children: jsx(LanguageComponent, {}) })) : null, openpwdreset ? (jsx(PasswordRotation, { classes: classes, ResetPassword: ResetPassword, open: openpwdreset, username: loginState.username, accessToken: loginState.access_token, tokenType: loginState.token_type, handleClose: handlePasswordRotationClose, validatePasswordFn: validatePasswordFn })) : (jsx(Fragment$1, { children: loginState.currentFlow === "username" ? (jsx(UsernamePasswordField, { classes: classes, loginState: loginState, verifyUsernamePassword: verifyUsernamePassword, forgotPasswordEndpoint: forgotPasswordEndpoint }, "username")) : (jsx(Fragment$1, { children: loginState.authType === "OTP" ? (jsx(OTPModel, { OTPResendRequest: OTPResendRequest, classes: classes, loginState: loginState, VerifyOTP: VerifyOTP, previousStep: changeUserName, OTPError: t(loginState?.OtpuserMessage ?? ""), setOTPError: (error) => {
                                         dispath({
                                             type: "OTPVerificationFailed",
                                             payload: { error: error },
@@ -1576,6 +1632,7 @@ const inititalState = {
     username: "",
     auth_type: "O",
     transactionID: "",
+    contactUser: "",
 };
 const reducer = (state, action) => {
     switch (action.type) {
@@ -1591,6 +1648,7 @@ const reducer = (state, action) => {
                 apierrorMessage: action?.payload?.apierrorMessage ?? "",
                 requestCd: "",
                 username: "",
+                contactUser: "",
             };
         }
         case "initverifyUserNameandMobileNo": {
@@ -1618,6 +1676,7 @@ const reducer = (state, action) => {
                 company_ID: action?.payload?.company_ID,
                 branch_cd: action?.payload?.branch_cd,
                 otpValidFor: action?.payload?.otpValidFor,
+                contactUser: action?.payload?.contactUser,
             };
         }
         case "inititateOTPVerification": {
@@ -1686,7 +1745,7 @@ const reducer = (state, action) => {
         }
     }
 };
-const ForgotPasswordControllerWrapper = ({ screenFlag, updatenewPassword, veirfyUsernameandMobileNo, verifyOTPForPWDReset, logoUrl, logoTitle, LanguageComponent, bannerDetails, navigate, loginPageEndpoint, }) => {
+const ForgotPasswordControllerWrapper = ({ screenFlag, updatenewPassword, validatePasswordFn, veirfyUsernameandMobileNo, verifyOTPForPWDReset, logoUrl, logoTitle, LanguageComponent, bannerDetails, navigate, loginPageEndpoint, }) => {
     const classes = useStyles$3();
     const [loginState, dispath] = useReducer(reducer, inititalState);
     const [open, setOpen] = useState(false);
@@ -1725,6 +1784,7 @@ const ForgotPasswordControllerWrapper = ({ screenFlag, updatenewPassword, veirfy
                             company_ID: resdata?.COMP_CD,
                             branch_cd: resdata?.BRANCH_CD,
                             otpValidFor: resdata?.OTP_VALID,
+                            contactUser: resdata?.CONTACT2,
                         },
                     });
                     setOpen(true);
@@ -1741,29 +1801,59 @@ const ForgotPasswordControllerWrapper = ({ screenFlag, updatenewPassword, veirfy
             }
             else if (flag === 1) {
                 dispath({ type: "initverifyPasswordSetReq" });
-                const { status, data: resdata, message, } = await updatenewPassword(loginState?.requestCd, loginState?.username, data?.password);
-                if (status === "0") {
-                    dispath({ type: "passwordRegistaredSuccess" });
-                    enqueueSnackbar("Password successfully reset", {
-                        variant: "success",
-                    });
-                    navigate(loginPageEndpoint);
+                const { validateStatus, validateData } = await validatePasswordFn({
+                    USER_ID: data?.userName,
+                    PASSWORD: data?.password,
+                    SCREEN_REF: "FORGET_PW"
+                });
+                // console.log("validateData", validateData?.O_MESSAGE, validateStatus)
+                if (validateStatus === "0") {
+                    switch (validateData?.O_STATUS) {
+                        case "999":
+                            dispath({
+                                type: "verifyPasswordFailed",
+                                payload: {
+                                    isPasswordError: true,
+                                    userMessageforPassword: validateData?.O_MESSAGE,
+                                    apierrorMessage: validateData?.O_MESSAGE,
+                                },
+                            });
+                            break;
+                        case "0":
+                            const { status, data: resdata, message } = await updatenewPassword(loginState?.requestCd, loginState?.username, data?.password);
+                            if (status === "0") {
+                                dispath({ type: "passwordRegistaredSuccess" });
+                                enqueueSnackbar("Password successfully reset", {
+                                    variant: "success",
+                                });
+                                navigate(loginPageEndpoint);
+                            }
+                            else if (status === "99") {
+                                dispath({
+                                    type: "verifyPasswordFailed",
+                                    payload: {
+                                        isApiError: true,
+                                        apierrorMessage: message,
+                                    },
+                                });
+                            }
+                            else {
+                                enqueueSnackbar(message, {
+                                    variant: "error",
+                                });
+                                navigate(loginPageEndpoint);
+                            }
+                    }
                 }
-                else if (status === "99") {
+                else {
                     dispath({
                         type: "verifyPasswordFailed",
                         payload: {
                             isApiError: true,
-                            apierrorMessage: message,
+                            apierrorMessage: validateData?.O_MESSAGE,
                         },
                     });
                 }
-                else {
-                    enqueueSnackbar(message, {
-                        variant: "error",
-                    });
-                    navigate(loginPageEndpoint);
-                }
             }
         }
     };