@tap-payments/auth-jsconnect 2.8.57-development → 2.8.59-beta

package/build/features/featuresScreens.js

@@ -22,13 +22,11 @@ import ConnectExpressIdentityVerifyOTPScreen from './connectExpress/screens/Iden
 import ConnectExpressCollectIndividualScreen from './connectExpress/screens/CollectIndividualInfo';
 import ConnectExpressCollectBusinessScreen from './connectExpress/screens/CollectBusinessInfo';
 import ConnectExpressCreateAccountLoaderScreen from './connectExpress/screens/CreateAccountLoader';
-import ConnectExpressPreparingDataLoaderScreen from './connectExpress/screens/PrepareDataLoading';
 import ConnectExpressSuccessFlowButtonsScreen from './connectExpress/screens/SuccessWithFlowButtons';
 import ConnectExpressAccountAlreadyCreatedScreen from './connectExpress/screens/AccountAlreadyCreated';
 import ConnectExpressAuthenticationListScreen from './connectExpress/screens/AuthenticationList';
 import ConnectExpressAuthMerchantScreen from './connectExpress/screens/AuthMerchant';
 import ConnectExpressAuthAccountCreatedLoaderScreen from './connectExpress/screens/AccountCreatedLoader';
-import ConnectExpressOperatorError from './connectExpress/screens/OperatorError';
 import AuthBusinessCountry from './auth/screens/BusinessCountry/BusinessCountry';
 import AuthSwitchScreen from './auth/screens/AuthSwitch';
 import AuthMobileScreen from './auth/screens/Mobile';
@@ -59,15 +57,12 @@ import ResetPasswordSuccessPage from './business/screens/ResetPasswordSuccess';
 import BusCivilIDscreen from './business/screens/CivilID';
 import BusVerifyPACIScreen from './business/screens/VerifyPACI';
 import BrandVerifyScreen from './business/screens/BrandDetails';
-import BusinessOperatorError from './business/screens/OperatorError';
 import PasswordVerifyPage from './password/screens/Verify';
 import CreatePasswordPage from './password/screens/CreatePassword';
-import PasswordDataLoadingPage from './password/screens/PrepareDataLoading';
 import PasswordOTPPage from './password/screens/OTP';
 import SuccessPasswordPage from './password/screens/Success';
 import PasswordSuccessWithFlowPage from './password/screens/SuccessWithFlowButtons';
 import PasswordResetPasswordSuccessPage from './password/screens/ResetPasswordSuccess';
-import PasswordOperatorError from './password/screens/OperatorError';
 import IndividualVerifyPage from './individual/screens/Verify';
 import IndividualPhoneInfoPage from './individual/screens/IndividualPhoneInfo';
 import IndividualListPage from './individual/screens/IndividualList';
@@ -77,26 +72,22 @@ import SuccessOwnerPage from './individual/screens/Success';
 import IndividualSuccessWithFlowPage from './individual/screens/SuccessWithFlowButtons';
 import IndividualResetPasswordSuccessPage from './individual/screens/ResetPasswordSuccess';
 import IndividualDataLoadingPage from './individual/screens/PrepareDataLoading';
-import IndividualOperatorError from './individual/screens/OperatorError';
 import BankVerifyPage from './bank/screens/Verify';
 import BankDetailsPage from './bank/screens/BankDetails';
 import BankSuccessPage from './bank/screens/Success';
 import BankSuccessWithFlowPage from './bank/screens/SuccessWithFlowButtons';
 import BankResetPasswordSuccessPage from './bank/screens/ResetPasswordSuccess';
 import BankDataLoadingPage from './bank/screens/PrepareDataLoading';
-import BankOperatorError from './bank/screens/OperatorError';
 import TaxVerifyPage from './tax/screens/Verify';
 import TaxDetailsPage from './tax/screens/TaxDetails';
 import TaxSuccessPage from './tax/screens/Success';
 import TaxSuccessWithFlowPage from './tax/screens/SuccessWithFlowButtons';
 import TaxResetPasswordSuccessPage from './tax/screens/ResetPasswordSuccess';
 import TaxDataLoadingPage from './tax/screens/PrepareDataLoading';
-import TaxOperatorError from './tax/screens/OperatorError';
 import SignInMobilePage from './signIn/screens/Mobile';
 import SignInEmailPage from './signIn/screens/Email';
 import SignInOTPPage from './signIn/screens/OTP';
 import SignInPasswordPage from './signIn/screens/Password';
-import SignInOperatorError from './signIn/screens/OperatorError';
 import EntityVerifyPage from './entity/screens/Verify';
 import EntityNamePage from './entity/screens/EntityName';
 import EntityCapitalPage from './entity/screens/EntityCapital';
@@ -104,7 +95,6 @@ import EntitySuccessPage from './entity/screens/Success';
 import EntitySuccessWithFlowPage from './entity/screens/SuccessWithFlowButtons';
 import EntityResetPasswordSuccessPage from './entity/screens/ResetPasswordSuccess';
 import EntityDataLoadingPage from './entity/screens/PrepareDataLoading';
-import EntityOperatorError from './entity/screens/OperatorError';
 import BrandVerifyPage from './brand/screens/Verify';
 import BrandInfoPage from './brand/screens/BrandInfo';
 import BrandSegmentPage from './brand/screens/BrandSegmentInfo';
@@ -113,11 +103,9 @@ import BrandSuccessPage from './brand/screens/Success';
 import BrandSuccessWithFlowPage from './brand/screens/SuccessWithFlowButtons';
 import BrandResetPasswordSuccessPage from './brand/screens/ResetPasswordSuccess';
 import BrandDataLoadingPage from './brand/screens/PrepareDataLoading';
-import BrandOperatorError from './brand/screens/OperatorError';
 import BoardVerifyPage from './board/screens/Verify';
 import BoardSuccessWithFlowPage from './board/screens/SuccessWithFlowButtons';
 import BoardResetPasswordSuccessPage from './board/screens/ResetPasswordSuccess';
-import BoardOperatorError from './board/screens/OperatorError';
 export var connectFeatureScreens = [
     {
         name: 'CONNECT_BUSINESS_COUNTRY_STEP',
@@ -209,10 +197,6 @@ export var connectExpressFeatureScreens = [
         name: 'CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP',
         element: ConnectExpressCreateAccountLoaderScreen
     },
-    {
-        name: 'CONNECT_EXPRESS_PREPARING_DATA_STEP',
-        element: ConnectExpressPreparingDataLoaderScreen
-    },
     {
         name: 'CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP',
         element: ConnectExpressCollectIndividualScreen
@@ -240,10 +224,6 @@ export var connectExpressFeatureScreens = [
     {
         name: 'CONNECT_EXPRESS_AUTH_ACCOUNT_CREATED_STEP',
         element: ConnectExpressAuthAccountCreatedLoaderScreen
-    },
-    {
-        name: 'CONNECT_EXPRESS_OPERATOR_ERROR_STEP',
-        element: ConnectExpressOperatorError
     }
 ];
 export var authFeatureScreens = [
@@ -356,11 +336,7 @@ export var businessFeatureScreens = [
     { name: 'BUSINESS_SUCCESS_STEP', element: SuccessPage },
     { name: 'BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP', element: SuccessWithFlowButtonsPage },
     { name: 'BUSINESS_RESET_PASSWORD_SUCCESS', element: ResetPasswordSuccessPage },
-    { name: 'BUSINESS_VERIFY_BRAND_INFO', element: BrandVerifyScreen },
-    {
-        name: 'BUSINESS_OPERATOR_ERROR_STEP',
-        element: BusinessOperatorError
-    }
+    { name: 'BUSINESS_VERIFY_BRAND_INFO', element: BrandVerifyScreen }
 ];
 export var passwordFeatureScreens = [
     {
@@ -371,10 +347,6 @@ export var passwordFeatureScreens = [
         name: 'PASSWORD_CREATE_PASSWORD_STEP',
         element: CreatePasswordPage
     },
-    {
-        name: 'PASSWORD_LOADING_DATA_STEP',
-        element: PasswordDataLoadingPage
-    },
     {
         name: 'PASSWORD_RESET_PASSWORD_OTP_STEP',
         element: PasswordOTPPage
@@ -387,11 +359,7 @@ export var passwordFeatureScreens = [
         name: 'PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         element: PasswordSuccessWithFlowPage
     },
-    { name: 'PASSWORD_RESET_PASSWORD_SUCCESS', element: PasswordResetPasswordSuccessPage },
-    {
-        name: 'PASSWORD_OPERATOR_ERROR_STEP',
-        element: PasswordOperatorError
-    }
+    { name: 'PASSWORD_RESET_PASSWORD_SUCCESS', element: PasswordResetPasswordSuccessPage }
 ];
 export var individualFeatureScreens = [
     {
@@ -426,11 +394,7 @@ export var individualFeatureScreens = [
         name: 'INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         element: IndividualSuccessWithFlowPage
     },
-    { name: 'INDIVIDUAL_RESET_PASSWORD_SUCCESS', element: IndividualResetPasswordSuccessPage },
-    {
-        name: 'INDIVIDUAL_OPERATOR_ERROR_STEP',
-        element: IndividualOperatorError
-    }
+    { name: 'INDIVIDUAL_RESET_PASSWORD_SUCCESS', element: IndividualResetPasswordSuccessPage }
 ];
 export var bankFeatureScreens = [
     {
@@ -453,11 +417,7 @@ export var bankFeatureScreens = [
         name: 'BANK_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         element: BankSuccessWithFlowPage
     },
-    { name: 'BANK_RESET_PASSWORD_SUCCESS', element: BankResetPasswordSuccessPage },
-    {
-        name: 'BANK_OPERATOR_ERROR_STEP',
-        element: BankOperatorError
-    }
+    { name: 'BANK_RESET_PASSWORD_SUCCESS', element: BankResetPasswordSuccessPage }
 ];
 export var taxFeatureScreens = [
     {
@@ -480,11 +440,7 @@ export var taxFeatureScreens = [
         name: 'TAX_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         element: TaxSuccessWithFlowPage
     },
-    { name: 'TAX_RESET_PASSWORD_SUCCESS', element: TaxResetPasswordSuccessPage },
-    {
-        name: 'TAX_OPERATOR_ERROR_STEP',
-        element: TaxOperatorError
-    }
+    { name: 'TAX_RESET_PASSWORD_SUCCESS', element: TaxResetPasswordSuccessPage }
 ];
 export var signInFeatureScreens = [
     {
@@ -502,10 +458,6 @@ export var signInFeatureScreens = [
     {
         name: 'SIGIN_PASSWORD_STEP',
         element: SignInPasswordPage
-    },
-    {
-        name: 'SIGIN_OPERATOR_ERROR_STEP',
-        element: SignInOperatorError
     }
 ];
 export var entityFeatureScreens = [
@@ -533,11 +485,7 @@ export var entityFeatureScreens = [
         name: 'ENTITY_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         element: EntitySuccessWithFlowPage
     },
-    { name: 'ENTITY_RESET_PASSWORD_SUCCESS', element: EntityResetPasswordSuccessPage },
-    {
-        name: 'ENTITY_OPERATOR_ERROR_STEP',
-        element: EntityOperatorError
-    }
+    { name: 'ENTITY_RESET_PASSWORD_SUCCESS', element: EntityResetPasswordSuccessPage }
 ];
 export var brandFeatureScreens = [
     {
@@ -568,11 +516,7 @@ export var brandFeatureScreens = [
         name: 'BRAND_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         element: BrandSuccessWithFlowPage
     },
-    { name: 'BRAND_RESET_PASSWORD_SUCCESS', element: BrandResetPasswordSuccessPage },
-    {
-        name: 'BRAND_OPERATOR_ERROR_STEP',
-        element: BrandOperatorError
-    }
+    { name: 'BRAND_RESET_PASSWORD_SUCCESS', element: BrandResetPasswordSuccessPage }
 ];
 export var boardFeatureScreens = [
     {
@@ -586,9 +530,5 @@ export var boardFeatureScreens = [
     {
         name: 'BOARD_SUCCESS_FLOWS_BUTTONS_STEP',
         element: BoardSuccessWithFlowPage
-    },
-    {
-        name: 'BOARD_OPERATOR_ERROR_STEP',
-        element: BoardOperatorError
     }
 ];

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

@@ -2,7 +2,6 @@ import { LibConfig } from '../../@types';
 export interface IndividualLibProps extends LibConfig {
     verifyToken?: string;
     configToken?: string;
-    loaderColor?: string;
 }
 export declare function IndividualElement(props: IndividualLibProps): import("react/jsx-runtime").JSX.Element;
 export declare function renderIndividualLib(config: IndividualLibProps, elementId: string): {

package/build/features/individual/Individual.js

@@ -36,7 +36,7 @@ import { individualFeatureScreens } from '../featuresScreens';
 import { individualSelector, verifyLeadToken } from '../app/individual/individualStore';
 import Background from '../shared/Background';
 var Individual = memo(function (_a) {
-    var configToken = _a.configToken, verifyToken = _a.verifyToken, loaderColor = _a.loaderColor, props = __rest(_a, ["configToken", "verifyToken", "loaderColor"]);
+    var configToken = _a.configToken, verifyToken = _a.verifyToken, props = __rest(_a, ["configToken", "verifyToken"]);
     var theme = useAppTheme().theme;
     var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
     var _c = useAppSelector(individualSelector), customLoading = _c.customLoading, individualError = _c.error, loading = _c.loading;
@@ -49,11 +49,8 @@ var Individual = memo(function (_a) {
         loadingScreenName: 'INDIVIDUAL_LOADING_DATA_STEP',
         navigation: featureScreensNavigation,
         open: open,
-        mode: props.mode,
         internalToken: verifyToken,
-        settingLoading: settingLoading,
-        operatorErrorScreenName: 'INDIVIDUAL_OPERATOR_ERROR_STEP',
-        isValidOperator: data.isValidOperator
+        settingLoading: settingLoading
     });
     React.useEffect(function () {
         initializeGTM();
@@ -61,8 +58,8 @@ var Individual = memo(function (_a) {
             title: 'Individual'
         });
     }, []);
-    var initialLoading = verifyToken && props.mode !== 'content' ? settingLoading : settingLoading || customLoading;
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ mode: props.mode, open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: initialLoading, loaderColor: loaderColor, error: error, open: open, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: isMaturityExpress, type: props.mode === 'content' ? 'CONTENT' : undefined, dialogEdgeFormat: data.appConfig.dialogEdgeFormat, features: appConfig.features }, { children: _jsx(FeatureContainer, __assign({ mode: props.mode, isMaturityExpress: isMaturityExpress }, { children: individualFeatureScreens.map(function (_a, index) {
+    var initialLoading = verifyToken ? settingLoading : settingLoading || customLoading;
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: initialLoading, error: error, open: open, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: isMaturityExpress, type: props.mode === 'content' ? 'CONTENT' : undefined, dialogEdgeFormat: data.appConfig.dialogEdgeFormat, features: appConfig.features }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: isMaturityExpress }, { children: individualFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));

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, useDataVerified, useFormDirtyCheck } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage, useFormReadOnly, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
 import { DocumentPurpose, IndividualType } from '../../../../@types';
-import { deepCopy, getIndividualType, isKW, isKWOrSA, sendCustomEventToGTM } from '../../../../utils';
+import { deepCopy, getIndividualType, isKW } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
@@ -37,7 +37,6 @@ import SignatureFile from './SignatureFile';
 import ShareCount from './ShareCount';
 import ShareValue from './ShareValue';
 import { getFileDetailsFromDocument } from '../../../../utils';
-import IsAuthorizedSwitch from './IsAuthorizedSwitch';
 var TextBoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return (__assign(__assign({ display: 'flex', justifyContent: 'center', flexDirection: 'row', padding: theme.spacing(1.8, 2.5, 1.8, 2.5) }, theme.typography.body1), { lineHeight: theme.spacing(2.5), color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightMedium }));
@@ -53,21 +52,19 @@ var ListType;
     ListType["OccupationList"] = "OccupationList";
 })(ListType || (ListType = {}));
 var AdditionalIndividualInfo = function (_a) {
-    var _b, _c, _d, _e;
+    var _b;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _f = useAppSelector(individualSelector), data = _f.data, loading = _f.loading, error = _f.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 _g = data.individualData, occupation = _g.occupation, sourceIncome = _g.sourceIncome, monthlyIncome = _g.monthlyIncome, employerName = _g.employerName, isPEP = _g.isPEP, isInfluencer = _g.isInfluencer, civilID = _g.civilID, signatureFileId = _g.signatureFileId, civilIDUploading = _g.civilIDUploading, signatureFileUploading = _g.signatureFileUploading, shareCount = _g.shareCount, shareValue = _g.shareValue, isAuthorized = _g.isAuthorized;
-    var _h = user || {}, documents = _h.documents, is_authorized = _h.is_authorized, data_status = _h.data_status, data_verification = _h.data_verification, names = _h.names, role = _h.role, occupationRes = _h.occupation, source_income = _h.source_income, monthly_income = _h.monthly_income, shares = _h.shares, is_relative_PEP = _h.is_relative_PEP, is_influencer = _h.is_influencer, objects = _h.objects;
+    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 isOtherThanKWAndSa = React.useMemo(function () { return !isKWOrSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
-    var showIsAuthorized = isOtherThanKWAndSa;
     var methods = useForm({
-        resolver: yupResolver(IndividualInfoValidationSchema(objects, isKWCountry, showIsAuthorized)),
+        resolver: yupResolver(IndividualInfoValidationSchema(objects, isKWCountry)),
         defaultValues: {
             occupation: occupation,
             sourceIncome: sourceIncome,
@@ -80,8 +77,7 @@ var AdditionalIndividualInfo = function (_a) {
             civilIDUploading: civilIDUploading,
             signatureFileUploading: signatureFileUploading,
             shareCount: shareCount,
-            shareValue: shareValue,
-            isAuthorized: isAuthorized
+            shareValue: shareValue
         },
         mode: 'onChange'
     });
@@ -95,57 +91,22 @@ var AdditionalIndividualInfo = function (_a) {
         civilID: defaultCivilIdFiles,
         signatureFileId: defaultSignatureFiles
     });
-    var isDirty = useFormDirtyCheck(methods, {
-        occupation: ((_b = occupationRes === null || occupationRes === void 0 ? void 0 : occupationRes.chapter) === null || _b === void 0 ? void 0 : _b.id) && { id: occupationRes.chapter.id },
-        sourceIncome: source_income === null || source_income === void 0 ? void 0 : source_income[0],
-        monthlyIncome: monthly_income,
-        employerName: '',
-        isPEP: is_relative_PEP,
-        isInfluencer: is_influencer,
-        shareCount: (_c = shares === null || shares === void 0 ? void 0 : shares.count) === null || _c === void 0 ? void 0 : _c.toString(),
-        shareValue: (_d = shares === null || shares === void 0 ? void 0 : shares.value) === null || _d === void 0 ? void 0 : _d.toString(),
-        isAuthorized: is_authorized
-    }, [
-        {
-            name: 'occupation',
-            keys: ['id']
-        },
-        {
-            name: 'sourceIncome',
-            keys: ['id']
-        },
-        {
-            name: 'monthlyIncome',
-            keys: ['id']
-        }
-    ]).isDirty;
     var noneEditable = useDataNoneEditable(data_status, [
         'occupation',
         'source_of_income',
         'monthly_income',
         'is_relative_PEP',
-        'is_influencer',
-        'is_authorized'
+        'is_influencer'
     ]);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var dataVerified = useDataVerified(data_verification, ['occupation', 'is_relative_PEP', 'is_influencer']);
-    var isOccupationVerified = dataVerified['occupation'] && (occupationRes === null || occupationRes === void 0 ? void 0 : occupationRes.id) === ((_e = watch('occupation')) === null || _e === void 0 ? void 0 : _e.id);
+    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 isAuthorizedSwitchVerified = dataVerified['is_authorized'] && is_authorized === watch('isAuthorized');
-    var _j = React.useState(), listActive = _j[0], setListActive = _j[1];
-    React.useEffect(function () {
-        sendCustomEventToGTM({
-            event: 'Send Event',
-            event_category: 'Board Flows - Individual',
-            event_action: 'Income Details Page',
-            event_label: settingsData.businessCountry.iso2
-        });
-    }, []);
+    var _f = React.useState(), listActive = _f[0], setListActive = _f[1];
     var onSubmit = function (data) {
-        var formData = __assign(__assign({}, deepCopy(getFelids(__assign(__assign({}, data), { signatureFileUploading: signatureFileUploading, civilIDUploading: civilIDUploading })))), { isDirty: isDirty });
-        dispatch(updateIndividualInfo(formData));
+        dispatch(updateIndividualInfo(deepCopy(getFelids(data))));
     };
     var onBack = function () {
         dispatch(handleCurrentActiveScreen('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP'));
@@ -170,10 +131,9 @@ var AdditionalIndividualInfo = function (_a) {
             return t('type_board_member');
         return t('type_user');
     };
-    var _k = React.useMemo(function () { return getIndividualType(objects); }, [objects]), isUser = _k.isUser, isShareholder = _k.isShareholder, isBoardMember = _k.isBoardMember, isBuyer = _k.isBuyer;
+    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 isAuthorizedValue = watch('isAuthorized');
     var showSignatureFile = isUserORBuyerType;
     var showOccupationFile = isUserORBuyerType;
     var showSourceOfIncome = isUserORBuyerType;
@@ -184,7 +144,7 @@ var AdditionalIndividualInfo = function (_a) {
     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 && !!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, { 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'] }), _jsx(IsAuthorizedSwitch, { show: !listActive && showIsAuthorized, readOnly: readOnly['isAuthorized'] || noneEditable['is_authorized'], isVerified: isAuthorizedSwitchVerified }), _jsxs(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: [_jsx(CivilIDFile, { show: isKWCountry, readOnly: readOnly['civilID'], defaultFiles: defaultCivilIdFiles }), _jsx(SignatureFile, { show: isAuthorizedValue && 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') })) }))] })) }))] }));
+    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/MonthlyIncome.js

@@ -16,7 +16,7 @@ import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import { settingsSelector } from '../../../../app/settings';
-import { getCurrencyByCountryIso2, hasVerifiedValue } from '../../../../utils';
+import { hasVerifiedValue } from '../../../../utils';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
@@ -52,9 +52,6 @@ var MonthlyIncome = function (props) {
             return false;
         return hasVerifiedValue(user === null || user === void 0 ? void 0 : user.data_verification, "monthly_income.".concat(item.id));
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(countryCode.iso2));
-    }, [countryCode.iso2]);
     React.useEffect(function () {
         if ((monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.length) > 0) {
             setIncomeList(monthlyIncomeList);
@@ -84,7 +81,7 @@ 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(InputSelect, { label: t('please_enter_actual_income', {
-                        currency: getCurrency
+                        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) })] }));
                         } }) }))] })) })));

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

@@ -14,9 +14,8 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import Collapse from '@mui/material/Collapse';
-import { formatNumberAsCurrency, getCurrencyByCountryIso2, removeAllCharsFromNumber } from '../../../../utils';
+import { formatNumberAsCurrency, removeAllCharsFromNumber } from '../../../../utils';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { settingsSelector } from '../../../../app/settings';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
 import { individualSelector, clearError } from '../../../app/individual/individualStore';
@@ -25,11 +24,10 @@ var ShareValue = function (_a) {
     var _b;
     var show = _a.show, readOnly = _a.readOnly;
     var t = useTranslation().t;
-    var settingsData = useAppSelector(settingsSelector).data;
+    var data = useAppSelector(individualSelector).data;
     var control = useFormContext().control;
     var bckError = useAppSelector(individualSelector).error;
     var dispatch = useAppDispatch();
-    var countryCode = settingsData.businessCountry;
     var handleChange = function (_a) {
         var target = _a.target;
         if (bckError)
@@ -37,14 +35,11 @@ var ShareValue = function (_a) {
         var value = formatNumberAsCurrency(removeAllCharsFromNumber(target.value));
         shareValueControl.field.onChange(value);
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(countryCode.iso2));
-    }, [countryCode.iso2]);
     var shareValueControl = useController({ control: control, name: 'shareValue' });
     var shareValue = shareValueControl.field.value;
     var error = (_b = shareValueControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: t('share_value_label', {
-                    currency: getCurrency
+                    currency: t(data.currency)
                 }), onChange: handleChange, value: shareValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('share_value_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: shareValue, error: error }) }) })) })));
 };
 export default React.memo(ShareValue);

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

@@ -1,6 +1,6 @@
 import * as yup from 'yup';
 import { IndividualType } from '../../../../@types';
-export declare const IndividualInfoValidationSchema: (objects: Array<IndividualType>, isKWCountry: boolean, hasAuthorizedField: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const IndividualInfoValidationSchema: (objects: Array<IndividualType>, isKWCountry: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     occupation: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     sourceIncome: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     monthlyIncome: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
@@ -10,7 +10,6 @@ export declare const IndividualInfoValidationSchema: (objects: Array<IndividualT
     isInfluencer: yup.BooleanSchema<boolean | null | undefined, import("yup/lib/types").AnyObject, boolean | null | undefined>;
     shareCount: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     shareValue: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    isAuthorized: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     occupation: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     sourceIncome: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
@@ -21,7 +20,6 @@ export declare const IndividualInfoValidationSchema: (objects: Array<IndividualT
     isInfluencer: yup.BooleanSchema<boolean | null | undefined, import("yup/lib/types").AnyObject, boolean | null | undefined>;
     shareCount: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     shareValue: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    isAuthorized: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     occupation: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     sourceIncome: import("yup/lib/object").OptionalObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
@@ -32,5 +30,4 @@ export declare const IndividualInfoValidationSchema: (objects: Array<IndividualT
     isInfluencer: yup.BooleanSchema<boolean | null | undefined, import("yup/lib/types").AnyObject, boolean | null | undefined>;
     shareCount: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     shareValue: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    isAuthorized: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
 }>>>;

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

@@ -1,6 +1,6 @@
 import * as yup from 'yup';
 import { getIndividualType } from '../../../../utils';
-export var IndividualInfoValidationSchema = function (objects, isKWCountry, hasAuthorizedField) {
+export var IndividualInfoValidationSchema = function (objects, isKWCountry) {
     var isUserType = getIndividualType(objects).isUser;
     return yup.object().shape({
         occupation: isUserType ? yup.object().required('alert_choose_occupation') : yup.object().optional(),
@@ -11,7 +11,6 @@ export var IndividualInfoValidationSchema = function (objects, isKWCountry, hasA
         isPEP: isUserType ? yup.boolean().required('please_choose_relative_pep') : yup.boolean().optional().nullable(),
         isInfluencer: isUserType && isKWCountry ? yup.boolean().required('please_choose_are_you_influncer') : yup.boolean().optional().nullable(),
         shareCount: yup.string().optional(),
-        shareValue: yup.string().optional(),
-        isAuthorized: hasAuthorizedField ? yup.boolean().required('please_choose_is_authorized') : yup.boolean().optional()
+        shareValue: yup.string().optional()
     });
 };

package/build/features/individual/screens/IndividualList/Email.js

@@ -54,7 +54,7 @@ import { useController, useFormContext } from 'react-hook-form';
 import { styled } from '@mui/material/styles';
 import CircularProgress from '@mui/material/CircularProgress';
 import { useAppDispatch } from '../../../../hooks';
-import { isValidEmail, removeAllOtherThanCharsNumbersAtAndDot } from '../../../../utils';
+import { isValidEmail } from '../../../../utils';
 import Collapse from '../../../../components/Collapse';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
@@ -103,8 +103,7 @@ var Email = function (_a) {
         }
     }, [emailValue, error]);
     var handleEmailChange = function (event) {
-        var value = removeAllOtherThanCharsNumbersAtAndDot(event.target.value);
-        emailControl.field.onChange(value);
+        emailControl.field.onChange(event.target.value);
     };
     var clearEmail = function () {
         emailControl.field.onChange('');

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

@@ -16,13 +16,11 @@ import Box from '@mui/material/Box';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Text from '../../../../components/Text';
+import Button from '../../../../components/Button';
 import Collapse from '../../../../components/Collapse';
 import Warning from '../../../../components/Warning';
-import Button from '../../../../components/Button';
-import Loader from '../../../../components/Loader';
-import { sendCustomEventToGTM } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
-import { individualSelector, retrieveBoardStatus } from '../../../app/individual/individualStore';
+import { individualSelector } from '../../../app/individual/individualStore';
 import UserList from './UserList';
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
@@ -51,23 +49,12 @@ export var SubTitleStyled = styled(Text)(function (_a) {
 var IndividualList = function () {
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
-    var _a = useAppSelector(individualSelector), error = _a.error, data = _a.data, loading = _a.loading;
+    var error = useAppSelector(individualSelector).error;
     var settingsData = useAppSelector(settingsSelector).data;
-    var flows = (data.verify.responseBody || {}).flows;
     var onBack = function () {
-        sendCustomEventToGTM({
-            event: 'Send Event',
-            event_category: 'Board Flows - Individual',
-            event_action: 'Individual Details Back Button',
-            event_label: settingsData.businessCountry.iso2
-        });
-        if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0) {
-            dispatch(handlePrevScreenStep());
-            return;
-        }
-        dispatch(retrieveBoardStatus());
+        dispatch(handlePrevScreenStep());
     };
     var hideBack = settingsData.appConfig.mode === 'content';
-    return (_jsxs(ScreenContainer, { children: [_jsxs(BoxStyled, { children: [_jsxs(ContentStyled, { children: [_jsx(TitleStyled, { children: t('company_individuals') }), _jsx(SubTitleStyled, { children: t('company_individuals_add_or_request_details') })] }), _jsx(UserList, {})] }), _jsx(Collapse, __assign({ in: !!error, timeout: 400 }, { children: _jsx(Warning, __assign({ warningType: 'error' }, { children: t(error || '') })) })), !hideBack && (_jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: function () { return onBack(); }, variant: 'text' }, { children: loading ? _jsx(Loader, { innerColor: 'black', outerColor: 'black', size: 15, toggleAnimation: !!loading }) : t('back') })))] }));
+    return (_jsxs(ScreenContainer, { children: [_jsxs(BoxStyled, { children: [_jsxs(ContentStyled, { children: [_jsx(TitleStyled, { children: t('company_individuals') }), _jsx(SubTitleStyled, { children: t('company_individuals_add_or_request_details') })] }), _jsx(UserList, {})] }), _jsx(Collapse, __assign({ in: !!error, timeout: 400 }, { children: _jsx(Warning, __assign({ warningType: 'error' }, { children: t(error || '') })) })), !hideBack && (_jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: function () { return onBack(); }, variant: 'text' }, { children: t('back') })))] }));
 };
 export default IndividualList;