@tap-payments/auth-jsconnect 1.0.60 → 1.0.63

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

@@ -1,6 +1,7 @@
 export interface SharedState<T> {
     error: string | null;
     loading: boolean;
+    customLoading?: boolean;
     data: T;
 }
 export interface ActionState<T> {

package/build/api/lead.d.ts

@@ -56,7 +56,10 @@ export declare type UpdateLeadBody = {
     license_type?: string;
     is_acknowledged?: boolean;
     terms_conditions_accepted?: boolean;
-    email_url?: string;
+    flows?: {
+        name: string;
+        url: string;
+    }[];
 };
 export declare type LeadVerifyBody = {
     verify_token: string;

package/build/assets/locales/ar.json

@@ -215,9 +215,9 @@
     "select_brand_label": "Brand List",
     "choose_brand": "Choose Brand",
     "confirm_enter_iban": "الايبان",
-    "open_gmail": "Gmail",
-    "open_outlook": "Outlook",
-    "open_apple": "Apple",
+    "gmail_btn_open_title": "Gmail",
+    "outlook_btn_open_title": "Outlook",
+    "apple_btn_open_title": "Apple",
     "choose_any_license": "Choose Licene",
     "future_work": "Future Work",
     "add_other_fl": "Add Freelance",
@@ -231,5 +231,6 @@
     "tax_flow_pending": "Tax",
     "individual_flow_pending": "Individual",
     "bank_flow_pending": "Bank",
-    "password_flow_pending": "Password"
+    "password_flow_pending": "Password",
+    "continue": "Continue"
 }

package/build/assets/locales/en.json

@@ -229,9 +229,9 @@
     "select_brand_label": "Brand List",
     "choose_brand": "Choose Brand",
     "confirm_enter_iban": "IBAN",
-    "open_gmail": "Gmail",
-    "open_outlook": "Outlook",
-    "open_apple": "Apple",
+    "gmail_btn_open_title": "Gmail",
+    "outlook_btn_open_title": "Outlook",
+    "apple_btn_open_title": "Apple",
     "choose_any_license": "Choose Licene",
     "future_work": "Future Work",
     "add_other_fl": "Add Freelance",
@@ -245,5 +245,6 @@
     "tax_flow_pending": "Tax",
     "individual_flow_pending": "Individual",
     "bank_flow_pending": "Bank",
-    "password_flow_pending": "Password"
+    "password_flow_pending": "Password",
+    "continue": "Continue"
 }

package/build/constants/app.js

@@ -95,7 +95,7 @@ export var BUSINESS_SCREENS_NAVIGATION = [
     },
     {
         name: 'BUSINESS_SUCCESS_STEP',
-        next: '',
+        next: 'BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         prev: 'BUSINESS_CUSTOMERS_STEP',
         order: 6
     },

package/build/constants/assets.d.ts

@@ -30,15 +30,25 @@ export declare const ICONS_NAMES: {
     ID_IMAGE: string;
     MOBILE_IMAGE: string;
     WHITE_ARROW: string;
+    BLACK_ARROW: string;
     SUCCESS: string;
     ABSHER_LOGO: string;
     EMAIL_ICON: string;
     MOBILE_ICON: string;
-    GMAIL_ICON: string;
-    OUTLOOK_ICON: string;
-    APPLE_MAIL_ICON: string;
-    TAX_ICON: string;
-    BANK_ICON: string;
-    INDIVIDUAL_ICON: string;
-    PASSWORD_ICON: string;
+    GMAIL_Filled_ICON: string;
+    GMAIL_White_ICON: string;
+    outlook_Filled_ICON: string;
+    outlook_White_ICON: string;
+    Apple_Filled_ICON: string;
+    apple_white_icon: string;
+    Tax_filled_icon: string;
+    Tax_white_icon: string;
+    Bank_filled_icon: string;
+    Bank_white_icon: string;
+    User_filled_icon: string;
+    User_white_icon: string;
+    Password_filled_icon: string;
+    Password_white_icon: string;
+    Arrow_filled_right_icon: string;
+    Arrow_white_right_icon: string;
 };

package/build/constants/assets.js

@@ -30,15 +30,25 @@ export var ICONS_NAMES = {
     ID_IMAGE: 'https://villageofwarwick.org/wp-content/uploads/2020/02/ICON99-512-1.png',
     MOBILE_IMAGE: 'https://image.shutterstock.com/image-vector/smartphone-icon-logo-260nw-767440327.jpg',
     WHITE_ARROW: 'https://tap-connecet.b-cdn.net/imgs/whiteArrow.svg',
+    BLACK_ARROW: 'https://dash.b-cdn.net/icons/menu/arrow_right_icon.svg',
     SUCCESS: 'https://tap-connecet.b-cdn.net/imgs/success.svg',
     ABSHER_LOGO: 'https://dash.b-cdn.net/icons/menu/Absher.svg',
     EMAIL_ICON: 'https://dash.b-cdn.net/icons/menu/email.png',
     MOBILE_ICON: 'https://dash.b-cdn.net/icons/menu/mobile.svg',
-    GMAIL_ICON: 'https://dash.b-cdn.net/icons/menu/gmail-icon.svg',
-    OUTLOOK_ICON: 'https://dash.b-cdn.net/icons/menu/outlook-icon.svg',
-    APPLE_MAIL_ICON: 'https://dash.b-cdn.net/icons/menu/apple-icon.svg',
-    TAX_ICON: 'https://email-templates.b-cdn.net/file.png',
-    BANK_ICON: 'https://email-templates.b-cdn.net/dollar_square.png',
-    INDIVIDUAL_ICON: 'https://email-templates.b-cdn.net/user.png',
-    PASSWORD_ICON: 'https://email-templates.b-cdn.net/lock_square.png'
+    GMAIL_Filled_ICON: 'https://dash.b-cdn.net/icons/menu/Gmail-filled.svg',
+    GMAIL_White_ICON: 'https://dash.b-cdn.net/icons/menu/Gmail-white.svg',
+    outlook_Filled_ICON: 'https://dash.b-cdn.net/icons/menu/Outlook-filled.svg',
+    outlook_White_ICON: 'https://dash.b-cdn.net/icons/menu/Outlook-white.svg',
+    Apple_Filled_ICON: 'https://dash.b-cdn.net/icons/menu/Apple-filled.svg',
+    apple_white_icon: 'https://dash.b-cdn.net/icons/menu/Apple-white.svg',
+    Tax_filled_icon: 'https://dash.b-cdn.net/icons/menu/tax-filled.svg',
+    Tax_white_icon: 'https://dash.b-cdn.net/icons/menu/tax-white.svg',
+    Bank_filled_icon: 'https://dash.b-cdn.net/icons/menu/bank-filled.svg',
+    Bank_white_icon: 'https://dash.b-cdn.net/icons/menu/bank-white.svg',
+    User_filled_icon: 'https://dash.b-cdn.net/icons/menu/user-filled.svg',
+    User_white_icon: 'https://dash.b-cdn.net/icons/menu/user-white.svg',
+    Password_filled_icon: 'https://dash.b-cdn.net/icons/menu/password-filled.svg',
+    Password_white_icon: 'https://dash.b-cdn.net/icons/menu/password-white.svg',
+    Arrow_filled_right_icon: 'https://dash.b-cdn.net/icons/menu/right-arrow-filled.svg',
+    Arrow_white_right_icon: 'https://dash.b-cdn.net/icons/menu/right-arrow-white.svg'
 };

package/build/features/Landing/Landing.js

@@ -13,15 +13,12 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import React, { memo, useEffect } from 'react';
 import { useAppTheme, useAppDispatch, useAppSelector, useErrorListener, useAppConfig } from '../../hooks';
 import { settingsSelector } from '../../app/settings';
-import AnimationFlow from '../../components/AnimationFlow';
 import { store } from '../../app/store';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
 import { getParameterByName, reactElement } from '../../utils';
-import { FeatureContainer } from '../shared/Containers';
 import { LANDING_SCREENS_NAVIGATION } from '../../constants';
 import { landingFeatureScreens } from '../featuresScreens';
-import CustomFooter from '../shared/Footer';
 import { verifyAuthToken } from '../app/landing/landingStore';
 var Landing = memo(function (props) {
     var open = React.useState(true)[0];
@@ -41,11 +38,11 @@ var Landing = memo(function (props) {
         if (!loading)
             verifyToken();
     }, [loading]);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(AnimationFlow, __assign({ open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}) }, { children: _jsx(FeatureContainer, { children: landingFeatureScreens.map(function (_a, index) {
-                    var Element = _a.element, name = _a.name;
-                    var isActive = activeScreen.name === name;
-                    return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));
-                }) }) })) })));
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: landingFeatureScreens.map(function (_a, index) {
+            var Element = _a.element, name = _a.name;
+            var isActive = activeScreen.name === name;
+            return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));
+        }) })));
 });
 export function LandingLib(props) {
     return (_jsx(ReduxProvider, __assign({ store: store }, { children: _jsx(Landing, __assign({}, props)) })));

package/build/features/Landing/screens/VerifyAndRedirect/VerifyAndRedirect.js

@@ -4,32 +4,18 @@ import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import { settingsSelector } from '../../../../app/settings';
 import { landingSelector } from '../../../app/landing/landingStore';
-import BouncingDotsLoader from '../../../shared/BouncingDotsLoader';
 import { useAppSelector } from '../../../../hooks';
-import Text from '../../../../components/Text';
+import Loader from '../../../../components/AnimationFlow/Loader';
+import Error from '../../../../components/AnimationFlow/Error';
 import { getParameterByName } from '../../../../utils';
-var TextStyledWithThreeDots = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        fontWeight: theme.typography.fontWeightBold,
-        fontSize: theme.spacing(3),
-        color: theme.palette.text.primary,
-        marginBottom: '5px'
-    });
-});
 var ScreenContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
         display: 'flex',
-        height: theme.spacing(23),
         justifyContent: 'center',
-        alignItems: 'center'
-    });
-});
-var ContainerStyled = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        display: 'flex'
+        alignItems: 'center',
+        width: '100vw',
+        height: '100vh'
     });
 });
 var VerifyAndRedirect = function (_a) {
@@ -50,6 +36,6 @@ var VerifyAndRedirect = function (_a) {
             }, 300);
         }
     }, [data.verify.responseBody]);
-    return (_jsxs(ScreenContainerStyled, { children: [isLoading && (_jsxs(ContainerStyled, { children: [_jsx(TextStyledWithThreeDots, { children: "Verifying" }), _jsx(BouncingDotsLoader, {})] })), errorMessage && _jsx(TextStyledWithThreeDots, { children: errorMessage }), !isLoading && !errorMessage && _jsx(TextStyledWithThreeDots, { children: "Verified" })] }));
+    return (_jsxs(ScreenContainerStyled, { children: [isLoading && _jsx(Loader, {}), errorMessage && _jsx(Error, { error: errorMessage })] }));
 };
 export default React.memo(VerifyAndRedirect);

package/build/features/app/bank/bankStore.js

@@ -166,6 +166,7 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
 var initialState = {
     error: null,
     loading: false,
+    customLoading: false,
     data: {
         verify: {
             token: ''
@@ -198,10 +199,12 @@ export var bankSlice = createSlice({
         builder
             .addCase(verifyLeadToken.pending, function (state) {
             state.error = null;
+            state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
             var _a;
             state.error = null;
+            state.customLoading = false;
             var _b = action.payload, data = _b.data, token = _b.token, leadData = _b.leadData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
@@ -213,6 +216,7 @@ export var bankSlice = createSlice({
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
             state.error = action.error.message;
+            state.customLoading = false;
         })
             .addCase(verifyBankLeadOTP.pending, function (state) {
             state.loading = true;

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

@@ -29,7 +29,11 @@ export declare const updateLeadIdentity: import("@reduxjs/toolkit").AsyncThunk<{
 }, {}>;
 export declare const retrieveEntityList: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
-}, void, {}>;
+    licenseNumber: string;
+}, {
+    leadId: string;
+    licenseNumber: string;
+}, {}>;
 export declare const updateLeadBusinessType: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: BusinessTypeFormValues;
@@ -58,7 +62,7 @@ export declare const updateCustomersInfo: import("@reduxjs/toolkit").AsyncThunk<
 export declare const updateLeadSuccess: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: void;
-}, void, {}>;
+} | undefined, void, {}>;
 declare type VerifyData = {
     token: string;
 };

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

@@ -60,7 +60,7 @@ import moment from 'moment';
 import API from '../../../api';
 import { BusinessType } from '../../../@types';
 import { BUSINESS_STEP_NAMES, defaultCountry, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../constants';
-import { convertNumbers2English, getClientEmailUrl, removeRequestHeaders } from '../../../utils';
+import { convertNumbers2English, getFlowUrl, 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, businessCountry;
@@ -80,8 +80,9 @@ export var getCountries = createAsyncThunk('getCountries', function (_, thunkApi
 }); });
 export var verifyLeadToken = createAsyncThunk('verifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var payload, data, leadResponse;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var _a, _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 payload = {
                     service_name: 'tap_email',
@@ -89,20 +90,23 @@ export var verifyLeadToken = createAsyncThunk('verifyLeadToken', function (token
                 };
                 return [4, API.leadService.verifyLeadToken(payload)];
             case 1:
-                data = (_a.sent()).data;
+                data = (_d.sent()).data;
                 leadResponse = undefined;
-                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 3];
+                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 4];
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
-                leadResponse = _a.sent();
+                leadResponse = _d.sent();
+                return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id, licenseNumber: (_c = (_b = (_a = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _a === void 0 ? void 0 : _a.entity) === null || _b === void 0 ? void 0 : _b.license) === null || _c === void 0 ? void 0 : _c.number }))];
+            case 3:
+                _d.sent();
                 if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH) {
                     thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
                 }
                 if (data.step_name === 'business_info') {
                     thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
                 }
-                _a.label = 3;
-            case 3: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
+                _d.label = 4;
+            case 4: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
         }
     });
 }); });
@@ -180,17 +184,13 @@ export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function
     });
 }); });
 export var retrieveEntityList = createAsyncThunk('retrieveEntityList', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var business, leadId, data;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                business = thunkApi.getState().business;
-                leadId = (_a = business.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.id;
-                return [4, API.leadService.retrieveEntityList(leadId)];
+    var data;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4, API.leadService.retrieveEntityList(params.leadId)];
             case 1:
-                data = (_b.sent()).data;
-                return [2, { data: data }];
+                data = (_a.sent()).data;
+                return [2, { data: data, licenseNumber: params.licenseNumber }];
         }
     });
 }); });
@@ -212,11 +212,13 @@ export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', f
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 data = (_g.sent()).data;
-                if (!data.errors) {
-                    thunkApi.dispatch(createAccount());
-                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
-                }
-                return [2, { data: data, formData: params }];
+                if (!!data.errors) return [3, 3];
+                return [4, thunkApi.dispatch(createAccount())];
+            case 2:
+                _g.sent();
+                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
+                _g.label = 3;
+            case 3: return [2, { data: data, formData: params }];
         }
     });
 }); });
@@ -339,33 +341,51 @@ export var updateCustomersInfo = createAsyncThunk('updateCustomersInfo', functio
     });
 }); });
 export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, business, response, payload;
-    var _b, _c, _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var _a, settings, business, id, payload, data;
+    var _b, _c, _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
-                response = undefined;
-                if (!!!((_b = business.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.id)) return [3, 2];
+                id = (business.data.otpData.responseBody || {}).id;
+                if (!id)
+                    return [2];
                 payload = {
                     step_name: BUSINESS_STEP_NAMES.BUSINESS_SUCCESS,
-                    id: ((_c = business.data.otpData.responseBody) === null || _c === void 0 ? void 0 : _c.id) || '',
-                    email_url: getClientEmailUrl(),
+                    id: id,
+                    flows: [
+                        {
+                            name: 'tax',
+                            url: getFlowUrl('/tax')
+                        },
+                        {
+                            name: 'bank',
+                            url: getFlowUrl('/bank')
+                        },
+                        {
+                            name: 'individual',
+                            url: getFlowUrl('/individual')
+                        },
+                        {
+                            name: 'password',
+                            url: getFlowUrl('/password')
+                        }
+                    ],
                     encryption_contract: []
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                response = _h.sent();
-                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, params);
-                (_g = (_f = settings.data.appConfig).onFlowCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, { data: response === null || response === void 0 ? void 0 : response.data });
-                _h.label = 2;
-            case 2: return [2, { response: response === null || response === void 0 ? void 0 : response.data, formData: params }];
+                data = (_f.sent()).data;
+                (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, params);
+                (_e = (_d = settings.data.appConfig).onFlowCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, { data: data });
+                return [2, { response: data, formData: params }];
         }
     });
 }); });
 var initialState = {
     error: null,
     loading: false,
+    customLoading: false,
     data: {
         businessCountry: defaultCountry,
         countries: [],
@@ -416,23 +436,28 @@ export var businessSlice = createSlice({
         builder
             .addCase(getCountries.fulfilled, function (state, action) {
             state.error = null;
+            state.customLoading = false;
             var _a = action.payload, businessCountry = _a.businessCountry, countries = _a.countries;
             state.data.countries = countries;
             state.data.businessCountry = businessCountry || defaultCountry;
         })
             .addCase(getCountries.pending, function (state) {
             state.error = null;
+            state.customLoading = true;
         })
             .addCase(getCountries.rejected, function (state, action) {
             state.error = action.error.message;
+            state.customLoading = false;
         })
             .addCase(verifyLeadToken.pending, function (state) {
             state.error = null;
+            state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
-            var _a, _b, _c, _d, _e;
+            var _a;
             state.error = null;
-            var _f = action.payload, data = _f.data, token = _f.token, leadData = _f.leadData;
+            state.customLoading = false;
+            var _b = action.payload, data = _b.data, token = _b.token, leadData = _b.leadData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
                 state.error = description;
@@ -441,16 +466,10 @@ export var businessSlice = createSlice({
             state.data.verify.responseBody = __assign(__assign({}, data), leadData);
             state.data.verify.token = token;
             state.data.otpData.isNID = false;
-            if (!!((_c = (_b = leadData === null || leadData === void 0 ? void 0 : leadData.entity) === null || _b === void 0 ? void 0 : _b.license) === null || _c === void 0 ? void 0 : _c.issuing_date)) {
-                state.data.activitiesData.operationStartDate = convertNumbers2English(moment((_e = (_d = leadData === null || leadData === void 0 ? void 0 : leadData.entity) === null || _d === void 0 ? void 0 : _d.license) === null || _e === void 0 ? void 0 : _e.issuing_date).format('YYYY-MM-DD'));
-            }
-            var activities = (leadData === null || leadData === void 0 ? void 0 : leadData.entity_activities) || [];
-            var selectedActivity = activities === null || activities === void 0 ? void 0 : activities[0];
-            if (!!selectedActivity)
-                state.data.activitiesData.activities = [selectedActivity];
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
             state.error = action.error.message;
+            state.customLoading = false;
         })
             .addCase(verifyLeadOTP.pending, function (state) {
             state.loading = true;
@@ -474,13 +493,17 @@ export var businessSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(updateLeadIdentity.pending, function (state, action) {
-            var _a;
-            state.loading = ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend) ? false : true;
+            var _a, _b;
+            if ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend)
+                state.customLoading = true;
+            if ((_b = action.meta.arg) === null || _b === void 0 ? void 0 : _b.isResend)
+                state.loading = true;
             state.error = null;
         })
             .addCase(updateLeadIdentity.fulfilled, function (state, action) {
             var _a;
             state.loading = false;
+            state.customLoading = 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;
@@ -495,15 +518,18 @@ export var businessSlice = createSlice({
         })
             .addCase(updateLeadIdentity.rejected, function (state, action) {
             state.loading = false;
+            state.customLoading = false;
             state.error = action.error.message;
         })
             .addCase(retrieveEntityList.pending, function (state) {
             state.error = null;
+            state.customLoading = true;
         })
             .addCase(retrieveEntityList.fulfilled, function (state, action) {
-            var _a, _b;
+            var _a, _b, _c;
             state.error = null;
-            var data = action.payload.data;
+            state.customLoading = false;
+            var _d = action.payload, data = _d.data, licenseNumber = _d.licenseNumber;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             var licenseList = [];
             if (!description) {
@@ -522,37 +548,38 @@ export var businessSlice = createSlice({
             }
             licenseList = __spreadArray(__spreadArray([], licenseList, true), [OTHER_CR_LICENSE, OTHER_FL_LICENSE], false);
             state.data.businessTypeData.responseBody = { licenseList: licenseList };
-            var selectedLicense = licenseList === null || licenseList === void 0 ? void 0 : licenseList[0];
+            var selectedLicense = ((_b = licenseList === null || licenseList === void 0 ? void 0 : licenseList.find) === null || _b === void 0 ? void 0 : _b.call(licenseList, function (item) { var _a; return ((_a = item.license) === null || _a === void 0 ? void 0 : _a.number) === licenseNumber; })) || (licenseList === null || licenseList === void 0 ? void 0 : licenseList[0]);
             state.data.businessTypeData.selectedLicense = selectedLicense;
-            state.data.businessTypeData.licenseNumber = (_b = selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.license) === null || _b === void 0 ? void 0 : _b.number;
+            state.data.businessTypeData.licenseNumber = (_c = selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.license) === null || _c === void 0 ? void 0 : _c.number;
         })
             .addCase(retrieveEntityList.rejected, function (state, action) {
             state.error = action.error.message;
+            state.customLoading = false;
         })
             .addCase(updateLeadBusinessType.pending, function (state) {
             state.loading = true;
             state.error = null;
         })
             .addCase(updateLeadBusinessType.fulfilled, function (state, action) {
-            var _a, _b, _c, _d, _e;
-            state.loading = true;
+            var _a, _b, _c, _d;
+            state.loading = false;
             state.error = null;
-            var _f = action.payload, data = _f.data, formData = _f.formData;
+            var _e = action.payload, data = _e.data, formData = _e.formData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
                 state.error = description;
                 return;
             }
             state.data.businessTypeData = __assign(__assign({}, state.data.businessTypeData), formData);
-            if (!!((_c = (_b = data === null || data === void 0 ? void 0 : data.entity) === null || _b === void 0 ? void 0 : _b.license) === null || _c === void 0 ? void 0 : _c.issuing_date)) {
-                state.data.activitiesData.operationStartDate = convertNumbers2English(moment((_e = (_d = data === null || data === void 0 ? void 0 : data.entity) === null || _d === void 0 ? void 0 : _d.license) === null || _e === void 0 ? void 0 : _e.issuing_date).format('YYYY-MM-DD'));
+            var entity = data.entity, entity_activities = data.entity_activities;
+            if (!!((_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date)) {
+                state.data.activitiesData.operationStartDate = convertNumbers2English(moment((_d = (_c = data === null || data === void 0 ? void 0 : data.entity) === null || _c === void 0 ? void 0 : _c.license) === null || _d === void 0 ? void 0 : _d.issuing_date).format('YYYY-MM-DD'));
             }
-            var activities = (data === null || data === void 0 ? void 0 : data.entity_activities) || [];
+            var activities = entity_activities || [];
             var selectedActivity = activities === null || activities === void 0 ? void 0 : activities[0];
             if (!!selectedActivity)
                 state.data.activitiesData.activities = [selectedActivity];
-            var licenseList = (state.data.businessTypeData.responseBody || { licenseList: [] }).licenseList;
-            state.data.businessTypeData.responseBody = __assign(__assign({ licenseList: licenseList }, data), { activities: activities });
+            state.data.businessTypeData.responseBody = __assign(__assign(__assign({}, data), state.data.businessTypeData.responseBody), { activities: activities });
         })
             .addCase(updateLeadBusinessType.rejected, function (state, action) {
             state.loading = false;
@@ -656,7 +683,7 @@ export var businessSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var response = action.payload.response;
+            var response = (action.payload || {}).response;
             var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
                 state.error = description;