@tap-payments/auth-jsconnect 2.4.0-test → 2.4.1

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

@@ -24,7 +24,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -58,114 +58,125 @@ var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { BusinessType, FlowsTypes, DocumentPurpose, LicenseType } from '../../../@types';
-import { BUSINESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_ENTITY_LICENSE, OTHER_FL_LICENSE } from '../../../constants';
-import { convertNumbers2English, hasKey, sleep, isKW, isSA, dateFormat, isOtherLicense } from '../../../utils';
-import { handleNextScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
+import { BUSINESS_STEP_NAMES, EXPECTED_SALES_LIST, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_ENTITY_LICENSE, OTHER_FL_LICENSE } from '../../../constants';
+import { convertNumbers2English, hasKey, sleep, isKW, isSA, dateFormat, isOtherLicense, isOtherThanKWOrSA } from '../../../utils';
+import { handleNextScreenStep, handlePublicKey, handleSetCountryByIso2 } from '../../../app/settings';
 export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var payload, data, countryIso2, boardData, brandData, leadData, entity_activities, steps, brand, board_id, business_id, entity, brandID, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted, activityList;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var settings, payload, data, publicKey, countryIso2, boardData, brandData, currencyData, isicActivityList, leadData, _a, steps, brand, board_id, business_id, entity, brandID, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted, list, list;
+    var _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
+                settings = thunkApi.getState().settings;
                 payload = {
                     service_name: 'tap_email',
                     verify_token: token
                 };
                 return [4, API.leadService.verifyLeadToken(payload)];
             case 1:
-                data = (_b.sent()).data;
-                if ((_a = data.errors) === null || _a === void 0 ? void 0 : _a.length)
+                data = (_d.sent()).data;
+                if ((_b = data.errors) === null || _b === void 0 ? void 0 : _b.length)
                     throw new Error(data.errors[0].description);
                 if (data.mw_error)
                     throw new Error(data.mw_error);
+                publicKey = (_c = data === null || data === void 0 ? void 0 : data.config) === null || _c === void 0 ? void 0 : _c.public_key;
+                if (publicKey) {
+                    thunkApi.dispatch(handlePublicKey(publicKey));
+                }
                 countryIso2 = data === null || data === void 0 ? void 0 : data.country_code;
                 if (countryIso2)
                     thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                if (!(data.step_name !== BUSINESS_STEP_NAMES.PHONE_AUTH)) return [3, 20];
+                if (!(data.step_name !== BUSINESS_STEP_NAMES.PHONE_AUTH)) return [3, 21];
                 boardData = undefined;
-                brandData = undefined;
+                brandData = void 0, currencyData = undefined, isicActivityList = undefined;
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
-                leadData = (_b.sent()).data;
+                leadData = (_d.sent()).data;
                 countryIso2 = leadData === null || leadData === void 0 ? void 0 : leadData.country_code;
                 if (!countryIso2)
                     thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
                 if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH && isKW(countryIso2)) {
                     thunkApi.dispatch(handleNextScreenStep('BUSINESS_CIVIL_ID_STEP'));
                 }
-                if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH && !isKW(countryIso2)) {
+                if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH && (isSA(countryIso2) || isOtherThanKWOrSA(countryIso2))) {
                     thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
                 }
-                if (!(data.step_name === BUSINESS_STEP_NAMES.BUSINESS_INFO)) return [3, 19];
-                entity_activities = leadData.entity_activities, steps = leadData.steps, brand = leadData.brand, board_id = leadData.board_id, business_id = leadData.business_id, entity = leadData.entity;
+                if (!(data.step_name === BUSINESS_STEP_NAMES.BUSINESS_INFO)) return [3, 20];
+                _a = leadData || {}, steps = _a.steps, brand = _a.brand, board_id = _a.board_id, business_id = _a.business_id, entity = _a.entity;
                 brandID = brand === null || brand === void 0 ? void 0 : brand.id;
                 hasBusinessCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_SUCCESS);
                 hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO) && hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_INFO_CONFIRM);
                 hasBusinessCRActivitiesCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_ACTIVITIES);
                 hasBusinessCustomersCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CUSTOMERS);
-                if (!(!entity_activities && (hasBusinessCRInfoCompleted || hasBusinessCRActivitiesCompleted) && !hasBusinessCompleted)) return [3, 4];
-                return [4, API.dataService.getActivities()];
+                if (!hasBusinessCompleted) return [3, 6];
+                if (!board_id) return [3, 5];
+                return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
             case 3:
-                activityList = (_b.sent()).list;
-                leadData = __assign(__assign({}, leadData), { entity_activities: activityList });
-                _b.label = 4;
+                boardData = _d.sent();
+                return [4, thunkApi.dispatch(retrieveBoardDetails(board_id))];
             case 4:
-                if (!hasBusinessCompleted) return [3, 8];
-                if (!board_id) return [3, 7];
-                return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
+                _d.sent();
+                _d.label = 5;
             case 5:
-                boardData = _b.sent();
-                return [4, thunkApi.dispatch(retrieveBoardDetails(board_id))];
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
+                return [3, 20];
             case 6:
-                _b.sent();
-                _b.label = 7;
+                if (!(data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH)) return [3, 7];
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
+                return [3, 20];
             case 7:
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 19];
+                if (!hasBusinessCustomersCompleted) return [3, 8];
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_STEP'));
+                return [3, 20];
             case 8:
-                if (!(data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH)) return [3, 9];
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
-                return [3, 19];
+                if (!hasBusinessCRActivitiesCompleted) return [3, 13];
+                return [4, API.countryService.getCurrency(settings.data.businessCountry.iso2)];
             case 9:
-                if (!hasBusinessCustomersCompleted) return [3, 10];
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_STEP'));
-                return [3, 19];
+                currencyData = _d.sent();
+                return [4, API.dataService.getActivitiesIsIc()];
             case 10:
-                if (!hasBusinessCRActivitiesCompleted) return [3, 13];
+                list = (_d.sent()).list;
+                isicActivityList = list || [];
                 return [4, thunkApi.dispatch(retrieveDataList())];
             case 11:
-                _b.sent();
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
+                _d.sent();
                 return [4, API.brandService.retrieveBrand(brandID)];
             case 12:
-                brandData = _b.sent();
-                return [3, 19];
+                brandData = _d.sent();
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
+                return [3, 20];
             case 13:
-                if (!hasBusinessCRInfoCompleted) return [3, 15];
-                return [4, API.brandService.retrieveBrand(brandID)];
+                if (!hasBusinessCRInfoCompleted) return [3, 16];
+                return [4, API.dataService.getActivitiesIsIc()];
             case 14:
-                brandData = _b.sent();
+                list = (_d.sent()).list;
+                isicActivityList = list || [];
+                return [4, API.brandService.retrieveBrand(brandID)];
+            case 15:
+                brandData = _d.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP'));
-                return [3, 19];
-            case 15: return [4, thunkApi.dispatch(retrieveAllEntityList({ businessId: business_id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
-            case 16:
-                _b.sent();
-                if (!isSA(countryIso2)) return [3, 18];
-                return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
+                return [3, 20];
+            case 16: return [4, thunkApi.dispatch(retrieveAllEntityList({ businessId: business_id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
             case 17:
-                _b.sent();
-                _b.label = 18;
+                _d.sent();
+                if (!isSA(countryIso2)) return [3, 19];
+                return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
             case 18:
+                _d.sent();
+                _d.label = 19;
+            case 19:
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
-                _b.label = 19;
-            case 19: return [2, {
+                _d.label = 20;
+            case 20: return [2, {
                     data: data,
+                    isicActivityList: isicActivityList,
                     leadData: __assign(__assign({}, leadData), { flows: (boardData === null || boardData === void 0 ? void 0 : boardData.info) || [] }),
                     token: token,
-                    brandData: (brandData === null || brandData === void 0 ? void 0 : brandData.brand) || {},
-                    boardId: leadData === null || leadData === void 0 ? void 0 : leadData.board_id
+                    brandData: brandData === null || brandData === void 0 ? void 0 : brandData.brand,
+                    boardId: leadData === null || leadData === void 0 ? void 0 : leadData.board_id,
+                    currencyData: currencyData
                 }];
-            case 20: return [2, { data: data, isRequireOTP: true, token: token }];
+            case 21: return [2, { data: data, isRequireOTP: true, token: token }];
         }
     });
 }); });
@@ -187,10 +198,10 @@ export var resendOTP = createAsyncThunk('resendOTPBusiness', function (params, t
     });
 }); });
 export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, business, settings, isNID, responseBody, stepName, payload, data, brandData, leadData, brand, country_code, steps, board_id, business_id, entity, brandID, countryIso2, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted, isIdentityAuthStep, entity_activities, activityList, boardResponse;
-    var _b, _c, _d, _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var _a, business, settings, isNID, responseBody, stepName, payload, data, publicKey, brandData, isicActivityList, currencyData, leadData, brand, country_code, steps, board_id, business_id, entity, brandID, countryIso2, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted, isIdentityAuthStep, boardResponse, list, list;
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    return __generator(this, function (_k) {
+        switch (_k.label) {
             case 0:
                 _a = thunkApi.getState(), business = _a.business, settings = _a.settings;
                 isNID = business.data.otpData.isNID;
@@ -205,20 +216,24 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                data = (_j.sent()).data;
+                data = (_k.sent()).data;
                 if ((_f = data.errors) === null || _f === void 0 ? void 0 : _f.length)
                     throw new Error(data.errors[0].description);
-                brandData = undefined;
+                publicKey = (_g = data === null || data === void 0 ? void 0 : data.config) === null || _g === void 0 ? void 0 : _g.public_key;
+                if (publicKey) {
+                    thunkApi.dispatch(handlePublicKey(publicKey));
+                }
+                currencyData = undefined;
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
-                leadData = (_j.sent()).data;
+                leadData = (_k.sent()).data;
                 thunkApi.dispatch(updateStepName(stepName));
                 brand = leadData.brand, country_code = leadData.country_code, steps = leadData.steps, board_id = leadData.board_id, business_id = leadData.business_id, entity = leadData.entity;
                 brandID = brand === null || brand === void 0 ? void 0 : brand.id;
                 countryIso2 = country_code;
                 if (countryIso2)
                     thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, { otp: params.otp });
+                (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, { otp: params.otp });
                 hasBusinessCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_SUCCESS);
                 hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO) && hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_INFO_CONFIRM);
                 hasBusinessCRActivitiesCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_ACTIVITIES);
@@ -227,73 +242,76 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 if (!(!isIdentityAuthStep && !hasBusinessCRInfoCompleted)) return [3, 4];
                 return [4, thunkApi.dispatch(retrieveAllEntityList({ businessId: business_id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
             case 3:
-                _j.sent();
-                _j.label = 4;
+                _k.sent();
+                _k.label = 4;
             case 4:
                 if (!(isSA(countryIso2) && !isIdentityAuthStep && !hasBusinessCRInfoCompleted)) return [3, 6];
                 return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
             case 5:
-                _j.sent();
-                _j.label = 6;
+                _k.sent();
+                _k.label = 6;
             case 6:
-                entity_activities = leadData.entity_activities;
-                if (!(!entity_activities && (hasBusinessCRInfoCompleted || hasBusinessCRActivitiesCompleted) && !hasBusinessCompleted)) return [3, 8];
-                return [4, API.dataService.getActivities()];
-            case 7:
-                activityList = (_j.sent()).list;
-                leadData = __assign(__assign({}, leadData), { entity_activities: activityList });
-                _j.label = 8;
-            case 8:
-                if (!isNID) return [3, 9];
+                if (!isNID) return [3, 7];
                 thunkApi.dispatch(handleNextScreenStep());
-                return [3, 22];
-            case 9:
-                if (!(isIdentityAuthStep && isKW(countryIso2))) return [3, 10];
+                return [3, 23];
+            case 7:
+                if (!(isIdentityAuthStep && isKW(countryIso2))) return [3, 8];
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_CIVIL_ID_STEP'));
-                return [3, 22];
-            case 10:
-                if (!hasBusinessCompleted) return [3, 14];
-                if (!board_id) return [3, 13];
+                return [3, 23];
+            case 8:
+                if (!hasBusinessCompleted) return [3, 12];
+                if (!board_id) return [3, 11];
                 return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
-            case 11:
-                boardResponse = _j.sent();
+            case 9:
+                boardResponse = _k.sent();
                 leadData = __assign(__assign({}, leadData), { flows: (boardResponse === null || boardResponse === void 0 ? void 0 : boardResponse.info) || [] });
                 return [4, thunkApi.dispatch(retrieveBoardDetails(board_id))];
+            case 10:
+                _k.sent();
+                _k.label = 11;
+            case 11:
+                sleep(50).then(function () { return thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP')); });
+                return [3, 23];
             case 12:
-                _j.sent();
-                _j.label = 13;
+                if (!(data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH)) return [3, 13];
+                sleep(50).then(function () { return thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP')); });
+                return [3, 23];
             case 13:
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 22];
+                if (!hasBusinessCustomersCompleted) return [3, 14];
+                sleep(50).then(function () { return thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_STEP')); });
+                return [3, 23];
             case 14:
-                if (!(data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH)) return [3, 15];
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
-                return [3, 22];
+                if (!hasBusinessCRActivitiesCompleted) return [3, 19];
+                return [4, API.countryService.getCurrency(settings.data.businessCountry.iso2)];
             case 15:
-                if (!hasBusinessCustomersCompleted) return [3, 16];
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_STEP'));
-                return [3, 22];
+                currencyData = _k.sent();
+                return [4, API.dataService.getActivitiesIsIc()];
             case 16:
-                if (!hasBusinessCRActivitiesCompleted) return [3, 19];
+                list = (_k.sent()).list;
+                isicActivityList = list || [];
                 return [4, thunkApi.dispatch(retrieveDataList())];
             case 17:
-                _j.sent();
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
+                _k.sent();
                 return [4, API.brandService.retrieveBrand(brandID)];
             case 18:
-                brandData = _j.sent();
-                return [3, 22];
+                brandData = _k.sent();
+                sleep(50).then(function () { return thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP')); });
+                return [3, 23];
             case 19:
-                if (!hasBusinessCRInfoCompleted) return [3, 21];
-                return [4, API.brandService.retrieveBrand(brandID)];
+                if (!hasBusinessCRInfoCompleted) return [3, 22];
+                return [4, API.dataService.getActivitiesIsIc()];
             case 20:
-                brandData = _j.sent();
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP'));
-                return [3, 22];
+                list = (_k.sent()).list;
+                isicActivityList = list || [];
+                return [4, API.brandService.retrieveBrand(brandID)];
             case 21:
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
-                _j.label = 22;
-            case 22: return [2, { data: data, formData: __assign(__assign({}, params), { isNID: isNID }), brand: brandData === null || brandData === void 0 ? void 0 : brandData.brand, leadData: leadData }];
+                brandData = _k.sent();
+                sleep(50).then(function () { return thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP')); });
+                return [3, 23];
+            case 22:
+                sleep(50).then(function () { return thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP')); });
+                _k.label = 23;
+            case 23: return [2, { data: data, isicActivityList: isicActivityList, formData: __assign(__assign({}, params), { isNID: isNID }), brand: brandData === null || brandData === void 0 ? void 0 : brandData.brand, leadData: leadData, currencyData: currencyData }];
         }
     });
 }); });
@@ -371,7 +389,7 @@ export var createCivilIdAuth = createAsyncThunk('createCivilIdAuth', function (p
     });
 }); });
 export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, business, identification_id_type, stepName, lead_id, requestBody, data;
+    var _a, settings, business, identification_id_type, stepName, lead_id, countryIso2, requestBody, data, business_id, entity, screen;
     var _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -380,11 +398,15 @@ export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function
                 identification_id_type = params.nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
                 stepName = BUSINESS_STEP_NAMES.IDENTITY_AUTH;
                 lead_id = (business.data.verify.responseBody || {}).lead_id;
+                countryIso2 = settings.data.businessCountry.iso2;
+                if (isOtherThanKWOrSA(countryIso2)) {
+                    identification_id_type = IDENTIFICATION_TYPE.NID;
+                }
                 requestBody = {
                     id: lead_id || '',
                     identification: {
                         id: params.nid,
-                        issued_country_code: settings.data.businessCountry.iso2,
+                        issued_country_code: countryIso2,
                         type: identification_id_type
                     },
                     date_of_birth: params.dob,
@@ -394,7 +416,20 @@ export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function
                 return [4, API.leadService.updateLead(requestBody)];
             case 1:
                 data = _d.sent();
-                thunkApi.dispatch(handleNextScreenStep());
+                business_id = data.business_id, entity = data.entity;
+                screen = 'BUSINESS_OTP_STEP';
+                if (!isOtherThanKWOrSA(countryIso2)) return [3, 4];
+                screen = 'BUSINESS_BUSINESS_TYPE_STEP';
+                return [4, thunkApi.dispatch(retrieveAllEntityList({ businessId: business_id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
+            case 2:
+                _d.sent();
+                if (!isSA(countryIso2)) return [3, 4];
+                return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
+            case 3:
+                _d.sent();
+                _d.label = 4;
+            case 4:
+                thunkApi.dispatch(handleNextScreenStep(screen));
                 (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, requestBody);
                 return [2, { data: data, formData: __assign(__assign({}, params), { type: identification_id_type }) }];
         }
@@ -466,37 +501,29 @@ export var retrieveBoardDetails = createAsyncThunk('retrieveBoardDetails', funct
     });
 }); });
 export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, business, isNonSA, selectedLicense, licenseNumber, entityLegalName, certificateId, articleId, selectedEntityLicense, isFL, _b, lead_id, brand, stepName, payload, data, entity_activities, list, accountBody, accountData, brandData, _c, message, error, brandRes, documentData, entityData, entityId, documentBody, payload_1;
+    var _a, settings, business, isKWCountry, selectedLicense, licenseNumber, entityLegalName, certificateId, articleId, selectedEntityLicense, isFL, _b, lead_id, brand, stepName, payload, data, accountBody, accountData, brandData, brandRes, _c, message, error, list, documentData, entityData, entityId, documentBody, payload_1;
     var _d, _e;
     return __generator(this, function (_f) {
         switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
-                isNonSA = !isSA(settings.data.businessCountry.iso2);
+                isKWCountry = isKW(settings.data.businessCountry.iso2);
                 selectedLicense = params.selectedLicense, licenseNumber = params.licenseNumber, entityLegalName = params.entityLegalName, certificateId = params.certificateId, articleId = params.articleId, selectedEntityLicense = params.selectedEntityLicense;
                 isFL = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.FL;
                 _b = business.data.verify.responseBody || {}, lead_id = _b.lead_id, brand = _b.brand;
                 stepName = 'BUSINESS_ACTIVITIES_STEP';
                 payload = __assign(__assign(__assign(__assign({ id: lead_id || '', entity: {
-                        id: (selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id) && (isNonSA ? !isFL : true) ? selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id : ''
+                        id: (selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id) && (isKWCountry ? !isFL : true) ? selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id : ''
                     } }, (!(selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id) && {
-                    license_number: isNonSA && isFL ? '' : licenseNumber,
+                    license_number: isKWCountry && isFL ? '' : licenseNumber,
                     license_type: isFL ? LicenseType.FL : LicenseType.CR,
                     business_type: selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type
-                })), { step_name: BUSINESS_STEP_NAMES.BUSINESS_CR_INFO }), (isNonSA && {
+                })), { step_name: BUSINESS_STEP_NAMES.BUSINESS_CR_INFO }), (isKWCountry && {
                     business_name: isFL ? undefined : { ar: entityLegalName, en: entityLegalName }
                 })), { encryption_contract: ['license_number', 'business_type', 'license_type'] });
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 data = _f.sent();
-                entity_activities = data.entity_activities;
-                if (!!entity_activities) return [3, 3];
-                return [4, API.dataService.getActivities()];
-            case 2:
-                list = (_f.sent()).list;
-                data.entity_activities = list;
-                _f.label = 3;
-            case 3:
                 accountBody = {
                     lead_id: lead_id,
                     notify: {
@@ -508,30 +535,34 @@ export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', f
                     step_name: BUSINESS_STEP_NAMES.BUSINESS_INFO_CONFIRM
                 };
                 brandData = undefined;
-                _f.label = 4;
-            case 4:
-                _f.trys.push([4, 6, , 10]);
+                _f.label = 2;
+            case 2:
+                _f.trys.push([2, 5, , 6]);
                 return [4, API.accountService.createAccount(accountBody)];
-            case 5:
+            case 3:
                 accountData = _f.sent();
-                return [3, 10];
-            case 6:
+                thunkApi.dispatch(updateStepName(BUSINESS_STEP_NAMES.BUSINESS_INFO_CONFIRM));
+                return [4, API.brandService.retrieveBrand(brand === null || brand === void 0 ? void 0 : brand.id)];
+            case 4:
+                brandRes = (_f.sent()).brand;
+                brandData = brandRes;
+                return [3, 6];
+            case 5:
                 _c = _f.sent();
                 message = _c.message;
                 error = message;
-                if (!((error === null || error === void 0 ? void 0 : error.toLowerCase()) === 'entity with license already exist')) return [3, 8];
-                return [4, API.brandService.retrieveBrand(brand === null || brand === void 0 ? void 0 : brand.id)];
+                if ((error === null || error === void 0 ? void 0 : error.toLowerCase()) === 'entity with license already exist') {
+                    stepName = 'BUSINESS_VERIFY_BRAND_INFO';
+                }
+                else
+                    throw new Error(error);
+                return [3, 6];
+            case 6: return [4, API.dataService.getActivitiesIsIc()];
             case 7:
-                brandRes = (_f.sent()).brand;
-                brandData = brandRes;
-                stepName = 'BUSINESS_VERIFY_BRAND_INFO';
-                return [3, 9];
-            case 8: throw new Error(error);
-            case 9: return [3, 10];
-            case 10:
+                list = (_f.sent()).list;
                 entityData = undefined;
                 entityId = accountData === null || accountData === void 0 ? void 0 : accountData.entity_id;
-                if (!((certificateId || []).length > 0)) return [3, 12];
+                if (!((certificateId || []).length > 0)) return [3, 9];
                 documentBody = {
                     entity_id: entityId || '',
                     documents: [
@@ -542,56 +573,81 @@ export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', f
                     ]
                 };
                 return [4, API.documentService.updateDocumentInfo(documentBody)];
-            case 11:
+            case 8:
                 documentData = _f.sent();
-                _f.label = 12;
-            case 12:
-                if (!(articleId && entityId)) return [3, 14];
+                _f.label = 9;
+            case 9:
+                if (!(articleId && entityId)) return [3, 11];
                 payload_1 = {
                     id: (accountData === null || accountData === void 0 ? void 0 : accountData.entity_id) || '',
                     AOA_file_id: articleId
                 };
                 return [4, API.entityService.updateEntity(payload_1)];
-            case 13:
+            case 10:
                 entityData = _f.sent();
-                _f.label = 14;
-            case 14:
+                _f.label = 11;
+            case 11:
                 thunkApi.dispatch(handleNextScreenStep(stepName));
                 (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, params);
-                return [2, { data: __assign(__assign({}, data), { brand: brandData }), formData: params, accountData: accountData, documentData: documentData, entityData: entityData }];
+                return [2, { data: __assign(__assign({}, data), { brand: brandData }), formData: params, accountData: accountData, documentData: documentData, entityData: entityData, isicActivityList: list || [] }];
         }
     });
 }); });
 export var updateActivitiesInfo = createAsyncThunk('updateActivitiesInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, business, activities, stepName, id, requestBody, data;
-    var _b, _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _a, settings, business, _b, brand, entity_activities, entity, _c, brandActivities, brandId, activities, operationStartDate, stepName, id, removedActivities, payload, newBrandActivities, newEntityActivities, activityPayload, requestBody, data, currencyData;
+    var _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
-                activities = (_b = (params.activities || [])) === null || _b === void 0 ? void 0 : _b.map(function (_a) {
-                    var id = _a.id;
-                    return ({ id: id });
-                });
+                _b = business.data.verify.responseBody || {}, brand = _b.brand, entity_activities = _b.entity_activities, entity = _b.entity;
+                _c = brand || {}, brandActivities = _c.activities, brandId = _c.id;
+                activities = params.activities, operationStartDate = params.operationStartDate;
                 stepName = BUSINESS_STEP_NAMES.BUSINESS_CR_ACTIVITIES;
-                id = (_d = (_c = business.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.brand) === null || _d === void 0 ? void 0 : _d.id;
-                requestBody = {
+                id = brandId;
+                removedActivities = (brandActivities || []).filter(function (brandActivity) { return !(activities || []).some(function (activity) { return activity.id === brandActivity.id; }); });
+                if (!(removedActivities === null || removedActivities === void 0 ? void 0 : removedActivities.length)) return [3, 2];
+                payload = {
                     id: id,
-                    activities: activities,
-                    operations: {
-                        start_date: params.operationStartDate
-                    },
-                    step_name: stepName,
-                    encryption_contract: ['operations.start_date']
+                    activities: removedActivities
                 };
-                return [4, API.brandService.updateBrandInfo(requestBody)];
+                return [4, API.brandService.removeBrandActivity(payload)];
             case 1:
-                data = _g.sent();
+                _f.sent();
+                _f.label = 2;
+            case 2:
+                newBrandActivities = activities === null || activities === void 0 ? void 0 : activities.filter(function (act) { return !(brandActivities || []).some(function (brandActivity) { return act.id === brandActivity.id; }); });
+                newEntityActivities = activities === null || activities === void 0 ? void 0 : activities.filter(function (act) { return !(entity_activities || []).some(function (entityActivity) { return act.id === entityActivity.id; }); });
+                if (!(newEntityActivities === null || newEntityActivities === void 0 ? void 0 : newEntityActivities.length)) return [3, 4];
+                activityPayload = {
+                    id: entity === null || entity === void 0 ? void 0 : entity.id,
+                    activities: newEntityActivities.map(function (_a) {
+                        var id = _a.id;
+                        return ({ id: id });
+                    })
+                };
+                return [4, API.entityService.updateEntityActivity(activityPayload)];
+            case 3:
+                _f.sent();
+                _f.label = 4;
+            case 4:
+                requestBody = __assign(__assign({ id: id }, ((newBrandActivities === null || newBrandActivities === void 0 ? void 0 : newBrandActivities.length) && { activities: newBrandActivities.map(function (_a) {
+                        var id = _a.id;
+                        return ({ id: id });
+                    }) })), { operations: {
+                        start_date: operationStartDate
+                    }, step_name: stepName, encryption_contract: ['operations.start_date'] });
+                return [4, API.brandService.updateBrandInfo(requestBody)];
+            case 5:
+                data = _f.sent();
                 thunkApi.dispatch(retrieveDataList());
+                return [4, API.countryService.getCurrency(settings.data.businessCountry.iso2)];
+            case 6:
+                currencyData = _f.sent();
                 thunkApi.dispatch(updateStepName(stepName));
                 thunkApi.dispatch(handleNextScreenStep());
-                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, requestBody);
-                return [2, { data: data === null || data === void 0 ? void 0 : data.brand, formData: __assign({}, params) }];
+                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, requestBody);
+                return [2, { data: data === null || data === void 0 ? void 0 : data.brand, formData: __assign({}, params), currencyData: currencyData }];
         }
     });
 }); });
@@ -618,7 +674,7 @@ export var retrieveDataList = createAsyncThunk('businessRetrieveDataList', funct
                 _a = _b.sent(), customerBases = _a[0].list, expectedSales = _a[1].list, expectedCustomerSales = _a[2].list;
                 return [2, {
                         customerBases: customerBases,
-                        expectedSales: expectedSales,
+                        expectedSales: (expectedSales === null || expectedSales === void 0 ? void 0 : expectedSales.length) ? expectedSales : EXPECTED_SALES_LIST,
                         expectedCustomerSales: expectedCustomerSales,
                         countryISO2: countryISO2
                     }];
@@ -667,7 +723,8 @@ export var updateLeadSuccess = createAsyncThunk('businessUpdateLeadSuccess', fun
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
                 _b = business.data.verify.responseBody || {}, steps = _b.steps, lead_id = _b.lead_id;
-                flowCompleted = Object.keys(steps).find(function (key) { return key === BUSINESS_STEP_NAMES.BUSINESS_SUCCESS; });
+                flowCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_SUCCESS);
+                console.info('stop success call', flowCompleted || !lead_id);
                 if (flowCompleted || !lead_id)
                     return [2];
                 boardResponse = undefined;
@@ -727,6 +784,7 @@ var initialState = {
     uploadingArticle: false,
     data: {
         flowName: FlowsTypes.BUSINESS,
+        currency: '',
         verify: {
             token: ''
         },
@@ -790,10 +848,10 @@ export var businessSlice = createSlice({
             state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
-            var _a, _b;
+            var _a, _b, _c, _d, _e, _f;
             state.error = null;
             state.customLoading = false;
-            var _c = action.payload, data = _c.data, boardId = _c.boardId, brandData = _c.brandData, leadData = _c.leadData, token = _c.token, isRequireOTP = _c.isRequireOTP;
+            var _g = action.payload, data = _g.data, boardId = _g.boardId, brandData = _g.brandData, leadData = _g.leadData, token = _g.token, isRequireOTP = _g.isRequireOTP, isicActivityList = _g.isicActivityList, currencyData = _g.currencyData;
             var responseBody = state.data.verify.responseBody;
             state.data.verify.responseBody = __assign(__assign(__assign(__assign(__assign({}, data), leadData), responseBody), { board_id: boardId, lead_id: data === null || data === void 0 ? void 0 : data.id }), (brandData && { brand: brandData }));
             if (token)
@@ -801,26 +859,28 @@ export var businessSlice = createSlice({
             state.data.otpData.isNID = false;
             if (isRequireOTP)
                 return;
-            var _d = state.data.verify.responseBody || {}, entity = _d.entity, entity_activities = _d.entity_activities, business_name = _d.business_name;
+            var _h = state.data.verify.responseBody || {}, entity = _h.entity, entity_activities = _h.entity_activities, business_name = _h.business_name;
             if (business_name === null || business_name === void 0 ? void 0 : business_name.en)
                 state.data.businessTypeData.entityLegalName = business_name === null || business_name === void 0 ? void 0 : business_name.en;
             var issuingDate = ((_a = brandData === null || brandData === void 0 ? void 0 : brandData.operations) === null || _a === void 0 ? void 0 : _a.start_date) || ((_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date);
             if (issuingDate)
                 state.data.activitiesData.operationStartDate = convertNumbers2English(dateFormat(issuingDate));
-            var activities = entity_activities || [];
-            var selectedActivity = activities === null || activities === void 0 ? void 0 : activities.filter(function (activity) {
-                var activities = (brandData || {}).activities;
-                return activities === null || activities === void 0 ? void 0 : activities.find(function (value) { return activity.id === value.id; });
-            });
-            var terms = (brandData || {}).terms;
+            var _j = brandData || {}, terms = _j.terms, activities = _j.activities;
+            var entityActivities = (entity_activities === null || entity_activities === void 0 ? void 0 : entity_activities.filter(function (activity) {
+                return !(activities === null || activities === void 0 ? void 0 : activities.some(function (value) { return value.id === activity.id; }));
+            })) || [];
+            var selectedActivity = __spreadArray(__spreadArray([], (activities || []), true), entityActivities, true);
             terms === null || terms === void 0 ? void 0 : terms.forEach(function (element) {
                 if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
                     state.data.customersData.transactionPolicy = element.agree;
                     state.data.customersData.refundPolicy = element.agree;
                 }
             });
-            state.data.activitiesData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [];
-            state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities });
+            if ((_c = currencyData === null || currencyData === void 0 ? void 0 : currencyData.code) === null || _c === void 0 ? void 0 : _c.english)
+                state.data.currency = currencyData.code.english;
+            state.data.activitiesData.activities = selectedActivity;
+            var licenseList = [OTHER_CR_LICENSE, OTHER_FL_LICENSE];
+            state.data.businessTypeData.responseBody = __assign(__assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activityList: isicActivityList }), (!((_f = (_e = (_d = state.data.businessTypeData) === null || _d === void 0 ? void 0 : _d.responseBody) === null || _e === void 0 ? void 0 : _e.licenseList) === null || _f === void 0 ? void 0 : _f.length) && { licenseList: licenseList }));
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
             state.error = action.error.message;
@@ -848,33 +908,35 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(verifyLeadOTP.fulfilled, function (state, action) {
-            var _a, _b;
+            var _a, _b, _c, _d, _e, _f;
             state.loading = false;
             state.error = null;
-            var _c = action.payload, data = _c.data, formData = _c.formData, brand = _c.brand, leadData = _c.leadData;
+            var _g = action.payload, data = _g.data, formData = _g.formData, brand = _g.brand, leadData = _g.leadData, isicActivityList = _g.isicActivityList, currencyData = _g.currencyData;
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
+            if ((_a = currencyData === null || currencyData === void 0 ? void 0 : currencyData.code) === null || _a === void 0 ? void 0 : _a.english)
+                state.data.currency = currencyData.code.english;
             state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, leadData), state.data.verify.responseBody), (brand && { brand: brand })), { flows: (leadData === null || leadData === void 0 ? void 0 : leadData.flows) || [] });
-            var _d = leadData || {}, entity = _d.entity, entity_activities = _d.entity_activities, business_name = _d.business_name;
+            var _h = leadData || {}, entity = _h.entity, entity_activities = _h.entity_activities, business_name = _h.business_name;
             if (business_name === null || business_name === void 0 ? void 0 : business_name.en)
                 state.data.businessTypeData.entityLegalName = business_name === null || business_name === void 0 ? void 0 : business_name.en;
-            var issuingDate = ((_a = brand === null || brand === void 0 ? void 0 : brand.operations) === null || _a === void 0 ? void 0 : _a.start_date) || ((_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date);
+            var issuingDate = ((_b = brand === null || brand === void 0 ? void 0 : brand.operations) === null || _b === void 0 ? void 0 : _b.start_date) || ((_c = entity === null || entity === void 0 ? void 0 : entity.license) === null || _c === void 0 ? void 0 : _c.issuing_date);
             if (issuingDate)
                 state.data.activitiesData.operationStartDate = convertNumbers2English(dateFormat(issuingDate));
-            var activities = entity_activities || [];
-            var selectedActivity = activities === null || activities === void 0 ? void 0 : activities.filter(function (activity) {
-                var activities = (brand || {}).activities;
-                return activities === null || activities === void 0 ? void 0 : activities.find(function (value) { return value.id === activity.id; });
-            });
-            var terms = (brand || {}).terms;
+            var _j = brand || {}, terms = _j.terms, activities = _j.activities;
+            var entityActivities = (entity_activities === null || entity_activities === void 0 ? void 0 : entity_activities.filter(function (activity) {
+                return !(activities === null || activities === void 0 ? void 0 : activities.some(function (value) { return value.id === activity.id; }));
+            })) || [];
+            var selectedActivity = __spreadArray(__spreadArray([], (activities || []), true), entityActivities, true);
             terms === null || terms === void 0 ? void 0 : terms.forEach(function (element) {
                 if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
                     state.data.customersData.transactionPolicy = element.agree;
                     state.data.customersData.refundPolicy = element.agree;
                 }
             });
-            state.data.activitiesData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [];
-            state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities });
+            state.data.activitiesData.activities = selectedActivity;
+            var licenseList = [OTHER_CR_LICENSE, OTHER_FL_LICENSE];
+            state.data.businessTypeData.responseBody = __assign(__assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activityList: isicActivityList }), (!((_f = (_e = (_d = state.data.businessTypeData) === null || _d === void 0 ? void 0 : _d.responseBody) === null || _e === void 0 ? void 0 : _e.licenseList) === null || _f === void 0 ? void 0 : _f.length) && { licenseList: licenseList }));
         })
             .addCase(verifyLeadOTP.rejected, function (state, action) {
             state.loading = false;
@@ -1058,7 +1120,7 @@ export var businessSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, data = _b.data, formData = _b.formData, accountData = _b.accountData, documentData = _b.documentData;
+            var _b = action.payload, data = _b.data, formData = _b.formData, accountData = _b.accountData, documentData = _b.documentData, isicActivityList = _b.isicActivityList;
             state.data.businessTypeData = __assign(__assign({}, state.data.businessTypeData), formData);
             var entity = data.entity, entity_activities = data.entity_activities, brand = data.brand;
             var issuingDate = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.issuing_date) || new Date().getTime();
@@ -1066,19 +1128,25 @@ export var businessSlice = createSlice({
                 state.error = 'signup_user_exists_error';
                 return;
             }
+            var activities = (brand || {}).activities;
+            var entityActivities = (entity_activities === null || entity_activities === void 0 ? void 0 : entity_activities.filter(function (activity) {
+                return !(activities === null || activities === void 0 ? void 0 : activities.some(function (value) { return value.id === activity.id; }));
+            })) || [];
+            var selectedActivity = __spreadArray(__spreadArray([], (activities || []), true), entityActivities, true);
+            state.data.activitiesData.activities = selectedActivity;
             if (issuingDate) {
                 state.data.activitiesData.operationStartDate = convertNumbers2English(dateFormat(issuingDate));
             }
-            var activities = entity_activities || [];
-            state.data.businessTypeData.responseBody = __assign(__assign(__assign(__assign(__assign({}, data), state.data.businessTypeData.responseBody), { activities: activities }), accountData), documentData);
+            state.data.businessTypeData.responseBody = __assign(__assign(__assign(__assign(__assign({}, data), state.data.businessTypeData.responseBody), { activityList: isicActivityList }), accountData), documentData);
             var terms = (brand || {}).terms;
+            var entity_id = (accountData || {}).entity_id;
             terms === null || terms === void 0 ? void 0 : terms.forEach(function (element) {
                 if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
                     state.data.customersData.transactionPolicy = element.agree;
                     state.data.customersData.refundPolicy = element.agree;
                 }
             });
-            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), { entity: entity }), (brand && { brand: brand }));
+            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), { entity: __assign(__assign({}, entity), (entity_id && { id: entity_id })) }), (brand && { brand: brand }));
         })
             .addCase(updateLeadBusinessType.rejected, function (state, action) {
             state.loading = false;
@@ -1089,10 +1157,21 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(updateActivitiesInfo.fulfilled, function (state, action) {
+            var _a;
             state.loading = false;
             state.error = null;
-            var _a = action.payload, data = _a.data, formData = _a.formData;
+            var _b = action.payload, data = _b.data, formData = _b.formData, currencyData = _b.currencyData;
             state.data.activitiesData = formData;
+            if ((_a = currencyData === null || currencyData === void 0 ? void 0 : currencyData.code) === null || _a === void 0 ? void 0 : _a.english)
+                state.data.currency = currencyData.code.english;
+            var terms = (data || {}).terms;
+            terms === null || terms === void 0 ? void 0 : terms.forEach(function (element) {
+                if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
+                    state.data.customersData.transactionPolicy = element.agree;
+                    state.data.customersData.refundPolicy = element.agree;
+                }
+            });
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { brand: data });
             state.data.activitiesData.responseBody = __assign(__assign({}, data), state.data.activitiesData.responseBody);
         })
             .addCase(updateActivitiesInfo.rejected, function (state, action) {
@@ -1142,7 +1221,7 @@ export var businessSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(updateLeadSuccess.fulfilled, function (state, action) {
-            var _a, _b;
+            var _a, _b, _c, _d, _e, _f;
             state.loading = false;
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { updateLeadSuccessLoading: false });
             state.error = null;
@@ -1152,7 +1231,7 @@ export var businessSlice = createSlice({
                 state.error = description;
                 return;
             }
-            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), response), { name: (_b = state.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.name });
+            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), response), { name: (_b = state.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.name, merchant: ((_c = state.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.merchant) || ((_f = (_e = (_d = state.data.verify.responseBody) === null || _d === void 0 ? void 0 : _d.business) === null || _e === void 0 ? void 0 : _e.entity) === null || _f === void 0 ? void 0 : _f.merchant) });
         })
             .addCase(updateLeadSuccess.pending, function (state) {
             state.loading = true;