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

package/build/features/business/screens/BusinessType/Article.js

@@ -10,17 +10,16 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import React from 'react';
 import { styled } from '@mui/material/styles';
 import { ScreenContainer } from '../../../shared/Containers';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { businessSelector, clearArticleId, uploadArticle } from '../../../app/business/businessStore';
-import UploadFile from '../../../shared/UploadFile';
-import { MAX_FILE_SIZE, VALID_FILE_FORMATS } from '../../../../constants';
-import { maskFileName } from '../../../../utils';
+import { businessSelector, clearAOAFile, clearError, uploadingArticleStatus } from '../../../app/business/businessStore';
+import { UploadWrapper } from '../../../shared/UploadFile';
+import { FileRemoveType } from '../../../../constants';
 import Collapse from '../../../../components/Collapse';
+import { DocumentPurpose } from '../../../../@types';
 var FeatureStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -28,60 +27,26 @@ var FeatureStyled = styled(ScreenContainer)(function (_a) {
     });
 });
 var Article = function (_a) {
-    var show = _a.show;
-    var _b = React.useState(), error = _b[0], setError = _b[1];
-    var _c = React.useState(0), progress = _c[0], setProgress = _c[1];
+    var _b;
+    var show = _a.show, defaultFile = _a.defaultFile;
     var t = useTranslation().t;
-    var _d = useFormContext(), control = _d.control, setValue = _d.setValue;
-    var articleFileControl = useController({ name: 'articleFile', control: control });
+    var control = useFormContext().control;
     var articleIdControl = useController({ name: 'articleId', control: control });
-    var _e = useAppSelector(businessSelector), loading = _e.loading, uploadingArticle = _e.uploadingArticle, sysError = _e.uploadingArticleError, data = _e.data;
+    var _c = useAppSelector(businessSelector), loading = _c.loading, error = _c.error, data = _c.data;
     var dispatch = useAppDispatch();
-    var articleValue = articleFileControl.field.value;
-    var businessTypeData = data.businessTypeData;
-    var articleFile = businessTypeData.articleFile, articleId = businessTypeData.articleId;
-    React.useEffect(function () {
-        if (!articleValue) {
-            setValue('articleFile', articleFile);
-            setValue('articleId', articleId);
-        }
-    }, [articleFile, articleId]);
-    var handleArticleChange = function (files) {
-        setError('');
-        var file = files === null || files === void 0 ? void 0 : files[0];
-        if (!file)
-            return;
-        if (!VALID_FILE_FORMATS.includes(file === null || file === void 0 ? void 0 : file.type)) {
-            setError('file_not_supported_alert');
-            return;
-        }
-        if ((file === null || file === void 0 ? void 0 : file.size) > MAX_FILE_SIZE) {
-            setError('file_size_alert');
-            return;
-        }
-        articleFileControl.field.onChange(file);
-        dispatch(uploadArticle({
-            file: file,
-            onProgress: function (value) {
-                setProgress(value);
-            }
-        }));
+    var AOA_file = (((_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.entity) || {}).AOA_file;
+    var handleArticleChange = function (id) {
+        if (error)
+            dispatch(clearError());
+        articleIdControl.field.onChange(id);
     };
     var handleReset = function () {
-        articleFileControl.field.onChange(undefined);
-        articleIdControl.field.onChange('');
-        dispatch(clearArticleId());
-        setProgress(0);
+        if (error)
+            dispatch(clearError());
+        if (AOA_file)
+            dispatch(clearAOAFile());
+        articleIdControl.field.onChange(undefined);
     };
-    React.useEffect(function () {
-        if (sysError === 'file_upload_error') {
-            setError(sysError);
-            articleFileControl.field.onChange(undefined);
-            setProgress(0);
-        }
-    }, [sysError]);
-    var fileName = articleValue ? maskFileName(articleValue === null || articleValue === void 0 ? void 0 : articleValue.name) : '';
-    var errorValue = error || sysError || '';
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadFile, { label: t('title_article'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('article_of_association'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_bank_statement'), onFileUploaded: handleArticleChange, isFileUploaded: !uploadingArticle && !!articleValue, isSubmitting: loading, isUploading: uploadingArticle, progress: progress, onReset: handleReset, error: errorValue && t(errorValue), initialFileName: fileName }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadWrapper, { id: 'articleId', fileRemoveType: FileRemoveType.AOA_FILE_ID, control: control, label: t('title_article'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('article_of_association'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_bank_statement'), onFileUploaded: handleArticleChange, isSubmitting: loading, onDeleteFile: handleReset, defaultFile: defaultFile, purpose: DocumentPurpose.ARTICLE_ASSOCIATION, fileUploadingStatus: function (uploading) { return dispatch(uploadingArticleStatus(uploading)); } }) }) })));
 };
 export default Article;

package/build/features/business/screens/BusinessType/BusinessType.js

@@ -21,28 +21,45 @@ import Collapse from '../../../../components/Collapse';
 import { useLanguage } from '../../../../hooks';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { businessSelector, clearError, updateLeadBusinessType } from '../../../app/business/businessStore';
+import { BusinessType as Type } from '../../../../@types';
 import Button from '../../../shared/Button';
-import { isSA } from '../../../../utils';
+import { deepCopy, isKW, isOtherLicense, isSA } from '../../../../utils';
 import { KWLicenseValidationSchema, LicenseValidationSchema } from './validation';
 import LicenseList from './LicenseList';
+import LicenseCertificate from './LicenseCertificate';
+import LicenseType from './LicenseType';
+import Article from './Article';
+import EntityLicenseList from './EntityLicenseList';
+import LicenseNumber from './LicenseNumber';
+import EntityName from './EntityName';
+var ListType;
+(function (ListType) {
+    ListType["LicenseList"] = "LicenseList";
+    ListType["EntityLicenseList"] = "EntityLicenseList";
+})(ListType || (ListType = {}));
 var BusinessType = function (_a) {
     var _b = useAppSelector(businessSelector), data = _b.data, loading = _b.loading, error = _b.error, uploading = _b.uploading, uploadingArticle = _b.uploadingArticle;
     var settingsData = useAppSelector(settingsSelector).data;
-    var _c = data.businessTypeData, selectedLicense = _c.selectedLicense, licenseNumber = _c.licenseNumber, entityLegalName = _c.entityLegalName, certificateId = _c.certificateId, articleId = _c.articleId, articleFile = _c.articleFile;
+    var _c = data.businessTypeData, selectedLicense = _c.selectedLicense, licenseNumber = _c.licenseNumber, entityLegalName = _c.entityLegalName, certificateId = _c.certificateId, articleId = _c.articleId, selectedEntityLicense = _c.selectedEntityLicense, responseBody = _c.responseBody;
+    var entityLicenseList = (responseBody === null || responseBody === void 0 ? void 0 : responseBody.entityLicenseList) || [];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _d = React.useState(false), listActive = _d[0], setListActive = _d[1];
+    var _d = React.useState(), listActive = _d[0], setListActive = _d[1];
+    var handleMenuClick = function (flag) {
+        setListActive(flag);
+    };
     var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
+    var isKWCountry = React.useMemo(function () { return isKW(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var methods = useForm({
         resolver: yupResolver(!isSACountry ? KWLicenseValidationSchema : LicenseValidationSchema),
         defaultValues: {
             selectedLicense: selectedLicense,
+            selectedEntityLicense: selectedEntityLicense,
             licenseNumber: licenseNumber,
             entityLegalName: entityLegalName,
             certificateId: certificateId,
-            articleId: articleId,
-            articleFile: articleFile
+            articleId: articleId
         },
         mode: 'onChange'
     });
@@ -54,21 +71,28 @@ var BusinessType = function (_a) {
     var onSubmit = function (data) {
         var dataValues = {
             selectedLicense: data.selectedLicense,
+            selectedEntityLicense: data.selectedEntityLicense,
             licenseNumber: data.licenseNumber,
             entityLegalName: data.entityLegalName,
-            certificateId: data.certificateId
+            certificateId: data.certificateId,
+            articleId: data.articleId
         };
-        dispatch(updateLeadBusinessType(dataValues));
+        dispatch(updateLeadBusinessType(deepCopy(dataValues)));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
+    var isLicenseListActive = listActive === ListType.LicenseList;
+    var isEntityLicenseListActive = listActive === ListType.EntityLicenseList;
+    var isAnyListActive = isLicenseListActive || isEntityLicenseListActive;
+    var selected = methods.getValues('selectedLicense');
+    var selectedLicenseEntity = methods.getValues('selectedEntityLicense');
+    var isCR = (selected === null || selected === void 0 ? void 0 : selected.type) === Type.CR;
+    var hasEntityList = !!(entityLicenseList === null || entityLicenseList === void 0 ? void 0 : entityLicenseList.length);
+    var showLicenseList = hasEntityList ? isSACountry && isOtherLicense(selectedLicenseEntity) : isSACountry;
+    var showEntityList = isKWCountry ? hasEntityList && !isLicenseListActive && isCR : hasEntityList && !isLicenseListActive;
     var disabled = !methods.formState.isValid || !!error || uploading || uploadingArticle;
     var disableBack = !data.otpData.isNID;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(LicenseList, { onListOpen: function () {
-                            setListActive(true);
-                        }, onListClose: function () {
-                            setListActive(false);
-                        } }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ disableBack: disableBack, onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(LicenseType, { show: !listActive && !isSACountry }), _jsx(EntityLicenseList, { show: showEntityList, onListOpen: function () { return handleMenuClick(ListType.EntityLicenseList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(LicenseList, { show: showLicenseList && !isEntityLicenseListActive, onListOpen: function () { return handleMenuClick(ListType.LicenseList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EntityName, { show: !isAnyListActive && !isSACountry && isCR }), _jsx(LicenseNumber, { show: !isSACountry ? !isAnyListActive && isCR : !isAnyListActive }), _jsx(LicenseCertificate, { show: !isAnyListActive && !isSACountry && isCR }), _jsx(Article, { show: !isAnyListActive && !isSACountry && isCR }), _jsx(Collapse, __assign({ in: !isAnyListActive, timeout: 500 }, { children: _jsx(Button, __assign({ disableBack: disableBack, onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(BusinessType);

package/build/features/business/screens/BusinessType/EntityLicenseList.d.ts

@@ -0,0 +1,9 @@
+import * as React from 'react';
+interface EntityLicenseListProps {
+    show: boolean;
+    onSelectLicense?: (number: string) => void;
+    onListOpen?: () => void;
+    onListClose?: () => void;
+}
+declare const _default: React.MemoExoticComponent<({ ...rest }: EntityLicenseListProps) => JSX.Element>;
+export default _default;

package/build/features/business/screens/BusinessType/EntityLicenseList.js

@@ -0,0 +1,129 @@
+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);
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { jsx as _jsx, 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 { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
+import { BusinessType } from '../../../../@types';
+import ScreenContainer from '../../../shared/Containers/ScreenContainer';
+import InputSelect from '../../../shared/InputSelect';
+import CheckIcon from '../../../shared/CheckIcon';
+import SimpleList from '../../../../components/SimpleList';
+import { businessSelector, clearError } from '../../../app/business/businessStore';
+import Text from '../../../../components/Text';
+import ExpandIcon from '../../../../components/ExpandIcon';
+import Collapse from '../../../../components/Collapse';
+import { isKW, isOtherLicense } from '../../../../utils';
+import { settingsSelector } from '../../../../app/settings';
+import { OTHER_CR_LICENSE } from '../../../../constants';
+var InputStyled = styled(InputSelect)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        marginBottom: theme.spacing(2.5)
+    });
+});
+var LicenseContainer = styled(Box)(function () { return ({
+    display: 'flex'
+}); });
+var LicenseNameText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
+    var theme = _a.theme, isSelected = _a.isSelected;
+    return (__assign(__assign({ display: 'flex', color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight }));
+});
+var EntityLicenseList = function (_a) {
+    var rest = __rest(_a, []);
+    var _b = useAppSelector(businessSelector), data = _b.data, error = _b.error;
+    var settingsData = useAppSelector(settingsSelector).data;
+    var businessTypeData = data.businessTypeData;
+    var _c = React.useState(null), anchorEl = _c[0], setAnchorEl = _c[1];
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var dispatch = useAppDispatch();
+    var _d = useFormContext(), setValue = _d.setValue, control = _d.control;
+    var selectedEntityLicenseControl = useController({ control: control, name: 'selectedEntityLicense' });
+    var responseBody = businessTypeData.responseBody, selectedEntityLicense = businessTypeData.selectedEntityLicense, licenseNumber = businessTypeData.licenseNumber;
+    var entityLicenseList = (responseBody || {}).entityLicenseList;
+    var country_code = settingsData.businessCountry.iso2;
+    var isKWCountry = React.useMemo(function () { return isKW(country_code); }, [country_code]);
+    var onOpenLicenseList = function (event) {
+        var _a;
+        setAnchorEl(event.currentTarget);
+        (_a = rest.onListOpen) === null || _a === void 0 ? void 0 : _a.call(rest);
+    };
+    var onCloseLicenseList = function () {
+        var _a;
+        setAnchorEl(null);
+        (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
+    };
+    React.useEffect(function () {
+        if ((entityLicenseList || []).length > 0)
+            setValue('entityLicenseList', entityLicenseList);
+    }, [entityLicenseList]);
+    React.useEffect(function () {
+        if ((entityLicenseList || []).length > 0) {
+            if (!!selectedEntityLicense) {
+                setValue('selectedEntityLicense', selectedEntityLicense, { shouldValidate: true });
+                setValue('licenseNumber', licenseNumber, { shouldValidate: true });
+            }
+        }
+    }, [entityLicenseList, selectedEntityLicense]);
+    var getLicenseNumber = function (item) {
+        var _a;
+        return ((_a = item === null || item === void 0 ? void 0 : item.license) === null || _a === void 0 ? void 0 : _a.number) || '';
+    };
+    var getLicenseName = function (item) {
+        var _a, _b;
+        if ((item === null || item === void 0 ? void 0 : item.type) === BusinessType.FL && !isOtherLicense(item))
+            return t('future_work');
+        return t((isAr ? (_a = item === null || item === void 0 ? void 0 : item.legal_name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.legal_name) === null || _b === void 0 ? void 0 : _b.en) || '');
+    };
+    var onSelectItem = function (license) {
+        if (error)
+            dispatch(clearError());
+        selectedEntityLicenseControl.field.onChange(license);
+        if (isOtherLicense(license)) {
+            var license_1 = isKWCountry ? OTHER_CR_LICENSE : {};
+            setValue('selectedLicense', license_1, { shouldValidate: true });
+            setValue('licenseNumber', '', { shouldValidate: true });
+        }
+        else {
+            setValue('selectedLicense', license, { shouldValidate: true });
+            setValue('licenseNumber', getLicenseNumber(license), { shouldValidate: true });
+        }
+        onCloseLicenseList();
+    };
+    var getLicenseFullName = function (item) {
+        if (isAr)
+            return _jsx("span", { children: "".concat(getLicenseName(item), " - ").concat(getLicenseNumber(item)) });
+        return _jsx("span", { children: "".concat(getLicenseNumber(item), " - ").concat(getLicenseName(item)) });
+    };
+    var selected = selectedEntityLicenseControl.field.value;
+    var isCR = (selected === null || selected === void 0 ? void 0 : selected.type) === BusinessType.CR;
+    var flValue = isOtherLicense(selected) ? t(getLicenseName(selected)) : getLicenseNumber(selected);
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputStyled, { label: t('choose_entity_license'), onClick: !!anchorEl ? function () { return onCloseLicenseList(); } : onOpenLicenseList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_license_entity'), value: isCR ? t(getLicenseName(selected)) : flValue }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'legal_name?.en', list: entityLicenseList || [], onSelectItem: onSelectItem, renderItem: function (item) {
+                            return (_jsxs(_Fragment, { children: [_jsx(LicenseContainer, { children: _jsx(LicenseNameText, __assign({ isSelected: getLicenseNumber(item) === getLicenseNumber(selected) }, { children: isOtherLicense(item) ? t(getLicenseName(item)) : getLicenseFullName(item) })) }), getLicenseNumber(item) === getLicenseNumber(selected) && _jsx(CheckIcon, {})] }));
+                        } }) }))] }) })));
+};
+export default React.memo(EntityLicenseList);

package/build/features/business/screens/BusinessType/EntityName.js

@@ -11,17 +11,16 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import ClearIcon from '../../../shared/ClearIcon';
-import CheckIcon from '../../../shared/CheckIcon';
-import Input from '../../../shared/Input';
-import Collapse from '../../../../components/Collapse';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import { isSA, removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
 import { styled } from '@mui/material/styles';
 import Box from '@mui/material/Box';
-import { useAppSelector } from '../../../../hooks';
 import { settingsSelector } from '../../../../app/settings';
+import { isSA, removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
+import { useAppSelector } from '../../../../hooks';
+import Collapse from '../../../../components/Collapse';
+import Input from '../../../shared/Input';
+import { EndAdornment } from '../../../shared/EndAdornment';
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -51,6 +50,6 @@ var EntityName = function (_a) {
     var clearEntityName = function () {
         entityNameControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(BoxStyled, { children: _jsx(Input, { label: t('entity_legal_name_title'), onChange: handleChange, value: entityNameValue, required: !isSACountry, endAdornment: !error && entityNameValue ? _jsx(CheckIcon, {}) : entityNameValue && _jsx(ClearIcon, { onClick: clearEntityName }), placeholder: t('entity_legal_name_placeholder'), warningType: 'alert', warningMessage: error && t(error) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(BoxStyled, { children: _jsx(Input, { label: t('entity_legal_name_title'), onChange: handleChange, value: entityNameValue, required: !isSACountry, endAdornment: _jsx(EndAdornment, { value: entityNameValue, error: error, onClear: clearEntityName }), placeholder: t('entity_legal_name_placeholder'), warningType: 'alert', warningMessage: error && t(error) }) }) })));
 };
 export default EntityName;

package/build/features/business/screens/BusinessType/LicenseList.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
 interface LicenseListProps {
+    show: boolean;
     onSelectLicense?: (number: string) => void;
     onListOpen?: () => void;
     onListClose?: () => void;

package/build/features/business/screens/BusinessType/LicenseList.js

@@ -29,28 +29,20 @@ import { styled } from '@mui/material/styles';
 import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
 import { BusinessType } from '../../../../@types';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import Input from '../../../shared/Input';
+import InputSelect from '../../../shared/InputSelect';
 import CheckIcon from '../../../shared/CheckIcon';
 import SimpleList from '../../../../components/SimpleList';
 import { businessSelector, clearError } from '../../../app/business/businessStore';
 import Text from '../../../../components/Text';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Collapse from '../../../../components/Collapse';
-import LicenseNumber from './LicenseNumber';
-import EntityName from '../../../business/screens/BusinessType/EntityName';
-import { isSA } from '../../../../utils';
-import LicenseType from './LicenseType';
+import { isOtherLicense, isSA } from '../../../../utils';
 import { OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../../constants';
-import LicenseCertificate from './LicenseCertificate';
 import { settingsSelector } from '../../../../app/settings';
-import Article from './Article';
-var InputStyled = styled(Input)(function (_a) {
+var InputStyled = styled(InputSelect)(function (_a) {
     var theme = _a.theme;
     return ({
-        marginBottom: theme.spacing(2.5),
-        '& .MuiInputBase-input': {
-            cursor: 'pointer'
-        }
+        marginBottom: theme.spacing(2.5)
     });
 });
 var LicenseContainer = styled(Box)(function () { return ({
@@ -84,7 +76,6 @@ var LicenseList = function (_a) {
         setAnchorEl(null);
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
-    var isSACountry = React.useMemo(function () { return isSA(country_code); }, [country_code]);
     React.useEffect(function () {
         if ((licenseList || []).length > 0)
             setValue('licenseList', licenseList);
@@ -117,10 +108,6 @@ var LicenseList = function (_a) {
             return t('future_work');
         return t((isAr ? (_a = item === null || item === void 0 ? void 0 : item.legal_name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.legal_name) === null || _b === void 0 ? void 0 : _b.en) || '');
     };
-    var isOtherLicense = function (item) {
-        var _a, _b;
-        return ((_a = item === null || item === void 0 ? void 0 : item.license) === null || _a === void 0 ? void 0 : _a.number) === 'other_fl' || ((_b = item === null || item === void 0 ? void 0 : item.license) === null || _b === void 0 ? void 0 : _b.number) === 'other_cr';
-    };
     var onSelectItem = function (license) {
         if (error)
             dispatch(clearError());
@@ -136,13 +123,11 @@ var LicenseList = function (_a) {
             return _jsx("span", { children: "".concat(getLicenseName(item), " - ").concat(getLicenseNumber(item)) });
         return _jsx("span", { children: "".concat(getLicenseNumber(item), " - ").concat(getLicenseName(item)) });
     };
-    var show = !anchorEl;
     var selected = selectedLicenseControl.field.value;
-    var licenseReadonly = !isOtherLicense(selected);
     var isCR = (selected === null || selected === void 0 ? void 0 : selected.type) === BusinessType.CR;
     var flValue = isOtherLicense(selected) ? t(getLicenseName(selected)) : getLicenseNumber(selected);
-    return (_jsxs(ScreenContainer, { children: [_jsxs(Collapse, __assign({ in: isSACountry }, { children: [_jsx(InputStyled, { label: t('choose_any_license'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseLicenseList(); } : onOpenLicenseList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_license_cr'), value: isCR ? t(getLicenseName(selected)) : flValue }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'legal_name?.en', list: licenseList || [], onSelectItem: onSelectItem, renderItem: function (item) {
-                                return (_jsxs(_Fragment, { children: [_jsx(LicenseContainer, { children: _jsx(LicenseNameText, __assign({ isSelected: getLicenseNumber(item) === getLicenseNumber(selected) }, { children: isOtherLicense(item) ? t(getLicenseName(item)) : getLicenseFullName(item) })) }), getLicenseNumber(item) === getLicenseNumber(selected) && _jsx(CheckIcon, {})] }));
-                            } }) }))] })), _jsx(LicenseType, { show: show && !isSACountry }), _jsx(EntityName, { show: show && !isSACountry && isCR }), _jsx(LicenseNumber, { show: !isSACountry ? isCR : show, readOnly: licenseReadonly }), _jsx(LicenseCertificate, { show: show && !isSACountry && isCR }), _jsx(Article, { show: show && !isSACountry && isCR })] }));
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputStyled, { label: t('choose_any_license'), onClick: !!anchorEl ? function () { return onCloseLicenseList(); } : onOpenLicenseList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_license_cr'), value: isCR ? t(getLicenseName(selected)) : flValue }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'legal_name?.en', list: licenseList || [], onSelectItem: onSelectItem, renderItem: function (item) {
+                            return (_jsxs(_Fragment, { children: [_jsx(LicenseContainer, { children: _jsx(LicenseNameText, __assign({ isSelected: getLicenseNumber(item) === getLicenseNumber(selected) }, { children: isOtherLicense(item) ? t(getLicenseName(item)) : getLicenseFullName(item) })) }), getLicenseNumber(item) === getLicenseNumber(selected) && _jsx(CheckIcon, {})] }));
+                        } }) }))] }) })));
 };
 export default React.memo(LicenseList);

package/build/features/business/screens/BusinessType/LicenseNumber.d.ts

@@ -1,7 +1,6 @@
 import * as React from 'react';
 interface LicenseNumberProps {
     show: boolean;
-    readOnly: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, readOnly }: LicenseNumberProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show }: LicenseNumberProps) => JSX.Element>;
 export default _default;

package/build/features/business/screens/BusinessType/LicenseNumber.js

@@ -13,8 +13,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import { CR_NUMBER_LENGTH, FL_NUMBER_LENGTH, KW_MAX_LICENSE_LENGTH, KW_MIN_LICENSE_LENGTH } from '../../../../constants';
-import { removeAllOtherThanCharsAndNumber, isSA } from '../../../../utils';
+import { CR_MIN_LICENSE_LENGTH, CR_NUMBER_MAX_LENGTH, FL_MIN_LICENSE_LENGTH, FL_NUMBER_MAX_LENGTH, KW_MAX_LICENSE_LENGTH, KW_MIN_LICENSE_LENGTH } from '../../../../constants';
+import { removeAllOtherThanCharsAndNumber, isSA, isOtherLicense } from '../../../../utils';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
@@ -25,14 +25,16 @@ import { useAppSelector } from '../../../../hooks';
 import { settingsSelector } from '../../../../app/settings';
 var LicenseNumber = function (_a) {
     var _b;
-    var show = _a.show, readOnly = _a.readOnly;
+    var show = _a.show;
     var t = useTranslation().t;
     var _c = useFormContext(), control = _c.control, watch = _c.watch, getValues = _c.getValues;
     var licenseNumberControl = useController({ control: control, name: 'licenseNumber' });
     var settingsData = useAppSelector(settingsSelector).data;
     var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var selectedLicense = !isSACountry ? watch('selectedLicense') : getValues('selectedLicense');
+    var selectedEntityLicense = !isSACountry ? watch('selectedEntityLicense') : getValues('selectedEntityLicense');
     var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+    var readOnly = !isOtherLicense(selectedLicense) || (selectedEntityLicense && !isOtherLicense(selectedEntityLicense));
     var handleFLNumberChange = function (_a) {
         var target = _a.target;
         var value = removeAllOtherThanCharsAndNumber(target.value);
@@ -43,8 +45,8 @@ var LicenseNumber = function (_a) {
     };
     var licenseNumberValue = licenseNumberControl.field.value;
     var error = (_b = licenseNumberControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    var length = !isSACountry ? KW_MAX_LICENSE_LENGTH : isCR ? CR_NUMBER_LENGTH : FL_NUMBER_LENGTH;
-    var minLength = !isSACountry ? KW_MIN_LICENSE_LENGTH : length;
+    var length = !isSACountry ? KW_MAX_LICENSE_LENGTH : isCR ? CR_NUMBER_MAX_LENGTH : FL_NUMBER_MAX_LENGTH;
+    var minLength = !isSACountry ? KW_MIN_LICENSE_LENGTH : isCR ? CR_MIN_LICENSE_LENGTH : FL_MIN_LICENSE_LENGTH;
     var label = isCR ? 'cr_number' : 'fl_number';
     var showCheckIcon = !isSACountry ? (licenseNumberValue === null || licenseNumberValue === void 0 ? void 0 : licenseNumberValue.length) >= minLength : (licenseNumberValue === null || licenseNumberValue === void 0 ? void 0 : licenseNumberValue.length) === length;
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { readOnly: readOnly, label: t(label), required: !isSACountry, onChange: handleFLNumberChange, inputProps: { maxLength: length }, value: licenseNumberValue, endAdornment: showCheckIcon ? _jsx(CheckIcon, {}) : licenseNumberValue && _jsx(ClearIcon, { onClick: clearLicenseNumber }), placeholder: isCR ? t('cr_number_hint') : t('fl_number_hint'), warningType: 'alert', warningMessage: error && t(error, { length: minLength }) }) }) })));