@tap-payments/auth-jsconnect 1.0.51 → 1.0.54

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

@@ -0,0 +1,218 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var _a;
+import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
+import API from '../../../api';
+import { removeRequestHeaders } from '../../../utils';
+import { handleNextScreenStep } from '../../../app/settings';
+import { BANK_STEP_NAMES } from '../../../constants';
+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) {
+            case 0:
+                payload = {
+                    service_name: 'tap_email',
+                    verify_token: token
+                };
+                return [4, API.leadService.verifyLeadToken(payload)];
+            case 1:
+                data = (_a.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];
+                return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
+            case 2:
+                leadResponse = _a.sent();
+                if (data.step_name === BANK_STEP_NAMES.IDENTITY_AUTH) {
+                    thunkApi.dispatch(handleNextScreenStep());
+                }
+                _a.label = 3;
+            case 3: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
+        }
+    });
+}); });
+export var verifyBankLeadOTP = createAsyncThunk('verifyBankLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, bank, settings, responseBody, payload, data;
+    var _b, _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
+            case 0:
+                _a = thunkApi.getState(), bank = _a.bank, settings = _a.settings;
+                responseBody = bank.data.verify.responseBody;
+                payload = {
+                    data: params.otp,
+                    service_name: (_b = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _b === void 0 ? void 0 : _b.service_name,
+                    verify_token: responseBody === null || responseBody === void 0 ? void 0 : responseBody.verify_token,
+                    step_name: BANK_STEP_NAMES.PHONE_AUTH,
+                    encryption_contract: ['data']
+                };
+                return [4, API.leadService.verifyLeadOTP(payload)];
+            case 1:
+                data = (_e.sent()).data;
+                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 });
+                    thunkApi.dispatch(handleNextScreenStep());
+                }
+                return [2, { data: data, formData: __assign({}, params) }];
+        }
+    });
+}); });
+export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, bank, payload, data;
+    var _b, _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, bank = _a.bank;
+                payload = {
+                    step_name: BANK_STEP_NAMES.BANK_SUCCESS,
+                    id: ((_b = bank.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.id) || '',
+                    encryption_contract: []
+                };
+                return [4, API.leadService.updateLead(payload)];
+            case 1:
+                data = (_g.sent()).data;
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
+                (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
+                return [2, { response: data, formData: params }];
+        }
+    });
+}); });
+var initialState = {
+    error: null,
+    loading: false,
+    data: {
+        verify: {
+            token: ''
+        },
+        otpData: {
+            otp: ''
+        },
+        bankData: {
+            iban: '',
+            beneficiaryName: '',
+            bankName: ''
+        }
+    }
+};
+export var bankSlice = createSlice({
+    name: 'bank/store',
+    initialState: initialState,
+    reducers: {
+        clearError: function (state) {
+            state.error = null;
+        },
+        stopLoader: function (state) {
+            state.loading = false;
+        },
+        resetOTPScreen: function (state) {
+            state.data.otpData.otp = '';
+        }
+    },
+    extraReducers: function (builder) {
+        builder
+            .addCase(verifyLeadToken.fulfilled, function (state, action) {
+            var _a;
+            state.error = null;
+            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;
+                return;
+            }
+            state.data.verify.responseBody = __assign(__assign({}, data), leadData);
+            state.data.verify.token = token;
+        })
+            .addCase(verifyLeadToken.rejected, function (state, action) {
+            state.error = action.error.message;
+        })
+            .addCase(verifyBankLeadOTP.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(verifyBankLeadOTP.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;
+            if (description) {
+                state.error = description;
+                return;
+            }
+            state.data.otpData = formData;
+        })
+            .addCase(verifyBankLeadOTP.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(updateLeadSuccess.fulfilled, function (state, action) {
+            var _a;
+            state.loading = false;
+            state.error = null;
+            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;
+                return;
+            }
+            removeRequestHeaders();
+        })
+            .addCase(updateLeadSuccess.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(updateLeadSuccess.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        });
+    }
+});
+export var clearError = (_a = bankSlice.actions, _a.clearError), stopLoader = _a.stopLoader, resetOTPScreen = _a.resetOTPScreen;
+export default bankSlice.reducer;
+export var bankSelector = function (state) { return state.bank; };

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

@@ -1,5 +1,5 @@
 import { RootState } from '../../../app/store';
-import { ActivitiesFormValues, BusinessInfoFormValues, CustomersFormValues, BusinessTypeFormValues, CountryCode, License, NIDFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
+import { ActivitiesFormValues, CustomersFormValues, BusinessTypeFormValues, CountryCode, License, NIDFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
 export declare const getCountries: import("@reduxjs/toolkit").AsyncThunk<{
     businessCountry: any;
     countries: any;
@@ -55,7 +55,7 @@ export declare const updateCustomersInfo: import("@reduxjs/toolkit").AsyncThunk<
     data: any;
     formData: {
         customerLocations: import("../../../@types").CustomerLocation[];
-        expectedCustomers: import("../../../@types").ExpectedCustomer | undefined;
+        expectedCustomer: import("../../../@types").ExpectedCustomer | undefined;
         expectedSalesRange: import("../../../@types").ExpectedSaleRange | undefined;
         refundPolicy: boolean;
         transactionPolicy: boolean;
@@ -81,7 +81,6 @@ export interface BusinessData {
     businessTypeData: BusinessTypeFormValues & ResponseData;
     crInfos: Array<License>;
     flInfos: Array<License>;
-    businessInfo: BusinessInfoFormValues & ResponseData;
     activitiesData: ActivitiesFormValues & ResponseData;
     customersData: CustomersFormValues & ResponseData;
 }

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

@@ -51,7 +51,6 @@ import moment from 'moment';
 import API from '../../../api';
 import { BusinessType } from '../../../@types';
 import { BUSINESS_STEP_NAMES, defaultCountry, IDENTIFICATION_TYPE } from '../../../constants';
-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 () {
@@ -71,9 +70,10 @@ 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 payload, data, leadResponse, steps, hasBusinessCompleted;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 payload = {
                     service_name: 'tap_email',
@@ -81,19 +81,25 @@ export var verifyLeadToken = createAsyncThunk('verifyLeadToken', function (token
                 };
                 return [4, API.leadService.verifyLeadToken(payload)];
             case 1:
-                data = (_a.sent()).data;
+                data = (_b.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];
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
-                leadResponse = _a.sent();
+                leadResponse = _b.sent();
+                steps = (_a = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _a === void 0 ? void 0 : _a.steps;
+                hasBusinessCompleted = Object.keys(steps).find(function (key) { return key === BUSINESS_STEP_NAMES.BUSINESS_SUCCESS; });
+                if (hasBusinessCompleted) {
+                    thunkApi.dispatch(handleCurrentActiveScreen('BUSINESS_SUCCESS_STEP'));
+                    return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
+                }
                 if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH) {
                     thunkApi.dispatch(handleCurrentActiveScreen('BUSINESS_IDBOD_STEP'));
                 }
                 if (data.step_name === 'business_info') {
                     thunkApi.dispatch(handleCurrentActiveScreen('BUSINESS_BUSINESS_TYPE_STEP'));
                 }
-                _a.label = 3;
+                _b.label = 3;
             case 3: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
         }
     });
@@ -189,7 +195,7 @@ export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', f
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
                 payload = {
-                    lead_id: ((_b = business.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.id) || '',
+                    id: ((_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.id) || '',
                     license_number: params.businessType === BusinessType.FL ? params.flNumber : params.crNumber,
                     license_type: params.businessType === BusinessType.FL ? 'freelance' : 'commercial_registration',
                     business_type: params.businessType,
@@ -200,7 +206,7 @@ export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', f
             case 1:
                 data = (_e.sent()).data;
                 if (!data.errors) {
-                    thunkApi.dispatch(handleNextScreenStep());
+                    thunkApi.dispatch(createAccount());
                     (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
                 }
                 return [2, { data: data, formData: params }];
@@ -215,7 +221,7 @@ export var createAccount = createAsyncThunk('createAccount', function (params, t
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
                 requestBody = {
-                    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,
                     notify: {
                         email: false,
                         phone: false
@@ -251,8 +257,8 @@ export var updateActivitiesInfo = createAsyncThunk('updateActivitiesInfo', funct
                     return value;
                 });
                 activities = (_b = (params.activities || [])) === null || _b === void 0 ? void 0 : _b.map(function (_a) {
-                    var id = _a.id;
-                    return id === null || id === void 0 ? void 0 : id.toString();
+                    var en = _a.en;
+                    return en;
                 });
                 requestBody = {
                     activities: activities,
@@ -260,42 +266,42 @@ export var updateActivitiesInfo = createAsyncThunk('updateActivitiesInfo', funct
                     business_operation_start_at: params.operationStartDate,
                     step_name: BUSINESS_STEP_NAMES.BUSINESS_CR_ACTIVITIES
                 };
-                headers = { entity_id: (_c = business.data.businessInfo.responseBody) === null || _c === void 0 ? void 0 : _c.entity_id };
+                headers = { entity_id: (_c = business.data.businessTypeData.responseBody) === null || _c === void 0 ? void 0 : _c.entity_id };
                 return [4, API.entityService.createEntityInfo(requestBody, { headers: headers })];
             case 1:
                 data = (_f.sent()).data;
-                if (!data.errors) {
-                    thunkApi.dispatch(retrieveDataList());
-                    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, { data: data, formData: __assign({}, params) }];
+                if (!!data.errors) return [3, 3];
+                return [4, thunkApi.dispatch(retrieveDataList())];
+            case 2:
+                _f.sent();
+                thunkApi.dispatch(handleNextScreenStep());
+                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, requestBody);
+                _f.label = 3;
+            case 3: return [2, { data: data, formData: __assign({}, params) }];
         }
     });
 }); });
 export var retrieveDataList = createAsyncThunk('retrieveDataList', function () { return __awaiter(void 0, void 0, void 0, function () {
-    var customerBases, expectedSales, expectedCustomerSales;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4, API.dataService.getCustomerBases()];
+    var _a, customerBases, expectedSales, expectedCustomerSales;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0: return [4, Promise.all([
+                    API.dataService.getCustomerBases(),
+                    API.dataService.getExpectedSales(),
+                    API.dataService.getExpectedCustomerSales()
+                ])];
             case 1:
-                customerBases = _a.sent();
-                return [4, API.dataService.getExpectedSales()];
-            case 2:
-                expectedSales = _a.sent();
-                return [4, API.dataService.getExpectedCutomerSales()];
-            case 3:
-                expectedCustomerSales = _a.sent();
+                _a = _b.sent(), customerBases = _a[0].data, expectedSales = _a[1].data, expectedCustomerSales = _a[2].data;
                 return [2, {
-                        customerBases: customerBases === null || customerBases === void 0 ? void 0 : customerBases.data,
-                        expectedSales: expectedSales === null || expectedSales === void 0 ? void 0 : expectedSales.data,
-                        expectedCustomerSales: expectedCustomerSales === null || expectedCustomerSales === void 0 ? void 0 : expectedCustomerSales.data
+                        customerBases: customerBases,
+                        expectedSales: expectedSales,
+                        expectedCustomerSales: expectedCustomerSales
                     }];
         }
     });
 }); });
 export var updateCustomersInfo = createAsyncThunk('updateCustomersInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, business, customerBase, requestBody, headers, data;
+    var _a, settings, business, customerBase, requestBody, data;
     var _b, _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
@@ -307,14 +313,14 @@ export var updateCustomersInfo = createAsyncThunk('updateCustomersInfo', functio
                 });
                 requestBody = {
                     customers_base: customerBase,
-                    customers_served_monthly: parseInt(((_b = params.expectedCustomers) === null || _b === void 0 ? void 0 : _b.id) || '0'),
-                    yearly_sales_range: ((_c = params.expectedSalesRange) === null || _c === void 0 ? void 0 : _c.title) || '',
+                    id: (_b = business.data.businessTypeData.responseBody) === null || _b === void 0 ? void 0 : _b.entity_id,
+                    customers_served_monthly: parseInt(((_c = params.expectedCustomer) === null || _c === void 0 ? void 0 : _c.id) || '0'),
+                    yearly_sales_range: ((_d = params.expectedSalesRange) === null || _d === void 0 ? void 0 : _d.title) || '',
                     agree_refund: params.refundPolicy,
                     agree_chargeback: params.transactionPolicy,
                     step_name: BUSINESS_STEP_NAMES.BUSINESS_CUSTOMERS
                 };
-                headers = { entity_id: (_d = business.data.activitiesData.responseBody) === null || _d === void 0 ? void 0 : _d.entity_id };
-                return [4, API.entityService.updateEntityInfo(requestBody, { headers: headers })];
+                return [4, API.entityService.updateEntityInfo(requestBody)];
             case 1:
                 data = (_g.sent()).data;
                 if (!data.errors) {
@@ -326,23 +332,26 @@ 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, payload, data;
-    var _b, _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _a, settings, business, response, payload;
+    var _b, _c, _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.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];
                 payload = {
                     step_name: BUSINESS_STEP_NAMES.BUSINESS_SUCCESS,
-                    lead_id: ((_b = business.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.id) || '',
+                    id: ((_c = business.data.otpData.responseBody) === null || _c === void 0 ? void 0 : _c.id) || '',
                     encryption_contract: []
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                data = (_g.sent()).data;
-                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
-                (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
-                return [2, { response: data, formData: params }];
+                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 }];
         }
     });
 }); });
@@ -371,11 +380,6 @@ var initialState = {
         },
         crInfos: [],
         flInfos: [],
-        businessInfo: {
-            licenseNumber: '',
-            brandName: '',
-            legalName: ''
-        },
         activitiesData: {
             activities: [],
             salesChannels: [],
@@ -383,7 +387,7 @@ var initialState = {
         },
         customersData: {
             customerLocations: [],
-            expectedCustomers: undefined,
+            expectedCustomer: undefined,
             expectedSalesRange: undefined,
             refundPolicy: false,
             transactionPolicy: false
@@ -422,9 +426,9 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
-            var _a;
+            var _a, _b, _c, _d, _e;
             state.error = null;
-            var _b = action.payload, data = _b.data, token = _b.token, leadData = _b.leadData;
+            var _f = action.payload, data = _f.data, token = _f.token, leadData = _f.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;
@@ -433,6 +437,13 @@ 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;
@@ -511,35 +522,24 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(updateLeadBusinessType.fulfilled, function (state, action) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-            state.loading = false;
+            var _a, _b, _c, _d, _e;
+            state.loading = true;
             state.error = null;
-            var _t = action.payload, data = _t.data, formData = _t.formData;
+            var _f = action.payload, data = _f.data, formData = _f.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 = formData;
-            var isAr = i18n.dir() === 'rtl';
-            state.data.businessInfo.brandName = isAr ? (_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.license_number) || '';
-            state.data.businessInfo.legalName = isAr ? (_g = (_f = data === null || data === void 0 ? void 0 : data.entity) === null || _f === void 0 ? void 0 : _f.legal_name) === null || _g === void 0 ? void 0 : _g.ar : (_j = (_h = data === null || data === void 0 ? void 0 : data.entity) === null || _h === void 0 ? void 0 : _h.legal_name) === null || _j === void 0 ? void 0 : _j.en;
-            if (!!((_l = (_k = data === null || data === void 0 ? void 0 : data.entity) === null || _k === void 0 ? void 0 : _k.license) === null || _l === void 0 ? void 0 : _l.issuing_date)) {
-                state.data.activitiesData.operationStartDate = convertNumbers2English(moment((_o = (_m = data === null || data === void 0 ? void 0 : data.entity) === null || _m === void 0 ? void 0 : _m.license) === null || _o === void 0 ? void 0 : _o.issuing_date).format('YYYY-MM-DD'));
-            }
-            if (formData.businessType === BusinessType.CR) {
-                var activities = ((_q = (_p = data === null || data === void 0 ? void 0 : data.license) === null || _p === void 0 ? void 0 : _p.activities) === null || _q === void 0 ? void 0 : _q.isic) || [];
-                var selectedActivity = activities === null || activities === void 0 ? void 0 : activities[0];
-                if (!!selectedActivity)
-                    state.data.activitiesData.activities = [selectedActivity];
-                state.data.businessTypeData.responseBody = __assign(__assign({}, data), { activities: activities });
-                return;
+            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 category = (_s = (_r = data === null || data === void 0 ? void 0 : data.license) === null || _r === void 0 ? void 0 : _r.License) === null || _s === void 0 ? void 0 : _s.Category;
-            if (!!category)
-                state.data.activitiesData.activities = [category];
-            state.data.businessTypeData.responseBody = __assign(__assign({}, data), { activities: !!category ? [category] : [] });
+            var activities = (data === null || data === void 0 ? void 0 : data.entity_activities) || [];
+            var selectedActivity = activities === null || activities === void 0 ? void 0 : activities[0];
+            if (!!selectedActivity)
+                state.data.activitiesData.activities = [selectedActivity];
+            state.data.businessTypeData.responseBody = __assign(__assign({}, data), { activities: activities });
         })
             .addCase(updateLeadBusinessType.rejected, function (state, action) {
             state.loading = false;
@@ -563,7 +563,7 @@ export var businessSlice = createSlice({
                 state.error = 'signup_user_exists_error';
                 return;
             }
-            state.data.businessInfo.responseBody = __assign(__assign({}, data), { channelList: channelsData || [] });
+            state.data.businessTypeData.responseBody = __assign(__assign({}, data), { channelList: channelsData || [] });
             var selectedChannel = channelsData === null || channelsData === void 0 ? void 0 : channelsData[0];
             if (!!selectedChannel)
                 state.data.activitiesData.salesChannels = [selectedChannel];
@@ -598,15 +598,9 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(retrieveDataList.fulfilled, function (state, action) {
-            var _a, _b, _c;
             state.loading = false;
             state.error = null;
-            var _d = action.payload, customerBases = _d.customerBases, expectedSales = _d.expectedSales, expectedCustomerSales = _d.expectedCustomerSales;
-            var description = (((_a = customerBases === null || customerBases === void 0 ? void 0 : customerBases.errors) === null || _a === void 0 ? void 0 : _a[0]) || ((_b = expectedSales === null || expectedSales === void 0 ? void 0 : expectedSales.errors) === null || _b === void 0 ? void 0 : _b[0]) || ((_c = expectedCustomerSales === null || expectedCustomerSales === void 0 ? void 0 : expectedCustomerSales.errors) === null || _c === void 0 ? void 0 : _c[0]) || {}).description;
-            if (description) {
-                state.error = description;
-                return;
-            }
+            var _a = action.payload, customerBases = _a.customerBases, expectedSales = _a.expectedSales, expectedCustomerSales = _a.expectedCustomerSales;
             var data = state.data.activitiesData.responseBody;
             state.data.activitiesData.responseBody = __assign(__assign({}, data), { customerBases: customerBases || [], expectedSales: expectedSales || [], expectedCustomerSales: expectedCustomerSales || [] });
             var selectedCustomerBase = customerBases === null || customerBases === void 0 ? void 0 : customerBases[0];
@@ -617,7 +611,7 @@ export var businessSlice = createSlice({
                 state.data.customersData.expectedSalesRange = selectedExpectedSale;
             var selectedExpectedCustomerSale = expectedCustomerSales === null || expectedCustomerSales === void 0 ? void 0 : expectedCustomerSales[(expectedCustomerSales === null || expectedCustomerSales === void 0 ? void 0 : expectedCustomerSales.length) - 1];
             if (!!selectedExpectedCustomerSale)
-                state.data.customersData.expectedCustomers = selectedExpectedCustomerSale;
+                state.data.customersData.expectedCustomer = selectedExpectedCustomerSale;
         })
             .addCase(retrieveDataList.rejected, function (state, action) {
             state.loading = false;