@tap-payments/auth-jsconnect 2.4.0-test → 2.4.1

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

@@ -17,9 +17,9 @@ import { useTranslation } from 'react-i18next';
 import { handleCurrentActiveScreen, settingsSelector } from '../../../../app/settings';
 import Box from '@mui/material/Box';
 import { alpha, styled } from '@mui/material/styles';
-import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage, useFormReadOnly, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage, useFormReadOnly, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
 import { DocumentPurpose, IndividualType } from '../../../../@types';
-import { isSA } from '../../../../utils';
+import { deepCopy, getIndividualType, isKW } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
@@ -52,22 +52,24 @@ 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 _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 isKWCountry = React.useMemo(function () { return isKW(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var methods = useForm({
-        resolver: yupResolver(IndividualInfoValidationSchema(user === null || user === void 0 ? void 0 : user.type)),
+        resolver: yupResolver(IndividualInfoValidationSchema(objects, isKWCountry)),
         defaultValues: {
             occupation: occupation,
             sourceIncome: sourceIncome,
             monthlyIncome: monthlyIncome,
             employerName: employerName,
-            employerLocation: employerLocation,
             isPEP: isPEP,
             isInfluencer: isInfluencer,
             civilID: civilID,
@@ -80,15 +82,16 @@ var AdditionalIndividualInfo = function (_a) {
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.individualData, true);
-    var defaultCivilIdFiles = React.useMemo(function () { return getFileDetailsFromDocument(user === null || user === void 0 ? void 0 : user.documents, DocumentPurpose.IDENTITY_DOCUMENT); }, [user === null || user === void 0 ? void 0 : user.documents]);
-    var defaultSignatureFiles = React.useMemo(function () { return getFileDetailsFromDocument(user === null || user === void 0 ? void 0 : user.documents, DocumentPurpose.CUSTOMER_SIGNATURE); }, [user === null || user === void 0 ? void 0 : user.documents]);
+    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(user === null || user === void 0 ? void 0 : user.data_status, [
+    var noneEditable = useDataNoneEditable(data_status, [
         'occupation',
         'source_of_income',
         'monthly_income',
@@ -97,10 +100,13 @@ var AdditionalIndividualInfo = function (_a) {
     ]);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
-    var _d = React.useState(), listActive = _d[0], setListActive = _d[1];
-    var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
+    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 onSubmit = function (data) {
-        dispatch(updateIndividualInfo(getFelids(data)));
+        dispatch(updateIndividualInfo(deepCopy(getFelids(data))));
     };
     var onBack = function () {
         dispatch(handleCurrentActiveScreen('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP'));
@@ -110,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, { 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: (user === null || user === void 0 ? void 0 : user.is_authorized) && showSignatureFile, readOnly: readOnly['signatureFileId'], defaultFiles: defaultSignatureFiles })] })), _jsx(PEPSwitch, { show: showIsPEP && !listActive, readOnly: readOnly['isPEP'] || noneEditable['is_relative_PEP'] }), _jsx(InfluencerSwitch, { show: showIsInfluencer && !listActive, readOnly: readOnly['isInfluencer'] || noneEditable['is_influencer'] })] }), _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: isKWCountry, 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 && isKWCountry && !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,9 +1,8 @@
-/// <reference types="react" />
 import { FileDetails } from '../../../../@types';
-declare type CivilIDFileProps = {
+type CivilIDFileProps = {
     defaultFiles?: Array<FileDetails>;
     readOnly?: boolean;
     show: boolean;
 };
-declare const CivilIDFile: ({ defaultFiles, readOnly, show }: CivilIDFileProps) => JSX.Element;
+declare const CivilIDFile: ({ defaultFiles, readOnly, show }: CivilIDFileProps) => import("react/jsx-runtime").JSX.Element;
 export default CivilIDFile;

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

@@ -10,16 +10,18 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import { ScreenContainer } from '../../../../features/shared/Containers';
-import { styled } from '@mui/material/styles';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
+import { styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { DocumentPurpose } from '../../../../@types';
 import { FileType } from '../../../../constants';
+import { hasVerifiedValue } from '../../../../utils';
 import Collapse from '../../../../components/Collapse';
 import { civilIDUploadingStatus, clearError, individualSelector } from '../../../app/individual/individualStore';
 import UploadMultipleFile from '../../../shared/UploadMultipleFile';
+import { ScreenContainer } from '../../../shared/Containers';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -27,12 +29,16 @@ var FeatureStyled = styled(ScreenContainer)(function (_a) {
     });
 });
 var CivilIDFile = function (_a) {
+    var _b;
     var defaultFiles = _a.defaultFiles, readOnly = _a.readOnly, show = _a.show;
     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, error = _b.error;
+    var _c = useAppSelector(individualSelector), loading = _c.loading, error = _c.error, data = _c.data;
+    var data_verification = (((_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.user) || {}).data_verification;
+    var uploadedIds = civilIDFileIdControl.field.value;
+    var isDocumentVerified = React.useMemo(function () { var _a; return !!((_a = defaultFiles === null || defaultFiles === void 0 ? void 0 : defaultFiles[0]) === null || _a === void 0 ? void 0 : _a.docId) && hasVerifiedValue(data_verification, "documents.".concat(defaultFiles[0].docId)); }, [data_verification]);
     var handleCivilIDChange = function (ids) {
         if (error)
             dispatch(clearError());
@@ -43,6 +49,6 @@ var CivilIDFile = function (_a) {
             dispatch(clearError());
         civilIDFileIdControl.field.onChange(ids);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadMultipleFile, { readOnly: readOnly, id: 'civilID', control: control, 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, defaultFiles: defaultFiles, purpose: DocumentPurpose.IDENTITY_DOCUMENT, fileUploadingStatus: function (uploading) { return dispatch(civilIDUploadingStatus(uploading)); }, fileType: FileType.IMAGES }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadMultipleFile, { readOnly: readOnly, id: 'civilID', control: control, 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, defaultFiles: defaultFiles, purpose: DocumentPurpose.IDENTITY_DOCUMENT, fileUploadingStatus: function (uploading) { return dispatch(civilIDUploadingStatus(uploading)); }, fileType: FileType.IMAGES, isVerified: !(uploadedIds === null || uploadedIds === void 0 ? void 0 : uploadedIds.length) && isDocumentVerified }) }) })));
 };
 export default CivilIDFile;

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

@@ -2,6 +2,7 @@ import * as React from 'react';
 export interface InfluencerSwitchProps {
     show: boolean;
     readOnly?: boolean;
+    isVerified?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, readOnly }: InfluencerSwitchProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, readOnly, isVerified }: InfluencerSwitchProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

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

@@ -13,18 +13,19 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useFormContext, useController } from 'react-hook-form';
-import { ScreenContainer } from '../../../shared/Containers';
-import Collapse from '../../../../components/Collapse';
+import Box from '@mui/material/Box';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { styled, alpha } from '@mui/material/styles';
-import Mandatory from '../../../shared/Mandatory';
+import Collapse from '../../../../components/Collapse';
+import Tooltip from '../../../../components/Tooltip';
 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';
+import { styled, alpha } from '@mui/material/styles';
+import Mandatory from '../../../shared/Mandatory';
+import CheckIcon from '../../../shared/CheckIcon';
+import { ScreenContainer } from '../../../shared/Containers';
 import { individualSelector, clearError } from '../../../app/individual/individualStore';
+import { InfoIconStyled, InfoOutlinedIconStyled } from './PEPSwitch';
 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) }));
@@ -35,15 +36,17 @@ var RadioGroupStyled = styled(RadioGroup)(function (_a) {
         marginInlineStart: theme.spacing(0.25)
     });
 });
+var RadioLabelStyled = styled('span')(function () { return ({
+    display: 'flex'
+}); });
 var InfluencerSwitch = function (_a) {
-    var show = _a.show, readOnly = _a.readOnly;
+    var show = _a.show, readOnly = _a.readOnly, isVerified = _a.isVerified;
     var _b = React.useState(false), isHovered = _b[0], setIsHovered = _b[1];
     var control = useFormContext().control;
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
     var influencerControl = useController({ name: 'isInfluencer', control: control });
     var error = useAppSelector(individualSelector).error;
-    var disabled = false;
     var handleOnChange = function (_a) {
         var target = _a.target;
         if (error)
@@ -51,6 +54,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(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({ readOnly: readOnly, value: influencerValue != null ? (influencerValue ? 'yes' : 'no') : false, onChange: disabled || readOnly ? undefined : 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({ readOnly: readOnly, value: influencerValue != null ? (influencerValue ? 'yes' : 'no') : false, onChange: readOnly ? undefined : handleOnChange }, { children: [_jsx(RadioLabel, { value: 'yes', label: _jsxs(RadioLabelStyled, { children: [t('yes'), influencerValue && isVerified && _jsx(CheckIcon, { sx: { marginInlineStart: '5px' }, isVerified: isVerified })] }) }), _jsx(RadioLabel, { value: 'no', label: _jsxs(RadioLabelStyled, { children: [t('no'), influencerValue === false && isVerified && _jsx(CheckIcon, { sx: { marginInlineStart: '5px' }, isVerified: isVerified })] }) })] }))] })) })));
 };
 export default React.memo(InfluencerSwitch);

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

@@ -7,5 +7,5 @@ interface MonthlyIncomeProps {
     onListClose?: () => void;
     readOnly?: boolean;
 }
-declare const _default: React.MemoExoticComponent<(props: MonthlyIncomeProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<(props: MonthlyIncomeProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

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

@@ -9,46 +9,30 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import { ScreenContainer } from '../../../shared/Containers';
-import Input from '../../../shared/Input';
-import CheckIcon from '../../../shared/CheckIcon';
-import Collapse from '../../../../components/Collapse';
+import { settingsSelector } from '../../../../app/settings';
+import { hasVerifiedValue } from '../../../../utils';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
-import { individualSelector, clearError } from '../../../app/individual/individualStore';
+import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
-import ExpandIcon from '../../../../components/ExpandIcon';
 import SimpleList from '../../../../components/SimpleList';
-import { findCurrencyByIso2 } from '../../../../utils';
-import { settingsSelector } from '../../../../app/settings';
+import { individualSelector, clearError } from '../../../app/individual/individualStore';
+import InputSelect from '../../../shared/InputSelect';
+import CheckIcon from '../../../shared/CheckIcon';
+import { ScreenContainer } from '../../../shared/Containers';
+import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
 var Container = styled(Box)(function () { return ({
     display: 'flex'
 }); });
-var InputStyled = styled(Input)(function (_a) {
-    var readOnly = _a.readOnly;
-    return ({
-        '& .MuiInputBase-input': {
-            cursor: readOnly ? 'default' : 'pointer'
-        }
-    });
-});
 var IncomeText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
     var theme = _a.theme, isSelected = _a.isSelected;
     return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25) }));
 });
-var CheckIconStyled = styled(CheckIcon)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        color: theme.palette.success.main,
-        display: 'flex',
-        alignItems: 'flex-end'
-    });
-});
 var MonthlyIncome = function (props) {
     var _a;
     var _b = React.useState([]), incomeList = _b[0], setIncomeList = _b[1];
@@ -62,7 +46,12 @@ var MonthlyIncome = function (props) {
     var monthlyIncomeList = (data.individualData.responseBody || {}).monthlyIncomeList;
     var monthlyIncomeControl = useController({ control: control, name: 'monthlyIncome' });
     var countryCode = settingsData.businessCountry;
-    var disabled = false;
+    var user = (data.verify.responseBody || {}).user;
+    var isMonthlyIncomeVerified = function (item) {
+        if (!(item === null || item === void 0 ? void 0 : item.id))
+            return false;
+        return hasVerifiedValue(user === null || user === void 0 ? void 0 : user.data_verification, "monthly_income.".concat(item.id));
+    };
     React.useEffect(function () {
         if ((monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.length) > 0) {
             setIncomeList(monthlyIncomeList);
@@ -91,10 +80,10 @@ var MonthlyIncome = function (props) {
     };
     var income = monthlyIncomeControl.field.value;
     var error = (_a = monthlyIncomeControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
-    return (_jsx(Collapse, __assign({ in: props.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 0 } }, { children: [_jsx(InputStyled, { label: t('please_enter_actual_income', {
-                        currency: t(findCurrencyByIso2(countryCode.iso2))
-                    }), disabled: disabled, readOnly: props.readOnly, onClick: disabled ? undefined : !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: disabled ? _jsx(_Fragment, {}) : _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) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'range.en', searchValuePath: ['range.en', 'range.ar'], 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, {})] }));
+    return (_jsx(Collapse, __assign({ in: props.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 0 } }, { children: [_jsx(InputSelect, { label: t('please_enter_actual_income', {
+                        currency: t(data.currency)
+                    }), required: true, readOnly: props.readOnly, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, 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), endAdornment: _jsx(EndAdornmentExpanded, { isVerified: isMonthlyIncomeVerified(income), anchorEl: anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'range.en', searchValuePath: ['range.en', 'range.ar'], 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(CheckIcon, { isVerified: isMonthlyIncomeVerified(item) })] }));
                         } }) }))] })) })));
 };
 export default React.memo(MonthlyIncome);

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

@@ -1,11 +1,9 @@
-/// <reference types="react" />
-import { Occupation as OccupationType } from '../../../../@types';
 interface OccupationProps {
     show: boolean;
-    onSelectOccupation?: (occupation: OccupationType) => void;
     onListOpen?: () => void;
     onListClose?: () => void;
     readOnly?: boolean;
+    isVerified?: boolean;
 }
-declare const Occupation: (props: OccupationProps) => JSX.Element;
+declare const Occupation: (props: OccupationProps) => import("react/jsx-runtime").JSX.Element;
 export default Occupation;

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

@@ -9,84 +9,123 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
+import { useController, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import { useTranslation } from 'react-i18next';
-import { useController, useFormContext } from 'react-hook-form';
-import { useAppSelector, useLanguage, useAppDispatch } from '../../../../hooks';
-import { individualSelector, clearError } from '../../../app/individual/individualStore';
+import { useLanguage, useAppSelector, useAppDispatch } from '../../../../hooks';
+import { isExist } from '../../../../utils';
+import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
 import Collapse from '../../../../components/Collapse';
-import CheckIcon from '@mui/icons-material/Check';
-import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import Input from '../../../shared/Input';
 import ExpandIcon from '../../../../components/ExpandIcon';
-import SimpleList from '../../../../components/SimpleList';
-var Container = styled(Box)(function () { return ({
-    display: 'flex'
-}); });
-var InputStyled = styled(Input)(function (_a) {
-    var readOnly = _a.readOnly;
-    return ({
-        '& .MuiInputBase-input': {
-            cursor: readOnly ? 'default' : 'pointer'
-        }
-    });
-});
-var IncomeText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
+import { ScreenContainer } from '../../../shared/Containers';
+import Search from '../../../shared/Search';
+import { individualSelector, clearError } from '../../../app/individual/individualStore';
+import InputSelect from '../../../shared/InputSelect';
+import CheckIcon from '../../../shared/CheckIcon';
+var NameContainer = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
     var theme = _a.theme, isSelected = _a.isSelected;
     return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25) }));
 });
-var CheckIconStyled = styled(CheckIcon)(function (_a) {
+var ListItem = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
-        color: theme.palette.success.main,
         display: 'flex',
-        alignItems: 'flex-end'
+        justifyContent: 'space-between',
+        width: '100%',
+        paddingInlineStart: theme.spacing(2.5),
+        paddingInlineEnd: theme.spacing(2.5),
+        paddingTop: theme.spacing(1.5),
+        paddingBottom: theme.spacing(1.5)
     });
 });
+var ListItemContainer = styled(Box)(function () { return ({
+    display: 'flex',
+    flexDirection: 'column',
+    width: '100%'
+}); });
+var SimpleListStyled = styled((SimpleList))(function () { return ({
+    height: 'fit-content'
+}); });
 var Occupation = function (props) {
     var _a, _b;
-    var _c = React.useState([]), occupationList = _c[0], setOccupationList = _c[1];
+    var _c = React.useState([]), occupation = _c[0], setOccupation = _c[1];
     var _d = React.useState(null), anchorEl = _d[0], setAnchorEl = _d[1];
+    var _e = React.useState(''), subIndex = _e[0], setSubIndex = _e[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _e = useAppSelector(individualSelector), data = _e.data, bckError = _e.error;
+    var _f = useAppSelector(individualSelector), data = _f.data, bckError = _f.error;
     var control = useFormContext().control;
-    var occupationsList = ((_a = data.individualData.responseBody) === null || _a === void 0 ? void 0 : _a.occupationList) || [];
-    var occupationControl = useController({ control: control, name: 'occupation' });
-    var disabled = false;
-    React.useEffect(function () {
-        if ((occupationsList === null || occupationsList === void 0 ? void 0 : occupationsList.length) > 0) {
-            setOccupationList(occupationsList);
-        }
-    }, [occupationsList === null || occupationsList === void 0 ? void 0 : occupationsList.occupation]);
-    var onOpenList = function (event) {
+    var occupationControl = useController({ name: 'occupation', control: control });
+    var occupationList = (data.individualData.responseBody || {}).occupationList;
+    var occupationValue = occupationControl.field.value;
+    var handleCloseMainMenu = function () {
+        var _a;
+        setAnchorEl(null);
+        handleSearch('');
+        (_a = props.onListClose) === null || _a === void 0 ? void 0 : _a.call(props);
+    };
+    var handleOpenMainMenu = function (event) {
         var _a;
-        if (props.readOnly)
-            return;
         setAnchorEl(event.currentTarget);
         (_a = props.onListOpen) === null || _a === void 0 ? void 0 : _a.call(props);
     };
-    var onCloseList = function () {
-        var _a;
-        setAnchorEl(null);
-        (_a = props.onListClose) === null || _a === void 0 ? void 0 : _a.call(props);
+    var handleOpenSubMenu = function (index) {
+        if (subIndex === index)
+            setSubIndex('');
+        else
+            setSubIndex(index);
     };
+    var handleCloseSubMenu = function () {
+        setSubIndex('');
+        handleCloseMainMenu();
+    };
+    React.useEffect(function () {
+        if ((occupationList === null || occupationList === void 0 ? void 0 : occupationList.length) > 0) {
+            setOccupation(occupationList);
+        }
+    }, [occupationList]);
     var onSelectItem = function (occupation) {
         if (bckError)
             dispatch(clearError());
-        onCloseList();
+        handleCloseSubMenu();
         occupationControl.field.onChange(occupation);
     };
-    var occupation = occupationControl.field.value;
-    var error = (_b = occupationControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: props.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 2.5 } }, { children: [_jsx(InputStyled, { required: true, disabled: disabled, label: t('occupation_title'), readOnly: props.readOnly, onClick: disabled ? undefined : !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: disabled ? _jsx(_Fragment, {}) : _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', searchValuePath: ['name.en', 'name.ar'], 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, {})] }));
-                        } }) }))] })) })));
+    var handleSearch = function (value) {
+        var filteredList = occupationList === null || occupationList === void 0 ? void 0 : occupationList.filter(function (chapter) {
+            var _a, _b, _c;
+            return chapter.name.en.toLowerCase().includes(value.toLowerCase()) ||
+                chapter.name.en.toLowerCase().replace(',', '').includes(value.toLowerCase()) ||
+                chapter.name.ar.toLowerCase().includes(value.toLowerCase()) ||
+                ((_a = chapter.sub) === null || _a === void 0 ? void 0 : _a.find(function (obj) { return obj.name.en.toLowerCase().includes(value.toLowerCase()); })) ||
+                ((_b = chapter.sub) === null || _b === void 0 ? void 0 : _b.find(function (obj) { return obj.name.en.toLowerCase().replace(',', '').includes(value.toLowerCase()); })) ||
+                ((_c = chapter.sub) === null || _c === void 0 ? void 0 : _c.find(function (obj) { return obj.name.ar.toLowerCase().includes(value.toLowerCase()); }));
+        });
+        setOccupation(filteredList);
+    };
+    React.useEffect(function () {
+        var item = isExist(occupationList || [], occupationValue === null || occupationValue === void 0 ? void 0 : occupationValue.code);
+        if (item)
+            setSubIndex(item.code);
+    }, [anchorEl, occupationValue]);
+    return (_jsx(Collapse, __assign({ in: props.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 2.5 } }, { children: [_jsx(InputSelect, { required: true, label: t('occupation_title'), value: (isAr ? (_a = occupationValue === null || occupationValue === void 0 ? void 0 : occupationValue.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = occupationValue === null || occupationValue === void 0 ? void 0 : occupationValue.name) === null || _b === void 0 ? void 0 : _b.en) || '', readOnly: props.readOnly, onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_any_occupation'), endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: occupation, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
+                                var _a;
+                                var isSubEmpty = !item.sub || !((_a = item.sub) === null || _a === void 0 ? void 0 : _a.length);
+                                if (isSubEmpty)
+                                    onSelectItem(item);
+                                else
+                                    handleOpenSubMenu(item.code);
+                            }, renderItem: function (item) {
+                                var _a;
+                                var isSubEmpty = !item.sub || !((_a = item.sub) === null || _a === void 0 ? void 0 : _a.length);
+                                var showCheck = item.code === (occupationValue === null || occupationValue === void 0 ? void 0 : occupationValue.section_code) && isSubEmpty;
+                                return (_jsxs(ListItemContainer, { children: [_jsxs(ListItem, __assign({ sx: __assign({ bgcolor: 'rgb(196 184 184 / 8%)', borderBottom: '1px solid rgba(227, 232, 238, 0.8)' }, (isSubEmpty && { bgcolor: 'inherit', borderBottom: 'none' })) }, { children: [_jsx(NameContainer, __assign({ isSelected: item.code === (occupationValue === null || occupationValue === void 0 ? void 0 : occupationValue.section_code), sx: __assign({}, (isSubEmpty && { paddingInlineStart: '5px' })) }, { children: isAr ? item.name.ar : item.name.en })), showCheck ? _jsx(CheckIcon, {}) : !isSubEmpty && _jsx(ExpandIcon, { anchorEl: subIndex === item.code })] })), _jsx(Collapse, __assign({ in: item.code === subIndex && !isSubEmpty }, { children: _jsx(SimpleListStyled, { sx: { pt: 0, pb: 0 }, list: (!isSubEmpty && item.sub) || [], onSelectItem: onSelectItem, listItemProps: { sx: { padding: 0, '&:last-child': { paddingBottom: 0 } } }, renderItem: function (item, idx) {
+                                                    return (_jsxs(ListItem, __assign({ sx: { mt: idx === 0 ? 1 : 0 } }, { children: [_jsx(NameContainer, __assign({ isSelected: item.code === (occupationValue === null || occupationValue === void 0 ? void 0 : occupationValue.code) }, { children: isAr ? item.name.ar : item.name.en })), item.code === (occupationValue === null || occupationValue === void 0 ? void 0 : occupationValue.code) && _jsx(CheckIcon, {})] })));
+                                                } }) }))] }));
+                            } })] }))] })) })));
 };
 export default Occupation;