@tap-payments/auth-jsconnect 2.3.5-test → 2.3.6

package/build/features/entity/screens/EntityName/validation.js

@@ -1,79 +1,76 @@
 import * as yup from 'yup';
-import { BusinessType, FieldType } from '../../../../@types';
+import { BusinessType } from '../../../../@types';
 import { KW_MIN_LICENSE_LENGTH, CR_MIN_LICENSE_LENGTH, FL_MIN_LICENSE_LENGTH } from '../../../../constants';
-export var EntityNameValidationSchema = function (entity) {
-    var _a, _b, _c, _d, _e;
-    var _f = entity || {}, legal_name = _f.legal_name, data_status = _f.data_status, license = _f.license;
-    var isLegalNameOptional = !((legal_name === null || legal_name === void 0 ? void 0 : legal_name.ar) || (legal_name === null || legal_name === void 0 ? void 0 : legal_name.en)) && (data_status === null || data_status === void 0 ? void 0 : data_status.legal_name) === FieldType.NON_EDITABLE;
-    var isEntityTypeOptional = !(license === null || license === void 0 ? void 0 : license.type) && (data_status === null || data_status === void 0 ? void 0 : data_status.type) === FieldType.NON_EDITABLE;
-    var isLicenseNumberOptional = !(license === null || license === void 0 ? void 0 : license.number) && ((_a = data_status === null || data_status === void 0 ? void 0 : data_status.license) === null || _a === void 0 ? void 0 : _a.number) === FieldType.NON_EDITABLE;
-    var isUnifiedNumberOptional = !((_b = license === null || license === void 0 ? void 0 : license.additional_info) === null || _b === void 0 ? void 0 : _b.unified_number) && ((_c = data_status === null || data_status === void 0 ? void 0 : data_status.license) === null || _c === void 0 ? void 0 : _c.additional_info) === FieldType.NON_EDITABLE;
-    var isIssuingDateOptional = !(license === null || license === void 0 ? void 0 : license.issuing_date) && ((_d = data_status === null || data_status === void 0 ? void 0 : data_status.license) === null || _d === void 0 ? void 0 : _d.issuing_date) === FieldType.NON_EDITABLE;
-    var isExpiryDateOptional = !(license === null || license === void 0 ? void 0 : license.expiry_date) && ((_e = data_status === null || data_status === void 0 ? void 0 : data_status.license) === null || _e === void 0 ? void 0 : _e.expiry_date) === FieldType.NON_EDITABLE;
+export var EntityNameValidationSchema = function () {
     return yup.object().shape({
-        legalName: isLegalNameOptional
-            ? yup.string().optional()
-            : yup
-                .string()
-                .required('')
-                .test({
-                test: function (value) {
-                    var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
-                    if (length === 0)
-                        return true;
-                    return length >= 3 ? true : this.createError({ message: 'enter_legal_name_min_three_chars' });
-                }
-            }),
+        legalName: yup
+            .string()
+            .required('')
+            .test({
+            test: function (value) {
+                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (length === 0)
+                    return true;
+                return length >= 3 ? true : this.createError({ message: 'enter_legal_name_min_three_chars' });
+            }
+        }),
         licenseType: yup.string().optional(),
-        entityType: isEntityTypeOptional ? yup.string().optional() : yup.string().required('entity_type_required'),
-        licenseNumber: isLicenseNumberOptional
-            ? yup.string().optional()
-            : yup
-                .string()
-                .test({
-                test: function (value) {
-                    var type = this.parent.licenseType;
-                    var isCR = type === BusinessType.CR;
-                    var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
-                    if (length === 0)
-                        return true;
-                    if (isCR) {
-                        return length > CR_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_max_length' });
-                    }
-                    return length > FL_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'fl_max_length' });
-                }
-            })
-                .required(''),
-        unifiedNumber: isUnifiedNumberOptional
-            ? yup.string().optional()
-            : yup
-                .string()
-                .when('licenseType', function (licenseType) {
-                var isCR = licenseType === BusinessType.CR;
+        entityType: yup.string().required('entity_type_required'),
+        licenseNumber: yup
+            .string()
+            .test({
+            test: function (value) {
+                var type = this.parent.licenseType;
+                var isCR = type === BusinessType.CR;
+                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (length === 0)
+                    return true;
                 if (isCR) {
-                    return yup.string().required('unified_number_required');
+                    return length >= CR_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_max_length' });
                 }
-                return yup.string().optional();
-            })
-                .required(''),
-        issuingDate: isIssuingDateOptional ? yup.string().optional() : yup.string().required('choose_any_issuing_date'),
-        expiryDate: isExpiryDateOptional ? yup.string().optional() : yup.string().required('choose_any_expiry_date'),
+                return length >= FL_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'fl_max_length' });
+            }
+        })
+            .required(''),
+        unifiedNumber: yup
+            .string()
+            .when('licenseType', function (licenseType) {
+            var isCR = licenseType === BusinessType.CR;
+            if (isCR) {
+                return yup.string().required('unified_number_required');
+            }
+            return yup.string().optional();
+        })
+            .required(''),
+        issuingDate: yup.string().required('choose_any_issuing_date'),
+        expiryDate: yup.string().required('choose_any_expiry_date'),
         certificateId: yup.array().optional(),
         articleId: yup.string().optional()
     });
 };
-export var EntityNameKWValidationSchema = function (entity) {
-    var _a, _b, _c;
-    var _d = entity || {}, legal_name = _d.legal_name, data_status = _d.data_status, license = _d.license;
-    var isLegalNameOptional = !((legal_name === null || legal_name === void 0 ? void 0 : legal_name.ar) || (legal_name === null || legal_name === void 0 ? void 0 : legal_name.en)) && (data_status === null || data_status === void 0 ? void 0 : data_status.legal_name) === FieldType.NON_EDITABLE;
-    var isEntityTypeOptional = !(license === null || license === void 0 ? void 0 : license.type) && (data_status === null || data_status === void 0 ? void 0 : data_status.type) === FieldType.NON_EDITABLE;
-    var isLicenseNumberOptional = !(license === null || license === void 0 ? void 0 : license.number) && ((_a = data_status === null || data_status === void 0 ? void 0 : data_status.license) === null || _a === void 0 ? void 0 : _a.number) === FieldType.NON_EDITABLE;
-    var isIssuingDateOptional = !(license === null || license === void 0 ? void 0 : license.issuing_date) && ((_b = data_status === null || data_status === void 0 ? void 0 : data_status.license) === null || _b === void 0 ? void 0 : _b.issuing_date) === FieldType.NON_EDITABLE;
-    var isExpiryDateOptional = !(license === null || license === void 0 ? void 0 : license.expiry_date) && ((_c = data_status === null || data_status === void 0 ? void 0 : data_status.license) === null || _c === void 0 ? void 0 : _c.expiry_date) === FieldType.NON_EDITABLE;
+export var EntityNameKWValidationSchema = function () {
     return yup.object().shape({
-        legalName: isLegalNameOptional
-            ? yup.string().optional()
-            : yup
+        legalName: yup
+            .string()
+            .required('')
+            .test({
+            test: function (value) {
+                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (length === 0)
+                    return true;
+                return length >= 3 ? true : this.createError({ message: 'enter_legal_name_min_three_chars' });
+            }
+        }),
+        licenseType: yup.string().optional(),
+        entityType: yup.string().required('entity_type_required'),
+        licenseNumber: yup
+            .string()
+            .when('licenseType', function (licenseType) {
+            var isCR = licenseType === BusinessType.CR;
+            if (!isCR) {
+                return yup.string().optional();
+            }
+            return yup
                 .string()
                 .required('')
                 .test({
@@ -81,35 +78,13 @@ export var EntityNameKWValidationSchema = function (entity) {
                     var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
                     if (length === 0)
                         return true;
-                    return length >= 3 ? true : this.createError({ message: 'enter_legal_name_min_three_chars' });
-                }
-            }),
-        licenseType: yup.string().optional(),
-        entityType: isEntityTypeOptional ? yup.string().optional() : yup.string().required('entity_type_required'),
-        licenseNumber: isLicenseNumberOptional
-            ? yup.string().optional()
-            : yup
-                .string()
-                .when('licenseType', function (licenseType) {
-                var isCR = licenseType === BusinessType.CR;
-                if (!isCR) {
-                    return yup.string().optional();
+                    return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_kw_max_length' });
                 }
-                return yup
-                    .string()
-                    .required('')
-                    .test({
-                    test: function (value) {
-                        var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
-                        if (length === 0)
-                            return true;
-                        return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_kw_max_length' });
-                    }
-                });
-            })
-                .required(''),
-        issuingDate: isIssuingDateOptional ? yup.string().optional() : yup.string().required('choose_any_issuing_date'),
-        expiryDate: isExpiryDateOptional ? yup.string().optional() : yup.string().required('choose_any_expiry_date'),
+            });
+        })
+            .required(''),
+        issuingDate: yup.string().required('choose_any_issuing_date'),
+        expiryDate: yup.string().required('choose_any_expiry_date'),
         certificateId: yup.array().optional(),
         articleId: yup.string().optional()
     });

package/build/features/entity/screens/ResetPasswordSuccess/ResetPasswordSuccess.js

@@ -1,16 +1,21 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import SuccessScreen from '../../../shared/SuccessScreen';
 import { maskEmail } from '../../../../utils';
-import { entitySelector } from '../../../../features/app/entity/entityStore';
-import { useAppSelector } from '../../../../hooks';
+import { entitySelector } from '../../../app/entity/entityStore';
+import { useAppSelector, useAppDispatch } from '../../../../hooks';
 var ResetPasswordSuccess = function (_a) {
     var _b, _c;
     var t = useTranslation().t;
+    var dispatch = useAppDispatch();
     var data = useAppSelector(entitySelector).data;
-    var email = ((_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.business) === null || _c === void 0 ? void 0 : _c.primary_contact).email;
+    var email = (((_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.business) === null || _c === void 0 ? void 0 : _c.primary_contact) || {}).email;
     var maskedEmail = maskEmail(email);
-    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true }));
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true, enableBack: true, onBack: function () { return onBack(); } }));
 };
 export default React.memo(ResetPasswordSuccess);

package/build/features/entity/screens/Verify/OTPInput.js

@@ -17,8 +17,9 @@ import OTPField from '../../../shared/OTP';
 import { useController, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { DEFAULT_TIMER_VALUE } from '../../../../constants';
-import { useAppDispatch } from '../../../../hooks';
-import { resendOTP } from '../../../app/entity/entityStore';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { isTokenExpired } from '../../../../utils';
+import { entitySelector, resendOTP } from '../../../app/entity/entityStore';
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -33,6 +34,7 @@ var OTPInput = function (_a) {
     var t = useTranslation().t;
     var otpControl = useController({ name: 'otp', control: control });
     var dispatch = useAppDispatch();
+    var error = useAppSelector(entitySelector).error;
     var handleOnOTPChange = function (otp) {
         otpControl.field.onChange(otp);
     };
@@ -42,6 +44,6 @@ var OTPInput = function (_a) {
         dispatch(resendOTP());
     };
     var otpValue = otpControl.field.value;
-    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { loading: loading, timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
+    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { loading: loading, timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendOTP, value: otpValue, hasError: isTokenExpired(error), onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
 };
 export default React.memo(OTPInput);

package/build/features/entity/screens/Verify/Verify.js

@@ -9,17 +9,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useAppDispatch, useSetFromDefaultValues } from '../../../../hooks';
@@ -28,7 +17,6 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
-import { handlePrevScreenStep } from '../../../../app/settings';
 import { useLanguage, useAppSelector } from '../../../../hooks';
 import { maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
@@ -61,16 +49,18 @@ var VerifyNumber = function (_a) {
     var _b, _c;
     var dispatch = useAppDispatch();
     var _d = useAppSelector(entitySelector), data = _d.data, loading = _d.loading, error = _d.error;
-    var _e = data.otpData, responseBody = _e.responseBody, defaultValues = __rest(_e, ["responseBody"]);
+    var otp = data.otpData.otp;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
-        defaultValues: defaultValues,
+        defaultValues: {
+            otp: otp
+        },
         mode: 'onChange'
     });
-    useSetFromDefaultValues(methods, defaultValues);
+    useSetFromDefaultValues(methods, data.otpData);
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
+    var _e = React.useState(false), resendLoading = _e[0], setResendLoading = _e[1];
     var phone = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.verification_by) === null || _c === void 0 ? void 0 : _c.sent_to;
     React.useEffect(function () {
         if (error && methods.formState.isValid && phone)
@@ -82,10 +72,7 @@ var VerifyNumber = function (_a) {
     var onSubmit = function (formData) {
         dispatch(verifyEntityLeadOTP(formData));
     };
-    var onBack = function () {
-        dispatch(handlePrevScreenStep());
-    };
     var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

package/build/features/featuresScreens.js

@@ -4,6 +4,7 @@ import ConnectCivilIDScreen from '../features/connect/screens/CivilID';
 import ConnectVerifyPACIScreen from './connect/screens/VerifyPACI';
 import IndividualScreen from './connect/screens/Individual';
 import MerchantInfoScreen from './connect/screens/Merchant';
+import BrandSegmentInfoScreen from './connect/screens/BrandSegment';
 import ConnectOTPScreen from './connect/screens/OTP';
 import ThankYouScreen from './connect/screens/ThankYou';
 import ConnectExpressMobileScreen from './connectExpress/screens/Mobile';
@@ -31,6 +32,7 @@ import SuccessWithFlowButtonsPage from './business/screens/SuccessWithFlowButton
 import ResetPasswordSuccessPage from './business/screens/ResetPasswordSuccess';
 import BusCivilIDscreen from './business/screens/CivilID';
 import BusVerifyPACIScreen from './business/screens/VerifyPACI';
+import BrandVerifyScreen from './business/screens/BrandDetails';
 import PasswordVerifyPage from './password/screens/Verify';
 import CreatePasswordPage from './password/screens/CreatePassword';
 import PasswordOTPPage from './password/screens/OTP';
@@ -71,6 +73,7 @@ import EntityResetPasswordSuccessPage from './entity/screens/ResetPasswordSucces
 import EntityDataLoadingPage from './entity/screens/PrepareDataLoading';
 import BrandVerifyPage from './brand/screens/Verify';
 import BrandInfoPage from './brand/screens/BrandInfo';
+import BrandSegmentPage from './brand/screens/BrandSegmentInfo';
 import BrandActivitiesPage from './brand/screens/BrandActivities';
 import BrandSuccessPage from './brand/screens/Success';
 import BrandSuccessWithFlowPage from './brand/screens/SuccessWithFlowButtons';
@@ -105,6 +108,10 @@ export var connectFeatureScreens = [
         name: 'CONNECT_MERCHANT_INFO_STEP',
         element: MerchantInfoScreen
     },
+    {
+        name: 'CONNECT_BRAND_SEGMENT_INFO_STEP',
+        element: BrandSegmentInfoScreen
+    },
     {
         name: 'CONNECT_THANK_YOU_STEP',
         element: ThankYouScreen
@@ -203,7 +210,8 @@ export var businessFeatureScreens = [
     },
     { name: 'BUSINESS_SUCCESS_STEP', element: SuccessPage },
     { name: 'BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP', element: SuccessWithFlowButtonsPage },
-    { name: 'BUSINESS_RESET_PASSWORD_SUCCESS', element: ResetPasswordSuccessPage }
+    { name: 'BUSINESS_RESET_PASSWORD_SUCCESS', element: ResetPasswordSuccessPage },
+    { name: 'BUSINESS_VERIFY_BRAND_INFO', element: BrandVerifyScreen }
 ];
 export var passwordFeatureScreens = [
     {
@@ -367,6 +375,10 @@ export var brandFeatureScreens = [
         name: 'BRAND_INFO_STEP',
         element: BrandInfoPage
     },
+    {
+        name: 'BRAND_SEGMENT_INFO_STEP',
+        element: BrandSegmentPage
+    },
     {
         name: 'BRAND_ACTIVITIES_STEP',
         element: BrandActivitiesPage

package/build/features/individual/Individual.js

@@ -21,7 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import { memo } from 'react';
+import React, { memo } from 'react';
 import { createRoot } from 'react-dom/client';
 import { useAppTheme, useAppSelector, useAppConfig, useErrorListener, useStepStartedListener, useVerifyToken } from '../../hooks';
 import { settingsSelector } from '../../app/settings';
@@ -29,12 +29,11 @@ import AnimationFlow from '../../components/AnimationFlow';
 import { store } from '../../app/store';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
-import { findOrCreateElementAndInject } from '../../utils';
+import { findOrCreateElementAndInject, sendPageView } from '../../utils';
 import { FeatureContainer } from '../shared/Containers';
 import { INDIVIDUAL_SCREENS_NAVIGATION } from '../../constants';
 import { individualFeatureScreens } from '../featuresScreens';
 import { individualSelector, verifyLeadToken } from '../app/individual/individualStore';
-import CustomFooter from '../shared/Footer';
 import Background from '../shared/Background';
 var Individual = memo(function (_a) {
     var verifyToken = _a.verifyToken, props = __rest(_a, ["verifyToken"]);
@@ -44,7 +43,7 @@ var Individual = memo(function (_a) {
     useAppConfig(__assign(__assign({ navigation: INDIVIDUAL_SCREENS_NAVIGATION }, props), { disableSettingFetching: !!verifyToken }));
     useErrorListener(individualError || error);
     useStepStartedListener();
-    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, featureScreensNavigation = data.featureScreensNavigation;
+    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, featureScreensNavigation = data.featureScreensNavigation, merchant = data.merchant, isMaturityExpress = data.isMaturityExpress;
     useVerifyToken({
         verify: verifyLeadToken,
         loadingScreenName: 'INDIVIDUAL_LOADING_DATA_STEP',
@@ -53,12 +52,17 @@ var Individual = memo(function (_a) {
         internalToken: verifyToken,
         settingLoading: settingLoading
     });
+    React.useEffect(function () {
+        sendPageView({
+            title: 'Individual'
+        });
+    }, []);
     var initialLoading = verifyToken ? settingLoading : settingLoading || customLoading;
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: initialLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: individualFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: initialLoading, error: error, open: open, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: isMaturityExpress }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: isMaturityExpress }, { children: individualFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));
-                    }) }) })) })) })));
+                    }) })) })) })) })));
 });
 export function IndividualElement(props) {
     return (_jsx(ReduxProvider, __assign({ store: store }, { children: _jsx(Individual, __assign({}, props)) })));

package/build/features/individual/screens/AdditionalIndividualInfo/AdditionalIndividualInfo.d.ts

@@ -7,8 +7,8 @@ export declare const RoleTextStyled: import("@emotion/styled").StyledComponent<i
     noWrap?: boolean | undefined;
     paragraph?: boolean | undefined;
     sx?: import("@mui/material/styles").SxProps<import("@mui/material/styles").Theme> | undefined;
-    variant?: "button" | "caption" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "inherit" | "overline" | "subtitle1" | "subtitle2" | "body1" | "body2" | undefined;
-    variantMapping?: Partial<Record<"button" | "caption" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "inherit" | "overline" | "subtitle1" | "subtitle2" | "body1" | "body2", string>> | undefined;
+    variant?: "button" | "caption" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "inherit" | "subtitle1" | "subtitle2" | "body1" | "body2" | "overline" | undefined;
+    variantMapping?: Partial<Record<"button" | "caption" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "inherit" | "subtitle1" | "subtitle2" | "body1" | "body2" | "overline", string>> | undefined;
 } & import("@mui/material/OverridableComponent").CommonProps & Omit<Pick<React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, "key" | keyof React.HTMLAttributes<HTMLSpanElement>> & {
     ref?: ((instance: HTMLSpanElement | null) => void) | React.RefObject<HTMLSpanElement> | null | undefined;
 }, keyof import("@mui/material/OverridableComponent").CommonProps | ("border" | "borderTop" | "borderRight" | "borderBottom" | "borderLeft" | "borderColor" | "borderRadius" | "display" | "displayPrint" | "overflow" | "textOverflow" | "visibility" | "whiteSpace" | "flexBasis" | "flexDirection" | "flexWrap" | "justifyContent" | "alignItems" | "alignContent" | "order" | "flex" | "flexGrow" | "flexShrink" | "alignSelf" | "justifyItems" | "justifySelf" | "gap" | "columnGap" | "rowGap" | "gridColumn" | "gridRow" | "gridAutoFlow" | "gridAutoColumns" | "gridAutoRows" | "gridTemplateColumns" | "gridTemplateRows" | "gridTemplateAreas" | "gridArea" | "bgcolor" | "color" | "zIndex" | "position" | "top" | "right" | "bottom" | "left" | "boxShadow" | "width" | "maxWidth" | "minWidth" | "height" | "maxHeight" | "minHeight" | "boxSizing" | "m" | "mt" | "mr" | "mb" | "ml" | "mx" | "my" | "p" | "pt" | "pr" | "pb" | "pl" | "px" | "py" | "margin" | "marginTop" | "marginRight" | "marginBottom" | "marginLeft" | "marginX" | "marginY" | "padding" | "paddingTop" | "paddingRight" | "paddingBottom" | "paddingLeft" | "paddingX" | "paddingY" | "typography" | "fontFamily" | "fontSize" | "fontStyle" | "fontWeight" | "letterSpacing" | "lineHeight" | "textAlign" | "textTransform") | "children" | "sx" | "variant" | "align" | "gutterBottom" | "noWrap" | "paragraph" | "variantMapping"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;

package/build/features/individual/screens/AdditionalIndividualInfo/AdditionalIndividualInfo.js

@@ -14,11 +14,12 @@ import * as React from 'react';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { handleCurrentActiveScreen } from '../../../../app/settings';
+import { handleCurrentActiveScreen, settingsSelector } from '../../../../app/settings';
 import Box from '@mui/material/Box';
 import { alpha, styled } from '@mui/material/styles';
-import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage } from '../../../../hooks';
-import { IndividualType } from '../../../../@types';
+import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage, useFormReadOnly, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
+import { DocumentPurpose, IndividualType } from '../../../../@types';
+import { getIndividualType, isSA } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
@@ -35,6 +36,7 @@ import CivilIDFile from './CivilIDFile';
 import SignatureFile from './SignatureFile';
 import ShareCount from './ShareCount';
 import ShareValue from './ShareValue';
+import { getFileDetailsFromDocument } from '../../../../utils';
 var TextBoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return (__assign(__assign({ display: 'flex', justifyContent: 'center', flexDirection: 'row', padding: theme.spacing(1.8, 2.5, 1.8, 2.5) }, theme.typography.body1), { lineHeight: theme.spacing(2.5), color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightMedium }));
@@ -50,22 +52,23 @@ var ListType;
     ListType["OccupationList"] = "OccupationList";
 })(ListType || (ListType = {}));
 var AdditionalIndividualInfo = function (_a) {
+    var _b;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _b = useAppSelector(individualSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var _c = useAppSelector(individualSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var settingsData = useAppSelector(settingsSelector).data;
     var verify = data.verify;
     var user = (verify.responseBody || {}).user;
-    var isAuthorizedUser = user === null || user === void 0 ? void 0 : user.is_authorized;
-    var _c = data.individualData, occupation = _c.occupation, sourceIncome = _c.sourceIncome, monthlyIncome = _c.monthlyIncome, employerName = _c.employerName, employerLocation = _c.employerLocation, isPEP = _c.isPEP, isInfluencer = _c.isInfluencer, civilID = _c.civilID, signatureFileId = _c.signatureFileId, civilIDUploading = _c.civilIDUploading, signatureFileUploading = _c.signatureFileUploading, shareCount = _c.shareCount, shareValue = _c.shareValue;
+    var _d = data.individualData, occupation = _d.occupation, sourceIncome = _d.sourceIncome, monthlyIncome = _d.monthlyIncome, employerName = _d.employerName, isPEP = _d.isPEP, isInfluencer = _d.isInfluencer, civilID = _d.civilID, signatureFileId = _d.signatureFileId, civilIDUploading = _d.civilIDUploading, signatureFileUploading = _d.signatureFileUploading, shareCount = _d.shareCount, shareValue = _d.shareValue;
+    var _e = user || {}, documents = _e.documents, is_authorized = _e.is_authorized, data_status = _e.data_status, data_verification = _e.data_verification, names = _e.names, role = _e.role, occupationRes = _e.occupation, is_relative_PEP = _e.is_relative_PEP, is_influencer = _e.is_influencer, objects = _e.objects;
     var methods = useForm({
-        resolver: yupResolver(IndividualInfoValidationSchema(isAuthorizedUser, user)),
+        resolver: yupResolver(IndividualInfoValidationSchema(objects)),
         defaultValues: {
             occupation: occupation,
             sourceIncome: sourceIncome,
             monthlyIncome: monthlyIncome,
             employerName: employerName,
-            employerLocation: employerLocation,
             isPEP: isPEP,
             isInfluencer: isInfluencer,
             civilID: civilID,
@@ -78,9 +81,32 @@ var AdditionalIndividualInfo = function (_a) {
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.individualData, true);
-    var _d = React.useState(), listActive = _d[0], setListActive = _d[1];
+    var watch = methods.watch;
+    var defaultCivilIdFiles = React.useMemo(function () { return getFileDetailsFromDocument(documents, DocumentPurpose.IDENTITY_DOCUMENT); }, [documents]);
+    var defaultSignatureFiles = React.useMemo(function () { return getFileDetailsFromDocument(documents, DocumentPurpose.CUSTOMER_SIGNATURE); }, [documents]);
+    var originalReadOnly = useFormReadOnly(methods, {
+        isPEP: typeof isPEP === 'boolean',
+        isInfluencer: typeof isInfluencer === 'boolean',
+        civilID: defaultCivilIdFiles,
+        signatureFileId: defaultSignatureFiles
+    });
+    var noneEditable = useDataNoneEditable(data_status, [
+        'occupation',
+        'source_of_income',
+        'monthly_income',
+        'is_relative_PEP',
+        'is_influencer'
+    ]);
+    var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
+    var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
+    var dataVerified = useDataVerified(data_verification, ['occupation', 'is_relative_PEP', 'is_influencer']);
+    var isOccupationVerified = dataVerified['occupation'] && (occupationRes === null || occupationRes === void 0 ? void 0 : occupationRes.id) === ((_b = watch('occupation')) === null || _b === void 0 ? void 0 : _b.id);
+    var isPEPSwitchVerified = dataVerified['is_relative_PEP'] && is_relative_PEP === watch('isPEP');
+    var isInfluencerSwitchVerified = dataVerified['is_influencer'] && is_influencer === watch('isInfluencer');
+    var _f = React.useState(), listActive = _f[0], setListActive = _f[1];
+    var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var onSubmit = function (data) {
-        dispatch(updateIndividualInfo(data));
+        dispatch(updateIndividualInfo(getFelids(data)));
     };
     var onBack = function () {
         dispatch(handleCurrentActiveScreen('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP'));
@@ -90,30 +116,35 @@ var AdditionalIndividualInfo = function (_a) {
     };
     var getUserName = function () {
         var _a, _b, _c, _d;
-        var name = isAr ? (_b = (_a = user === null || user === void 0 ? void 0 : user.names) === null || _a === void 0 ? void 0 : _a.ar) === null || _b === void 0 ? void 0 : _b.first : (_d = (_c = user === null || user === void 0 ? void 0 : user.names) === null || _c === void 0 ? void 0 : _c.en) === null || _d === void 0 ? void 0 : _d.first;
+        var firstName = isAr ? (_a = names === null || names === void 0 ? void 0 : names.ar) === null || _a === void 0 ? void 0 : _a.first : (_b = names === null || names === void 0 ? void 0 : names.en) === null || _b === void 0 ? void 0 : _b.first;
+        var lastName = isAr ? (_c = names === null || names === void 0 ? void 0 : names.ar) === null || _c === void 0 ? void 0 : _c.last : (_d = names === null || names === void 0 ? void 0 : names.en) === null || _d === void 0 ? void 0 : _d.last;
+        var name = firstName && lastName ? "".concat(firstName, " ").concat(lastName) : firstName;
         return name;
     };
     var getUserRole = function () {
-        var _a, _b, _c, _d, _e;
-        if ((((_a = user === null || user === void 0 ? void 0 : user.role) === null || _a === void 0 ? void 0 : _a.length) || 0) > 0)
-            return isAr ? (_c = (_b = user.role[0]) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.ar : (_e = (_d = user.role[0]) === null || _d === void 0 ? void 0 : _d.name) === null || _e === void 0 ? void 0 : _e.en;
-        if ((user === null || user === void 0 ? void 0 : user.type) === IndividualType.SHARE_HOLDER)
+        var _a, _b, _c, _d;
+        if (((role === null || role === void 0 ? void 0 : role.length) || 0) > 0)
+            return isAr ? (_b = (_a = user.role[0]) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.ar : (_d = (_c = user.role[0]) === null || _c === void 0 ? void 0 : _c.name) === null || _d === void 0 ? void 0 : _d.en;
+        if (objects === null || objects === void 0 ? void 0 : objects.includes(IndividualType.SHARE_HOLDER))
             return t('type_share_holder');
-        if ((user === null || user === void 0 ? void 0 : user.type) === IndividualType.BOARD_MEMBER)
+        if (objects === null || objects === void 0 ? void 0 : objects.includes(IndividualType.BOARD_MEMBER))
             return t('type_board_member');
         return t('type_user');
     };
-    var showSignatureFile = (user === null || user === void 0 ? void 0 : user.type) === IndividualType.USER || (user === null || user === void 0 ? void 0 : user.type) === IndividualType.BUYER;
-    var showOccupationFile = (user === null || user === void 0 ? void 0 : user.type) === IndividualType.USER || (user === null || user === void 0 ? void 0 : user.type) === IndividualType.BUYER;
-    var showSourceOfIncome = (user === null || user === void 0 ? void 0 : user.type) === IndividualType.USER || (user === null || user === void 0 ? void 0 : user.type) === IndividualType.BUYER;
-    var showIsPEP = (user === null || user === void 0 ? void 0 : user.type) === IndividualType.USER || (user === null || user === void 0 ? void 0 : user.type) === IndividualType.BOARD_MEMBER;
-    var showIsInfluencer = (user === null || user === void 0 ? void 0 : user.type) === IndividualType.USER || (user === null || user === void 0 ? void 0 : user.type) === IndividualType.BOARD_MEMBER;
-    var showShares = (user === null || user === void 0 ? void 0 : user.type) === IndividualType.SHARE_HOLDER;
+    var _g = React.useMemo(function () { return getIndividualType(objects); }, [objects]), isUser = _g.isUser, isShareholder = _g.isShareholder, isBoardMember = _g.isBoardMember, isBuyer = _g.isBuyer;
+    var isUserORBuyerType = isUser || isBuyer;
+    var isUserORBoardMemberType = isUser || isBoardMember;
+    var showSignatureFile = isUserORBuyerType;
+    var showOccupationFile = isUserORBuyerType;
+    var showSourceOfIncome = isUserORBuyerType;
+    var showIsPEP = isUserORBoardMemberType;
+    var showIsInfluencer = isUserORBoardMemberType;
+    var showShares = isShareholder;
     var isSourceOfIncomeListActive = listActive === ListType.SourceOfIncomeList;
     var isMonthlyIncomeListActive = listActive === ListType.MonthlyIncomeList;
     var isOccupationListActive = listActive === ListType.OccupationList;
     var disabled = !methods.formState.isValid || civilIDUploading || signatureFileUploading;
-    return (_jsxs(ScreenContainer, { children: [_jsx(Collapse, __assign({ in: !listActive && !!(user === null || user === void 0 ? void 0 : user.is_authorized), timeout: 500 }, { children: _jsxs(TextBoxStyled, { children: [getUserName() || '', _jsx(RoleTextStyled, { children: getUserRole() || '' })] }) })), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(Occupation, { onListOpen: function () { return handleMenuClick(ListType.OccupationList); }, onListClose: function () { return handleMenuClick(); }, show: showOccupationFile && !isMonthlyIncomeListActive && !isSourceOfIncomeListActive }), _jsx(SourceOfIncome, { onListOpen: function () { return handleMenuClick(ListType.SourceOfIncomeList); }, onListClose: function () { return handleMenuClick(); }, show: showSourceOfIncome && !isMonthlyIncomeListActive && !isOccupationListActive }), _jsx(MonthlyIncome, { show: showSourceOfIncome && !isSourceOfIncomeListActive && !isOccupationListActive, onListOpen: function () { return handleMenuClick(ListType.MonthlyIncomeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(ShareCount, { show: !listActive && showShares }), _jsx(ShareValue, { show: !listActive && showShares }), _jsxs(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: [_jsx(CivilIDFile, {}), _jsx(SignatureFile, { show: (user === null || user === void 0 ? void 0 : user.is_authorized) && showSignatureFile })] })), _jsx(PEPSwitch, { show: showIsPEP && !listActive }), _jsx(InfluencerSwitch, { show: showIsInfluencer && !listActive })] }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) }))] }));
+    return (_jsxs(ScreenContainer, { children: [_jsx(Collapse, __assign({ in: !listActive && !!is_authorized, timeout: 500 }, { children: _jsx(TextBoxStyled, { children: getUserName() || '' }) })), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(Occupation, { isVerified: isOccupationVerified, readOnly: readOnly['occupation'] || noneEditable['occupation'], onListOpen: function () { return handleMenuClick(ListType.OccupationList); }, onListClose: function () { return handleMenuClick(); }, show: showOccupationFile && !isMonthlyIncomeListActive && !isSourceOfIncomeListActive }), _jsx(SourceOfIncome, { readOnly: readOnly['sourceIncome'] || noneEditable['source_of_income'], onListOpen: function () { return handleMenuClick(ListType.SourceOfIncomeList); }, onListClose: function () { return handleMenuClick(); }, show: showSourceOfIncome && !isMonthlyIncomeListActive && !isOccupationListActive }), _jsx(MonthlyIncome, { readOnly: readOnly['monthlyIncome'] || noneEditable['monthly_income'], show: showSourceOfIncome && !isSourceOfIncomeListActive && !isOccupationListActive, onListOpen: function () { return handleMenuClick(ListType.MonthlyIncomeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(ShareCount, { show: !listActive && showShares, readOnly: readOnly['shareCount'] }), _jsx(ShareValue, { show: !listActive && showShares, readOnly: readOnly['shareValue'] }), _jsxs(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: [_jsx(CivilIDFile, { show: !isSACountry, readOnly: readOnly['civilID'], defaultFiles: defaultCivilIdFiles }), _jsx(SignatureFile, { show: is_authorized && showSignatureFile, readOnly: readOnly['signatureFileId'], defaultFiles: defaultSignatureFiles })] })), _jsx(PEPSwitch, { show: showIsPEP && !listActive, readOnly: readOnly['isPEP'] || noneEditable['is_relative_PEP'], isVerified: isPEPSwitchVerified }), _jsx(InfluencerSwitch, { show: showIsInfluencer && !listActive, readOnly: readOnly['isInfluencer'] || noneEditable['is_influencer'], isVerified: isInfluencerSwitchVerified })] }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) }))] }));
 };
 export default React.memo(AdditionalIndividualInfo);
 AdditionalIndividualInfo.defaultProps = {};

package/build/features/individual/screens/AdditionalIndividualInfo/CivilIDFile.d.ts

@@ -1,3 +1,9 @@
 /// <reference types="react" />
-declare const CivilIDFile: () => JSX.Element;
+import { FileDetails } from '../../../../@types';
+declare type CivilIDFileProps = {
+    defaultFiles?: Array<FileDetails>;
+    readOnly?: boolean;
+    show: boolean;
+};
+declare const CivilIDFile: ({ defaultFiles, readOnly, show }: CivilIDFileProps) => JSX.Element;
 export default CivilIDFile;