@tap-payments/auth-jsconnect 2.0.45-test → 2.0.45

package/build/features/featuresScreens.js

@@ -1,9 +1,25 @@
 import MobileScreen from './connect/screens/Mobile';
 import NIDScreen from './connect/screens/NID';
+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 ConnectOTPScreen from './connect/screens/OTP';
 import ThankYouScreen from './connect/screens/ThankYou';
+import ConnectExpressMobileScreen from './connectExpress/screens/Mobile';
+import ConnectExpressNIDScreen from './connectExpress/screens/NID';
+import ConnectExpressCivilIDScreen from './connectExpress/screens/CivilID';
+import ConnectExpressVerifyPACIScreen from './connectExpress/screens/VerifyPACI';
+import ConnectExpressOTPScreen from './connectExpress/screens/OTP';
+import ConnectExpressNIDMissedScreen from './connectExpress/screens/NIDMissed';
+import ConnectExpressCivilIDMissedScreen from './connectExpress/screens/CivilIDMissed';
+import ConnectExpressIdentityVerifyPACIScreen from './connectExpress/screens/IdentityVerifyPACI';
+import ConnectExpressIdentityVerifyOTPScreen from './connectExpress/screens/IdentityOTP';
+import ConnectExpressCollectIndividualScreen from './connectExpress/screens/CollectIndividualInfo';
+import ConnectExpressCollectBusinessScreen from './connectExpress/screens/CollectBusinessInfo';
+import ConnectExpressCreateAccountLoaderScreen from './connectExpress/screens/CreateAccountLoader';
+import ConnectExpressSuccessFlowButtonsScreen from '../features/connectExpress/screens/SuccessWithFlowButtons';
+import ConnectExpressAccountAlreadyCreatedScreen from '../features/connectExpress/screens/AccountAlreadyCreated';
 import CustomersPage from './business/screens/Customers';
 import IDBODPage from './business/screens/IDBOD';
 import BusinessVerifyPage from './business/screens/Verify';
@@ -13,6 +29,8 @@ import ActivitiesPage from './business/screens/Activities';
 import SuccessPage from './business/screens/Success';
 import SuccessWithFlowButtonsPage from './business/screens/SuccessWithFlowButtons';
 import ResetPasswordSuccessPage from './business/screens/ResetPasswordSuccess';
+import BusCivilIDscreen from './business/screens/CivilID';
+import BusVerifyPACIScreen from './business/screens/VerifyPACI';
 import PasswordVerifyPage from './password/screens/Verify';
 import CreatePasswordPage from './password/screens/CreatePassword';
 import PasswordOTPPage from './password/screens/OTP';
@@ -24,32 +42,46 @@ import AdditionalIndividualInfoPage from './individual/screens/AdditionalIndivid
 import SuccessOwnerPage from './individual/screens/Success';
 import IndividualSuccessWithFlowPage from './individual/screens/SuccessWithFlowButtons';
 import IndividualResetPasswordSuccessPage from './individual/screens/ResetPasswordSuccess';
+import IndividualDataLoadingPage from './individual/screens/PrepareDataLoading';
 import BankVerifyPage from './bank/screens/Verify';
 import BankDetailsPage from './bank/screens/BankDetails';
 import BankSuccessPage from './bank/screens/Success';
 import BankSuccessWithFlowPage from './bank/screens/SuccessWithFlowButtons';
 import BankResetPasswordSuccessPage from './bank/screens/ResetPasswordSuccess';
+import BankDataLoadingPage from './bank/screens/PrepareDataLoading';
 import TaxVerifyPage from './tax/screens/Verify';
 import TaxDetailsPage from './tax/screens/TaxDetails';
 import TaxSuccessPage from './tax/screens/Success';
 import TaxSuccessWithFlowPage from './tax/screens/SuccessWithFlowButtons';
 import TaxResetPasswordSuccessPage from './tax/screens/ResetPasswordSuccess';
+import TaxDataLoadingPage from './tax/screens/PrepareDataLoading';
 import SignInMobilePage from './signIn/screens/Mobile';
 import SignInEmailPage from './signIn/screens/Email';
 import SignInOTPPage from './signIn/screens/OTP';
 import SignInPasswordPage from './signIn/screens/Password';
 import EntityVerifyPage from './entity/screens/Verify';
-import EntityInfoConfirmPage from './entity/screens/EntityInfoConfirm';
+import EntityNamePage from './entity/screens/EntityName';
+import EntityCapitalPage from './entity/screens/EntityCapital';
 import EntitySuccessPage from './entity/screens/Success';
 import EntitySuccessWithFlowPage from './entity/screens/SuccessWithFlowButtons';
 import EntityResetPasswordSuccessPage from './entity/screens/ResetPasswordSuccess';
-import OtpVerifyPage from '../features/otp/screens/OTPVerify';
-import AuthVerifyPage from './auth/screens/OTP';
+import EntityDataLoadingPage from './entity/screens/PrepareDataLoading';
+import BrandVerifyPage from './brand/screens/Verify';
+import BrandInfoPage from './brand/screens/BrandInfo';
+import BrandActivitiesPage from './brand/screens/BrandActivities';
+import BrandSuccessPage from './brand/screens/Success';
+import BrandSuccessWithFlowPage from './brand/screens/SuccessWithFlowButtons';
+import BrandResetPasswordSuccessPage from './brand/screens/ResetPasswordSuccess';
+import BrandDataLoadingPage from './brand/screens/PrepareDataLoading';
 export var connectFeatureScreens = [
     {
         name: 'CONNECT_NID_STEP',
         element: NIDScreen
     },
+    {
+        name: 'CONNECT_CIVIL_ID_STEP',
+        element: ConnectCivilIDScreen
+    },
     {
         name: 'CONNECT_MOBILE_STEP',
         element: MobileScreen
@@ -58,6 +90,10 @@ export var connectFeatureScreens = [
         name: 'CONNECT_OTP_STEP',
         element: ConnectOTPScreen
     },
+    {
+        name: 'CONNECT_VERIFY_PACI_STEP',
+        element: ConnectVerifyPACIScreen
+    },
     {
         name: 'CONNECT_INDIVIDUAL_STEP',
         element: IndividualScreen
@@ -71,6 +107,64 @@ export var connectFeatureScreens = [
         element: ThankYouScreen
     }
 ];
+export var connectExpressFeatureScreens = [
+    {
+        name: 'CONNECT_EXPRESS_NID_STEP',
+        element: ConnectExpressNIDScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_CIVIL_ID_STEP',
+        element: ConnectExpressCivilIDScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_MOBILE_STEP',
+        element: ConnectExpressMobileScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_OTP_STEP',
+        element: ConnectExpressOTPScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_VERIFY_PACI_STEP',
+        element: ConnectExpressVerifyPACIScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_NID_MISSED_STEP',
+        element: ConnectExpressNIDMissedScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_CIVIL_ID_MISSED_STEP',
+        element: ConnectExpressCivilIDMissedScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_VERIFY_PACI_IDENTITY_STEP',
+        element: ConnectExpressIdentityVerifyPACIScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_OTP_IDENTITY_STEP',
+        element: ConnectExpressIdentityVerifyOTPScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP',
+        element: ConnectExpressCreateAccountLoaderScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP',
+        element: ConnectExpressCollectIndividualScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_COLLECT_BUSINESS_INFO_STEP',
+        element: ConnectExpressCollectBusinessScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_ACCOUNT_ALREADY_CREATED_STEP',
+        element: ConnectExpressAccountAlreadyCreatedScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_SUCCESS_WITH_FLOW_BUTTONS_STEP',
+        element: ConnectExpressSuccessFlowButtonsScreen
+    }
+];
 export var businessFeatureScreens = [
     {
         name: 'BUSINESS_VERIFY_STEP',
@@ -80,6 +174,14 @@ export var businessFeatureScreens = [
         name: 'BUSINESS_IDBOD_STEP',
         element: IDBODPage
     },
+    {
+        name: 'BUSINESS_CIVIL_ID_STEP',
+        element: BusCivilIDscreen
+    },
+    {
+        name: 'BUSINESS_VERIFY_PACI_STEP',
+        element: BusVerifyPACIScreen
+    },
     {
         name: 'BUSINESS_OTP_STEP',
         element: BusinessOTPPage
@@ -128,6 +230,10 @@ export var individualFeatureScreens = [
         name: 'INDIVIDUAL_VERIFY_STEP',
         element: IndividualVerifyPage
     },
+    {
+        name: 'INDIVIDUAL_LOADING_DATA_STEP',
+        element: IndividualDataLoadingPage
+    },
     {
         name: 'INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP',
         element: AdditionalIndividualInfoPage
@@ -147,6 +253,10 @@ export var bankFeatureScreens = [
         name: 'BANK_VERIFY_STEP',
         element: BankVerifyPage
     },
+    {
+        name: 'BANK_LOADING_DATA_STEP',
+        element: BankDataLoadingPage
+    },
     {
         name: 'BANK_BANK_DETAILS_STEP',
         element: BankDetailsPage
@@ -166,6 +276,10 @@ export var taxFeatureScreens = [
         name: 'TAX_VERIFY_STEP',
         element: TaxVerifyPage
     },
+    {
+        name: 'TAX_LOADING_DATA_STEP',
+        element: TaxDataLoadingPage
+    },
     {
         name: 'TAX_TAX_DETAILS_STEP',
         element: TaxDetailsPage
@@ -204,8 +318,16 @@ export var entityFeatureScreens = [
         element: EntityVerifyPage
     },
     {
-        name: 'ENTITY_INFO_STEP',
-        element: EntityInfoConfirmPage
+        name: 'ENTITY_LOADING_DATA_STEP',
+        element: EntityDataLoadingPage
+    },
+    {
+        name: 'ENTITY_NAME_STEP',
+        element: EntityNamePage
+    },
+    {
+        name: 'ENTITY_CAPITAL_STEP',
+        element: EntityCapitalPage
     },
     {
         name: 'ENTITY_DETAILS_SUCCESS_STEP',
@@ -217,15 +339,30 @@ export var entityFeatureScreens = [
     },
     { name: 'ENTITY_RESET_PASSWORD_SUCCESS', element: EntityResetPasswordSuccessPage }
 ];
-export var otpFeatureScreens = [
+export var brandFeatureScreens = [
     {
-        name: 'OTP_VERIFY_STEP',
-        element: OtpVerifyPage
-    }
-];
-export var authFeatureScreens = [
+        name: 'BRAND_VERIFY_STEP',
+        element: BrandVerifyPage
+    },
     {
-        name: 'AUTH_VERIFY_STEP',
-        element: AuthVerifyPage
-    }
+        name: 'BRAND_LOADING_DATA_STEP',
+        element: BrandDataLoadingPage
+    },
+    {
+        name: 'BRAND_INFO_STEP',
+        element: BrandInfoPage
+    },
+    {
+        name: 'BRAND_ACTIVITIES_STEP',
+        element: BrandActivitiesPage
+    },
+    {
+        name: 'BRAND_DETAILS_SUCCESS_STEP',
+        element: BrandSuccessPage
+    },
+    {
+        name: 'BRAND_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
+        element: BrandSuccessWithFlowPage
+    },
+    { name: 'BRAND_RESET_PASSWORD_SUCCESS', element: BrandResetPasswordSuccessPage }
 ];

package/build/features/individual/Individual.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="react" />
 import { LibConfig } from '../../@types';
 export interface IndividualLibProps extends LibConfig {
+    verifyToken?: string;
 }
-export declare function IndividualLib(props: IndividualLibProps): JSX.Element;
-export declare function renderIndividualLib(config: IndividualLibProps, elementId: string): void;
-export declare function unmountIndividualLib(elementId: string, unmountTimeout?: number): void;
+export declare function IndividualElement(props: IndividualLibProps): JSX.Element;
+export declare function renderIndividualLib(config: IndividualLibProps, elementId: string): {
+    unmount: () => void;
+};

package/build/features/individual/Individual.js

@@ -9,62 +9,64 @@ 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 } from "react/jsx-runtime";
-import { memo, useEffect } from 'react';
-import { useAppTheme, useAppDispatch, useAppSelector, useAppConfig, useErrorListener, useStepStartedListener } from '../../hooks';
-import { handleLanguage, settingsSelector } from '../../app/settings';
+import { memo } from 'react';
+import { createRoot } from 'react-dom/client';
+import { useAppTheme, useAppSelector, useAppConfig, useErrorListener, useStepStartedListener, useVerifyToken } from '../../hooks';
+import { settingsSelector } from '../../app/settings';
 import AnimationFlow from '../../components/AnimationFlow';
 import { store } from '../../app/store';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
-import { getParameterByName, reactElement, removeElement } from '../../utils';
+import { createElementAndInject } from '../../utils';
 import { FeatureContainer } from '../shared/Containers';
-import { DIALOG_ID, INDIVIDUAL_SCREENS_NAVIGATION } from '../../constants';
+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 (props) {
+var Individual = memo(function (_a) {
+    var verifyToken = _a.verifyToken, props = __rest(_a, ["verifyToken"]);
     var theme = useAppTheme().theme;
-    var dispatch = useAppDispatch();
-    var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
-    var _b = useAppSelector(individualSelector), customLoading = _b.customLoading, individualError = _b.error;
-    useAppConfig(__assign({ navigation: INDIVIDUAL_SCREENS_NAVIGATION }, props));
+    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
+    var _c = useAppSelector(individualSelector), customLoading = _c.customLoading, individualError = _c.error, loading = _c.loading;
+    useAppConfig(__assign(__assign({ navigation: INDIVIDUAL_SCREENS_NAVIGATION }, props), { disableSettingFetching: !!verifyToken }));
     useErrorListener(individualError || error);
     useStepStartedListener();
-    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open;
-    var verifyToken = function () {
-        var token = getParameterByName('token');
-        var lang = getParameterByName('lang');
-        if (lang)
-            dispatch(handleLanguage(lang));
-        if (!token)
-            throw new Error('Auth token is not found!');
-        dispatch(verifyLeadToken(token));
-    };
-    useEffect(function () {
-        if (!settingLoading)
-            verifyToken();
-    }, [settingLoading]);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: individualFeatureScreens.map(function (_a, index) {
+    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, featureScreensNavigation = data.featureScreensNavigation;
+    useVerifyToken({
+        verify: verifyLeadToken,
+        loadingScreenName: 'INDIVIDUAL_LOADING_DATA_STEP',
+        navigation: featureScreensNavigation,
+        open: open,
+        internalToken: verifyToken,
+        settingLoading: settingLoading
+    });
+    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) {
                         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 IndividualLib(props) {
+export function IndividualElement(props) {
     return (_jsx(ReduxProvider, __assign({ store: store }, { children: _jsx(Individual, __assign({}, props)) })));
 }
 export function renderIndividualLib(config, elementId) {
-    reactElement(elementId).render(_jsx(IndividualLib, __assign({}, config)));
-}
-export function unmountIndividualLib(elementId, unmountTimeout) {
-    if (unmountTimeout === void 0) { unmountTimeout = 1000; }
-    var element = document.getElementById(elementId);
-    setTimeout(function () {
-        var _a;
-        ((_a = element === null || element === void 0 ? void 0 : element.children) === null || _a === void 0 ? void 0 : _a.length) && element.removeChild(element.children[0]);
-        removeElement(DIALOG_ID);
-        reactElement(elementId).unmount();
-    }, unmountTimeout);
+    var element = createElementAndInject(elementId);
+    var root = createRoot(element);
+    root.render(_jsx(IndividualElement, __assign({}, config)));
+    var unmount = function () { return root.unmount(); };
+    return { unmount: unmount };
 }

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

@@ -15,7 +15,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useForm, FormProvider } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
-import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
 import { handleCurrentActiveScreen, settingsSelector } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
@@ -31,6 +31,8 @@ import EmployerLocation from './EmployerLocation';
 import SourceOfIncome from './SourceOfIncome';
 import { individualSelector, updateIndividualInfo } from '../../../app/individual/individualStore';
 import Occupation from './Occupation';
+import CivilIDFile from './CivilIDFile';
+import SignatureFile from './SignatureFile';
 var ListType;
 (function (ListType) {
     ListType["SourceOfIncomeList"] = "SourceOfIncomeList";
@@ -45,40 +47,35 @@ var AdditionalIndividualInfo = function (_a) {
     var _b = useAppSelector(individualSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var settingsData = useAppSelector(settingsSelector).data;
     var countries = settingsData.countries;
-    var _c = data.individualData || {}, sourceIncome = _c.sourceIncome, monthlyIncome = _c.monthlyIncome, employerLocation = _c.employerLocation, occupation = _c.occupation, isPEP = _c.isPEP, isInfluencer = _c.isInfluencer;
+    var user = (data.verify.responseBody || {}).user;
+    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;
     var methods = useForm({
         resolver: yupResolver(IndividualInfoValidationSchema),
-        defaultValues: data.individualData,
+        defaultValues: {
+            occupation: occupation,
+            sourceIncome: sourceIncome,
+            monthlyIncome: monthlyIncome,
+            employerName: employerName,
+            employerLocation: employerLocation,
+            isPEP: isPEP,
+            isInfluencer: isInfluencer,
+            civilID: civilID,
+            signatureFileId: signatureFileId,
+            civilIDUploading: civilIDUploading,
+            signatureFileUploading: signatureFileUploading
+        },
         mode: 'onChange'
     });
+    useSetFromDefaultValues(methods, data.individualData, true);
     var _d = React.useState(), listActive = _d[0], setListActive = _d[1];
     var _e = React.useState(false), employerFieldsActive = _e[0], setEmployerFieldsActive = _e[1];
     React.useEffect(function () {
         var _a, _b;
-        if (((_b = (_a = methods.getValues('sourceIncome')) === null || _a === void 0 ? void 0 : _a.name_en) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'salary')
+        if (((_b = (_a = methods.getValues('sourceIncome')) === null || _a === void 0 ? void 0 : _a.name.en) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'salary')
             setEmployerFieldsActive(true);
-        else {
+        else
             setEmployerFieldsActive(false);
-        }
     }, [methods.watch('sourceIncome')]);
-    React.useEffect(function () {
-        if (!!sourceIncome) {
-            methods.setValue('sourceIncome', sourceIncome);
-        }
-        if (!!monthlyIncome) {
-            methods.setValue('monthlyIncome', monthlyIncome);
-        }
-        if (!!employerLocation) {
-            methods.setValue('employerLocation', employerLocation);
-        }
-        if (!!occupation) {
-            methods.setValue('occupation', occupation);
-        }
-        if (isPEP !== undefined)
-            methods.setValue('isPEP', isPEP);
-        if (isInfluencer !== undefined)
-            methods.setValue('isInfluencer', isInfluencer);
-    }, [data.individualData]);
     var onSubmit = function (data) {
         dispatch(updateIndividualInfo(data));
     };
@@ -92,10 +89,8 @@ var AdditionalIndividualInfo = function (_a) {
     var isEmployerLocationListActive = listActive === ListType.EmployerLocationList;
     var isMonthlyIncomeListActive = listActive === ListType.MonthlyIncomeList;
     var isOccupationListActive = listActive === ListType.OccupationList;
-    return (_jsx(ScreenContainer, { children: _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: !isEmployerLocationListActive && !isMonthlyIncomeListActive && !isSourceOfIncomeListActive }), _jsx(SourceOfIncome, { onListOpen: function () { return handleMenuClick(ListType.SourceOfIncomeList); }, onListClose: function () { return handleMenuClick(); }, show: !isEmployerLocationListActive && !isMonthlyIncomeListActive && !isOccupationListActive }), _jsx(MonthlyIncome, { show: !isEmployerLocationListActive && !isSourceOfIncomeListActive && !isOccupationListActive, onListOpen: function () { return handleMenuClick(ListType.MonthlyIncomeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EmployerName, { show: false }), _jsx(EmployerLocation, { show: !isSourceOfIncomeListActive &&
-                                    employerFieldsActive &&
-                                    !isMonthlyIncomeListActive &&
-                                    !isOccupationListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.EmployerLocationList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(PEPSwitch, { show: !listActive }), _jsx(InfluencerSwitch, { show: !listActive })] }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    var disabled = !methods.formState.isValid || civilIDUploading || signatureFileUploading;
+    return (_jsx(ScreenContainer, { children: _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: !isEmployerLocationListActive && !isMonthlyIncomeListActive && !isSourceOfIncomeListActive }), _jsx(SourceOfIncome, { onListOpen: function () { return handleMenuClick(ListType.SourceOfIncomeList); }, onListClose: function () { return handleMenuClick(); }, show: !isEmployerLocationListActive && !isMonthlyIncomeListActive && !isOccupationListActive }), _jsx(MonthlyIncome, { show: !isEmployerLocationListActive && !isSourceOfIncomeListActive && !isOccupationListActive, onListOpen: function () { return handleMenuClick(ListType.MonthlyIncomeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EmployerName, { show: false }), _jsx(EmployerLocation, { show: !isSourceOfIncomeListActive && employerFieldsActive && !isMonthlyIncomeListActive && !isOccupationListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.EmployerLocationList); }, onListClose: function () { return handleMenuClick(); } }), _jsxs(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: [_jsx(CivilIDFile, {}), _jsx(SignatureFile, { show: user === null || user === void 0 ? void 0 : user.is_authorized })] })), _jsx(PEPSwitch, { show: !listActive }), _jsx(InfluencerSwitch, { show: !listActive })] }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, 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

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const CivilIDFile: () => JSX.Element;
+export default CivilIDFile;

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

@@ -0,0 +1,30 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { ScreenContainer } from '../../../../features/shared/Containers';
+import { styled } from '@mui/material/styles';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { civilIDUploadingStatus, individualSelector } from '../../../app/individual/individualStore';
+import UploadMultipleFile from '../../../shared/UploadMultipleFile';
+var FeatureStyled = styled(ScreenContainer)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        marginBlockStart: theme.spacing(3)
+    });
+});
+var CivilIDFile = function () {
+    var _a;
+    var t = useTranslation().t;
+    var dispatch = useAppDispatch();
+    var control = useFormContext().control;
+    var civilIDFileIdControl = useController({ name: 'civilID', control: control });
+    var _b = useAppSelector(individualSelector), loading = _b.loading, data = _b.data;
+    var handleCivilIDChange = function (ids) {
+        civilIDFileIdControl.field.onChange(ids);
+    };
+    var handleReset = function (ids) {
+        civilIDFileIdControl.field.onChange(ids);
+    };
+    return (_jsx(FeatureStyled, { children: _jsx(UploadMultipleFile, { label: t('title_civil_id'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('desc_drag_and_drop_civilID'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_civil_id'), onFileUploaded: handleCivilIDChange, isSubmitting: loading, onDeleteFile: handleReset, maxLimit: 4, fileTitle: (_a = data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant_id, purpose: 'identity_document', fileUploadingStatus: function (uploading) { return dispatch(civilIDUploadingStatus(uploading)); } }) }));
+};
+export default CivilIDFile;

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

@@ -20,6 +20,9 @@ import Mandatory from '../../../shared/Mandatory';
 import Text from '../../../../components/Text';
 import RadioGroup from '../../../../components/RadioGroup';
 import RadioLabel from '../../../../components/RadioLabel';
+import { InfoIconStyled, InfoOutlinedIconStyled } from './PEPSwitch';
+import Box from '@mui/material/Box';
+import Tooltip from '../../../../components/Tooltip';
 var LabelTextStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
     return (__assign(__assign({}, theme.typography.caption), { color: alpha(theme.palette.text.primary, 0.6), marginBlockEnd: theme.spacing(0.625) }));
@@ -32,6 +35,7 @@ var RadioGroupStyled = styled(RadioGroup)(function (_a) {
 });
 var InfluencerSwitch = function (_a) {
     var show = _a.show;
+    var _b = React.useState(false), isHovered = _b[0], setIsHovered = _b[1];
     var control = useFormContext().control;
     var t = useTranslation().t;
     var influencerControl = useController({ name: 'isInfluencer', control: control });
@@ -40,6 +44,6 @@ var InfluencerSwitch = function (_a) {
         influencerControl.field.onChange(target.value === 'yes');
     };
     var influencerValue = influencerControl.field.value;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pt: 2.5, pl: 2.5, pr: 2.5 } }, { children: [_jsxs(LabelTextStyled, { children: [t('tap_js_are_you_an_influencer'), _jsx(Mandatory, {})] }), _jsxs(RadioGroupStyled, __assign({ value: influencerValue != null ? (influencerValue ? 'yes' : 'no') : false, onChange: handleOnChange }, { children: [_jsx(RadioLabel, { value: 'yes', label: t('yes') }), _jsx(RadioLabel, { value: 'no', label: t('no') })] }))] })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pt: 2.5, pl: 2.5, pr: 2.5 } }, { children: [_jsxs(Box, __assign({ style: { display: 'flex', justifyContent: 'space-between' } }, { children: [_jsxs(LabelTextStyled, { children: [t('tap_js_are_you_an_influencer'), _jsx(Mandatory, {})] }), _jsx(Tooltip, __assign({ title: t('influencer_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] })), _jsxs(RadioGroupStyled, __assign({ value: influencerValue != null ? (influencerValue ? 'yes' : 'no') : false, onChange: handleOnChange }, { children: [_jsx(RadioLabel, { value: 'yes', label: t('yes') }), _jsx(RadioLabel, { value: 'no', label: t('no') })] }))] })) })));
 };
 export default React.memo(InfluencerSwitch);

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

@@ -35,6 +35,9 @@ import { individualSelector } from '../../../app/individual/individualStore';
 import Text from '../../../../components/Text';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import SimpleList from '../../../../components/SimpleList';
+import Search from '../../../../features/shared/Search';
+import { findCurrencyByIso2 } from '../../../../utils';
+import { settingsSelector } from '../../../../app/settings';
 var Container = styled(Box)(function () { return ({
     display: 'flex'
 }); });
@@ -59,8 +62,10 @@ var MonthlyIncome = function (_a) {
     var isAr = useLanguage().isAr;
     var data = useAppSelector(individualSelector).data;
     var control = useFormContext().control;
+    var settingsData = useAppSelector(settingsSelector).data;
     var monthlyIncomeList = (data.individualData.responseBody || {}).monthlyIncomeList;
     var monthlyIncomeControl = useController({ control: control, name: 'monthlyIncome' });
+    var countryCode = settingsData.businessCountry;
     React.useEffect(function () {
         if ((monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.length) > 0) {
             setIncomeList(monthlyIncomeList);
@@ -75,15 +80,28 @@ var MonthlyIncome = function (_a) {
         var _a;
         setAnchorEl(null);
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
+        if ((monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.length) > 0) {
+            setIncomeList(monthlyIncomeList);
+        }
     };
     var onSelectItem = function (source) {
         onCloseList();
         monthlyIncomeControl.field.onChange(source);
     };
+    var handleSearch = function (value) {
+        var filteredList = monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.filter(function (income) {
+            var _a, _b, _c, _d;
+            return ((_b = (_a = income === null || income === void 0 ? void 0 : income.range) === null || _a === void 0 ? void 0 : _a.en) === null || _b === void 0 ? void 0 : _b.replace(',', '').toLowerCase().includes(value.toLowerCase())) ||
+                ((_d = (_c = income === null || income === void 0 ? void 0 : income.range) === null || _c === void 0 ? void 0 : _c.ar) === null || _d === void 0 ? void 0 : _d.replace(',', '').toLowerCase().includes(value.toLowerCase()));
+        });
+        setIncomeList(filteredList);
+    };
     var income = monthlyIncomeControl.field.value;
     var error = (_b = monthlyIncomeControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 0 } }, { children: [_jsx(Input, { label: t('please_enter_actual_income'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_any_source_of_income'), value: (isAr ? income === null || income === void 0 ? void 0 : income.name_ar : income === null || income === void 0 ? void 0 : income.name_en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name_en', list: incomeList, onSelectItem: onSelectItem, renderItem: function (item) {
-                            return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (income === null || income === void 0 ? void 0 : income.id) }, { children: isAr ? item.name_ar : item === null || item === void 0 ? void 0 : item.name_en })) }), item.id === (income === null || income === void 0 ? void 0 : income.id) && _jsx(CheckIconStyled, {})] }));
-                        } }) }))] })) })));
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 0 } }, { children: [_jsx(Input, { label: t('please_enter_actual_income', {
+                        currency: t(findCurrencyByIso2(countryCode.iso2))
+                    }), readOnly: true, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_any_source_of_income'), value: (isAr ? income === null || income === void 0 ? void 0 : income.range.ar : income === null || income === void 0 ? void 0 : income.range.en) || '', warningMessage: error && t(error) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'range.en', list: incomeList, onSelectItem: onSelectItem, renderItem: function (item) {
+                                return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (income === null || income === void 0 ? void 0 : income.id) }, { children: isAr ? item.range.ar : item === null || item === void 0 ? void 0 : item.range.en })) }), item.id === (income === null || income === void 0 ? void 0 : income.id) && _jsx(CheckIconStyled, {})] }));
+                            } })] }))] })) })));
 };
 export default React.memo(MonthlyIncome);

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

@@ -35,6 +35,7 @@ import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import Input from '../../../shared/Input';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import SimpleList from '../../../../components/SimpleList';
+import Search from '../../../../features/shared/Search';
 var Container = styled(Box)(function () { return ({
     display: 'flex'
 }); });
@@ -80,10 +81,17 @@ var Occupation = function (_a) {
         onCloseList();
         occupationControl.field.onChange(occupation);
     };
+    var handleSearch = function (value) {
+        var filteredList = occupationsList === null || occupationsList === void 0 ? void 0 : occupationsList.filter(function (occupation) {
+            return occupation.name.en.toLowerCase().includes(value.toLowerCase()) || occupation.name.ar.toLowerCase().includes(value.toLowerCase());
+        });
+        setOccupationList(filteredList);
+    };
     var occupation = occupationControl.field.value;
     var error = (_c = occupationControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 2.5 } }, { children: [_jsx(Input, { required: true, label: t('occupation_title'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_any_occupation'), value: (isAr ? occupation === null || occupation === void 0 ? void 0 : occupation.name_ar : occupation === null || occupation === void 0 ? void 0 : occupation.name_en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name_en', list: occupationList, onSelectItem: onSelectItem, renderItem: function (item) {
-                            return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id) }, { children: isAr ? item.name_ar : item === null || item === void 0 ? void 0 : item.name_en })) }), item.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id) && _jsx(CheckIconStyled, {})] }));
-                        } }) }))] })) })));
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 2.5 } }, { children: [_jsx(Input, { required: true, label: t('occupation_title'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_any_occupation'), value: (isAr ? occupation === null || occupation === void 0 ? void 0 : occupation.name.ar : occupation === null || occupation === void 0 ? void 0 : occupation.name.en) || '', warningMessage: error && t(error) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'name.en', list: occupationList, onSelectItem: onSelectItem, renderItem: function (item) {
+                                var _a, _b;
+                                return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id) }, { children: isAr ? (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en })) }), item.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id) && _jsx(CheckIconStyled, {})] }));
+                            } })] }))] })) })));
 };
 export default Occupation;