@tap-payments/auth-jsconnect 2.6.10-test → 2.6.13-test

package/build/features/app/entity/entityStore.js

@@ -279,7 +279,7 @@ export var retrieveBoardDetails = createAsyncThunk('entityRetrieveEntityInfo', f
 export var updateEntityName = createAsyncThunk('entityUpdateEntityName', function (_a, thunkApi) {
     var formData = _a.formData, originalFormData = _a.originalFormData;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, entity, _c, id, data_status, data_verification, documents, issuingDate, expiryDate, licenseType, licenseNumber, articleId, unifiedNumber, legalName, certificateId, entityType, issueDate, expDate, isFL, isLegalNameENNonEditable, isLegalNameARNonEditable, isLicenseTypeNonEditable, isEntityTypeNonEditable, isLicenseNumberNonEditable, isUnifiedNumberNonEditable, isIssuingDateNonEditable, isExpiryDateNonEditable, isDocumentsNonEditable, isAOAFileNonEditable, isEntityTypeVerified, isLicenseNonEditable, isLicenseAvailable, payload, data, documentResponse, document, documentBody, documentBody, list;
+        var _b, settings, entity, _c, id, data_status, data_verification, documents, issuingDate, expiryDate, licenseType, licenseNumber, articleId, unifiedNumber, legalName, certificateId, entityType, issueDate, expDate, isFL, isLegalNameENNonEditable, isLegalNameARNonEditable, isLicenseTypeNonEditable, isEntityTypeNonEditable, isLicenseNumberNonEditable, isUnifiedNumberNonEditable, isIssuingDateNonEditable, isExpiryDateNonEditable, isDocumentsNonEditable, isAOAFileNonEditable, isEntityTypeVerified, isLicenseNonEditable, isLicenseAvailable, payload, data, currencyData, documentResponse, document, documentBody, documentBody, list;
         var _d, _e, _f;
         return __generator(this, function (_g) {
             switch (_g.label) {
@@ -328,19 +328,22 @@ export var updateEntityName = createAsyncThunk('entityUpdateEntityName', functio
                     return [4, API.entityService.updateEntity(payload)];
                 case 1:
                     data = _g.sent();
+                    return [4, API.countryService.getCurrency(settings.data.businessCountry.iso2)];
+                case 2:
+                    currencyData = _g.sent();
                     documentResponse = undefined;
                     document = getRecentDocumentBasedOnPurpose(documents, DocumentPurpose.CR);
-                    if (!(!isDocumentsNonEditable && (certificateId || []).length > 0)) return [3, 7];
-                    if (!(document === null || document === void 0 ? void 0 : document.id)) return [3, 3];
+                    if (!(!isDocumentsNonEditable && (certificateId || []).length > 0)) return [3, 8];
+                    if (!(document === null || document === void 0 ? void 0 : document.id)) return [3, 4];
                     documentBody = {
                         id: document.id,
                         images: certificateId
                     };
                     return [4, API.documentService.addFilesToExistingDocument(documentBody)];
-                case 2:
-                    documentResponse = _g.sent();
-                    return [3, 5];
                 case 3:
+                    documentResponse = _g.sent();
+                    return [3, 6];
+                case 4:
                     documentBody = {
                         entity_id: id || '',
                         documents: [
@@ -351,21 +354,21 @@ export var updateEntityName = createAsyncThunk('entityUpdateEntityName', functio
                         ]
                     };
                     return [4, API.documentService.updateDocumentInfo(documentBody)];
-                case 4:
+                case 5:
                     documentResponse = _g.sent();
-                    _g.label = 5;
-                case 5: return [4, API.entityService.retrieveEntity(id)];
-                case 6:
+                    _g.label = 6;
+                case 6: return [4, API.entityService.retrieveEntity(id)];
+                case 7:
                     data = _g.sent();
                     data.documentData = documentResponse;
-                    _g.label = 7;
-                case 7: return [4, API.dataService.getActivitiesIsIc()];
-                case 8:
+                    _g.label = 8;
+                case 8: return [4, API.dataService.getActivitiesIsIc()];
+                case 9:
                     list = (_g.sent()).list;
                     data.activityList = list;
                     sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
                     (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, id);
-                    return [2, { data: data, formData: originalFormData }];
+                    return [2, { data: data, formData: originalFormData, currencyData: currencyData }];
             }
         });
     });
@@ -475,6 +478,7 @@ var initialState = {
     uploadingArticle: false,
     data: {
         flowName: FlowsTypes.ENTITY,
+        currency: '',
         verify: {
             token: ''
         },
@@ -673,10 +677,13 @@ export var entitySlice = createSlice({
             state.error = null;
         })
             .addCase(updateEntityName.fulfilled, function (state, action) {
+            var _a;
             state.loading = false;
             state.error = null;
-            var _a = action.payload, data = _a.data, formData = _a.formData;
-            var _b = data || {}, activityList = _b.activityList, rest = __rest(_b, ["activityList"]);
+            var _b = action.payload, data = _b.data, formData = _b.formData, currencyData = _b.currencyData;
+            var _c = data || {}, activityList = _c.activityList, rest = __rest(_c, ["activityList"]);
+            if ((_a = currencyData === null || currencyData === void 0 ? void 0 : currencyData.code) === null || _a === void 0 ? void 0 : _a.english)
+                state.data.currency = currencyData.code.english;
             state.data.entityNameData = __assign(__assign({}, formData), { certificateId: undefined });
             state.data.entityNameData.responseBody = __assign(__assign({}, state.data.entityNameData.responseBody), { rest: rest });
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { entity: data === null || data === void 0 ? void 0 : data.entity, activityList: activityList });

package/build/features/app/individual/individualStore.d.ts

@@ -100,6 +100,7 @@ export declare const updatePhoneInfo: import("@reduxjs/toolkit").AsyncThunk<{
 export declare const updateIndividualPersonalInfo: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: IndividualPersonalInfoFormValues;
+    currencyData: any;
 }, AsyncThunkParams<IndividualPersonalInfoFormValues>, {}>;
 export declare const updateIndividualInfo: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
@@ -131,6 +132,7 @@ export interface IndividualData {
     individualPersonalData: IndividualPersonalInfoFormValues & ResponseData;
     individualData: IndividualExtraFormValues & ResponseData;
     flowName: FlowsTypes;
+    currency: string;
 }
 export interface IndividualState extends SharedState<IndividualData> {
     customLoading?: boolean;

package/build/features/app/individual/individualStore.js

@@ -70,7 +70,7 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { FlowsTypes, IndividualGender, DocumentPurpose } from '../../../@types';
 import { handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../../app/settings';
-import { defaultCountry, IDENTIFICATION_TYPE, INDIVIDUAl_STEP_NAMES } from '../../../constants';
+import { defaultCountry, IDENTIFICATION_TYPE, INDIVIDUAl_STEP_NAMES, MONTHLY_INCOME_LIST } from '../../../constants';
 import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, hasNoneEditableValue, getUserNameObject, getUserName, sleep, isValidEmail, getRecentDocumentBasedOnPurpose, formatNumberAsCurrency, removeAllCharsFromNumber, mapUserList, sortUserList, getIndividualType } from '../../../utils';
 export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally, isUpdatePhoneInfo = _a.isUpdatePhoneInfo;
@@ -553,7 +553,7 @@ export var updatePhoneInfo = createAsyncThunk('individual/updatePhoneInfo', func
 export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateIndividualPersonalInfo', function (_a, thunkApi) {
     var formData = _a.formData, originalFormData = _a.originalFormData;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, individual, _c, notification, user, entity, id, _d, objects, ids, countryCode, name, email, mobile, gender, nid, issuedCountry, expiryDate, dob, placeOfBirthCountry, placeOfBirthCity, nationality, code, data_status, userName, identification_id_type, isGenderNonEditable, isNameENNonEditable, isNameARNonEditable, isEmailNonEditable, isMobileNumberNonEditable, isMobileCountryNonEditable, isNidNonEditable, isIssuedCountryNonEditable, isExpiryNonEditable, isIdTypeNonEditable, isNationalityNonEditable, isDOBNonEditable, isBirthCityNonEditable, isBirthCountryNonEditable, hasContact, hasPhone, hasIdentification, hasBirth, nameIsEditable, contact, requestBody, data, _e, isUser, isBuyer, isUserORBuyerType;
+        var _b, settings, individual, _c, notification, user, entity, id, _d, objects, ids, countryCode, name, email, mobile, gender, nid, issuedCountry, expiryDate, dob, placeOfBirthCountry, placeOfBirthCity, nationality, code, data_status, userName, identification_id_type, isGenderNonEditable, isNameENNonEditable, isNameARNonEditable, isEmailNonEditable, isMobileNumberNonEditable, isMobileCountryNonEditable, isNidNonEditable, isIssuedCountryNonEditable, isExpiryNonEditable, isIdTypeNonEditable, isNationalityNonEditable, isDOBNonEditable, isBirthCityNonEditable, isBirthCountryNonEditable, hasContact, hasPhone, hasIdentification, hasBirth, nameIsEditable, contact, requestBody, data, currencyData, _e, isUser, isBuyer, isUserORBuyerType;
         var _f, _g, _h, _j, _k;
         return __generator(this, function (_l) {
             switch (_l.label) {
@@ -634,17 +634,20 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
                     return [4, API.individualService.updateMultipleIndividual(requestBody)];
                 case 1:
                     data = _l.sent();
+                    return [4, API.countryService.getCurrency(settings.data.businessCountry.iso2)];
+                case 2:
+                    currencyData = _l.sent();
                     _e = getIndividualType(objects), isUser = _e.isUser, isBuyer = _e.isBuyer;
                     isUserORBuyerType = isUser || isBuyer;
-                    if (!isUserORBuyerType) return [3, 3];
+                    if (!isUserORBuyerType) return [3, 4];
                     return [4, thunkApi.dispatch(retrieveDataList(code))];
-                case 2:
-                    _l.sent();
-                    _l.label = 3;
                 case 3:
+                    _l.sent();
+                    _l.label = 4;
+                case 4:
                     sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
                     (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, requestBody);
-                    return [2, { data: data, formData: originalFormData }];
+                    return [2, { data: data, formData: originalFormData, currencyData: currencyData }];
             }
         });
     });
@@ -841,6 +844,7 @@ var initialState = {
     cityLoading: false,
     data: {
         flowName: FlowsTypes.INDIVIDUAL,
+        currency: '',
         verify: {
             token: ''
         },
@@ -1155,16 +1159,16 @@ export var individualSlice = createSlice({
             state.error = null;
         })
             .addCase(retrieveDataList.fulfilled, function (state, action) {
-            var _a;
+            var _a, _b;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, sourceIncome = _b.sourceIncome, monthlyIncome = _b.monthlyIncome, occupationData = _b.occupation;
+            var _c = action.payload, sourceIncome = _c.sourceIncome, monthlyIncome = _c.monthlyIncome, occupationData = _c.occupation;
             var data = state.data.individualData.responseBody;
             var sourceIncomeList = (sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome.list) || [];
-            var monthlyIncomeList = (monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome.list) || [];
+            var monthlyIncomeList = ((_a = monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome.list) === null || _a === void 0 ? void 0 : _a.length) ? monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome.list : MONTHLY_INCOME_LIST;
             var occupationList = (occupationData === null || occupationData === void 0 ? void 0 : occupationData.list) || [];
             state.data.individualData.responseBody = __assign(__assign({}, data), { sourceIncomeList: sourceIncomeList, monthlyIncomeList: monthlyIncomeList, occupationList: occupationList });
-            var _c = ((_a = state.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.user) || {}, source_income = _c.source_income, monthly_income = _c.monthly_income, occupation = _c.occupation;
+            var _d = ((_b = state.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.user) || {}, source_income = _d.source_income, monthly_income = _d.monthly_income, occupation = _d.occupation;
             var selectedSourceIncome = (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList.find(function (source) { var _a; return (source === null || source === void 0 ? void 0 : source.id) === ((_a = source_income === null || source_income === void 0 ? void 0 : source_income[0]) === null || _a === void 0 ? void 0 : _a.id); })) || (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList[0]);
             if (!!selectedSourceIncome)
                 state.data.individualData.sourceIncome = selectedSourceIncome;
@@ -1223,11 +1227,14 @@ export var individualSlice = createSlice({
             state.error = null;
         })
             .addCase(updateIndividualPersonalInfo.fulfilled, function (state, action) {
+            var _a;
             state.loading = false;
             state.error = null;
-            var _a = action.payload, data = _a.data, formData = _a.formData;
+            var _b = action.payload, data = _b.data, formData = _b.formData, currencyData = _b.currencyData;
             state.data.individualPersonalData = formData;
             state.data.individualPersonalData.responseBody = data;
+            if ((_a = currencyData === null || currencyData === void 0 ? void 0 : currencyData.code) === null || _a === void 0 ? void 0 : _a.english)
+                state.data.currency = currencyData.code.english;
         })
             .addCase(updateIndividualPersonalInfo.rejected, function (state, action) {
             state.loading = false;

package/build/features/brand/screens/BrandActivities/ExpectedSalesRange.js

@@ -15,7 +15,7 @@ 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 { findCurrencyByIso2, isExist } from '../../../../utils';
+import { isExist } from '../../../../utils';
 import { useLanguage, useAppSelector, useAppDispatch } from '../../../../hooks';
 import { settingsSelector } from '../../../../app/settings';
 import SimpleList from '../../../../components/SimpleList';
@@ -68,7 +68,7 @@ var ExpectedSalesRange = function (_a) {
     var expectedSaleControl = useController({ name: 'expectedSale', control: control });
     var _g = useAppSelector(brandSelector), data = _g.data, error = _g.error;
     var settingsData = useAppSelector(settingsSelector).data;
-    var brandActivities = data.brandActivities;
+    var brandActivities = data.brandActivities, currency = data.currency;
     var expectedSales = (brandActivities.responseBody || {}).expectedSales;
     var expectedSalesRangeValue = expectedSaleControl.field.value;
     var countryCode = settingsData.businessCountry;
@@ -124,7 +124,7 @@ var ExpectedSalesRange = function (_a) {
             setSubIndex(item.id);
     }, [anchorEl, expectedSalesRangeValue]);
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [t('expected_sales_monthly', {
-                            currency: t(findCurrencyByIso2(countryCode.iso2))
+                            currency: t(currency)
                         }), _jsx(MandatoryStyled, { children: "*" })] }), _jsx(InputStyled, { readOnly: readOnly, value: isAr ? (_b = expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar) !== null && _b !== void 0 ? _b : '' : (_c = expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) !== null && _c !== void 0 ? _c : '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
                                 var isOnlyOneItem = !item.sub || item.sub.length === 1;
                                 if (isOnlyOneItem)

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

@@ -23,8 +23,8 @@ 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 { deepCopy, isKW, isOtherLicense, isSA } from '../../../../utils';
-import { KWLicenseValidationSchema, LicenseValidationSchema } from './validation';
+import { deepCopy, isKW, isOtherLicense, isOtherThanKWOrSA, isSA } from '../../../../utils';
+import { KWLicenseValidationSchema, LicenseValidationSchema, OtherCountryLicenseValidationSchema } from './validation';
 import LicenseList from './LicenseList';
 import LicenseCertificate from './LicenseCertificate';
 import LicenseType from './LicenseType';
@@ -51,8 +51,16 @@ var BusinessType = function (_a) {
     };
     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 isOtherCountry = React.useMemo(function () { return isOtherThanKWOrSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
+    var getSchema = function () {
+        if (isSACountry)
+            return LicenseValidationSchema;
+        if (isKWCountry)
+            return KWLicenseValidationSchema;
+        return OtherCountryLicenseValidationSchema;
+    };
     var methods = useForm({
-        resolver: yupResolver(!isSACountry ? KWLicenseValidationSchema : LicenseValidationSchema),
+        resolver: yupResolver(getSchema()),
         defaultValues: {
             selectedLicense: selectedLicense,
             selectedEntityLicense: selectedEntityLicense,
@@ -89,10 +97,10 @@ var BusinessType = function (_a) {
     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 showLicenseList = hasEntityList ? (isSACountry || isOtherCountry) && isOtherLicense(selectedLicenseEntity) : isSACountry || isOtherCountry;
     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(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') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(LicenseType, { show: !listActive && isKWCountry }), _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 && isKWCountry && isCR }), _jsx(LicenseNumber, { show: isKWCountry ? !isAnyListActive && isCR : !isAnyListActive }), _jsx(LicenseCertificate, { show: !isAnyListActive && isKWCountry && isCR }), _jsx(Article, { show: !isAnyListActive && isKWCountry && 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/EntityName.js

@@ -16,7 +16,7 @@ import { useController, useFormContext } from 'react-hook-form';
 import { styled } from '@mui/material/styles';
 import Box from '@mui/material/Box';
 import { settingsSelector } from '../../../../app/settings';
-import { isSA, removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
+import { isKW, removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
 import { useAppSelector } from '../../../../hooks';
 import Collapse from '../../../../components/Collapse';
 import Input from '../../../shared/Input';
@@ -41,7 +41,7 @@ var EntityName = function (_a) {
     var entityNameValue = entityNameControl.field.value;
     var error = (_b = entityNameControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     var settingsData = useAppSelector(settingsSelector).data;
-    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 handleChange = function (_a) {
         var target = _a.target;
         var value = removeAllOtherThanCharsNumbersAndSpace(target.value);
@@ -50,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: _jsx(EndAdornment, { value: entityNameValue, error: error, onClear: 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: isKWCountry, 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.js

@@ -36,7 +36,7 @@ import { businessSelector, clearError } from '../../../app/business/businessStor
 import Text from '../../../../components/Text';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Collapse from '../../../../components/Collapse';
-import { isOtherLicense, isSA } from '../../../../utils';
+import { isKW, isOtherLicense } from '../../../../utils';
 import { OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../../constants';
 import { settingsSelector } from '../../../../app/settings';
 var InputStyled = styled(InputSelect)(function (_a) {
@@ -90,8 +90,8 @@ var LicenseList = function (_a) {
     }, [licenseList, selectedLicense]);
     React.useEffect(function () {
         if (!!country_code) {
-            var isNonSA = !isSA(country_code);
-            if (isNonSA) {
+            var isKWCountry = isKW(country_code);
+            if (isKWCountry) {
                 var license = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR ? OTHER_CR_LICENSE : OTHER_FL_LICENSE;
                 setValue('selectedLicense', license, { shouldValidate: true });
                 setValue('entityLegalName', entityLegalName, { shouldValidate: true });

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

@@ -14,7 +14,7 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 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 { removeAllOtherThanCharsAndNumber, isOtherLicense, isKW, isOtherThanKWOrSA } from '../../../../utils';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
@@ -30,9 +30,10 @@ var LicenseNumber = function (_a) {
     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 isKWCountry = React.useMemo(function () { return isKW(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
+    var isOtherThanKWOrSACountry = React.useMemo(function () { return isOtherThanKWOrSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
+    var selectedLicense = isKWCountry ? watch('selectedLicense') : getValues('selectedLicense');
+    var selectedEntityLicense = isKWCountry ? 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) {
@@ -45,10 +46,10 @@ 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_MAX_LENGTH : FL_NUMBER_MAX_LENGTH;
-    var minLength = !isSACountry ? KW_MIN_LICENSE_LENGTH : isCR ? CR_MIN_LICENSE_LENGTH : FL_MIN_LICENSE_LENGTH;
+    var length = isKWCountry || isOtherThanKWOrSACountry ? KW_MAX_LICENSE_LENGTH : isCR ? CR_NUMBER_MAX_LENGTH : FL_NUMBER_MAX_LENGTH;
+    var minLength = isKWCountry || isOtherThanKWOrSACountry ? 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 }) }) }) })));
+    var showCheckIcon = isKWCountry || isOtherThanKWOrSACountry ? (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: isKWCountry, 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 }) }) }) })));
 };
 export default React.memo(LicenseNumber);

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

@@ -31,3 +31,13 @@ export declare const KWLicenseValidationSchema: yup.ObjectSchema<import("yup/lib
     articleId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     articleFile: any;
 }>>>;
+export declare const OtherCountryLicenseValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    selectedLicense: any;
+    licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    selectedLicense: any;
+    licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    selectedLicense: any;
+    licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>>;

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

@@ -87,3 +87,19 @@ export var KWLicenseValidationSchema = yup.object().shape({
     })
         .optional()
 });
+export var OtherCountryLicenseValidationSchema = yup.object().shape({
+    selectedLicense: yup.object().shape(objectElements).required(''),
+    licenseNumber: yup
+        .string()
+        .test({
+        test: function (value) {
+            var selectedLicense = this.parent.selectedLicense;
+            var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+            var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+            if (length === 0)
+                return true;
+            return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: isCR ? 'cr_kw_max_length' : 'fl_max_length' });
+        }
+    })
+        .required('')
+});

package/build/features/business/screens/Customers/ExpectedSalesRange.js

@@ -21,7 +21,7 @@ import SimpleList from '../../../../components/SimpleList';
 import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import { businessSelector, clearError } from '../../../app/business/businessStore';
-import { findCurrencyByIso2, isExist } from '../../../../utils';
+import { isExist } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import Search from '../../../shared/Search';
 import InputSelect from '../../../shared/InputSelect';
@@ -65,7 +65,7 @@ var ExpectedSalesRange = function (_a) {
     var expectedSaleControl = useController({ name: 'expectedSale', control: control });
     var _e = useAppSelector(businessSelector), data = _e.data, error = _e.error;
     var settingsData = useAppSelector(settingsSelector).data;
-    var activitiesData = data.activitiesData;
+    var activitiesData = data.activitiesData, currency = data.currency;
     var expectedSales = (activitiesData.responseBody || {}).expectedSales;
     var expectedSalesRangeValue = expectedSaleControl.field.value;
     var countryCode = settingsData.businessCountry;
@@ -119,7 +119,7 @@ var ExpectedSalesRange = function (_a) {
             setSubIndex(item.id);
     }, [anchorEl, expectedSalesRangeValue]);
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_sales_monthly', {
-                        currency: t(findCurrencyByIso2(countryCode.iso2))
+                        currency: t(currency)
                     }) }), _jsx(InputStyled, { value: (isAr ? expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar : expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) || '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
                                 var isOnlyOneItem = !item.sub || item.sub.length === 1;
                                 if (isOnlyOneItem)

package/build/features/connect/Connect.js

@@ -56,7 +56,7 @@ import { store } from '../../app/store';
 import { connectSelector, retrieveLead, setDefaultCountryCode } from '../app/connect/connectStore';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
-import { isKW, findOrCreateElementAndInject, initializeGTM, sendCustomEventToGTM, sendCustomDimension, sendPageView } from '../../utils';
+import { isKW, findOrCreateElementAndInject, initializeGTM, sendCustomEventToGTM, sendCustomDimension, sendPageView, isOtherThanKWOrSA } from '../../utils';
 import { CONNECT_SCREENS_NAVIGATION } from '../../constants';
 import { connectFeatureScreens } from '../featuresScreens';
 import Background from '../shared/Background';
@@ -93,9 +93,9 @@ var Connect = memo(function (props) {
         initializeGTM();
     }, []);
     React.useEffect(function () {
-        var _a;
+        var _a, _b;
         if (!settingLoading) {
-            if (isKW((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2))
+            if (isOtherThanKWOrSA((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2) || isKW((_b = data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2))
                 dispatch(handleCurrentActiveScreen('CONNECT_MOBILE_STEP'));
             if (leadId && !configToken) {
                 dispatch(retrieveLead(leadId));

package/build/features/connect/screens/Mobile/Mobile.js

@@ -25,7 +25,7 @@ import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { clearError, connectSelector, createMobileAuth, resetNIDScreen, resetCivilScreen, resetOTPScreen, resetStore } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import Divider from '@mui/material/Divider';
-import { deepCopy, isKW, sendCustomEventToGTM } from '../../../../utils';
+import { deepCopy, isKW, isOtherThanKWOrSA, sendCustomEventToGTM } from '../../../../utils';
 import Text from '../../../../components/Text';
 import MIDTitle from './Title';
 import MobileNumber from './MobileNumber';
@@ -74,12 +74,12 @@ var ListType;
     ListType["CountryCodeList"] = "CountryCodeList";
 })(ListType || (ListType = {}));
 var Mobile = function (_a) {
-    var _b;
+    var _b, _c;
     var settingsStore = useAppSelector(settingsSelector);
-    var _c = useAppSelector(connectSelector), data = _c.data, loading = _c.loading, error = _c.error;
-    var _d = React.useState(), listType = _d[0], setListType = _d[1];
+    var _d = useAppSelector(connectSelector), data = _d.data, loading = _d.loading, error = _d.error;
+    var _e = React.useState(), listType = _e[0], setListType = _e[1];
     var dispatch = useAppDispatch();
-    var _e = data.mobileData, mobile = _e.mobile, countryCode = _e.countryCode, termAndConditionChecked = _e.termAndConditionChecked;
+    var _f = data.mobileData, mobile = _f.mobile, countryCode = _f.countryCode, termAndConditionChecked = _f.termAndConditionChecked;
     var methods = useForm({
         resolver: yupResolver(PhoneValidationSchema),
         defaultValues: {
@@ -108,6 +108,7 @@ var Mobile = function (_a) {
         dispatch(resetCivilScreen());
     };
     var isKWCountry = React.useMemo(function () { var _a; return isKW((_a = settingsStore.data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2); }, [(_b = settingsStore.data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2]);
+    var isOtherThanKWOrSACountry = React.useMemo(function () { var _a; return isOtherThanKWOrSA((_a = settingsStore.data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2); }, [(_c = settingsStore.data.businessCountry) === null || _c === void 0 ? void 0 : _c.iso2]);
     var onBack = function () {
         sendCustomEventToGTM({
             event: 'Send Event',
@@ -125,6 +126,6 @@ var Mobile = function (_a) {
     var disabled = !methods.formState.isValid || !!error;
     var title = t('join_our_community');
     var subTitle = t('ide_terms_and_conditions_description');
-    return (_jsxs(ScreenContainer, { children: [(title || subTitle) && _jsx(MIDTitle, { show: !listActive, title: title, description: subTitle }), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { show: !isBusinessListActive, countries: settingsStore.data.countries, onListOpen: function () { return handleMenuListClick(ListType.CountryCodeList); }, onListClose: function () { return handleMenuListClick(); } }) }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), isKWCountry ? (_jsx(MobileButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); }, icon: ICONS_NAMES.PACI_ICON }, { children: t('paci_button_label') }))) : (_jsx(AbsherButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); } }, { children: t('absher_button_label') })))] }))] }))] })) }))] }));
+    return (_jsxs(ScreenContainer, { children: [(title || subTitle) && _jsx(MIDTitle, { show: !listActive, title: title, description: subTitle }), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { show: !isBusinessListActive, countries: settingsStore.data.countries, onListOpen: function () { return handleMenuListClick(ListType.CountryCodeList); }, onListClose: function () { return handleMenuListClick(); } }) }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(Button, __assign({ isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid && !isOtherThanKWOrSACountry }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), isKWCountry ? (_jsx(MobileButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); }, icon: ICONS_NAMES.PACI_ICON }, { children: t('paci_button_label') }))) : (_jsx(AbsherButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); } }, { children: t('absher_button_label') })))] }))] }))] })) }))] }));
 };
 export default React.memo(Mobile);

package/build/features/connect/screens/Mobile/MobileNumber.js

@@ -26,6 +26,7 @@ import Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { styled, alpha } from '@mui/material/styles';
+import { settingsSelector } from '../../../../app/settings';
 import Text from '../../../../components/Text';
 import Collapse from '../../../../components/Collapse';
 import ClearIcon from '../../../shared/ClearIcon';
@@ -35,7 +36,7 @@ import { connectSelector } from '../../../app/connect/connectStore';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Input from '../../../shared/Input';
 import SimpleList from '../../../../components/SimpleList';
-import { removeAllCharsFromNumber, sendCustomEventToGTM } from '../../../../utils';
+import { isOtherThanKWOrSA, removeAllCharsFromNumber, sendCustomEventToGTM } from '../../../../utils';
 import { useLanguage, useAppSelector } from '../../../../hooks';
 import Search from '../../../shared/Search';
 var LabelContainerStyled = styled(Box)(function (_a) {
@@ -80,14 +81,15 @@ var InputStyled = styled(Input)(function () { return ({
     }
 }); });
 var MobileNumber = React.forwardRef(function (_a, ref) {
-    var _b, _c, _d;
+    var _b, _c, _d, _e;
     var countries = _a.countries, rest = __rest(_a, ["countries"]);
-    var _e = React.useState(countries || []), countriesCode = _e[0], setCountries = _e[1];
-    var _f = React.useState(null), anchorEl = _f[0], setAnchorEl = _f[1];
+    var _f = React.useState(countries || []), countriesCode = _f[0], setCountries = _f[1];
+    var _g = React.useState(null), anchorEl = _g[0], setAnchorEl = _g[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _g = useFormContext(), control = _g.control, setValue = _g.setValue;
+    var _h = useFormContext(), control = _h.control, setValue = _h.setValue;
     var loading = useAppSelector(connectSelector).loading;
+    var settingsStore = useAppSelector(settingsSelector);
     var phoneControl = useController({ name: 'mobile', control: control });
     var countryCodeControl = useController({ name: 'countryCode', control: control });
     var countryCodeValue = countryCodeControl.field.value;
@@ -98,6 +100,7 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
     var mobileLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.digits;
     var isStartsWith5 = mobileValue.startsWith('5');
     var requiredLen = isSA && isStartsWith5 ? mobileLen - 1 : mobileLen;
+    var isOtherThanKWOrSACountry = React.useMemo(function () { var _a; return isOtherThanKWOrSA((_a = settingsStore.data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2); }, [(_e = settingsStore.data.businessCountry) === null || _e === void 0 ? void 0 : _e.iso2]);
     React.useEffect(function () {
         if (mobileValue)
             setValue('mobile', mobileValue, { shouldValidate: true });
@@ -151,7 +154,7 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         });
         setCountries(filteredCountries);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { minHeight: mobileValue ? '133px' : '0px' } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredLen }, type: 'tel', readOnly: !!anchorEl, required: true, onClick: onCloseCountryList, onChange: onPhoneNumberChange, onEnterPressed: function (e) { return loading && e.preventDefault(); }, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: !anchorEl ? error && t(error, { length: requiredLen, number: '05|5' }) : undefined }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { minHeight: mobileValue ? '133px' : isOtherThanKWOrSACountry ? '117px' : '0px' } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredLen }, type: 'tel', readOnly: !!anchorEl, required: true, onClick: onCloseCountryList, onChange: onPhoneNumberChange, onEnterPressed: function (e) { return loading && e.preventDefault(); }, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: !anchorEl ? error && t(error, { length: requiredLen, number: '05|5' }) : undefined }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
                                 return (_jsxs(_Fragment, { children: [_jsxs(CountryItemContainer, { children: [_jsxs(CountryCodeText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: ["+", item.idd_prefix] })), _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english }))] }), item.idd_prefix === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) && _jsx(CheckIcon, {})] }));
                             } })] }))] })) })));
 });

package/build/features/connectExpress/ConnectExpress.js

@@ -67,7 +67,7 @@ import { store } from '../../app/store';
 import { connectExpressSelector, setIsLeadIdPassed, setLeadId, retrieveLeadIdentityByIdAsync, setShowBoard } from '../app/connectExpress/connectExpressStore';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
-import { isKW, findOrCreateElementAndInject, sendPageView } from '../../utils';
+import { isKW, findOrCreateElementAndInject, sendPageView, isOtherThanKWOrSA } from '../../utils';
 import { CONNECT_EXPRESS_SCREENS_NAVIGATION } from '../../constants';
 import { connectExpressFeatureScreens } from '../featuresScreens';
 import Background from '../shared/Background';
@@ -118,8 +118,8 @@ var ConnectExpress = memo(function (_a) {
         }
     }, [data.isValidOperator, settingLoading]);
     React.useEffect(function () {
-        var _a;
-        if (!settingLoading && isKW((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2)) {
+        var _a, _b;
+        if (!settingLoading && (isKW((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2) || isOtherThanKWOrSA((_b = data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2))) {
             dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_MOBILE_STEP'));
         }
     }, [settingLoading]);