@tap-payments/auth-jsconnect 2.8.55-beta → 2.8.55-development

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 } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage, useFormReadOnly, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified, useFormDirtyCheck } from '../../../../hooks';
 import { DocumentPurpose, IndividualType } from '../../../../@types';
-import { deepCopy, getIndividualType, isKW } from '../../../../utils';
+import { deepCopy, getIndividualType, isKW, isKWOrSA, sendCustomEventToGTM } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
@@ -37,6 +37,7 @@ 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 }));
@@ -52,19 +53,21 @@ var ListType;
     ListType["OccupationList"] = "OccupationList";
 })(ListType || (ListType = {}));
 var AdditionalIndividualInfo = function (_a) {
-    var _b;
+    var _b, _c, _d, _e;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _c = useAppSelector(individualSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var _f = useAppSelector(individualSelector), data = _f.data, loading = _f.loading, error = _f.error;
     var settingsData = useAppSelector(settingsSelector).data;
     var verify = data.verify;
     var user = (verify.responseBody || {}).user;
-    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 _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 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)),
+        resolver: yupResolver(IndividualInfoValidationSchema(objects, isKWCountry, showIsAuthorized)),
         defaultValues: {
             occupation: occupation,
             sourceIncome: sourceIncome,
@@ -77,7 +80,8 @@ var AdditionalIndividualInfo = function (_a) {
             civilIDUploading: civilIDUploading,
             signatureFileUploading: signatureFileUploading,
             shareCount: shareCount,
-            shareValue: shareValue
+            shareValue: shareValue,
+            isAuthorized: isAuthorized
         },
         mode: 'onChange'
     });
@@ -91,22 +95,57 @@ 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_influencer',
+        'is_authorized'
     ]);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var dataVerified = useDataVerified(data_verification, ['occupation', 'is_relative_PEP', 'is_influencer']);
-    var isOccupationVerified = dataVerified['occupation'] && (occupationRes === null || occupationRes === void 0 ? void 0 : occupationRes.id) === ((_b = watch('occupation')) === null || _b === void 0 ? void 0 : _b.id);
+    var isOccupationVerified = dataVerified['occupation'] && (occupationRes === null || occupationRes === void 0 ? void 0 : occupationRes.id) === ((_e = watch('occupation')) === null || _e === void 0 ? void 0 : _e.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 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 onSubmit = function (data) {
-        dispatch(updateIndividualInfo(deepCopy(getFelids(data))));
+        var formData = __assign(__assign({}, deepCopy(getFelids(__assign(__assign({}, data), { signatureFileUploading: signatureFileUploading, civilIDUploading: civilIDUploading })))), { isDirty: isDirty });
+        dispatch(updateIndividualInfo(formData));
     };
     var onBack = function () {
         dispatch(handleCurrentActiveScreen('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP'));
@@ -131,9 +170,10 @@ var AdditionalIndividualInfo = function (_a) {
             return t('type_board_member');
         return t('type_user');
     };
-    var _g = React.useMemo(function () { return getIndividualType(objects); }, [objects]), isUser = _g.isUser, isShareholder = _g.isShareholder, isBoardMember = _g.isBoardMember, isBuyer = _g.isBuyer;
+    var _k = React.useMemo(function () { return getIndividualType(objects); }, [objects]), isUser = _k.isUser, isShareholder = _k.isShareholder, isBoardMember = _k.isBoardMember, isBuyer = _k.isBuyer;
     var isUserORBuyerType = isUser || isBuyer;
     var isUserORBoardMemberType = isUser || isBoardMember;
+    var isAuthorizedValue = watch('isAuthorized');
     var showSignatureFile = isUserORBuyerType;
     var showOccupationFile = isUserORBuyerType;
     var showSourceOfIncome = isUserORBuyerType;
@@ -144,7 +184,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: _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') })) }))] })) }))] }));
+    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') })) }))] })) }))] }));
 };
 export default React.memo(AdditionalIndividualInfo);
 AdditionalIndividualInfo.defaultProps = {};

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

@@ -0,0 +1,14 @@
+import * as React from 'react';
+export declare const InfoIconStyled: import("@emotion/styled").StyledComponent<import("@mui/material").SvgIconOwnProps & import("@mui/material/OverridableComponent").CommonProps & Omit<Omit<React.SVGProps<SVGSVGElement>, "ref"> & {
+    ref?: ((instance: SVGSVGElement | null) => void) | React.RefObject<SVGSVGElement> | null | undefined;
+}, "className" | "style" | "classes" | "color" | "fontSize" | "shapeRendering" | "children" | "sx" | "htmlColor" | "inheritViewBox" | "titleAccess" | "viewBox"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
+export declare const InfoOutlinedIconStyled: import("@emotion/styled").StyledComponent<import("@mui/material").SvgIconOwnProps & import("@mui/material/OverridableComponent").CommonProps & Omit<Omit<React.SVGProps<SVGSVGElement>, "ref"> & {
+    ref?: ((instance: SVGSVGElement | null) => void) | React.RefObject<SVGSVGElement> | null | undefined;
+}, "className" | "style" | "classes" | "color" | "fontSize" | "shapeRendering" | "children" | "sx" | "htmlColor" | "inheritViewBox" | "titleAccess" | "viewBox"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
+export interface IsAuthorizedSwitchProps {
+    show: boolean;
+    readOnly?: boolean;
+    isVerified?: boolean;
+}
+declare const _default: React.MemoExoticComponent<({ show, readOnly, isVerified }: IsAuthorizedSwitchProps) => import("react/jsx-runtime").JSX.Element>;
+export default _default;

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

@@ -0,0 +1,76 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+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 { styled, alpha } from '@mui/material/styles';
+import InfoIcon from '@mui/icons-material/Info';
+import Box from '@mui/material/Box';
+import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
+import { ScreenContainer } from '../../../shared/Containers';
+import { useAppSelector, useAppDispatch } from '../../../../hooks';
+import Collapse from '../../../../components/Collapse';
+import RadioGroup from '../../../../components/RadioGroup';
+import RadioLabel from '../../../../components/RadioLabel';
+import Text from '../../../../components/Text';
+import Mandatory from '../../../shared/Mandatory';
+import CheckIcon from '../../../shared/CheckIcon';
+import { individualSelector, clearError } from '../../../app/individual/individualStore';
+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) }));
+});
+var RadioGroupStyled = styled(RadioGroup)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        marginInlineStart: theme.spacing(0.25)
+    });
+});
+export var InfoIconStyled = styled(InfoIcon)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        width: theme.spacing(2.75),
+        height: theme.spacing(2.125),
+        cursor: 'pointer',
+        color: alpha(theme.palette.text.primary, 0.4)
+    });
+});
+export var InfoOutlinedIconStyled = styled(InfoOutlinedIcon)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        width: theme.spacing(2.75),
+        height: theme.spacing(2.125),
+        cursor: 'pointer',
+        color: alpha(theme.palette.text.primary, 0.4)
+    });
+});
+var RadioLabelStyled = styled('span')(function () { return ({
+    display: 'flex'
+}); });
+var IsAuthorizedSwitch = function (_a) {
+    var show = _a.show, readOnly = _a.readOnly, isVerified = _a.isVerified;
+    var control = useFormContext().control;
+    var t = useTranslation().t;
+    var authorizedControl = useController({ name: 'isAuthorized', control: control });
+    var error = useAppSelector(individualSelector).error;
+    var dispatch = useAppDispatch();
+    var handleOnChange = function (_a) {
+        var target = _a.target;
+        if (error)
+            dispatch(clearError());
+        authorizedControl.field.onChange(target.value === 'yes');
+    };
+    var authorizedValue = authorizedControl.field.value;
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pt: 2.5, pl: 2.5, pr: 2.5 } }, { children: [_jsx(Box, __assign({ style: { display: 'flex', justifyContent: 'space-between' } }, { children: _jsxs(LabelTextStyled, { children: [t('is_authorized_user_label'), _jsx(Mandatory, {})] }) })), _jsxs(RadioGroupStyled, __assign({ readOnly: readOnly, value: authorizedValue ? 'yes' : 'no', onChange: readOnly ? undefined : handleOnChange }, { children: [_jsx(RadioLabel, { value: 'yes', label: _jsxs(RadioLabelStyled, { children: [t('yes'), authorizedValue && isVerified && _jsx(CheckIcon, { sx: { marginInlineStart: '5px' }, isVerified: isVerified })] }) }), _jsx(RadioLabel, { value: 'no', label: _jsxs(RadioLabelStyled, { children: [t('no'), authorizedValue === false && isVerified && _jsx(CheckIcon, { sx: { marginInlineStart: '5px' }, isVerified: isVerified })] }) })] }))] })) })));
+};
+export default React.memo(IsAuthorizedSwitch);

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 { hasVerifiedValue } from '../../../../utils';
+import { getCurrencyByCountryIso2, hasVerifiedValue } from '../../../../utils';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
@@ -52,6 +52,9 @@ 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);
@@ -81,7 +84,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: t(data.currency)
+                        currency: getCurrency
                     }), 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,8 +14,9 @@ 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, removeAllCharsFromNumber } from '../../../../utils';
+import { formatNumberAsCurrency, getCurrencyByCountryIso2, 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';
@@ -24,10 +25,11 @@ var ShareValue = function (_a) {
     var _b;
     var show = _a.show, readOnly = _a.readOnly;
     var t = useTranslation().t;
-    var data = useAppSelector(individualSelector).data;
+    var settingsData = useAppSelector(settingsSelector).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)
@@ -35,11 +37,14 @@ 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: t(data.currency)
+                    currency: getCurrency
                 }), 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) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const IndividualInfoValidationSchema: (objects: Array<IndividualType>, isKWCountry: boolean, hasAuthorizedField: 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,6 +10,7 @@ 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>>;
@@ -20,6 +21,7 @@ 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>>;
@@ -30,4 +32,5 @@ 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) {
+export var IndividualInfoValidationSchema = function (objects, isKWCountry, hasAuthorizedField) {
     var isUserType = getIndividualType(objects).isUser;
     return yup.object().shape({
         occupation: isUserType ? yup.object().required('alert_choose_occupation') : yup.object().optional(),
@@ -11,6 +11,7 @@ export var IndividualInfoValidationSchema = function (objects, isKWCountry) {
         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()
+        shareValue: yup.string().optional(),
+        isAuthorized: hasAuthorizedField ? yup.boolean().required('please_choose_is_authorized') : yup.boolean().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 } from '../../../../utils';
+import { isValidEmail, removeAllOtherThanCharsNumbersAtAndDot } from '../../../../utils';
 import Collapse from '../../../../components/Collapse';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
@@ -103,7 +103,8 @@ var Email = function (_a) {
         }
     }, [emailValue, error]);
     var handleEmailChange = function (event) {
-        emailControl.field.onChange(event.target.value);
+        var value = removeAllOtherThanCharsNumbersAtAndDot(event.target.value);
+        emailControl.field.onChange(value);
     };
     var clearEmail = function () {
         emailControl.field.onChange('');

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

@@ -16,11 +16,13 @@ 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 } from '../../../app/individual/individualStore';
+import { individualSelector, retrieveBoardStatus } from '../../../app/individual/individualStore';
 import UserList from './UserList';
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
@@ -49,12 +51,23 @@ export var SubTitleStyled = styled(Text)(function (_a) {
 var IndividualList = function () {
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
-    var error = useAppSelector(individualSelector).error;
+    var _a = useAppSelector(individualSelector), error = _a.error, data = _a.data, loading = _a.loading;
     var settingsData = useAppSelector(settingsSelector).data;
+    var flows = (data.verify.responseBody || {}).flows;
     var onBack = function () {
-        dispatch(handlePrevScreenStep());
+        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());
     };
     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: 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: loading ? _jsx(Loader, { innerColor: 'black', outerColor: 'black', size: 15, toggleAnimation: !!loading }) : t('back') })))] }));
 };
 export default IndividualList;

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

@@ -25,7 +25,7 @@ import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { alpha, styled, useTheme } from '@mui/material/styles';
 import Box from '@mui/material/Box';
-import { getUserName, isValidEmail } from '../../../../utils';
+import { getUserName, isKWOrSA, isValidEmail } from '../../../../utils';
 import { useLanguage, useAppSelector, useAppDispatch, useSetFromDefaultValues } from '../../../../hooks';
 import { IndividualType } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
@@ -35,9 +35,10 @@ import Text from '../../../../components/Text';
 import CheckIcon from '../../../shared/CheckIcon';
 import { ScreenContainer } from '../../../shared/Containers';
 import { addDetailsAsync, individualSelector, requestDetailsByEmail, resetIndividualData } from '../../../app/individual/individualStore';
-import IndividualActionButtons from '../../../../features/shared/Button/IndividualActionButtons';
+import IndividualActionButtons from '../../../shared/Button/IndividualActionButtons';
 import { IndividualCollectInfoValidationSchema } from './validation';
 import CollectPhoneEmail from './CollectPhoneEmail';
+import { settingsSelector } from '../../../../app/settings';
 var ScreenContainerStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -84,11 +85,12 @@ var UserList = function (_a) {
     var dispatch = useAppDispatch();
     var _j = React.useState(false), emailChecking = _j[0], setEmailChecking = _j[1];
     var theme = useTheme();
-    var _k = useAppSelector(individualSelector), data = _k.data, loading = _k.loading, error = _k.error;
+    var _k = useAppSelector(individualSelector), data = _k.data, addOrRequestDetailLoading = _k.addOrRequestDetailLoading, error = _k.error;
+    var settingsData = useAppSelector(settingsSelector).data;
     var _l = data.individualCollectData, email = _l.email, mobile = _l.mobile, responseBody = _l.responseBody;
     var is_available = (responseBody || {}).is_available;
     var verify = data.verify;
-    var _m = verify.responseBody || {}, userList = _m.userList, notification = _m.notification;
+    var _m = verify.responseBody || {}, userList = _m.userList, recipient = _m.recipient, userRes = _m.user;
     var methods = useForm({
         resolver: yupResolver(IndividualCollectInfoValidationSchema(activeUser)),
         defaultValues: {
@@ -157,8 +159,10 @@ var UserList = function (_a) {
         return (activeUser === null || activeUser === void 0 ? void 0 : activeUser.id) === user.id;
     };
     var isSameUserRequestedBefore = function (user) {
-        var _a, _b;
-        return (_a = user === null || user === void 0 ? void 0 : user.ids) === null || _a === void 0 ? void 0 : _a.includes((_b = notification === null || notification === void 0 ? void 0 : notification.recipient) === null || _b === void 0 ? void 0 : _b.id);
+        var _a;
+        if (!(userRes === null || userRes === void 0 ? void 0 : userRes.is_authorized) && !isKWOrSA(settingsData.businessCountry.iso2))
+            return false;
+        return (_a = user === null || user === void 0 ? void 0 : user.ids) === null || _a === void 0 ? void 0 : _a.includes(recipient === null || recipient === void 0 ? void 0 : recipient.id);
     };
     var getUserStatus = function (user) {
         return user === null || user === void 0 ? void 0 : user.individual_data_state;
@@ -188,11 +192,11 @@ var UserList = function (_a) {
     return (_jsx(ScreenContainerStyled, { children: usersMenuList.map(function (user, index) {
             return (_jsxs(Box, __assign({ sx: index !== usersMenuList.length - 1 ? { borderBottom: "1px solid ".concat(alpha(theme.palette.divider, 0.8)) } : {} }, { children: [_jsxs(TextBoxStyled, __assign({ sx: {
                             cursor: emailChecking ? 'default' : 'pointer'
-                        }, onClick: !!anchorEl && isActiveUser(user) ? function () { return onCloseUserAction(); } : function (e) { return onClickUser(user, e); } }, { children: [_jsx(TextStyled, { children: _jsx("span", { children: getName(user) || '' }) }), (user === null || user === void 0 ? void 0 : user.isRequestedEmail) ? _jsx(CheckIcon, {}) : _jsx(ExpandIcon, { anchorEl: !!anchorEl && isActiveUser(user) })] })), _jsx(Collapse, __assign({ in: !!anchorEl && isActiveUser(user), timeout: 300 }, { children: _jsx(IndividualActionButtons, { isAr: isAr, addDetails: {
+                        }, onClick: !!anchorEl && isActiveUser(user) ? function () { return onCloseUserAction(); } : function (e) { return onClickUser(user, e); } }, { children: [_jsxs(TextStyled, { children: [_jsx("span", { children: getName(user) || '' }), _jsx(RoleTextStyled, { children: getUserRole(user) || '' })] }), (user === null || user === void 0 ? void 0 : user.isRequestedEmail) ? _jsx(CheckIcon, {}) : _jsx(ExpandIcon, { anchorEl: !!anchorEl && isActiveUser(user) })] })), _jsx(Collapse, __assign({ in: !!anchorEl && isActiveUser(user), timeout: 300 }, { children: _jsx(IndividualActionButtons, { isAr: isAr, addDetails: {
                                 status: getUserStatus(user),
                                 title: t('add_details'),
                                 onClick: onAddDetails,
-                                loading: isActiveUser(user) && loading && type === IndividualRequestType.ADD
+                                loading: isActiveUser(user) && !!addOrRequestDetailLoading && type === IndividualRequestType.ADD
                             }, requestEmail: {
                                 children: getCollectForm(user),
                                 title: t('request_details_by_email'),
@@ -200,7 +204,7 @@ var UserList = function (_a) {
                                 disabled: showCollectForm ? disabled : false,
                                 onClick: onRequestEmail,
                                 show: !isSameUserRequestedBefore(user),
-                                loading: isActiveUser(user) && loading && type === IndividualRequestType.REQUEST_EMAIL
+                                loading: isActiveUser(user) && !!addOrRequestDetailLoading && type === IndividualRequestType.REQUEST_EMAIL
                             } }) }))] }), index));
         }) }));
 };

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

@@ -15,9 +15,10 @@ import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { styled } from '@mui/material/styles';
 import Collapse from '../../../../components/Collapse';
+import { removeAllOtherThanCharsNumbersAtAndDot } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
-import { EndAdornment } from '../../../../features/shared/EndAdornment';
+import { EndAdornment } from '../../../shared/EndAdornment';
 var InputStyled = styled(Input)(function () { return ({
     input: {
         textTransform: 'lowercase'
@@ -32,7 +33,8 @@ var Email = function (_a) {
     var emailValue = emailControl.field.value;
     var error = (_b = emailControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     var handleEmailChange = function (event) {
-        emailControl.field.onChange(event.target.value);
+        var value = removeAllOtherThanCharsNumbersAtAndDot(event.target.value);
+        emailControl.field.onChange(value);
     };
     var clearNumber = function () {
         emailControl.field.onChange('');