@tap-payments/auth-jsconnect 2.6.12-test → 2.6.16-test

package/build/features/app/business/businessStore.js

@@ -58,8 +58,8 @@ var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { BusinessType, FlowsTypes, DocumentPurpose, LicenseType } from '../../../@types';
-import { BUSINESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_ENTITY_LICENSE, OTHER_FL_LICENSE } from '../../../constants';
-import { convertNumbers2English, hasKey, sleep, isKW, isSA, dateFormat, isOtherLicense } from '../../../utils';
+import { BUSINESS_STEP_NAMES, EXPECTED_SALES_LIST, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_ENTITY_LICENSE, OTHER_FL_LICENSE } from '../../../constants';
+import { convertNumbers2English, hasKey, sleep, isKW, isSA, dateFormat, isOtherLicense, isOtherThanKWOrSA } from '../../../utils';
 import { handleNextScreenStep, handlePublicKey, handleSetCountryByIso2 } from '../../../app/settings';
 export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var settings, payload, data, publicKey, countryIso2, boardData, brandData, currencyData, isicActivityList, leadData, _a, steps, brand, board_id, business_id, entity, brandID, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted, list, list;
@@ -98,7 +98,7 @@ export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', functio
                 if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH && isKW(countryIso2)) {
                     thunkApi.dispatch(handleNextScreenStep('BUSINESS_CIVIL_ID_STEP'));
                 }
-                if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH && !isKW(countryIso2)) {
+                if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH && (isSA(countryIso2) || isOtherThanKWOrSA(countryIso2))) {
                     thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
                 }
                 if (!(data.step_name === BUSINESS_STEP_NAMES.BUSINESS_INFO)) return [3, 20];
@@ -389,7 +389,7 @@ export var createCivilIdAuth = createAsyncThunk('createCivilIdAuth', function (p
     });
 }); });
 export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, business, identification_id_type, stepName, lead_id, requestBody, data;
+    var _a, settings, business, identification_id_type, stepName, lead_id, countryIso2, requestBody, data, business_id, entity, screen;
     var _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -398,11 +398,15 @@ export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function
                 identification_id_type = params.nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
                 stepName = BUSINESS_STEP_NAMES.IDENTITY_AUTH;
                 lead_id = (business.data.verify.responseBody || {}).lead_id;
+                countryIso2 = settings.data.businessCountry.iso2;
+                if (isOtherThanKWOrSA(countryIso2)) {
+                    identification_id_type = IDENTIFICATION_TYPE.NID;
+                }
                 requestBody = {
                     id: lead_id || '',
                     identification: {
                         id: params.nid,
-                        issued_country_code: settings.data.businessCountry.iso2,
+                        issued_country_code: countryIso2,
                         type: identification_id_type
                     },
                     date_of_birth: params.dob,
@@ -412,7 +416,20 @@ export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function
                 return [4, API.leadService.updateLead(requestBody)];
             case 1:
                 data = _d.sent();
-                thunkApi.dispatch(handleNextScreenStep());
+                business_id = data.business_id, entity = data.entity;
+                screen = 'BUSINESS_OTP_STEP';
+                if (!isOtherThanKWOrSA(countryIso2)) return [3, 4];
+                screen = 'BUSINESS_BUSINESS_TYPE_STEP';
+                return [4, thunkApi.dispatch(retrieveAllEntityList({ businessId: business_id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
+            case 2:
+                _d.sent();
+                if (!isSA(countryIso2)) return [3, 4];
+                return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
+            case 3:
+                _d.sent();
+                _d.label = 4;
+            case 4:
+                thunkApi.dispatch(handleNextScreenStep(screen));
                 (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, requestBody);
                 return [2, { data: data, formData: __assign(__assign({}, params), { type: identification_id_type }) }];
         }
@@ -484,24 +501,24 @@ export var retrieveBoardDetails = createAsyncThunk('retrieveBoardDetails', funct
     });
 }); });
 export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, business, isNonSA, selectedLicense, licenseNumber, entityLegalName, certificateId, articleId, selectedEntityLicense, isFL, _b, lead_id, brand, stepName, payload, data, accountBody, accountData, brandData, brandRes, _c, message, error, list, documentData, entityData, entityId, documentBody, payload_1;
+    var _a, settings, business, isKWCountry, selectedLicense, licenseNumber, entityLegalName, certificateId, articleId, selectedEntityLicense, isFL, _b, lead_id, brand, stepName, payload, data, accountBody, accountData, brandData, brandRes, _c, message, error, list, documentData, entityData, entityId, documentBody, payload_1;
     var _d, _e;
     return __generator(this, function (_f) {
         switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
-                isNonSA = !isSA(settings.data.businessCountry.iso2);
+                isKWCountry = isKW(settings.data.businessCountry.iso2);
                 selectedLicense = params.selectedLicense, licenseNumber = params.licenseNumber, entityLegalName = params.entityLegalName, certificateId = params.certificateId, articleId = params.articleId, selectedEntityLicense = params.selectedEntityLicense;
                 isFL = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.FL;
                 _b = business.data.verify.responseBody || {}, lead_id = _b.lead_id, brand = _b.brand;
                 stepName = 'BUSINESS_ACTIVITIES_STEP';
                 payload = __assign(__assign(__assign(__assign({ id: lead_id || '', entity: {
-                        id: (selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id) && (isNonSA ? !isFL : true) ? selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id : ''
+                        id: (selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id) && (isKWCountry ? !isFL : true) ? selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id : ''
                     } }, (!(selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id) && {
-                    license_number: isNonSA && isFL ? '' : licenseNumber,
+                    license_number: isKWCountry && isFL ? '' : licenseNumber,
                     license_type: isFL ? LicenseType.FL : LicenseType.CR,
                     business_type: selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type
-                })), { step_name: BUSINESS_STEP_NAMES.BUSINESS_CR_INFO }), (isNonSA && {
+                })), { step_name: BUSINESS_STEP_NAMES.BUSINESS_CR_INFO }), (isKWCountry && {
                     business_name: isFL ? undefined : { ar: entityLegalName, en: entityLegalName }
                 })), { encryption_contract: ['license_number', 'business_type', 'license_type'] });
                 return [4, API.leadService.updateLead(payload)];
@@ -630,7 +647,7 @@ export var updateActivitiesInfo = createAsyncThunk('updateActivitiesInfo', funct
                 thunkApi.dispatch(updateStepName(stepName));
                 thunkApi.dispatch(handleNextScreenStep());
                 (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, requestBody);
-                return [2, __assign({ data: data === null || data === void 0 ? void 0 : data.brand, formData: __assign({}, params) }, currencyData)];
+                return [2, { data: data === null || data === void 0 ? void 0 : data.brand, formData: __assign({}, params), currencyData: currencyData }];
         }
     });
 }); });
@@ -657,7 +674,7 @@ export var retrieveDataList = createAsyncThunk('businessRetrieveDataList', funct
                 _a = _b.sent(), customerBases = _a[0].list, expectedSales = _a[1].list, expectedCustomerSales = _a[2].list;
                 return [2, {
                         customerBases: customerBases,
-                        expectedSales: expectedSales,
+                        expectedSales: (expectedSales === null || expectedSales === void 0 ? void 0 : expectedSales.length) ? expectedSales : EXPECTED_SALES_LIST,
                         expectedCustomerSales: expectedCustomerSales,
                         countryISO2: countryISO2
                     }];
@@ -830,10 +847,10 @@ export var businessSlice = createSlice({
             state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f;
             state.error = null;
             state.customLoading = false;
-            var _d = action.payload, data = _d.data, boardId = _d.boardId, brandData = _d.brandData, leadData = _d.leadData, token = _d.token, isRequireOTP = _d.isRequireOTP, isicActivityList = _d.isicActivityList, currencyData = _d.currencyData;
+            var _g = action.payload, data = _g.data, boardId = _g.boardId, brandData = _g.brandData, leadData = _g.leadData, token = _g.token, isRequireOTP = _g.isRequireOTP, isicActivityList = _g.isicActivityList, currencyData = _g.currencyData;
             var responseBody = state.data.verify.responseBody;
             state.data.verify.responseBody = __assign(__assign(__assign(__assign(__assign({}, data), leadData), responseBody), { board_id: boardId, lead_id: data === null || data === void 0 ? void 0 : data.id }), (brandData && { brand: brandData }));
             if (token)
@@ -841,13 +858,13 @@ export var businessSlice = createSlice({
             state.data.otpData.isNID = false;
             if (isRequireOTP)
                 return;
-            var _e = state.data.verify.responseBody || {}, entity = _e.entity, entity_activities = _e.entity_activities, business_name = _e.business_name;
+            var _h = state.data.verify.responseBody || {}, entity = _h.entity, entity_activities = _h.entity_activities, business_name = _h.business_name;
             if (business_name === null || business_name === void 0 ? void 0 : business_name.en)
                 state.data.businessTypeData.entityLegalName = business_name === null || business_name === void 0 ? void 0 : business_name.en;
             var issuingDate = ((_a = brandData === null || brandData === void 0 ? void 0 : brandData.operations) === null || _a === void 0 ? void 0 : _a.start_date) || ((_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date);
             if (issuingDate)
                 state.data.activitiesData.operationStartDate = convertNumbers2English(dateFormat(issuingDate));
-            var _f = brandData || {}, terms = _f.terms, activities = _f.activities;
+            var _j = brandData || {}, terms = _j.terms, activities = _j.activities;
             var entityActivities = (entity_activities === null || entity_activities === void 0 ? void 0 : entity_activities.filter(function (activity) {
                 return !(activities === null || activities === void 0 ? void 0 : activities.some(function (value) { return value.id === activity.id; }));
             })) || [];
@@ -861,7 +878,8 @@ export var businessSlice = createSlice({
             if ((_c = currencyData === null || currencyData === void 0 ? void 0 : currencyData.code) === null || _c === void 0 ? void 0 : _c.english)
                 state.data.currency = currencyData.code.english;
             state.data.activitiesData.activities = selectedActivity;
-            state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activityList: isicActivityList });
+            var licenseList = [OTHER_CR_LICENSE, OTHER_FL_LICENSE];
+            state.data.businessTypeData.responseBody = __assign(__assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activityList: isicActivityList }), (!((_f = (_e = (_d = state.data.businessTypeData) === null || _d === void 0 ? void 0 : _d.responseBody) === null || _e === void 0 ? void 0 : _e.licenseList) === null || _f === void 0 ? void 0 : _f.length) && { licenseList: licenseList }));
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
             state.error = action.error.message;
@@ -889,22 +907,22 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(verifyLeadOTP.fulfilled, function (state, action) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f;
             state.loading = false;
             state.error = null;
-            var _d = action.payload, data = _d.data, formData = _d.formData, brand = _d.brand, leadData = _d.leadData, isicActivityList = _d.isicActivityList, currencyData = _d.currencyData;
+            var _g = action.payload, data = _g.data, formData = _g.formData, brand = _g.brand, leadData = _g.leadData, isicActivityList = _g.isicActivityList, currencyData = _g.currencyData;
             state.data.otpData = formData;
             state.data.otpData.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;
             state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, leadData), state.data.verify.responseBody), (brand && { brand: brand })), { flows: (leadData === null || leadData === void 0 ? void 0 : leadData.flows) || [] });
-            var _e = leadData || {}, entity = _e.entity, entity_activities = _e.entity_activities, business_name = _e.business_name;
+            var _h = leadData || {}, entity = _h.entity, entity_activities = _h.entity_activities, business_name = _h.business_name;
             if (business_name === null || business_name === void 0 ? void 0 : business_name.en)
                 state.data.businessTypeData.entityLegalName = business_name === null || business_name === void 0 ? void 0 : business_name.en;
             var issuingDate = ((_b = brand === null || brand === void 0 ? void 0 : brand.operations) === null || _b === void 0 ? void 0 : _b.start_date) || ((_c = entity === null || entity === void 0 ? void 0 : entity.license) === null || _c === void 0 ? void 0 : _c.issuing_date);
             if (issuingDate)
                 state.data.activitiesData.operationStartDate = convertNumbers2English(dateFormat(issuingDate));
-            var _f = brand || {}, terms = _f.terms, activities = _f.activities;
+            var _j = brand || {}, terms = _j.terms, activities = _j.activities;
             var entityActivities = (entity_activities === null || entity_activities === void 0 ? void 0 : entity_activities.filter(function (activity) {
                 return !(activities === null || activities === void 0 ? void 0 : activities.some(function (value) { return value.id === activity.id; }));
             })) || [];
@@ -916,7 +934,8 @@ export var businessSlice = createSlice({
                 }
             });
             state.data.activitiesData.activities = selectedActivity;
-            state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activityList: isicActivityList });
+            var licenseList = [OTHER_CR_LICENSE, OTHER_FL_LICENSE];
+            state.data.businessTypeData.responseBody = __assign(__assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activityList: isicActivityList }), (!((_f = (_e = (_d = state.data.businessTypeData) === null || _d === void 0 ? void 0 : _d.responseBody) === null || _e === void 0 ? void 0 : _e.licenseList) === null || _f === void 0 ? void 0 : _f.length) && { licenseList: licenseList }));
         })
             .addCase(verifyLeadOTP.rejected, function (state, action) {
             state.loading = false;

package/build/features/app/connectExpress/connectExpressStore.d.ts

@@ -134,12 +134,13 @@ export declare const connectSlice: import("@reduxjs/toolkit").Slice<ConnectExpre
     stopLoader: (state: ConnectExpressState) => void;
     resetMobileScreen: (state: ConnectExpressState, action: ActionState<CountryCode>) => void;
     resetNIDScreen: (state: ConnectExpressState) => void;
+    setDefaultCountryCode: (state: ConnectExpressState, action: ActionState<CountryCode>) => void;
     resetCivilScreen: (state: ConnectExpressState) => void;
     resetOTPValue: (state: ConnectExpressState) => void;
     resetStore: (state: ConnectExpressState) => void;
     resetIndividualScreen: (state: ConnectExpressState) => void;
 }, "connectExpress/store">;
-export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setIsLeadIdPassed: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetMobileScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, resetOTPValue: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetNIDScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetCivilScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetStore: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setError: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setLeadId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setShowBoard: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetIndividualScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setIsLeadIdPassed: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetMobileScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, resetOTPValue: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetNIDScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetCivilScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetStore: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setError: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setLeadId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setShowBoard: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetIndividualScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setDefaultCountryCode: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>;
 declare const _default: import("redux").Reducer<ConnectExpressState, import("redux").AnyAction>;
 export default _default;
 export declare const connectExpressSelector: (state: RootState) => ConnectExpressState;

package/build/features/app/connectExpress/connectExpressStore.js

@@ -61,7 +61,7 @@ import { FlowsTypes, AuthForType, BusinessType, LicenseType } from '../../../@ty
 import API from '../../../api';
 import { CONNECT_EXPRESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_FL_LICENSE, SCOPE_AUTH } from '../../../constants';
 import { defaultCountry } from '../../../constants';
-import { getIndividualName, capitalizeTheFirstLetterOfEachWord, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA } from '../../../utils';
+import { getIndividualName, capitalizeTheFirstLetterOfEachWord, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA, isKW, isOtherThanKWOrSA } from '../../../utils';
 export var retrieveLeadIdentityByIdAsync = createAsyncThunk('expressConnect/retrieveLeadIdentityByIdAsync', function (leadId, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, connectExpress, countryCode, showBoard, data, _b, country_code, contact, phone, status, board_id, board_info_id, isRegistered, _c, boardInfo, boardData, error_1;
     var _d, _e, _f, _g;
@@ -370,7 +370,7 @@ export var createCivilIdAuthAsync = createAsyncThunk('connectExpress/createCivil
     });
 }); });
 export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileOtpAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, _b, responseData, leadId, isLeadIdPassed, mobileData, _c, auth_token, device_token, service_name, _d, scope, redirectUrl, authData, isScopeAuthentication, bi, isDataHasOperator, payload, data, authId, urlQueryStart, _e, brandList, entityList, isSaudi, next;
+    var _a, settings, connectExpress, _b, responseData, leadId, isLeadIdPassed, mobileData, _c, auth_token, device_token, service_name, _d, scope, redirectUrl, authData, isScopeAuthentication, bi, isDataHasOperator, payload, data, authId, urlQueryStart, _e, brandList, entityList, isKuwait, next;
     var _f, _g;
     return __generator(this, function (_h) {
         switch (_h.label) {
@@ -426,8 +426,10 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
             case 3: return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead_id)).unwrap()];
             case 4:
                 _h.sent();
-                isSaudi = isSA(settings.data.businessCountry.iso2);
-                next = isSaudi ? 'CONNECT_EXPRESS_NID_MISSED_STEP' : 'CONNECT_EXPRESS_CIVIL_ID_MISSED_STEP';
+                isKuwait = isKW(settings.data.businessCountry.iso2);
+                next = 'CONNECT_EXPRESS_NID_MISSED_STEP';
+                if (isKuwait)
+                    next = 'CONNECT_EXPRESS_CIVIL_ID_MISSED_STEP';
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep(next)); });
                 return [2, data];
         }
@@ -547,6 +549,9 @@ export var createNIDAuthIdentityAsync = createAsyncThunk('connectExpress/createN
                 dob = params.dob, nid = params.nid;
                 nidType = nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
                 countryCode = settings.data.businessCountry.iso2;
+                if (isOtherThanKWOrSA(countryCode)) {
+                    nidType = IDENTIFICATION_TYPE.NID;
+                }
                 requestBody = {
                     id: (_b = connectExpress.data.responseData) === null || _b === void 0 ? void 0 : _b.authData.lead_id,
                     identification: {
@@ -562,7 +567,17 @@ export var createNIDAuthIdentityAsync = createAsyncThunk('connectExpress/createN
                 return [4, API.leadService.updateLead(requestBody)];
             case 1:
                 data = _e.sent();
-                thunkApi.dispatch(handleNextScreenStep());
+                if (!((data === null || data === void 0 ? void 0 : data.verify_token) !== 'null')) return [3, 2];
+                thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_OTP_IDENTITY_STEP'));
+                return [3, 4];
+            case 2:
+                if (!isOtherThanKWOrSA(countryCode)) return [3, 4];
+                return [4, thunkApi.dispatch(getLeadByIdAsync(data.id)).unwrap()];
+            case 3:
+                _e.sent();
+                thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP'));
+                _e.label = 4;
+            case 4:
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, requestBody.identification);
                 return [2, { response: { verify_token: data.verify_token }, formData: params }];
         }
@@ -578,6 +593,9 @@ export var resendNIDAuthIdentityOTP = createAsyncThunk('connectExpress/resendNID
                 dob = params.dob, nid = params.nid;
                 nidType = nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
                 countryCode = settings.data.businessCountry.iso2;
+                if (isOtherThanKWOrSA(countryCode)) {
+                    nidType = IDENTIFICATION_TYPE.NID;
+                }
                 requestBody = {
                     id: (_b = connectExpress.data.responseData) === null || _b === void 0 ? void 0 : _b.authData.lead_id,
                     identification: {
@@ -800,14 +818,14 @@ export var updateLeadIndividualAsync = createAsyncThunk('connectExpress/updateLe
 export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDataAsync ', function (_a, thunkApi) {
     var formData = _a.formData, originalFormData = _a.originalFormData;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, connectExpress, selectedLicense, brandName, licenseNumber, termAndConditionChecked, isNonSA, isFL, _c, responseData, isLeadIdPassed, id, brandNameBody, payload, data;
+        var _b, settings, connectExpress, selectedLicense, brandName, licenseNumber, termAndConditionChecked, isKWCountry, isFL, _c, responseData, isLeadIdPassed, id, brandNameBody, payload, data;
         var _d, _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
                 case 0:
                     _b = thunkApi.getState(), settings = _b.settings, connectExpress = _b.connectExpress;
                     selectedLicense = formData.selectedLicense, brandName = formData.brandName, licenseNumber = formData.licenseNumber, termAndConditionChecked = formData.termAndConditionChecked;
-                    isNonSA = !isSA(settings.data.businessCountry.iso2);
+                    isKWCountry = isKW(settings.data.businessCountry.iso2);
                     isFL = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.FL;
                     _c = connectExpress.data, responseData = _c.responseData, isLeadIdPassed = _c.isLeadIdPassed;
                     id = ((responseData === null || responseData === void 0 ? void 0 : responseData.leadData) || {}).id;
@@ -820,13 +838,13 @@ export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDat
                     payload = {
                         id: id || '',
                         brand: brandNameBody,
-                        license_number: isNonSA && isFL ? '' : licenseNumber,
+                        license_number: isKWCountry && isFL ? '' : licenseNumber,
                         license_type: (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) ? (isFL ? LicenseType.FL : LicenseType.CR) : undefined,
                         business_type: selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type,
                         is_acknowledged: true,
                         terms_conditions_accepted: !isLeadIdPassed ? termAndConditionChecked : undefined,
                         step_name: CONNECT_EXPRESS_STEP_NAMES.UPDATE_LEAD_BRAND_BUSINESS,
-                        encryption_contract: ['license_number', 'business_type', 'license_type']
+                        encryption_contract: []
                     };
                     return [4, API.leadService.updateLeadExpress(payload)];
                 case 1:
@@ -966,6 +984,10 @@ export var connectSlice = createSlice({
         resetNIDScreen: function (state) {
             state.data.nidData = __assign(__assign({}, state.data.nidData), initialState.data.nidData);
         },
+        setDefaultCountryCode: function (state, action) {
+            state.data.mobileData.countryCode = action.payload;
+            state.data.individualData.countryCode = action.payload;
+        },
         resetCivilScreen: function (state) {
             state.data.civilIdData = __assign(__assign({}, state.data.civilIdData), initialState.data.civilIdData);
         },
@@ -1115,7 +1137,7 @@ export var connectSlice = createSlice({
             var _a;
             state.loading = false;
             state.data.civilIdData = action.payload.formData;
-            state.data.otpData.authFor = AuthForType.NATIONAL_ID;
+            state.data.otpData.authFor = AuthForType.NATIONAL_ID_MISSED;
             state.data.responseData = __assign(__assign({}, state.data.responseData), { authData: __assign(__assign({}, (_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.authData), action.payload.response) });
         })
             .addCase(createCivilIDAuthIdentityAsync.rejected, function (state, action) {
@@ -1130,7 +1152,7 @@ export var connectSlice = createSlice({
             var _a;
             state.loading = false;
             state.data.nidData = action.payload.formData;
-            state.data.otpData.authFor = AuthForType.NATIONAL_ID;
+            state.data.otpData.authFor = AuthForType.NATIONAL_ID_MISSED;
             state.data.responseData = __assign(__assign({}, state.data.responseData), { authData: __assign(__assign({}, (_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.authData), action.payload.response) });
         })
             .addCase(createNIDAuthIdentityAsync.rejected, function (state, action) {
@@ -1143,7 +1165,7 @@ export var connectSlice = createSlice({
             .addCase(resendNIDAuthIdentityOTP.fulfilled, function (state, action) {
             var _a;
             state.data.nidData = action.payload.formData;
-            state.data.otpData.authFor = AuthForType.NATIONAL_ID;
+            state.data.otpData.authFor = AuthForType.NATIONAL_ID_MISSED;
             state.data.responseData = __assign(__assign({}, state.data.responseData), { authData: __assign(__assign({}, (_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.authData), action.payload.response) });
         })
             .addCase(resendNIDAuthIdentityOTP.rejected, function (state, action) {
@@ -1294,10 +1316,12 @@ export var connectSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(updateLeadIndividualAsync.fulfilled, function (state, action) {
+            var _a, _b;
             state.loading = false;
             state.error = null;
+            var licenseList = [OTHER_CR_LICENSE, OTHER_FL_LICENSE];
             state.data.individualData = action.payload.formData;
-            state.data.responseData = __assign(__assign({}, state.data.responseData), { individualData: action.payload.response });
+            state.data.responseData = __assign(__assign(__assign({}, state.data.responseData), { individualData: action.payload.response }), (!((_b = (_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.licenseList) === null || _b === void 0 ? void 0 : _b.length) && { licenseList: licenseList }));
         })
             .addCase(updateLeadIndividualAsync.pending, function (state) {
             state.loading = true;
@@ -1391,6 +1415,6 @@ export var connectSlice = createSlice({
         });
     }
 });
-export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, setIsLeadIdPassed = _a.setIsLeadIdPassed, resetMobileScreen = _a.resetMobileScreen, resetOTPValue = _a.resetOTPValue, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, resetStore = _a.resetStore, setError = _a.setError, setLeadId = _a.setLeadId, setShowBoard = _a.setShowBoard, resetIndividualScreen = _a.resetIndividualScreen;
+export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, setIsLeadIdPassed = _a.setIsLeadIdPassed, resetMobileScreen = _a.resetMobileScreen, resetOTPValue = _a.resetOTPValue, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, resetStore = _a.resetStore, setError = _a.setError, setLeadId = _a.setLeadId, setShowBoard = _a.setShowBoard, resetIndividualScreen = _a.resetIndividualScreen, setDefaultCountryCode = _a.setDefaultCountryCode;
 export default connectSlice.reducer;
 export var connectExpressSelector = function (state) { return state.connectExpress; };

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;
@@ -1159,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;

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('')
+});