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

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

@@ -16,7 +16,7 @@ import { styled } from '@mui/material/styles';
 import { FlowsButtons } from '../../../shared/Button';
 import { ICONS_NAMES, PASSWORD_OPERATION_TYPE } from '../../../../constants';
 import { useAppSelector, useLanguage } from '../../../../hooks';
-import { getResetFlowUrl, showLastFour } from '../../../../utils';
+import { getResetFlowUrl, shortenBankName, showLastFour } from '../../../../utils';
 import { entitySelector } from '../../../app/entity/entityStore';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
@@ -44,23 +44,24 @@ var ButtonGroupStyled = styled(Box)(function (_a) {
     });
 });
 var SuccessWithFlowButtons = function () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var data = useAppSelector(entitySelector).data;
-    var _d = data.verify.responseBody || {}, flows = _d.flows, nameObj = _d.name, entity = _d.entity, brand = _d.brand, bank = _d.bank, merchant = _d.merchant, identification_id = _d.identification_id, vatID = _d.vatID;
-    var _e = useState([]), buttons = _e[0], setButtons = _e[1];
+    var _e = data.verify.responseBody || {}, flows = _e.flows, nameObj = _e.name, entity = _e.entity, brand = _e.brand, bank = _e.bank, merchant = _e.merchant, vatID = _e.vatID, user = _e.user;
+    var _f = useState([]), buttons = _f[0], setButtons = _f[1];
     var username = ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.first) || '') + ' ' + ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.last) || '');
     var licenseNumber = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.number) || '';
-    var bankName = (bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
+    var bankName = shortenBankName(bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
     var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
     var taxID = vatID || '';
     var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';
     var isAcceptance = merchant === null || merchant === void 0 ? void 0 : merchant.is_acceptance_allowed;
     var isPayout = merchant === null || merchant === void 0 ? void 0 : merchant.is_payout_allowed;
-    var maskedId = !!identification_id ? " ".concat(t('masking_symbols')).concat(identification_id) : '';
+    var identification = (user || {}).identification;
+    var maskedId = (identification === null || identification === void 0 ? void 0 : identification.id) ? " ".concat(t('masking_symbols')).concat((_d = identification === null || identification === void 0 ? void 0 : identification.id) === null || _d === void 0 ? void 0 : _d.slice(-2)) : '';
     var settings = useAppSelector(settingsSelector);
-    var _f = data.verify.responseBody || { contact: {}, board_id: '' }, contact = _f.contact, board_id = _f.board_id, board_info_id = _f.board_info_id;
+    var _g = data.verify.responseBody || { contact: {}, board_id: '' }, contact = _g.contact, board_id = _g.board_id, board_info_id = _g.board_info_id;
     var email = (contact || { email: '' }).email;
     var url = getResetFlowUrl('/password', settings.data.language, PASSWORD_OPERATION_TYPE.RESET_PASSWORD, board_id, board_info_id);
     var reMapFlowData = function (flows) {
@@ -74,10 +75,10 @@ var SuccessWithFlowButtons = function () {
             var title = t("".concat(name, "_flow_").concat(type), {
                 individual_name: username.toLowerCase() + maskedId,
                 business_type: brandName,
-                license_number: t('masking_symbols') + showLastFour(licenseNumber),
+                license_number: licenseNumber ? t('masking_symbols') + showLastFour(licenseNumber) : '',
                 bank_name: bankName,
-                iban: t('masking_symbols') + iban,
-                tax_id: t('masking_symbols') + showLastFour(taxID)
+                iban: iban ? t('masking_symbols') + iban : '',
+                tax_id: taxID ? t('masking_symbols') + showLastFour(taxID) : ''
             });
             var isCompleted = status === 'completed' && name !== 'password';
             var isIndividual = name === 'individual';

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

@@ -9,9 +9,20 @@ 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 } from '../../../../hooks';
+import { useAppDispatch, useSetFromDefaultValues } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
@@ -47,18 +58,20 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var VerifyNumber = function (_a) {
-    var _b, _c, _d;
+    var _b, _c;
     var dispatch = useAppDispatch();
-    var _e = useAppSelector(entitySelector), data = _e.data, loading = _e.loading, error = _e.error;
+    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 methods = useForm({
         resolver: yupResolver(OTPValidation),
-        defaultValues: data.otpData,
+        defaultValues: defaultValues,
         mode: 'onChange'
     });
+    useSetFromDefaultValues(methods, defaultValues);
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
-    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
+    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)
             dispatch(clearError());

package/build/features/featuresScreens.d.ts

@@ -7,5 +7,4 @@ export declare const bankFeatureScreens: Array<FeatureScreenStep>;
 export declare const taxFeatureScreens: Array<FeatureScreenStep>;
 export declare const signInFeatureScreens: Array<FeatureScreenStep>;
 export declare const entityFeatureScreens: Array<FeatureScreenStep>;
-export declare const otpFeatureScreens: Array<FeatureScreenStep>;
 export declare const authFeatureScreens: Array<FeatureScreenStep>;

package/build/features/featuresScreens.js

@@ -1,5 +1,7 @@
 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';
@@ -13,6 +15,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';
@@ -40,16 +44,21 @@ 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 EntityCustomersPage from './entity/screens/Customers';
 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 AuthNIDPage from './auth/screens/NID';
 import AuthVerifyPage from './auth/screens/OTP';
 export var connectFeatureScreens = [
     {
         name: 'CONNECT_NID_STEP',
         element: NIDScreen
     },
+    {
+        name: 'CONNECT_CIVIL_ID_STEP',
+        element: ConnectCivilIDScreen
+    },
     {
         name: 'CONNECT_MOBILE_STEP',
         element: MobileScreen
@@ -58,6 +67,10 @@ export var connectFeatureScreens = [
         name: 'CONNECT_OTP_STEP',
         element: ConnectOTPScreen
     },
+    {
+        name: 'CONNECT_VERIFY_PACI_STEP',
+        element: ConnectVerifyPACIScreen
+    },
     {
         name: 'CONNECT_INDIVIDUAL_STEP',
         element: IndividualScreen
@@ -80,6 +93,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
@@ -207,6 +228,10 @@ export var entityFeatureScreens = [
         name: 'ENTITY_INFO_STEP',
         element: EntityInfoConfirmPage
     },
+    {
+        name: 'ENTITY_CUSTOMERS_STEP',
+        element: EntityCustomersPage
+    },
     {
         name: 'ENTITY_DETAILS_SUCCESS_STEP',
         element: EntitySuccessPage
@@ -217,13 +242,11 @@ export var entityFeatureScreens = [
     },
     { name: 'ENTITY_RESET_PASSWORD_SUCCESS', element: EntityResetPasswordSuccessPage }
 ];
-export var otpFeatureScreens = [
-    {
-        name: 'OTP_VERIFY_STEP',
-        element: OtpVerifyPage
-    }
-];
 export var authFeatureScreens = [
+    {
+        name: 'AUTH_NID_STEP',
+        element: AuthNIDPage
+    },
     {
         name: 'AUTH_VERIFY_STEP',
         element: AuthVerifyPage

package/build/features/individual/Individual.js

@@ -28,7 +28,7 @@ var Individual = memo(function (props) {
     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;
+    var _b = useAppSelector(individualSelector), customLoading = _b.customLoading, individualError = _b.error, loading = _b.loading;
     useAppConfig(__assign({ navigation: INDIVIDUAL_SCREENS_NAVIGATION }, props));
     useErrorListener(individualError || error);
     useStepStartedListener();
@@ -43,10 +43,10 @@ var Individual = memo(function (props) {
         dispatch(verifyLeadToken(token));
     };
     useEffect(function () {
-        if (!settingLoading)
+        if (!settingLoading && open)
             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) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', 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 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));
@@ -65,6 +65,6 @@ export function unmountIndividualLib(elementId, unmountTimeout) {
         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();
+        elementId && reactElement(elementId).unmount();
     }, unmountTimeout);
 }

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

@@ -9,13 +9,24 @@ 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 { 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';
@@ -45,40 +56,22 @@ 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 _c = data.individualData, responseBody = _c.responseBody, defaultValues = __rest(_c, ["responseBody"]);
     var methods = useForm({
         resolver: yupResolver(IndividualInfoValidationSchema),
-        defaultValues: data.individualData,
+        defaultValues: defaultValues,
         mode: 'onChange'
     });
+    useSetFromDefaultValues(methods, defaultValues);
     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));
     };
@@ -95,7 +88,7 @@ var AdditionalIndividualInfo = function (_a) {
     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') })) }))] })) })) }));
+                                    !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, disableBack: true, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(AdditionalIndividualInfo);
 AdditionalIndividualInfo.defaultProps = {};

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

@@ -35,6 +35,7 @@ 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';
 var Container = styled(Box)(function () { return ({
     display: 'flex'
 }); });
@@ -75,15 +76,26 @@ 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'), 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) {
+                                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, {})] }));
+                            } })] }))] })) })));
 };
 export default Occupation;

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

@@ -82,8 +82,8 @@ var SourceOfIncome = function (_a) {
     };
     var source = sourceIncomeControl.field.value;
     var error = (_c = sourceIncomeControl.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('tap_js_source_of_income'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_any_source_of_income'), value: (isAr ? source === null || source === void 0 ? void 0 : source.name_ar : source === null || source === void 0 ? void 0 : source.name_en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name_en', list: sourceList, onSelectItem: onSelectItem, renderItem: function (item) {
-                            return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (source === null || source === void 0 ? void 0 : source.id) }, { children: isAr ? item.name_ar : item === null || item === void 0 ? void 0 : item.name_en })) }), item.id === (source === null || source === void 0 ? void 0 : source.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('tap_js_source_of_income'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_any_source_of_income'), value: (isAr ? source === null || source === void 0 ? void 0 : source.name.ar : source === null || source === void 0 ? void 0 : source.name.en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', list: sourceList, onSelectItem: onSelectItem, renderItem: function (item) {
+                            return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (source === null || source === void 0 ? void 0 : source.id) }, { children: isAr ? item.name.ar : item === null || item === void 0 ? void 0 : item.name.en })) }), item.id === (source === null || source === void 0 ? void 0 : source.id) && _jsx(CheckIconStyled, {})] }));
                         } }) }))] })) })));
 };
 export default React.memo(SourceOfIncome);

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

@@ -7,10 +7,14 @@ import SuccessScreen from '../../../shared/SuccessScreen';
 var Success = function (_a) {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var _b = useAppSelector(individualSelector), loading = _b.loading, error = _b.error;
-    var onSuccess = function () {
+    var _b = useAppSelector(individualSelector), error = _b.error, loading = _b.loading;
+    var _c = React.useState(false), clicked = _c[0], setClicked = _c[1];
+    React.useEffect(function () {
         dispatch(updateBoardSuccess());
+    }, []);
+    var onSuccess = function () {
+        setClicked(true);
     };
-    return (_jsx(SuccessScreen, { title: t('individual_success_title'), onSuccess: onSuccess, successTitle: t('continue'), loading: loading, error: error || '' }));
+    return (_jsx(SuccessScreen, { title: t('individual_success_title'), onSuccess: onSuccess, successTitle: t('continue'), loading: clicked && loading, error: error || '' }));
 };
 export default React.memo(Success);

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

@@ -16,7 +16,7 @@ import { styled } from '@mui/material/styles';
 import { FlowsButtons } from '../../../shared/Button';
 import { ICONS_NAMES, PASSWORD_OPERATION_TYPE } from '../../../../constants';
 import { useAppSelector, useLanguage } from '../../../../hooks';
-import { getResetFlowUrl, showLastFour } from '../../../../utils';
+import { concatenateObjectValues, getResetFlowUrl, shortenBankName, showLastFour } from '../../../../utils';
 import { individualSelector } from '../../../app/individual/individualStore';
 import Box from '@mui/material/Box';
 import Text from '../../../../components/Text';
@@ -44,23 +44,27 @@ var ButtonGroupStyled = styled(Box)(function (_a) {
     });
 });
 var SuccessWithFlowButtons = function () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var data = useAppSelector(individualSelector).data;
-    var _d = data.verify.responseBody || {}, flows = _d.flows, nameObj = _d.name, entity = _d.entity, brand = _d.brand, bank = _d.bank_account, merchant = _d.merchant, identification_id = _d.identification_id;
-    var _e = useState([]), buttons = _e[0], setButtons = _e[1];
-    var username = ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.first) || '') + ' ' + ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.last) || '');
+    var _e = data.verify.responseBody || {}, flows = _e.flows, nameObj = _e.name, entity = _e.entity, brand = _e.brand, bank = _e.bank_account, merchant = _e.merchant, user = _e.user;
+    var _f = useState([]), buttons = _f[0], setButtons = _f[1];
+    var _g = nameObj || {}, en = _g.en, ar = _g.ar;
+    var username = isAr
+        ? concatenateObjectValues(ar || en, ['first', 'last'])
+        : concatenateObjectValues(en, ['first', 'last']);
     var licenseNumber = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.number) || '';
-    var bankName = (bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
+    var bankName = shortenBankName(bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
     var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
-    var taxID = (entity === null || entity === void 0 ? void 0 : entity.tax_number) || '';
+    var taxID = (entity === null || entity === void 0 ? void 0 : entity.vat_id) || '';
     var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';
     var isAcceptance = merchant === null || merchant === void 0 ? void 0 : merchant.is_acceptance_allowed;
     var isPayout = merchant === null || merchant === void 0 ? void 0 : merchant.is_payout_allowed;
-    var maskedId = !!identification_id ? " ".concat(t('masking_symbols')).concat(identification_id) : '';
+    var identification = (user || {}).identification;
+    var maskedId = (identification === null || identification === void 0 ? void 0 : identification.id) ? " ".concat(t('masking_symbols')).concat((_d = identification === null || identification === void 0 ? void 0 : identification.id) === null || _d === void 0 ? void 0 : _d.slice(-2)) : '';
     var settings = useAppSelector(settingsSelector);
-    var _f = data.verify.responseBody || { contact: {}, board_id: '' }, contact = _f.contact, board_id = _f.board_id, board_info_id = _f.board_info_id;
+    var _h = data.verify.responseBody || { contact: {}, board_id: '' }, contact = _h.contact, board_id = _h.board_id, board_info_id = _h.board_info_id;
     var email = (contact || { email: '' }).email;
     var url = getResetFlowUrl('/password', settings.data.language, PASSWORD_OPERATION_TYPE.RESET_PASSWORD, board_id, board_info_id);
     var reMapFlowData = function (flows) {
@@ -74,10 +78,10 @@ var SuccessWithFlowButtons = function () {
             var title = t("".concat(name, "_flow_").concat(type), {
                 individual_name: username.toLowerCase() + maskedId,
                 business_type: brandName,
-                license_number: t('masking_symbols') + showLastFour(licenseNumber),
+                license_number: licenseNumber ? t('masking_symbols') + showLastFour(licenseNumber) : '',
                 bank_name: bankName,
-                iban: t('masking_symbols') + iban,
-                tax_id: t('masking_symbols') + showLastFour(taxID)
+                iban: iban ? t('masking_symbols') + iban : '',
+                tax_id: taxID ? t('masking_symbols') + showLastFour(taxID) : ''
             });
             var isCompleted = status === 'completed' && name !== 'password';
             var isIndividual = name === 'individual';

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

@@ -9,9 +9,20 @@ 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 } from '../../../../hooks';
+import { useAppDispatch, useSetFromDefaultValues } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
@@ -47,18 +58,20 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var VerifyNumber = function (_a) {
-    var _b, _c, _d;
+    var _b, _c;
     var dispatch = useAppDispatch();
-    var _e = useAppSelector(individualSelector), data = _e.data, loading = _e.loading, error = _e.error;
+    var _d = useAppSelector(individualSelector), data = _d.data, loading = _d.loading, error = _d.error;
+    var _e = data.otpData, responseBody = _e.responseBody, defaultValues = __rest(_e, ["responseBody"]);
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
-        defaultValues: data.otpData,
+        defaultValues: defaultValues,
         mode: 'onChange'
     });
+    useSetFromDefaultValues(methods, defaultValues);
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
-    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
+    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)
             dispatch(clearError());

package/build/features/password/Password.js

@@ -28,7 +28,7 @@ var Password = memo(function (props) {
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
     var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
-    var _b = useAppSelector(passwordSelector), customLoading = _b.customLoading, passwordError = _b.error;
+    var _b = useAppSelector(passwordSelector), customLoading = _b.customLoading, passwordError = _b.error, loading = _b.loading;
     useAppConfig(__assign({ navigation: PASSWORD_SCREENS_NAVIGATION }, props));
     useErrorListener(passwordError || error);
     useStepStartedListener();
@@ -50,10 +50,10 @@ var Password = memo(function (props) {
         dispatch(verifyLeadToken(token));
     };
     useEffect(function () {
-        if (!settingLoading)
+        if (!settingLoading && open)
             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: passwordFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: passwordFeatureScreens.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));
@@ -72,6 +72,6 @@ export function unmountPasswordLib(elementId, unmountTimeout) {
         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();
+        elementId && reactElement(elementId).unmount();
     }, unmountTimeout);
 }

package/build/features/password/screens/CreatePassword/CreatePassword.js

@@ -9,6 +9,17 @@ 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 { useForm, FormProvider } from 'react-hook-form';
@@ -16,7 +27,7 @@ import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useSetFromDefaultValues } from '../../../../hooks';
 import { handleCurrentActiveScreen, handleNextScreenStep } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import { useLanguage } from '../../../../hooks';
@@ -39,11 +50,13 @@ var CreatePassword = function (_a) {
     var dispatch = useAppDispatch();
     var _b = useSelector(passwordSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var operationType = data.verify.operationType;
+    var _c = data.passwordData, responseBody = _c.responseBody, defaultValues = __rest(_c, ["responseBody"]);
     var methods = useForm({
         resolver: yupResolver(PasswordValidation),
-        defaultValues: data.passwordData,
+        defaultValues: defaultValues,
         mode: 'onChange'
     });
+    useSetFromDefaultValues(methods, defaultValues);
     var onSubmit = function (data) {
         if (operationType === PASSWORD_OPERATION_TYPE.RESET_PASSWORD) {
             dispatch(storePasswordScreen(data));
@@ -55,6 +68,6 @@ var CreatePassword = function (_a) {
     var onBack = function () {
         dispatch(handleCurrentActiveScreen('PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
     };
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(Password, {}) }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(Password, {}) }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(CreatePassword);