@tap-payments/auth-jsconnect 2.0.10 → 2.0.11

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

@@ -60,12 +60,13 @@ import moment from 'moment';
 import API from '../../../api';
 import { BusinessType, FlowsTypes } from '../../../@types';
 import { BUSINESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../constants';
-import { convertNumbers2English, getFlowUrl, hasKey } from '../../../utils';
+import { convertNumbers2English, getEighteenYearsAgo, hasKey } from '../../../utils';
 import { handleNextScreenStep } from '../../../app/settings';
 export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', 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, brandInfo, boardResponse, board_id, board_info_id, steps, entityID, brandID, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted;
+    var _a, _b, _c, _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
                 payload = {
                     service_name: 'tap_email',
@@ -73,20 +74,76 @@ export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', functio
                 };
                 return [4, API.leadService.verifyLeadToken(payload)];
             case 1:
-                data = (_a.sent()).data;
+                data = (_h.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];
+                brandInfo = undefined;
+                boardResponse = undefined;
+                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 17];
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
-                leadResponse = _a.sent();
+                leadResponse = _h.sent();
+                board_id = (_a = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _a === void 0 ? void 0 : _a.board_id;
+                board_info_id = (_b = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _b === void 0 ? void 0 : _b.board_info_id;
+                if (!(!!board_id && !!board_info_id)) return [3, 4];
+                return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
+            case 3:
+                boardResponse = _h.sent();
+                _h.label = 4;
+            case 4:
                 if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH) {
                     thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
                 }
-                if (data.step_name === 'business_info') {
-                    thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
-                }
-                _a.label = 3;
-            case 3: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
+                if (!(data.step_name === 'business_info')) return [3, 17];
+                steps = (_c = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _c === void 0 ? void 0 : _c.steps;
+                entityID = (_e = (_d = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _d === void 0 ? void 0 : _d.entity) === null || _e === void 0 ? void 0 : _e.id;
+                brandID = (_g = (_f = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _f === void 0 ? void 0 : _f.brand) === null || _g === void 0 ? void 0 : _g.id;
+                hasBusinessCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_SUCCESS);
+                hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO);
+                hasBusinessCRActivitiesCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_ACTIVITIES);
+                hasBusinessCustomersCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CUSTOMERS);
+                if (!hasBusinessCompleted) return [3, 6];
+                return [4, thunkApi.dispatch(retrieveEntityInfo(entityID))];
+            case 5:
+                _h.sent();
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
+                return [3, 17];
+            case 6:
+                if (!(data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH)) return [3, 7];
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
+                return [3, 17];
+            case 7:
+                if (!hasBusinessCustomersCompleted) return [3, 8];
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_STEP'));
+                return [3, 17];
+            case 8:
+                if (!hasBusinessCRActivitiesCompleted) return [3, 12];
+                return [4, thunkApi.dispatch(retrieveChannels())];
+            case 9:
+                _h.sent();
+                return [4, thunkApi.dispatch(retrieveDataList())];
+            case 10:
+                _h.sent();
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
+                return [4, API.brandService.retrieveBrand(brandID)];
+            case 11:
+                brandInfo = _h.sent();
+                return [3, 17];
+            case 12:
+                if (!hasBusinessCRInfoCompleted) return [3, 15];
+                return [4, thunkApi.dispatch(retrieveChannels())];
+            case 13:
+                _h.sent();
+                return [4, API.brandService.retrieveBrand(brandID)];
+            case 14:
+                brandInfo = _h.sent();
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP'));
+                return [3, 17];
+            case 15: return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
+            case 16:
+                _h.sent();
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
+                _h.label = 17;
+            case 17: return [2, { data: data, leadData: __assign(__assign({}, leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data), { flows: boardResponse === null || boardResponse === void 0 ? void 0 : boardResponse.info }), token: token, brandInfo: brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.brand }];
         }
     });
 }); });
@@ -108,7 +165,7 @@ 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, verifyResponse, stepName, entityID, payload, data, steps, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted, entityInfo;
+    var _a, business, settings, isNID, responseBody, verifyResponse, stepName, brandID, payload, data, brandInfo, steps, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted;
     var _b, _c, _d, _e, _f, _g;
     return __generator(this, function (_h) {
         switch (_h.label) {
@@ -118,7 +175,7 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 responseBody = (isNID ? business.data.nidData : business.data.verify).responseBody;
                 verifyResponse = business.data.verify.responseBody;
                 stepName = isNID ? BUSINESS_STEP_NAMES.IDENTITY_VERIFY_AUTH : BUSINESS_STEP_NAMES.PHONE_AUTH;
-                entityID = (_c = (_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.entity) === null || _c === void 0 ? void 0 : _c.id;
+                brandID = (_c = (_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.brand) === null || _c === void 0 ? void 0 : _c.id;
                 payload = {
                     data: params.otp,
                     service_name: (_d = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _d === void 0 ? void 0 : _d.service_name,
@@ -129,7 +186,8 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
                 data = (_h.sent()).data;
-                if (!!data.errors) return [3, 11];
+                brandInfo = undefined;
+                if (!!data.errors) return [3, 13];
                 thunkApi.dispatch(updateStepName(stepName));
                 return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
             case 2:
@@ -142,42 +200,45 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 hasBusinessCustomersCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CUSTOMERS);
                 if (!isNID) return [3, 3];
                 thunkApi.dispatch(handleNextScreenStep());
-                return [3, 11];
+                return [3, 13];
             case 3:
                 if (!hasBusinessCompleted) return [3, 5];
                 return [4, thunkApi.dispatch(retrieveEntityInfo((_g = verifyResponse === null || verifyResponse === void 0 ? void 0 : verifyResponse.entity) === null || _g === void 0 ? void 0 : _g.id))];
             case 4:
                 _h.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 11];
+                return [3, 13];
             case 5:
                 if (!(data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH)) return [3, 6];
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
-                return [3, 11];
+                return [3, 13];
             case 6:
                 if (!hasBusinessCustomersCompleted) return [3, 7];
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_STEP'));
-                return [3, 11];
+                return [3, 13];
             case 7:
-                if (!hasBusinessCRActivitiesCompleted) return [3, 8];
+                if (!hasBusinessCRActivitiesCompleted) return [3, 9];
                 thunkApi.dispatch(retrieveChannels());
                 thunkApi.dispatch(retrieveDataList());
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
-                return [3, 11];
+                return [4, API.brandService.retrieveBrand(brandID)];
             case 8:
-                if (!hasBusinessCRInfoCompleted) return [3, 10];
-                return [4, thunkApi.dispatch(retrieveChannels())];
+                brandInfo = _h.sent();
+                return [3, 13];
             case 9:
+                if (!hasBusinessCRInfoCompleted) return [3, 12];
+                return [4, thunkApi.dispatch(retrieveChannels())];
+            case 10:
                 _h.sent();
+                return [4, API.brandService.retrieveBrand(brandID)];
+            case 11:
+                brandInfo = _h.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP'));
-                return [3, 11];
-            case 10:
-                thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
-                _h.label = 11;
-            case 11: return [4, API.entityService.retrieveBusinessInfo(entityID)];
+                return [3, 13];
             case 12:
-                entityInfo = _h.sent();
-                return [2, { data: data, formData: __assign(__assign({}, params), { isNID: isNID }), entityInfo: entityInfo }];
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
+                _h.label = 13;
+            case 13: return [2, { data: data, formData: __assign(__assign({}, params), { isNID: isNID }), brandInfo: brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.brand }];
         }
     });
 }); });
@@ -289,14 +350,12 @@ export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', f
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                data = (_g.sent()).data;
-                if (!!data.errors) return [3, 3];
+                data = _g.sent();
                 return [4, thunkApi.dispatch(createAccount())];
             case 2:
                 _g.sent();
                 (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
-                _g.label = 3;
-            case 3: return [2, { data: data, formData: params }];
+                return [2, { data: data, formData: params }];
         }
     });
 }); });
@@ -319,7 +378,7 @@ export var createAccount = createAsyncThunk('createAccount', function (params, t
                 };
                 return [4, API.accountService.createAccount(requestBody)];
             case 1:
-                data = (_e.sent()).data;
+                data = _e.sent();
                 if (!!data.errors) return [3, 3];
                 return [4, thunkApi.dispatch(retrieveChannels())];
             case 2:
@@ -333,9 +392,9 @@ export var createAccount = createAsyncThunk('createAccount', function (params, t
 }); });
 export var updateActivitiesInfo = createAsyncThunk('updateActivitiesInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, business, channel, activities, stepName, id, requestBody, data;
-    var _b, _c, _d, _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+    var _b, _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
                 channel = params.salesChannels.map(function (_a) {
@@ -347,25 +406,25 @@ export var updateActivitiesInfo = createAsyncThunk('updateActivitiesInfo', funct
                     return en;
                 });
                 stepName = BUSINESS_STEP_NAMES.BUSINESS_CR_ACTIVITIES;
-                id = (_c = business.data.businessTypeData.responseBody) === null || _c === void 0 ? void 0 : _c.entity_id;
+                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: id,
-                    activities: activities,
-                    channel_services: channel,
-                    business_operation_start_at: params.operationStartDate,
+                    brand: {
+                        activities: activities,
+                        channel_services: channel,
+                        business_operation_start_at: params.operationStartDate
+                    },
                     step_name: stepName,
-                    encryption_contract: ['business_operation_start_at']
+                    encryption_contract: ['brand.business_operation_start_at']
                 };
-                return [4, API.entityService.createEntityInfo(requestBody)];
+                return [4, API.brandService.updateBrandInfo(requestBody)];
             case 1:
-                data = (_f.sent()).data;
+                data = _g.sent();
                 thunkApi.dispatch(retrieveDataList());
-                if (!data.errors) {
-                    thunkApi.dispatch(updateStepName(stepName));
-                    thunkApi.dispatch(handleNextScreenStep());
-                    (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, requestBody);
-                }
-                return [2, { data: data, formData: __assign({}, params) }];
+                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) }];
         }
     });
 }); });
@@ -390,41 +449,41 @@ export var retrieveDataList = createAsyncThunk('bankRetrieveDataList', function
 }); });
 export var updateCustomersInfo = createAsyncThunk('updateCustomersInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, business, id, customerBase, stepName, requestBody, data;
-    var _b, _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    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;
-                id = (_b = business.data.businessTypeData.responseBody) === null || _b === void 0 ? void 0 : _b.entity_id;
+                id = (_c = (_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.brand) === null || _c === void 0 ? void 0 : _c.id;
                 customerBase = params.customerLocations.map(function (_a) {
                     var id = _a.id;
                     return id;
                 });
                 stepName = BUSINESS_STEP_NAMES.BUSINESS_CUSTOMERS;
                 requestBody = {
-                    customers_base: customerBase,
+                    brand: {
+                        customers_base: customerBase,
+                        customers_served_monthly: parseInt(((_d = params.expectedCustomer) === null || _d === void 0 ? void 0 : _d.id) || '0'),
+                        monthly_sales_range: ((_e = params.expectedSale) === null || _e === void 0 ? void 0 : _e.id) || '',
+                        agree_refund: params.refundPolicy,
+                        agree_chargeback: params.transactionPolicy
+                    },
                     id: id,
-                    customers_served_monthly: parseInt(((_c = params.expectedCustomer) === null || _c === void 0 ? void 0 : _c.id) || '0'),
-                    monthly_sales_range: ((_d = params.expectedSale) === null || _d === void 0 ? void 0 : _d.id) || '',
-                    agree_refund: params.refundPolicy,
-                    agree_chargeback: params.transactionPolicy,
                     step_name: stepName,
-                    encryption_contract: ['customers_served_monthly', 'monthly_sales_range']
+                    encryption_contract: ['brand.customers_served_monthly', 'brand.monthly_sales_range']
                 };
-                return [4, API.entityService.updateEntityInfo(requestBody)];
+                return [4, API.brandService.updateBrandInfo(requestBody)];
             case 1:
-                data = (_g.sent()).data;
-                if (!data.errors) {
-                    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, formData: params }];
+                data = _h.sent();
+                thunkApi.dispatch(updateStepName(stepName));
+                thunkApi.dispatch(handleNextScreenStep());
+                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, requestBody);
+                return [2, { data: data === null || data === void 0 ? void 0 : data.brand, formData: params }];
         }
     });
 }); });
 export var updateLeadSuccess = createAsyncThunk('businessUpdateLeadSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, business, _b, steps, id, flowCompleted, payload, data;
+    var _a, settings, business, _b, steps, id, flowCompleted, boardResponse, payload, data, board_id, board_info_id;
     var _c, _d, _e, _f, _g;
     return __generator(this, function (_h) {
         switch (_h.label) {
@@ -434,42 +493,31 @@ export var updateLeadSuccess = createAsyncThunk('businessUpdateLeadSuccess', fun
                 flowCompleted = Object.keys(steps).find(function (key) { return key === BUSINESS_STEP_NAMES.BUSINESS_SUCCESS; });
                 if (flowCompleted || !id)
                     return [2];
+                boardResponse = undefined;
                 payload = {
                     lang: settings.data.language,
                     step_name: BUSINESS_STEP_NAMES.BUSINESS_SUCCESS,
                     id: id,
-                    flows: [
-                        {
-                            name: 'tax',
-                            url: getFlowUrl('/tax', settings.data.language)
-                        },
-                        {
-                            name: 'bank',
-                            url: getFlowUrl('/bank', settings.data.language)
-                        },
-                        {
-                            name: 'individual',
-                            url: getFlowUrl('/individual', settings.data.language)
-                        },
-                        {
-                            name: 'password',
-                            url: getFlowUrl('/password', settings.data.language)
-                        }
-                    ],
                     encryption_contract: []
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                data = (_h.sent()).data;
-                if (!!data.errors) return [3, 3];
+                data = _h.sent();
+                board_id = data === null || data === void 0 ? void 0 : data.board_id;
+                board_info_id = data === null || data === void 0 ? void 0 : data.board_info_id;
+                if (!(!!board_id && !!board_info_id)) return [3, 3];
+                return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
+            case 2:
+                boardResponse = _h.sent();
+                _h.label = 3;
+            case 3:
                 (_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 [4, thunkApi.dispatch(retrieveEntityInfo((_g = data.entity) === null || _g === void 0 ? void 0 : _g.id))];
-            case 2:
+            case 4:
                 _h.sent();
                 thunkApi.dispatch(handleNextScreenStep());
-                _h.label = 3;
-            case 3: return [2, { response: data, formData: params }];
+                return [2, { response: __assign(__assign({}, data), { flows: boardResponse === null || boardResponse === void 0 ? void 0 : boardResponse.info }), formData: params }];
         }
     });
 }); });
@@ -487,7 +535,7 @@ export var updateStepName = createAsyncThunk('updateStepName', function (stepNam
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                data = (_b.sent()).data;
+                data = _b.sent();
                 return [2, { response: data }];
         }
     });
@@ -507,7 +555,7 @@ var initialState = {
         },
         nidData: {
             nid: '',
-            dob: '1998-08-22',
+            dob: getEighteenYearsAgo(),
             type: ''
         },
         businessTypeData: {
@@ -548,10 +596,10 @@ export var businessSlice = createSlice({
             state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
-            var _a;
+            var _a, _b, _c, _d;
             state.error = null;
             state.customLoading = false;
-            var _b = action.payload, data = _b.data, token = _b.token, leadData = _b.leadData;
+            var _e = action.payload, data = _e.data, token = _e.token, leadData = _e.leadData, brandInfo = _e.brandInfo;
             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;
@@ -560,6 +608,34 @@ export var businessSlice = createSlice({
             state.data.verify.responseBody = __assign(__assign({}, data), leadData);
             state.data.verify.token = token;
             state.data.otpData.isNID = false;
+            var _f = state.data.verify.responseBody || {}, entity = _f.entity, entity_activities = _f.entity_activities, business_type = _f.business_type;
+            var issuingDate = (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_operation_start_at)
+                ? brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_operation_start_at
+                : (_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date;
+            if (!!issuingDate) {
+                var formattedDate = moment(issuingDate).format('YYYY-MM-DD');
+                state.data.activitiesData.operationStartDate = convertNumbers2English(formattedDate);
+            }
+            var channels = (_c = state.data.businessTypeData.responseBody) === null || _c === void 0 ? void 0 : _c.channelList;
+            var selectedChannels = channels === null || channels === void 0 ? void 0 : channels.filter(function (channel) {
+                var _a;
+                return (_a = brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.channel_services) === null || _a === void 0 ? void 0 : _a.find(function (storedChannel) { return channel.name_en.toLowerCase() === storedChannel.toLowerCase(); });
+            });
+            state.data.activitiesData.salesChannels = (selectedChannels === null || selectedChannels === void 0 ? void 0 : selectedChannels.length) > 0 ? selectedChannels : [channels === null || channels === void 0 ? void 0 : channels[0]];
+            var activities = entity_activities || [];
+            var selectedActivity = activities === null || activities === void 0 ? void 0 : activities.filter(function (activity) {
+                var _a;
+                return (_a = brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.activities) === null || _a === void 0 ? void 0 : _a.find(function (value) { var _a; return ((_a = activity.en) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === value.toLowerCase(); });
+            });
+            state.data.activitiesData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [activities === null || activities === void 0 ? void 0 : activities[0]];
+            state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities });
+            if (!!(entity === null || entity === void 0 ? void 0 : entity.license)) {
+                state.data.businessTypeData.selectedLicense = {
+                    legal_name: entity === null || entity === void 0 ? void 0 : entity.legal_name,
+                    license: { number: (_d = entity === null || entity === void 0 ? void 0 : entity.license) === null || _d === void 0 ? void 0 : _d.number },
+                    type: business_type
+                };
+            }
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
             state.error = action.error.message;
@@ -590,7 +666,7 @@ export var businessSlice = createSlice({
             var _a, _b, _c, _d;
             state.loading = false;
             state.error = null;
-            var _e = action.payload, data = _e.data, formData = _e.formData, entityInfo = _e.entityInfo;
+            var _e = action.payload, data = _e.data, formData = _e.formData, brandInfo = _e.brandInfo;
             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;
@@ -599,23 +675,25 @@ export var businessSlice = createSlice({
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
             var _f = state.data.verify.responseBody || {}, entity = _f.entity, entity_activities = _f.entity_activities, business_type = _f.business_type;
-            var issuingDate = entityInfo ? entityInfo.business_operation_start_at : (_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date;
+            var issuingDate = (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_operation_start_at)
+                ? brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_operation_start_at
+                : (_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date;
             if (!!issuingDate) {
                 var formattedDate = moment(issuingDate).format('YYYY-MM-DD');
                 state.data.activitiesData.operationStartDate = convertNumbers2English(formattedDate);
             }
             var channels = (_c = state.data.businessTypeData.responseBody) === null || _c === void 0 ? void 0 : _c.channelList;
-            var selectedChannels = (channels === null || channels === void 0 ? void 0 : channels.filter(function (channel) {
-                return entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.channel_services.find(function (storedChannel) { return channel.name_en.toLowerCase() === storedChannel.toLowerCase(); });
-            })) || [channels === null || channels === void 0 ? void 0 : channels[0]];
-            if ((selectedChannels === null || selectedChannels === void 0 ? void 0 : selectedChannels.length) > 0)
-                state.data.activitiesData.salesChannels = selectedChannels;
+            var selectedChannels = channels === null || channels === void 0 ? void 0 : channels.filter(function (channel) {
+                var _a;
+                return (_a = brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.channel_services) === null || _a === void 0 ? void 0 : _a.find(function (storedChannel) { return channel.name_en.toLowerCase() === storedChannel.toLowerCase(); });
+            });
+            state.data.activitiesData.salesChannels = (selectedChannels === null || selectedChannels === void 0 ? void 0 : selectedChannels.length) > 0 ? selectedChannels : [channels === null || channels === void 0 ? void 0 : channels[0]];
             var activities = entity_activities || [];
-            var selectedActivity = (activities === null || activities === void 0 ? void 0 : activities.filter(function (activity) {
-                return entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.activities.find(function (value) { var _a; return ((_a = activity.en) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === value.toLowerCase(); });
-            })) || [activities === null || activities === void 0 ? void 0 : activities[0]];
-            if ((selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0)
-                state.data.activitiesData.activities = selectedActivity;
+            var selectedActivity = activities === null || activities === void 0 ? void 0 : activities.filter(function (activity) {
+                var _a;
+                return (_a = brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.activities) === null || _a === void 0 ? void 0 : _a.find(function (value) { var _a; return ((_a = activity.en) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === value.toLowerCase(); });
+            });
+            state.data.activitiesData.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [activities === null || activities === void 0 ? void 0 : activities[0]];
             state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities });
             if (!!(entity === null || entity === void 0 ? void 0 : entity.license)) {
                 state.data.businessTypeData.selectedLicense = {
@@ -817,15 +895,9 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(updateActivitiesInfo.fulfilled, function (state, action) {
-            var _a;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, data = _b.data, formData = _b.formData;
-            var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
-            if (description) {
-                state.error = description;
-                return;
-            }
+            var _a = action.payload, data = _a.data, formData = _a.formData;
             state.data.activitiesData = formData;
             console.log('updateActivitiesInfo', state.data.activitiesData.responseBody);
             console.log('updateActivitiesInfo', data);
@@ -868,15 +940,9 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(updateCustomersInfo.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;
-            }
+            var _a = action.payload, data = _a.data, formData = _a.formData;
             state.data.customersData = formData;
             state.data.customersData.responseBody = data;
         })

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

@@ -61,7 +61,7 @@ import { FlowsTypes } from '../../../@types';
 import API from '../../../api';
 import { CONNECT_STEP_NAMES, IDENTIFICATION_TYPE, INSTAGRAM_URL, OTHER_BRAND, TWITTER_URL } from '../../../constants';
 import { defaultCountry } from '../../../constants';
-import { getIndividualName, getFlowUrl, capitalizeTheFirstLetterOfEachWord } from '../../../utils';
+import { getIndividualName, capitalizeTheFirstLetterOfEachWord, getEighteenYearsAgo } from '../../../utils';
 export var createMobileAuth = createAsyncThunk('createMobileAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var settings, requestBody, data;
     var _a, _b;
@@ -275,29 +275,30 @@ export var retrieveBrandList = createAsyncThunk('retrieveBrandList', function (i
                 brandPayload = {
                     individual_id: individualId
                 };
-                return [4, API.individualService.getBrandList(brandPayload)];
+                return [4, API.brandService.getBrandList(brandPayload)];
             case 1:
-                data = (_a.sent()).data;
+                data = _a.sent();
                 return [2, data];
         }
     });
 }); });
 export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, connect, isAbsher, payload, data;
-    var _b, _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _b, _c, _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 isAbsher = connect.data.otpData.isAbsher;
                 payload = {
                     name: getIndividualName(params.name),
                     id: ((_b = connect.data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.lead_id) || '',
+                    country_code: (_c = settings.data.businessCountry) === null || _c === void 0 ? void 0 : _c.iso2,
                     contact: {
                         email: params.email,
                         phone: isAbsher
                             ? {
-                                country_code: (_d = (_c = params.countryCode) === null || _c === void 0 ? void 0 : _c.idd_prefix) === null || _d === void 0 ? void 0 : _d.toString(),
+                                country_code: (_e = (_d = params.countryCode) === null || _d === void 0 ? void 0 : _d.idd_prefix) === null || _e === void 0 ? void 0 : _e.toString(),
                                 number: params.mobile || ''
                             }
                             : undefined
@@ -314,11 +315,9 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                data = (_g.sent()).data;
-                if (!data.errors) {
-                    thunkApi.dispatch(handleNextScreenStep());
-                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
-                }
+                data = _h.sent();
+                thunkApi.dispatch(handleNextScreenStep());
+                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
                 return [2, { response: data, formData: params }];
         }
     });
@@ -350,7 +349,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                     brand: brand,
                     id: (isExistingUser ? (_l = brandData.responseBody) === null || _l === void 0 ? void 0 : _l.lead_id : (_m = otpData.responseBody) === null || _m === void 0 ? void 0 : _m.lead_id) || '',
                     terms_conditions_accepted: isExistingUser && !isOther ? undefined : params.termAndConditionChecked,
-                    step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_MERCHANT,
+                    step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_BRAND,
                     encryption_contract: [
                         'brand.name.en',
                         'brand.name.ar',
@@ -362,11 +361,9 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                data = (_q.sent()).data;
-                if (!data.errors) {
-                    thunkApi.dispatch(handleNextScreenStep());
-                    (_p = (_o = settings.data.appConfig).onStepCompleted) === null || _p === void 0 ? void 0 : _p.call(_o, settings.data.activeScreen.name, params);
-                }
+                data = _q.sent();
+                thunkApi.dispatch(handleNextScreenStep());
+                (_p = (_o = settings.data.appConfig).onStepCompleted) === null || _p === void 0 ? void 0 : _p.call(_o, settings.data.activeScreen.name, params);
                 return [2, { response: data, formData: params }];
         }
     });
@@ -430,18 +427,12 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
                 payload = {
                     lang: settings.data.language,
                     step_name: CONNECT_STEP_NAMES.CONNECT_SUCCESS,
-                    flows: [
-                        {
-                            name: 'business',
-                            url: getFlowUrl('/business', settings.data.language)
-                        }
-                    ],
                     id: leadId,
                     encryption_contract: []
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                data = (_j.sent()).data;
+                data = _j.sent();
                 (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
                 (_h = (_g = settings.data.appConfig).onFlowCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, { data: data });
                 return [2, { response: data, formData: params }];
@@ -460,7 +451,7 @@ var initialState = {
         },
         nidData: {
             nid: '',
-            dob: '1998-08-22',
+            dob: getEighteenYearsAgo(),
             type: ''
         },
         otpData: {