@tap-payments/auth-jsconnect 1.0.36 → 1.0.40

package/build/@types/app.d.ts

@@ -99,13 +99,13 @@ export interface Activity {
 }
 export interface SalesChannel {
     id: number;
-    name: string;
-    nameEn: string;
+    titleAr: string;
+    title: string;
 }
 export interface SourceOfIncome {
     id: number;
-    name: string;
-    nameEn: string;
+    titleAr: string;
+    title: string;
 }
 export interface AppInfo {
     name: string;

package/build/components/AnimationFlow/BottomSheet.js

@@ -24,12 +24,14 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { BottomSheet } from 'react-spring-bottom-sheet';
 import { styled } from '@mui/material/styles';
+import { useWindowSize } from '../../hooks';
 import 'react-spring-bottom-sheet/dist/style.css';
 var BottomSheetStyled = styled(BottomSheet)(function (_a) {
     var theme = _a.theme;
     return ({
         '[data-rsbs-header]:before': {
-            width: '80px'
+            width: '75px',
+            height: '5px'
         },
         '[data-rsbs-overlay]': {
             backgroundColor: theme.palette.background.paper
@@ -51,9 +53,31 @@ var BottomSheetStyled = styled(BottomSheet)(function (_a) {
 });
 var BottomSheetComponent = function (_a) {
     var open = _a.open, children = _a.children, rest = __rest(_a, ["open", "children"]);
+    var height = useWindowSize().height;
+    var getMinHeight = function (maxHeight) {
+        if (height < 500)
+            return maxHeight * 0.95;
+        if (height >= 500 && height < 550)
+            return maxHeight * 0.93;
+        if (height >= 550 && height < 600)
+            return maxHeight * 0.87;
+        if (height >= 600 && height < 650)
+            return maxHeight * 0.8;
+        if (height >= 650 && height < 700)
+            return maxHeight * 0.75;
+        if (height >= 700 && height < 750)
+            return maxHeight * 0.7;
+        if (height >= 750 && height < 800)
+            return maxHeight * 0.65;
+        if (height >= 800 && height < 850)
+            return maxHeight * 0.6;
+        if (height >= 850 && height < 900)
+            return maxHeight * 0.57;
+        return maxHeight * 0.5;
+    };
     return (_jsx(BottomSheetStyled, __assign({ open: open, snapPoints: function (_a) {
             var maxHeight = _a.maxHeight;
-            return [maxHeight * 0.7, maxHeight * 0.9];
+            return [getMinHeight(maxHeight), maxHeight * 0.95];
         } }, rest, { children: children })));
 };
 export default React.memo(BottomSheetComponent);

package/build/components/OTPTimer/OTPTimer.js

@@ -30,7 +30,9 @@ var OTPTimerStyled = styled(Box)(function (_a) {
     return ({
         display: 'flex',
         paddingInline: theme.spacing(2.5),
-        justifyContent: 'flex-end'
+        justifyContent: 'flex-end',
+        maxWidth: 'fit-content',
+        marginLeft: 'auto'
     });
 });
 var OTPTimerTextStyled = styled(Text)(function (_a) {
@@ -53,7 +55,7 @@ var OTPTimerComponent = function (_a) {
         return function () { return clearInterval(interval); };
     }, [timeValue]);
     var resetTimer = function () {
-        if (onResetClick) {
+        if (onResetClick && timeValue == 0) {
             onResetClick();
             seTimeValue(timeInSeconds || 60);
         }

package/build/constants/app.js

@@ -45,7 +45,7 @@ export var CONNECT_SCREENS_NAVIGATION = [
     {
         name: 'CONNECT_MERCHANT_INFO_STEP',
         next: 'CONNECT_THANK_YOU_STEP',
-        prev: 'CONNECT_INDIVIDUAL_STEP',
+        prev: ['CONNECT_INDIVIDUAL_STEP', 'CONNECT_PASSWORD_STEP'],
         order: 4
     },
     {
@@ -77,7 +77,7 @@ export var BUSINESS_SCREENS_NAVIGATION = [
     {
         name: 'BUSINESS_BUSINESS_TYPE_STEP',
         next: 'BUSINESS_CONFIRM_STEP',
-        prev: 'BUSINESS_OTP_STEP',
+        prev: 'BUSINESS_IDBOD_STEP',
         order: 2
     },
     {

package/build/constants/dummy.d.ts

@@ -338,6 +338,6 @@ export declare const SALES_CHANNELS: {
 }[];
 export declare const SOURCE_OF_INCOME: {
     id: number;
-    name: string;
-    nameEn: string;
+    titleAr: string;
+    title: string;
 }[];

package/build/constants/dummy.js

@@ -6425,10 +6425,10 @@ export var SALES_CHANNELS = [
     { id: 5, nameEn: 'Call Center', name: 'مركز اتصال' }
 ];
 export var SOURCE_OF_INCOME = [
-    { id: 1, name: 'راتب', nameEn: 'Salary' },
-    { id: 2, name: 'تمويل', nameEn: 'Investment' },
-    { id: 3, name: 'ورث', nameEn: 'Inheritance / inherit' },
-    { id: 4, name: 'اسهم', nameEn: 'Stocks' },
-    { id: 5, name: 'تجارة', nameEn: 'Trading' },
-    { id: 6, name: 'غير ذلك', nameEn: 'Other' }
+    { id: 1, titleAr: 'راتب', title: 'Salary' },
+    { id: 2, titleAr: 'تمويل', title: 'Investment' },
+    { id: 3, titleAr: 'ورث', title: 'Inheritance / inherit' },
+    { id: 4, titleAr: 'اسهم', title: 'Stocks' },
+    { id: 5, titleAr: 'تجارة', title: 'Trading' },
+    { id: 6, titleAr: 'غير ذلك', title: 'Other' }
 ];

package/build/constants/validation.d.ts

@@ -6,3 +6,4 @@ export declare const FL_NUMBER_LENGTH = 8;
 export declare const CR_NUMBER_LENGTH = 10;
 export declare const SAUDI_NUMBER_LENGTH = 9;
 export declare const REGEX_FULL_NAME: RegExp;
+export declare const REGEX_WEBSITE: RegExp;

package/build/constants/validation.js

@@ -6,3 +6,4 @@ export var FL_NUMBER_LENGTH = 8;
 export var CR_NUMBER_LENGTH = 10;
 export var SAUDI_NUMBER_LENGTH = 9;
 export var REGEX_FULL_NAME = /^([a-zA-Z]{2,}\s{1}[a-zA-Z]{1,}|[a-zA-Z]+\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z]{1,}|[a-zA-Z]+\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z]{1,})$/g;
+export var REGEX_WEBSITE = /^[a-zA-Z0-9]+([\-\.]{1}[a-zA-Z0-9]+)*\.[a-zA-Z]{2,63}(:[0-9]{1,5})?(\/.*)?$/;

package/build/features/app/business/businessStore.d.ts

@@ -1,7 +1,7 @@
 import { RootState } from '../../../app/store';
 import { ActivitiesFormValues, BusinessInfoFormValues, CustomersFormValues, BusinessTypeFormValues, CountryCode, CRLicense, FLLicense, NIDFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
 export declare const getCountries: import("@reduxjs/toolkit").AsyncThunk<{
-    businessCountry: any;
+    businessCountry: undefined;
     countries: any;
 }, void, {}>;
 export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
@@ -57,11 +57,8 @@ export declare const updateCustomersInfo: import("@reduxjs/toolkit").AsyncThunk<
         expectedSalesRange: import("../../../@types").ExpectedSaleRange | undefined;
         refundPolicy: boolean;
         transactionPolicy: boolean;
-        isResend: boolean;
     };
-}, CustomersFormValues & {
-    isResend: boolean;
-}, {}>;
+}, CustomersFormValues, {}>;
 export declare const updateLeadSuccess: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: void;
@@ -91,8 +88,9 @@ export interface BusinessState extends SharedState<BusinessData> {
 export declare const businessSlice: import("@reduxjs/toolkit").Slice<BusinessState, {
     clearError: (state: BusinessState) => void;
     stopLoader: (state: BusinessState) => void;
+    resetOTPScreen: (state: BusinessState) => void;
 }, "business/store">;
-export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetOTPScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
 declare const _default: import("redux").Reducer<BusinessState, import("redux").AnyAction>;
 export default _default;
 export declare const businessSelector: (state: RootState) => BusinessState;

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

@@ -55,7 +55,7 @@ import i18n from '../../../i18n';
 import { convertNumbers2English, removeRequestHeaders } from '../../../utils';
 import { handleCurrentActiveScreen, handleNextScreenStep } from '../../../app/settings';
 export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, countriesBody, list, businessCountry;
+    var settings, countriesBody, businessCountry, list;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -63,11 +63,17 @@ export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi
                 return [4, API.countryService.getAllCountries()];
             case 1:
                 countriesBody = (_a.sent()).data;
-                list = countriesBody.list;
-                businessCountry = list.find(function (item) {
-                    return [item.iso2, item.iso3].includes(settings.data.appConfig.businessCountryCode.toUpperCase());
+                businessCountry = undefined;
+                list = (countriesBody.list || []).map(function (country) {
+                    if ([country.iso2, country.iso3].includes(settings.data.appConfig.businessCountryCode.toUpperCase())) {
+                        businessCountry = country;
+                    }
+                    if (country.iso2 === 'SA') {
+                        country.digits = 9;
+                    }
+                    return country;
                 });
-                return [2, { businessCountry: businessCountry, countries: list || [] }];
+                return [2, { businessCountry: businessCountry, countries: list }];
         }
     });
 }); });
@@ -121,8 +127,6 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 if (!data.errors) {
                     (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
                     if (isNID) {
-                        thunkApi.dispatch(retrieveFLInfos());
-                        thunkApi.dispatch(retrieveCRInfos());
                         thunkApi.dispatch(handleNextScreenStep());
                     }
                     else {
@@ -147,7 +151,7 @@ export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function
                 _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
                 identification_id_type = params.nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
                 headers = {
-                    lead_id: ((_b = business.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.id) || '',
+                    lead_id: ((_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.id) || '',
                     device_identifier: (_d = (_c = settings.data.deviceInfo) === null || _c === void 0 ? void 0 : _c.browser) === null || _d === void 0 ? void 0 : _d.browser_id
                 };
                 requestBody = {
@@ -169,32 +173,32 @@ export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function
         }
     });
 }); });
-export var retrieveCRInfos = createAsyncThunk('retrieveCRInfos', function (_a, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+export var retrieveCRInfos = createAsyncThunk('retrieveCRInfos', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var business, leadId, data;
-    var _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 business = thunkApi.getState().business;
-                leadId = (_b = business.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.id;
+                leadId = (_a = business.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.id;
                 return [4, API.leadService.retrieveCRInfos(leadId)];
             case 1:
-                data = (_c.sent()).data;
+                data = (_b.sent()).data;
                 return [2, { data: data }];
         }
     });
 }); });
-export var retrieveFLInfos = createAsyncThunk('retrieveFLInfos', function (_a, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+export var retrieveFLInfos = createAsyncThunk('retrieveFLInfos', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var business, leadId, data;
-    var _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 business = thunkApi.getState().business;
-                leadId = (_b = business.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.id;
+                leadId = (_a = business.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.id;
                 return [4, API.leadService.retrieveFLInfos(leadId)];
             case 1:
-                data = (_c.sent()).data;
+                data = (_b.sent()).data;
                 return [2, { data: data }];
         }
     });
@@ -304,7 +308,7 @@ export var updateCustomersInfo = createAsyncThunk('updateCustomersInfo', functio
                 return [4, API.entityService.updateEntityInfo(requestBody, { headers: headers })];
             case 1:
                 data = (_e.sent()).data;
-                if (!data.errors && !params.isResend) {
+                if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep());
                     (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, requestBody);
                 }
@@ -389,6 +393,9 @@ export var businessSlice = createSlice({
         },
         stopLoader: function (state) {
             state.loading = false;
+        },
+        resetOTPScreen: function (state) {
+            state.data.otpData.otp = '';
         }
     },
     extraReducers: function (builder) {
@@ -445,8 +452,9 @@ export var businessSlice = createSlice({
             state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(updateLeadIdentity.pending, function (state) {
-            state.loading = true;
+            .addCase(updateLeadIdentity.pending, function (state, action) {
+            var _a;
+            state.loading = ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend) ? false : true;
             state.error = null;
         })
             .addCase(updateLeadIdentity.fulfilled, function (state, action) {
@@ -479,8 +487,10 @@ export var businessSlice = createSlice({
             var data = action.payload.data;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (!description) {
-                state.data.crInfos = data;
-                state.data.businessTypeData.businessType = BusinessType.CR;
+                if (Array.isArray(data)) {
+                    state.data.crInfos = data;
+                    state.data.businessTypeData.businessType = BusinessType.CR;
+                }
             }
         })
             .addCase(retrieveCRInfos.rejected, function (state, action) {
@@ -522,8 +532,9 @@ export var businessSlice = createSlice({
             }
             state.data.businessTypeData = formData;
             state.data.businessInfo.brandName = i18n.dir() === 'rtl' ? (_c = (_b = data === null || data === void 0 ? void 0 : data.brand) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.ar : (_e = (_d = data === null || data === void 0 ? void 0 : data.brand) === null || _d === void 0 ? void 0 : _d.name) === null || _e === void 0 ? void 0 : _e.en;
-            state.data.businessInfo.licenseNumber = (data === null || data === void 0 ? void 0 : data.freelancer_number) || (data === null || data === void 0 ? void 0 : data.cr_number);
+            state.data.businessInfo.licenseNumber = data === null || data === void 0 ? void 0 : data.freelancer_number;
             if (formData.businessType === BusinessType.CR) {
+                state.data.businessInfo.licenseNumber = data === null || data === void 0 ? void 0 : data.cr_number;
                 state.data.businessInfo.legalName = (_f = data === null || data === void 0 ? void 0 : data.license) === null || _f === void 0 ? void 0 : _f.crName;
                 state.data.activitiesData.operationStartDate = convertNumbers2English(moment((_g = data === null || data === void 0 ? void 0 : data.license) === null || _g === void 0 ? void 0 : _g.issueDate, 'iYYYY/iMM/iDD').format('YYYY-MM-DD'));
                 var activities = (_j = (_h = data === null || data === void 0 ? void 0 : data.license) === null || _h === void 0 ? void 0 : _h.activities) === null || _j === void 0 ? void 0 : _j.isic;
@@ -548,11 +559,12 @@ export var businessSlice = createSlice({
         })
             .addCase(createAccount.fulfilled, function (state, action) {
             var _a, _b;
+            state.loading = false;
             state.error = null;
             var _c = action.payload, data = _c.data, channelsData = _c.channelsData;
-            var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || ((_b = channelsData === null || channelsData === void 0 ? void 0 : channelsData.errors) === null || _b === void 0 ? void 0 : _b[0]) || {}).description;
-            if (description) {
-                state.error = description;
+            var message = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || ((_b = channelsData === null || channelsData === void 0 ? void 0 : channelsData.errors) === null || _b === void 0 ? void 0 : _b[0]) || {}).message;
+            if (message) {
+                state.error = message;
                 return;
             }
             if ((data === null || data === void 0 ? void 0 : data.status) === 'ALREADY_TAKEN') {
@@ -574,6 +586,7 @@ export var businessSlice = createSlice({
         })
             .addCase(updateActivitiesInfo.fulfilled, function (state, action) {
             var _a;
+            state.loading = false;
             state.error = null;
             var _b = action.payload, data = _b.data, formData = _b.formData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
@@ -631,6 +644,6 @@ export var businessSlice = createSlice({
         });
     }
 });
-export var clearError = (_a = businessSlice.actions, _a.clearError), stopLoader = _a.stopLoader;
+export var clearError = (_a = businessSlice.actions, _a.clearError), stopLoader = _a.stopLoader, resetOTPScreen = _a.resetOTPScreen;
 export default businessSlice.reducer;
 export var businessSelector = function (state) { return state.business; };

package/build/features/app/connect/connectStore.d.ts

@@ -1,7 +1,7 @@
 import { RootState } from '../../../app/store';
 import { ResponseData, CountryCode, MobileFormValues, NIDFormValues, OTPFormValues, IndividualFormValues, SharedState, BrandFormValues, PasswordFormValues } from '../../../@types';
 export declare const getCountries: import("@reduxjs/toolkit").AsyncThunk<{
-    businessCountry: any;
+    businessCountry: undefined;
     countries: any;
 }, void, {}>;
 export declare const createMobileAuth: import("@reduxjs/toolkit").AsyncThunk<{

package/build/features/app/connect/connectStore.js

@@ -53,7 +53,7 @@ import { CONNECT_STEP_NAMES, IDENTIFICATION_TYPE } from '../../../constants';
 import { defaultCountry } from '../../../constants';
 import { getIndividualName, getClientEmailUrl, capitalizeTheFirstLetterOfEachWord, removeRequestHeaders } from '../../../utils';
 export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, countriesBody, list, businessCountry;
+    var settings, countriesBody, businessCountry, list;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -61,11 +61,17 @@ export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi
                 return [4, API.countryService.getAllCountries()];
             case 1:
                 countriesBody = (_a.sent()).data;
-                list = countriesBody.list;
-                businessCountry = list.find(function (item) {
-                    return [item.iso2, item.iso3].includes(settings.data.appConfig.businessCountryCode.toUpperCase());
+                businessCountry = undefined;
+                list = (countriesBody.list || []).map(function (country) {
+                    if ([country.iso2, country.iso3].includes(settings.data.appConfig.businessCountryCode.toUpperCase())) {
+                        businessCountry = country;
+                    }
+                    if (country.iso2 === 'SA') {
+                        country.digits = 9;
+                    }
+                    return country;
                 });
-                return [2, { businessCountry: businessCountry, countries: list || [] }];
+                return [2, { businessCountry: businessCountry, countries: list }];
         }
     });
 }); });
@@ -437,22 +443,18 @@ export var connectSlice = createSlice({
             state.loading = false;
         },
         resetMobileScreen: function (state) {
-            state.data.mobileData = __assign(__assign({}, state.data.mobileData), initialState.data.mobileData);
         },
         resetNIDScreen: function (state) {
-            state.data.nidData = __assign(__assign({}, state.data.nidData), initialState.data.nidData);
         },
         resetOTPScreen: function (state) {
-            state.data.otpData = __assign(__assign(__assign({}, state.data.otpData), initialState.data.otpData), { isAbsher: state.data.otpData.isAbsher });
+            state.data.otpData.otp = '';
         },
         resetPasswordScreen: function (state) {
-            state.data.passwordData = initialState.data.passwordData;
         },
         resetIndividualScreen: function (state) {
             state.data.individualData = initialState.data.individualData;
         },
         resetMerchantScreen: function (state) {
-            state.data.brandData = initialState.data.brandData;
         }
     },
     extraReducers: function (builder) {
@@ -484,8 +486,9 @@ export var connectSlice = createSlice({
             state.data.mobileData.responseBody = response;
             state.data.otpData.isAbsher = false;
         })
-            .addCase(createMobileAuth.pending, function (state) {
-            state.loading = true;
+            .addCase(createMobileAuth.pending, function (state, action) {
+            var _a;
+            state.loading = ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend) ? false : true;
             state.error = null;
         })
             .addCase(createMobileAuth.rejected, function (state, action) {
@@ -506,8 +509,9 @@ export var connectSlice = createSlice({
             state.data.nidData.responseBody = response;
             state.data.otpData.isAbsher = true;
         })
-            .addCase(createNIDAuth.pending, function (state) {
-            state.loading = true;
+            .addCase(createNIDAuth.pending, function (state, action) {
+            var _a;
+            state.loading = ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend) ? false : true;
             state.error = null;
         })
             .addCase(createNIDAuth.rejected, function (state, action) {
@@ -528,8 +532,12 @@ export var connectSlice = createSlice({
             if (!!leadResponse && !leadError) {
                 var name_1 = leadResponse.name, contact = leadResponse.contact;
                 var email = (contact || {}).email;
+                var firstName = (name_1 === null || name_1 === void 0 ? void 0 : name_1.first) + ' ';
+                var middleName = !!(name_1 === null || name_1 === void 0 ? void 0 : name_1.middle) ? (name_1 === null || name_1 === void 0 ? void 0 : name_1.middle) + ' ' : '';
+                var thirdName = !!(name_1 === null || name_1 === void 0 ? void 0 : name_1.third) ? (name_1 === null || name_1 === void 0 ? void 0 : name_1.third) + ' ' : '';
+                var lastName = !!(name_1 === null || name_1 === void 0 ? void 0 : name_1.last) ? name_1 === null || name_1 === void 0 ? void 0 : name_1.middle : '';
                 if (!!name_1) {
-                    var capitalizedName = capitalizeTheFirstLetterOfEachWord((name_1 === null || name_1 === void 0 ? void 0 : name_1.first) + ' ' + (name_1 === null || name_1 === void 0 ? void 0 : name_1.middle) + ' ' + (name_1 === null || name_1 === void 0 ? void 0 : name_1.third) + ' ' + (name_1 === null || name_1 === void 0 ? void 0 : name_1.last));
+                    var capitalizedName = capitalizeTheFirstLetterOfEachWord(firstName + middleName + thirdName + lastName);
                     state.data.individualData.name = capitalizedName;
                 }
                 if (!!email)

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

@@ -25,7 +25,7 @@ import SalesChannels from './SalesChannels';
 import { ScreenContainer } from '../../../shared/Containers';
 import Collapse from '../../../../components/Collapse';
 import OperationStartDate from './OperationStartDate';
-import { businessSelector, updateActivitiesInfo } from '../../../app/business/businessStore';
+import { businessSelector, clearError, updateActivitiesInfo } from '../../../app/business/businessStore';
 import { ActivitiesValidationSchema } from './validation';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
@@ -38,8 +38,8 @@ var Activities = function () {
     var dispatch = useAppDispatch();
     var isAr = useLanguage().isAr;
     var t = useTranslation().t;
-    var data = useSelector(businessSelector).data;
-    var response = data.businessInfo.responseBody;
+    var _d = useSelector(businessSelector), data = _d.data, loading = _d.loading, error = _d.error;
+    var businessTypeResponse = data.businessTypeData.responseBody;
     var methods = useForm({
         resolver: yupResolver(ActivitiesValidationSchema),
         defaultValues: data.activitiesData,
@@ -55,10 +55,15 @@ var Activities = function () {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
     var handleMenuClick = function () {
         anchorEl ? setAnchorEl(false) : setAnchorEl(true);
     };
-    var activities_list = ((_a = response === null || response === void 0 ? void 0 : response.activities) === null || _a === void 0 ? void 0 : _a.length) > 0;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Collapse, __assign({ in: !collapse }, { children: [!!activities_list && (_jsx(ActivitiesList, { onListOpen: function () { return handleMenuClick(); }, onListClose: function () { return handleMenuClick(); } })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(SalesChannels, {}) }))] })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(OperationStartDate, { onDateClicked: handleCollapseOpenClose }) })), _jsx(Collapse, __assign({ in: !collapse && !anchorEl }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid }, { children: t('next') })) }))] })) })) }));
+    var activities_list = ((_a = businessTypeResponse === null || businessTypeResponse === void 0 ? void 0 : businessTypeResponse.activities) === null || _a === void 0 ? void 0 : _a.length) > 0;
+    var disabled = !methods.formState.isValid || !!error;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Collapse, __assign({ in: !collapse }, { children: [!!activities_list && (_jsx(ActivitiesList, { onListOpen: function () { return handleMenuClick(); }, onListClose: function () { return handleMenuClick(); } })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(SalesChannels, {}) }))] })), _jsx(Collapse, __assign({ in: !anchorEl }, { children: _jsx(OperationStartDate, { onDateClicked: handleCollapseOpenClose }) })), _jsx(Collapse, __assign({ in: !collapse && !anchorEl }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default Activities;

package/build/features/business/screens/Activities/ActivitiesList.js

@@ -94,7 +94,7 @@ var ActivitiesList = function (_a) {
         if (((_a = response === null || response === void 0 ? void 0 : response.activities) === null || _a === void 0 ? void 0 : _a.length) > 0) {
             setActivitiesMenuList(response === null || response === void 0 ? void 0 : response.activities);
         }
-    }, [response === null || response === void 0 ? void 0 : response.activities]);
+    }, []);
     var onOpenList = function (event) {
         var _a;
         setAnchorEl(event.currentTarget);

package/build/features/business/screens/Activities/OperationStartDate.js

@@ -1,14 +1,3 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { InputLabelStyled } from './ActivitiesList';
 import { useTranslation } from 'react-i18next';
@@ -26,6 +15,6 @@ var OperationStartDate = function (_a) {
         oDateControl.field.onChange(data);
     };
     var dateValue = (_b = oDateControl === null || oDateControl === void 0 ? void 0 : oDateControl.field) === null || _b === void 0 ? void 0 : _b.value;
-    return (_jsxs(ScreenContainer, __assign({ sx: { mb: 5 } }, { children: [_jsxs(InputLabelStyled, { children: [t('business_start_date'), _jsx(MandatoryStyled, { children: "*" })] }), _jsx(DatePicker, { readOnly: true, defaultValue: dateValue ? new Date(dateValue) : new Date(), dir: 'ltr', locale: 'en', onClick: function () { return onDateClicked === null || onDateClicked === void 0 ? void 0 : onDateClicked(true); }, onDatePicked: function () { return onDateClicked === null || onDateClicked === void 0 ? void 0 : onDateClicked(false); }, onDateChange: handleOperationStartDateChange })] })));
+    return (_jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [t('business_start_date'), _jsx(MandatoryStyled, { children: "*" })] }), _jsx(DatePicker, { readOnly: true, defaultValue: dateValue ? new Date(dateValue) : new Date(), dir: 'ltr', locale: 'en', onClick: function () { return onDateClicked === null || onDateClicked === void 0 ? void 0 : onDateClicked(true); }, onDatePicked: function () { return onDateClicked === null || onDateClicked === void 0 ? void 0 : onDateClicked(false); }, onDateChange: handleOperationStartDateChange })] }));
 };
 export default OperationStartDate;

package/build/features/business/screens/Activities/SalesChannels.js

@@ -105,6 +105,6 @@ var SalesChannels = function () {
         if (channelsChecked)
             return !!(channelsChecked === null || channelsChecked === void 0 ? void 0 : channelsChecked.find(function (channel) { return channel.id === (item === null || item === void 0 ? void 0 : item.id); }));
     };
-    return (_jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [t('channel_of_service'), " ", _jsx(MandatoryStyled, { children: "*" })] }), channelsMenuList.map(function (channel) { return (_jsxs(ContainerStyled, { children: [_jsx(CheckBoxStyled, { id: channel.id.toString(), disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: getSelectedChannelsFlag(channel), onChange: handleSalesChannelChange }), _jsxs(TextStyled, { children: [isAr ? channel.name : channel.nameEn, " "] })] }, channel.id)); }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: t(warningMessage) })) }))] }));
+    return (_jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [t('channel_of_service'), " ", _jsx(MandatoryStyled, { children: "*" })] }), channelsMenuList.map(function (channel) { return (_jsxs(ContainerStyled, { children: [_jsx(CheckBoxStyled, { id: channel.id.toString(), disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: getSelectedChannelsFlag(channel), onChange: handleSalesChannelChange }), _jsxs(TextStyled, { children: [isAr ? channel.titleAr : channel.title, " "] })] }, channel.id)); }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: t(warningMessage) })) }))] }));
 };
 export default SalesChannels;

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

@@ -15,32 +15,19 @@ import { useSelector } from 'react-redux';
 import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
-import Box from '@mui/material/Box';
-import { styled } from '@mui/material/styles';
 import { useAppDispatch } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import { useLanguage } from '../../../../hooks';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import { businessSelector, clearError, updateLeadBusinessType } from '../../../app/business/businessStore';
+import { businessSelector, clearError, retrieveCRInfos, retrieveFLInfos, updateLeadBusinessType } from '../../../app/business/businessStore';
 import { BusinessType as BusinessTypeEnum } from '../../../../@types';
 import Button from '../../../shared/Button';
 import { CRValidationSchema, FLValidationSchema } from './validation';
 import SelectType from './SelectType';
 import FreelanceLicense from './FreelanceLicense';
 import CompanyLicense from './CompanyLicense';
-var InputsContainerStyled = styled(Box)(function (_a) {
-    var _b;
-    var theme = _a.theme, listActive = _a.listActive;
-    return (_b = {
-            paddingBottom: theme.spacing(listActive ? 0 : 5)
-        },
-        _b[theme.transitions.create(['padding-bottom'])] = {
-            duration: theme.transitions.duration.standard
-        },
-        _b);
-});
 var BusinessType = function (_a) {
     var _b = React.useState(false), isCR = _b[0], setIsCR = _b[1];
     var _c = useSelector(businessSelector), data = _c.data, loading = _c.loading, error = _c.error;
@@ -54,8 +41,13 @@ var BusinessType = function (_a) {
         defaultValues: data.businessTypeData,
         mode: 'onChange'
     });
+    React.useEffect(function () {
+        dispatch(retrieveFLInfos());
+        dispatch(retrieveCRInfos());
+    }, []);
     React.useEffect(function () {
         var businessType = businessTypeData.businessType;
+        methods.setValue('businessType', businessType);
         if (businessType === BusinessTypeEnum.CR)
             setIsCR(true);
     }, [businessTypeData.businessType]);
@@ -73,14 +65,15 @@ var BusinessType = function (_a) {
         dispatch(handlePrevScreenStep());
     };
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(InputsContainerStyled, __assign({ listActive: listActive }, { children: [_jsx(SelectType, { show: !listActive, onSwitchToCR: function () { return setIsCR(true); }, onSwitchToFL: function () { return setIsCR(false); } }), _jsx(CompanyLicense, { show: isCR, list: data.crInfos, onListOpen: function () {
-                                    setListActive(true);
-                                }, onListClose: function () {
-                                    setListActive(false);
-                                } }), _jsx(FreelanceLicense, { show: !isCR, list: data.flInfos, onListOpen: function () {
-                                    setListActive(true);
-                                }, onListClose: function () {
-                                    setListActive(false);
-                                } })] })), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    var disableBack = !data.otpData.isNID;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(SelectType, { show: !listActive, onSwitchToCR: function () { return setIsCR(true); }, onSwitchToFL: function () { return setIsCR(false); } }), _jsx(CompanyLicense, { show: isCR, list: data.crInfos, onListOpen: function () {
+                            setListActive(true);
+                        }, onListClose: function () {
+                            setListActive(false);
+                        } }), _jsx(FreelanceLicense, { show: !isCR, list: data.flInfos, onListOpen: function () {
+                            setListActive(true);
+                        }, onListClose: function () {
+                            setListActive(false);
+                        } }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ disableBack: disableBack, onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(BusinessType);