@tap-payments/auth-jsconnect 2.0.126-test → 2.1.0

package/build/features/app/connect/connectStore.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]) {
@@ -66,13 +66,12 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 var _a;
-import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { handleNextScreenStep } from '../../../app/settings';
-import { FlowsTypes, AuthForType } from '../../../@types';
 import API from '../../../api';
-import { CONNECT_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_BRAND } from '../../../constants';
-import { defaultCountry } from '../../../constants';
-import { getIndividualName, capitalizeTheFirstLetterOfEachWord, getEighteenYearsAgo, sleep, findCountryByIddPrefix, concatenateObjectValues, isTwitter, isWebsite, fixBrandList } from '../../../utils';
+import { handleNextScreenStep } from '../../../app/settings';
+import { CONNECT_STEP_NAMES, defaultCountry, IDENTIFICATION_TYPE, OTHER_BRAND } from '../../../constants';
+import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
+import { AuthForType, FlowsTypes } from '../../../@types';
+import { capitalizeTheFirstLetterOfEachWord, concatenateObjectValues, findCountryByIddPrefix, fixBrandList, isTwitter, getIndividualName, isWebsite, sleep, sendCustomEventToGTM } 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;
@@ -81,6 +80,8 @@ export var createMobileAuth = createAsyncThunk('createMobileAuth', function (par
             case 0:
                 settings = thunkApi.getState().settings;
                 requestBody = {
+                    country: settings.data.businessCountry.iso2,
+                    scope: settings.data.appConfig.scope,
                     lang: settings.data.language,
                     user_credentail: {
                         phone: params.mobile || '',
@@ -93,11 +94,9 @@ export var createMobileAuth = createAsyncThunk('createMobileAuth', function (par
                 };
                 return [4, API.authService.createAuth(requestBody)];
             case 1:
-                data = (_c.sent()).data;
-                if (!data.errors) {
-                    thunkApi.dispatch(handleNextScreenStep());
-                    (_b = (_a = settings.data.appConfig).onStepCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, settings.data.activeScreen.name, requestBody.user_credentail);
-                }
+                data = _c.sent();
+                thunkApi.dispatch(handleNextScreenStep());
+                (_b = (_a = settings.data.appConfig).onStepCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, settings.data.activeScreen.name, requestBody.user_credentail);
                 return [2, { response: data, formData: params }];
         }
     });
@@ -110,6 +109,8 @@ export var createCivilIdAuth = createAsyncThunk('createCivilIdAuth', function (p
             case 0:
                 settings = thunkApi.getState().settings;
                 requestBody = {
+                    country: settings.data.businessCountry.iso2,
+                    scope: settings.data.appConfig.scope,
                     lang: settings.data.language,
                     user_credentail: {
                         identification_id: params.civilId,
@@ -122,23 +123,23 @@ export var createCivilIdAuth = createAsyncThunk('createCivilIdAuth', function (p
                 };
                 return [4, API.authService.createAuth(requestBody)];
             case 1:
-                data = (_c.sent()).data;
-                if (!data.errors) {
-                    thunkApi.dispatch(handleNextScreenStep());
-                    (_b = (_a = settings.data.appConfig).onStepCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, settings.data.activeScreen.name, requestBody.user_credentail);
-                }
+                data = _c.sent();
+                thunkApi.dispatch(handleNextScreenStep());
+                (_b = (_a = settings.data.appConfig).onStepCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, settings.data.activeScreen.name, requestBody.user_credentail);
                 return [2, { response: data, formData: params }];
         }
     });
 }); });
 export var resendOTPMobile = createAsyncThunk('resendOTPMobile', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, _b, mobile, countryCode, requestBody, data;
+    var _a, settings, connect, _b, mobile, countryCode, requestBody;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 _b = connect.data.mobileData, mobile = _b.mobile, countryCode = _b.countryCode;
                 requestBody = {
+                    country: settings.data.businessCountry.iso2,
+                    scope: settings.data.appConfig.scope,
                     lang: settings.data.language,
                     user_credentail: {
                         phone: mobile || '',
@@ -150,26 +151,26 @@ export var resendOTPMobile = createAsyncThunk('resendOTPMobile', function (param
                     encryption_contract: ['user_credentail.phone', 'user_credentail.code']
                 };
                 return [4, API.authService.createAuth(requestBody)];
-            case 1:
-                data = (_c.sent()).data;
-                return [2, data];
+            case 1: return [2, _c.sent()];
         }
     });
 }); });
-export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, identification_id_type, requestBody, data;
-    var _a, _b;
+export var resendOTPNID = createAsyncThunk('resendOTPNID', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connect, _b, nid, dob, identification_id_type, requestBody, data;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                settings = thunkApi.getState().settings;
-                identification_id_type = params.nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
+                _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
+                _b = connect.data.nidData, nid = _b.nid, dob = _b.dob;
+                identification_id_type = nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
                 requestBody = {
+                    country: settings.data.businessCountry.iso2,
+                    scope: settings.data.appConfig.scope,
                     lang: settings.data.language,
                     user_credentail: {
-                        identification_id: params.nid,
+                        identification_id: nid,
                         identification_id_type: identification_id_type,
-                        date_of_birth: params.dob,
+                        date_of_birth: dob,
                         country_code: settings.data.businessCountry.iso2
                     },
                     sign_in: false,
@@ -184,28 +185,27 @@ export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, t
                 };
                 return [4, API.authService.createAuth(requestBody)];
             case 1:
-                data = (_c.sent()).data;
-                if (!data.errors) {
-                    thunkApi.dispatch(handleNextScreenStep());
-                    (_b = (_a = settings.data.appConfig).onStepCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, settings.data.activeScreen.name, requestBody.user_credentail);
-                }
-                return [2, { response: data, formData: __assign(__assign({}, params), { type: identification_id_type }) }];
+                data = _c.sent();
+                return [2, data];
         }
     });
 }); });
-export var resendOTPNID = createAsyncThunk('resendOTPNID', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, _b, nid, dob, type, requestBody, data;
+export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var settings, identification_id_type, requestBody, data;
+    var _a, _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
-                _b = connect.data.nidData, nid = _b.nid, dob = _b.dob, type = _b.type;
+                settings = thunkApi.getState().settings;
+                identification_id_type = params.nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
                 requestBody = {
+                    country: settings.data.businessCountry.iso2,
+                    scope: settings.data.appConfig.scope,
                     lang: settings.data.language,
                     user_credentail: {
-                        identification_id: nid,
-                        identification_id_type: type,
-                        date_of_birth: dob,
+                        identification_id: params.nid,
+                        identification_id_type: identification_id_type,
+                        date_of_birth: params.dob,
                         country_code: settings.data.businessCountry.iso2
                     },
                     sign_in: false,
@@ -220,16 +220,18 @@ export var resendOTPNID = createAsyncThunk('resendOTPNID', function (params, thu
                 };
                 return [4, API.authService.createAuth(requestBody)];
             case 1:
-                data = (_c.sent()).data;
-                return [2, data];
+                data = _c.sent();
+                thunkApi.dispatch(handleNextScreenStep());
+                (_b = (_a = settings.data.appConfig).onStepCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, settings.data.activeScreen.name, requestBody.user_credentail);
+                return [2, { response: data, formData: __assign(__assign({}, params), { type: identification_id_type }) }];
         }
     });
 }); });
 export var verifyAuth = createAsyncThunk('connect/verifyAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, connect, settings, startWithNID, _b, mobileData, nidData, responseBody, stepName, payload, data, lead_id, individual_id, leadBody, leadResponse, _c, isNewUser, channels, brands, err_1, countryCode, contact, name, _d, phone, email, userInfoMissed;
-    var _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var _a, connect, settings, startWithNID, _b, mobileData, nidData, responseBody, stepName, payload, data, lead_id, leadResponse, channels, brands, err_1, countryCode, phone;
+    var _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), connect = _a.connect, settings = _a.settings;
                 startWithNID = connect.data.otpData.authFor === AuthForType.NATIONAL_ID;
@@ -244,72 +246,58 @@ export var verifyAuth = createAsyncThunk('connect/verifyAuth', function (params,
                     service_name: responseBody === null || responseBody === void 0 ? void 0 : responseBody.service_name,
                     sign_in: responseBody === null || responseBody === void 0 ? void 0 : responseBody.sign_in,
                     remember_me: responseBody === null || responseBody === void 0 ? void 0 : responseBody.remember_me,
-                    scopes: responseBody === null || responseBody === void 0 ? void 0 : responseBody.scopes,
                     step_name: stepName,
                     encryption_contract: ['data']
                 };
                 return [4, API.authService.verifyAuth(payload)];
             case 1:
-                data = (_j.sent()).data;
-                if ((_e = data.errors) === null || _e === void 0 ? void 0 : _e.length)
+                data = (_g.sent()).data;
+                if ((_c = data.errors) === null || _c === void 0 ? void 0 : _c.length)
                     throw new Error(data.errors[0].description);
-                lead_id = data.lead_id, individual_id = data.individual_id;
-                leadBody = {
-                    country_code: settings.data.businessCountry.iso2,
-                    individual_id: individual_id
-                };
-                if (!lead_id) return [3, 3];
+                sendCustomEventToGTM({
+                    event: 'Send Event',
+                    event_category: 'User Registration Flow',
+                    event_action: 'First OTP Success'
+                });
+                lead_id = data.lead_id;
+                if (!lead_id)
+                    throw new Error('Lead id is missing');
                 return [4, API.leadService.retrieveLead(lead_id)];
             case 2:
-                _c = _j.sent();
-                return [3, 5];
-            case 3: return [4, API.leadService.createLead(leadBody)];
-            case 4:
-                _c = _j.sent();
-                _j.label = 5;
-            case 5:
-                leadResponse = (_c).data;
-                if ((_f = leadResponse.errors) === null || _f === void 0 ? void 0 : _f.length)
+                leadResponse = (_g.sent()).data;
+                if ((_d = leadResponse.errors) === null || _d === void 0 ? void 0 : _d.length)
                     throw new Error(leadResponse.errors[0].description);
-                isNewUser = leadResponse.is_new_individual;
-                if (!!isNewUser) return [3, 10];
                 return [4, API.dataService.getChannelsOfServices({ page: 0 })];
-            case 6:
-                channels = (_j.sent()).list;
+            case 3:
+                channels = (_g.sent()).list;
                 leadResponse.channel_list = channels;
-                _j.label = 7;
-            case 7:
-                _j.trys.push([7, 9, , 10]);
+                _g.label = 4;
+            case 4:
+                _g.trys.push([4, 6, , 7]);
                 return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
-            case 8:
-                brands = (_j.sent()).brands;
+            case 5:
+                brands = (_g.sent()).brands;
                 leadResponse.brand_list = fixBrandList(brands, channels);
-                return [3, 10];
-            case 9:
-                err_1 = _j.sent();
-                return [3, 10];
-            case 10:
+                return [3, 7];
+            case 6:
+                err_1 = _g.sent();
+                return [3, 7];
+            case 7:
                 countryCode = settings.data.businessCountry;
-                contact = leadResponse.contact, name = leadResponse.name;
-                _d = contact || {}, phone = _d.phone, email = _d.email;
-                userInfoMissed = (!phone || !email || !name) && !isNewUser;
+                phone = (leadResponse.contact || {}).phone;
                 if (phone === null || phone === void 0 ? void 0 : phone.country_code)
                     countryCode = findCountryByIddPrefix(settings.data.countries, phone.country_code);
-                (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, { otp: params.otp });
-                if (isNewUser || userInfoMissed) {
-                    thunkApi.dispatch(handleNextScreenStep('CONNECT_INDIVIDUAL_STEP'));
-                    return [2, { authResponse: data, leadResponse: leadResponse, isNewUser: isNewUser, countryCode: countryCode, userInfoMissed: userInfoMissed }];
-                }
-                thunkApi.dispatch(handleNextScreenStep('CONNECT_MERCHANT_INFO_STEP'));
-                return [2, { authResponse: data, leadResponse: leadResponse, isNewUser: isNewUser, countryCode: countryCode, userInfoMissed: userInfoMissed }];
+                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, { otp: params.otp });
+                thunkApi.dispatch(handleNextScreenStep());
+                return [2, { authResponse: data, leadResponse: leadResponse, countryCode: countryCode }];
         }
     });
 }); });
 export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, responseBody, expiry, interval, maxCalls, count, authResponse, isSuccess, lead_id, individual_id, leadBody, leadResponse, _b, isNewUser, countryCode, contact, name_1, _c, phone, email, userInfoMissed, channels, brands, err_2;
-    var _d, _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var _a, settings, connect, responseBody, expiry, interval, maxCalls, count, authResponse, isSuccess, lead_id, leadResponse, countryCode, channels, brands, err_2, phone;
+    var _b, _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 responseBody = connect.data.civilIdData.responseBody;
@@ -317,115 +305,113 @@ export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params,
                 interval = 3;
                 maxCalls = Math.floor(expiry / interval);
                 count = 1;
-                _j.label = 1;
+                _g.label = 1;
             case 1:
-                if (!(count <= maxCalls)) return [3, 16];
+                if (!(count <= maxCalls)) return [3, 13];
                 if (thunkApi.signal.aborted) {
-                    return [3, 16];
+                    return [3, 13];
                 }
                 return [4, API.authService.getVerifyAuth(responseBody === null || responseBody === void 0 ? void 0 : responseBody.auth_token)];
             case 2:
-                authResponse = _j.sent();
-                isSuccess = ((_d = authResponse.status) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === 'success';
-                if (!isSuccess) return [3, 13];
-                return [4, ((_e = params === null || params === void 0 ? void 0 : params.onSuccess) === null || _e === void 0 ? void 0 : _e.call(params))];
-            case 3:
-                _j.sent();
-                lead_id = authResponse.lead_id, individual_id = authResponse.individual_id;
-                leadBody = {
-                    country_code: settings.data.businessCountry.iso2,
-                    individual_id: individual_id
-                };
-                if (!lead_id) return [3, 5];
+                authResponse = _g.sent();
+                isSuccess = ((_b = authResponse.status) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'success';
+                if (!isSuccess) return [3, 10];
+                lead_id = authResponse.lead_id;
+                if (!lead_id)
+                    throw new Error('Lead id is missing');
                 return [4, API.leadService.retrieveLead(lead_id)];
-            case 4:
-                _b = _j.sent();
-                return [3, 7];
-            case 5: return [4, API.leadService.createLead(leadBody)];
-            case 6:
-                _b = _j.sent();
-                _j.label = 7;
-            case 7:
-                leadResponse = (_b).data;
-                if ((_f = leadResponse.errors) === null || _f === void 0 ? void 0 : _f.length)
+            case 3:
+                leadResponse = (_g.sent()).data;
+                if ((_c = leadResponse.errors) === null || _c === void 0 ? void 0 : _c.length)
                     throw new Error(leadResponse.errors[0].description);
-                isNewUser = leadResponse.is_new_individual;
                 countryCode = settings.data.businessCountry;
-                contact = leadResponse.contact, name_1 = leadResponse.name;
-                _c = contact || {}, phone = _c.phone, email = _c.email;
-                userInfoMissed = (!phone || !email || !name_1) && !isNewUser;
-                if (!!isNewUser) return [3, 12];
                 return [4, API.dataService.getChannelsOfServices({ page: 0 })];
-            case 8:
-                channels = (_j.sent()).list;
+            case 4:
+                channels = (_g.sent()).list;
                 leadResponse.channel_list = channels;
-                _j.label = 9;
-            case 9:
-                _j.trys.push([9, 11, , 12]);
+                _g.label = 5;
+            case 5:
+                _g.trys.push([5, 7, , 8]);
                 return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
-            case 10:
-                brands = (_j.sent()).brands;
+            case 6:
+                brands = (_g.sent()).brands;
                 leadResponse.brand_list = fixBrandList(brands, channels);
-                return [3, 12];
-            case 11:
-                err_2 = _j.sent();
-                return [3, 12];
-            case 12:
+                return [3, 8];
+            case 7:
+                err_2 = _g.sent();
+                return [3, 8];
+            case 8:
+                (_d = params.onSuccess) === null || _d === void 0 ? void 0 : _d.call(params);
+                return [4, sleep(3000)];
+            case 9:
+                _g.sent();
+                phone = (leadResponse.contact || {}).phone;
                 if (phone === null || phone === void 0 ? void 0 : phone.country_code)
                     countryCode = findCountryByIddPrefix(settings.data.countries, phone.country_code);
-                (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, {});
-                if (isNewUser || userInfoMissed) {
-                    thunkApi.dispatch(handleNextScreenStep('CONNECT_INDIVIDUAL_STEP'));
-                    return [2, { authResponse: authResponse, leadResponse: leadResponse, isNewUser: isNewUser, countryCode: countryCode, userInfoMissed: userInfoMissed }];
-                }
-                thunkApi.dispatch(handleNextScreenStep('CONNECT_MERCHANT_INFO_STEP'));
-                return [2, { authResponse: authResponse, leadResponse: leadResponse, isNewUser: isNewUser, countryCode: countryCode, userInfoMissed: userInfoMissed }];
-            case 13: return [4, sleep(interval * 1000)];
-            case 14:
-                _j.sent();
-                _j.label = 15;
-            case 15:
+                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, {});
+                thunkApi.dispatch(handleNextScreenStep());
+                return [2, { authResponse: authResponse, leadResponse: leadResponse, countryCode: countryCode }];
+            case 10: return [4, sleep(interval * 1000)];
+            case 11:
+                _g.sent();
+                _g.label = 12;
+            case 12:
                 count++;
                 return [3, 1];
-            case 16: throw new Error('paci_verification_failed');
+            case 13: throw new Error('paci_verification_failed');
         }
     });
 }); });
 export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, _b, userInfoMissed, lead_id, phoneCountry, payload, leadResponse, brand, channels;
-    var _c, _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var _a, settings, connect, lead_id, phoneCountry, payload, leadResponse, segments, err_3, teamSize, err_4, brand;
+    var _b, _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
-                _b = connect.data.otpData.responseBody || {}, userInfoMissed = _b.userInfoMissed, lead_id = _b.lead_id;
-                phoneCountry = (_d = (_c = params.countryCode) === null || _c === void 0 ? void 0 : _c.idd_prefix) === null || _d === void 0 ? void 0 : _d.toString();
-                payload = __assign(__assign({ id: lead_id || '', country_code: (_e = settings.data.businessCountry) === null || _e === void 0 ? void 0 : _e.iso2 }, (params.name && { name: getIndividualName(params.name) })), { contact: __assign(__assign({}, (params.email && { email: params.email })), (params.mobile && { phone: { country_code: phoneCountry, number: params.mobile } })), step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_INDIVIDUAL, encryption_contract: [
-                        'name.first',
-                        'name.middle',
-                        'name.last',
-                        'contact.email',
-                        'contact.phone.country_code',
-                        'contact.phone.number'
-                    ] });
+                lead_id = (connect.data.otpData.responseBody || {}).lead_id;
+                phoneCountry = (_c = (_b = params.countryCode) === null || _b === void 0 ? void 0 : _b.idd_prefix) === null || _c === void 0 ? void 0 : _c.toString();
+                payload = {
+                    id: lead_id || '',
+                    country_code: (_d = settings.data.businessCountry) === null || _d === void 0 ? void 0 : _d.iso2,
+                    name: getIndividualName(params.name),
+                    contact: __assign({ email: params.email }, (params.mobile && { phone: { country_code: phoneCountry, number: params.mobile } })),
+                    step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_INDIVIDUAL,
+                    encryption_contract: ['name.first', 'name.middle', 'name.last', 'contact.email', 'contact.phone.country_code', 'contact.phone.number']
+                };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                leadResponse = _h.sent();
-                if (!leadResponse.brand) return [3, 3];
-                return [4, API.brandService.retrieveBrand(leadResponse.brand.id)];
+                leadResponse = _g.sent();
+                _g.label = 2;
             case 2:
-                brand = (_h.sent()).brand;
-                leadResponse.brand = __assign(__assign({}, leadResponse.brand), brand);
-                _h.label = 3;
+                _g.trys.push([2, 4, , 5]);
+                return [4, API.dataService.getSegments({ page: 0 })];
             case 3:
-                if (!!userInfoMissed) return [3, 5];
-                return [4, API.dataService.getChannelsOfServices({ page: 0 })];
+                segments = _g.sent();
+                leadResponse.segments_list = segments.list;
+                return [3, 5];
             case 4:
-                channels = (_h.sent()).list;
-                leadResponse.channel_list = channels;
-                _h.label = 5;
+                err_3 = _g.sent();
+                return [3, 5];
             case 5:
-                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
+                _g.trys.push([5, 7, , 8]);
+                return [4, API.dataService.getTeamSize({ page: 0 })];
+            case 6:
+                teamSize = _g.sent();
+                leadResponse.team_size_list = teamSize.list;
+                return [3, 8];
+            case 7:
+                err_4 = _g.sent();
+                return [3, 8];
+            case 8:
+                if (!leadResponse.brand) return [3, 10];
+                return [4, API.brandService.retrieveBrand(leadResponse.brand.id)];
+            case 9:
+                brand = (_g.sent()).brand;
+                leadResponse.brand = __assign(__assign({}, leadResponse.brand), brand);
+                _g.label = 10;
+            case 10:
+                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
                 thunkApi.dispatch(handleNextScreenStep());
                 return [2, { leadResponse: leadResponse, formData: params }];
         }
@@ -433,9 +419,9 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
 }); });
 export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, connect, responseBody, leadBrandId, isNewBrand, brandName, salesChannels, selectedBrandItem, getAddress, channel_services, payload_1, brandReqBody_1, brand_1, brandNameBody, payload, lead, brandReqBody, brand;
-    var _b, _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    return __generator(this, function (_l) {
+        switch (_l.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 responseBody = connect.data.otpData.responseBody;
@@ -469,23 +455,26 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 };
                 return [4, API.leadService.updateLead(payload_1)];
             case 1:
-                _g.sent();
-                _g.label = 2;
+                _l.sent();
+                _l.label = 2;
             case 2:
                 brandReqBody_1 = {
                     id: (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id) || '',
                     channel_services: channel_services,
+                    term: ['general'],
+                    segment: { type: { id: ((_b = params.segment) === null || _b === void 0 ? void 0 : _b.id) || '' }, team: { id: ((_c = params.teamSize) === null || _c === void 0 ? void 0 : _c.id) || '' } },
                     step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO
                 };
                 return [4, API.brandService.updateBrandInfo(brandReqBody_1)];
             case 3:
-                brand_1 = _g.sent();
+                brand_1 = _l.sent();
                 thunkApi.dispatch(updateLeadSuccess());
                 thunkApi.dispatch(handleNextScreenStep());
-                (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, params);
+                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, params);
                 return [2, { response: brand_1, formData: params }];
             case 4:
                 brandNameBody = {
+                    id: '',
                     name: {
                         en: brandName,
                         ar: brandName,
@@ -500,19 +489,24 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 5:
-                lead = _g.sent();
+                lead = _l.sent();
+                if (!lead.brand) {
+                    console.error('Internal server error: brand is not created');
+                    throw new Error('Internal server error');
+                }
                 brandReqBody = {
-                    id: ((_d = lead.brand) === null || _d === void 0 ? void 0 : _d.id) || '',
+                    id: ((_f = lead.brand) === null || _f === void 0 ? void 0 : _f.id) || '',
                     channel_services: channel_services,
-                    term: ['agree'],
-                    step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO
+                    term: ['general'],
+                    step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO,
+                    segment: { type: { id: ((_g = params.segment) === null || _g === void 0 ? void 0 : _g.id) || '' }, team: { id: ((_h = params.teamSize) === null || _h === void 0 ? void 0 : _h.id) || '' } }
                 };
                 return [4, API.brandService.updateBrandInfo(brandReqBody)];
             case 6:
-                brand = _g.sent();
+                brand = _l.sent();
                 thunkApi.dispatch(updateLeadSuccess());
                 thunkApi.dispatch(handleNextScreenStep());
-                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
+                (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, params);
                 return [2, { response: brand, formData: params }];
         }
     });
@@ -581,7 +575,7 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 data = _f.sent();
-                (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, params);
+                (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, {});
                 (_e = (_d = settings.data.appConfig).onFlowCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, { data: data });
                 return [2, { response: data, formData: params }];
         }
@@ -599,7 +593,7 @@ var initialState = {
         },
         nidData: {
             nid: '',
-            dob: getEighteenYearsAgo(),
+            dob: '',
             type: ''
         },
         civilIdData: {
@@ -613,11 +607,17 @@ var initialState = {
             name: '',
             email: '',
             mobile: '',
-            countryCode: defaultCountry
+            countryCode: defaultCountry,
+            responseBody: {
+                segments_list: [],
+                team_size_list: []
+            }
         },
         brandData: {
             brandName: '',
             salesChannels: [],
+            segment: undefined,
+            teamSize: undefined,
             termAndConditionChecked: false,
             selectedBrandItem: {},
             responseBody: {
@@ -665,15 +665,9 @@ export var connectSlice = createSlice({
     extraReducers: function (builder) {
         builder
             .addCase(createMobileAuth.fulfilled, function (state, action) {
-            var _a;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, formData = _b.formData, response = _b.response;
-            var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
-            if (description) {
-                state.error = description;
-                return;
-            }
+            var _a = action.payload, formData = _a.formData, response = _a.response;
             state.data.mobileData = formData;
             state.data.mobileData.responseBody = response;
             state.data.otpData.authFor = AuthForType.MOBILE;
@@ -687,14 +681,8 @@ export var connectSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(resendOTPMobile.fulfilled, function (state, action) {
-            var _a;
             state.error = null;
             var response = action.payload;
-            var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
-            if (description) {
-                state.error = description;
-                return;
-            }
             state.data.mobileData.responseBody = response;
             state.data.otpData.authFor = AuthForType.MOBILE;
         })
@@ -709,15 +697,9 @@ export var connectSlice = createSlice({
             state.error = null;
         })
             .addCase(createCivilIdAuth.fulfilled, function (state, action) {
-            var _a;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, formData = _b.formData, response = _b.response;
-            var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
-            if (description) {
-                state.error = description;
-                return;
-            }
+            var _a = action.payload, formData = _a.formData, response = _a.response;
             state.data.otpData.authFor = AuthForType.NATIONAL_ID;
             state.data.civilIdData = __assign(__assign({}, formData), { responseBody: response });
         })
@@ -733,7 +715,7 @@ export var connectSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, authResponse = _b.authResponse, leadResponse = _b.leadResponse, isNewUser = _b.isNewUser, countryCode = _b.countryCode, userInfoMissed = _b.userInfoMissed;
+            var _b = action.payload, authResponse = _b.authResponse, leadResponse = _b.leadResponse, countryCode = _b.countryCode;
             var name = leadResponse.name, contact = leadResponse.contact, brand = leadResponse.brand, brand_list = leadResponse.brand_list, channel_list = leadResponse.channel_list, is_new_individual = leadResponse.is_new_individual, id = leadResponse.id;
             var _c = contact || {}, email = _c.email, phone = _c.phone;
             var fullName = concatenateObjectValues(name, ['first', 'middle', 'last']);
@@ -749,22 +731,20 @@ export var connectSlice = createSlice({
                 state.data.individualData.countryCode = countryCode;
             if ((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en)
                 state.data.brandData.brandName = brand.name.en;
-            if (!isNewUser) {
-                var brandList = [];
-                if ((brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) > 0) {
-                    var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
-                    brandList = __spreadArray([], brand_list, true);
-                    if (!isBrandExist && brand)
-                        brandList = __spreadArray(__spreadArray([], brandList, true), [__assign(__assign({}, brand), { channel_services: [] })], false);
-                    brandList = __spreadArray(__spreadArray([], brandList, true), [OTHER_BRAND], false);
-                    state.data.brandData.selectedBrandItem = brandList[0];
-                }
-                state.data.brandData.responseBody = {
-                    brand_list: brandList,
-                    channel_list: channel_list
-                };
+            var brandList = [];
+            if ((brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) > 0) {
+                var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
+                brandList = __spreadArray([], brand_list, true);
+                if (!isBrandExist && brand)
+                    brandList = __spreadArray(__spreadArray([], brandList, true), [__assign(__assign({}, brand), { channel_services: [] })], false);
+                brandList = __spreadArray(__spreadArray([], brandList, true), [OTHER_BRAND], false);
+                state.data.brandData.selectedBrandItem = brandList[0];
             }
-            state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, brand_id: brand === null || brand === void 0 ? void 0 : brand.id, name: name, contact: contact, userInfoMissed: userInfoMissed });
+            state.data.brandData.responseBody = {
+                brand_list: brandList,
+                channel_list: channel_list
+            };
+            state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, brand_id: brand === null || brand === void 0 ? void 0 : brand.id, name: name, contact: contact });
         })
             .addCase(verifyPACI.rejected, function (state, action) {
             state.loading = false;
@@ -777,7 +757,7 @@ export var connectSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, authResponse = _b.authResponse, leadResponse = _b.leadResponse, isNewUser = _b.isNewUser, countryCode = _b.countryCode, userInfoMissed = _b.userInfoMissed;
+            var _b = action.payload, authResponse = _b.authResponse, leadResponse = _b.leadResponse, countryCode = _b.countryCode;
             var name = leadResponse.name, contact = leadResponse.contact, brand = leadResponse.brand, brand_list = leadResponse.brand_list, channel_list = leadResponse.channel_list, is_new_individual = leadResponse.is_new_individual, id = leadResponse.id;
             var _c = contact || {}, email = _c.email, phone = _c.phone;
             var fullName = concatenateObjectValues(name, ['first', 'middle', 'last']);
@@ -793,22 +773,20 @@ export var connectSlice = createSlice({
                 state.data.individualData.countryCode = countryCode;
             if ((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en)
                 state.data.brandData.brandName = brand.name.en;
-            if (!isNewUser) {
-                var brandList = [];
-                if ((brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) > 0) {
-                    var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
-                    brandList = __spreadArray([], brand_list, true);
-                    if (!isBrandExist && brand)
-                        brandList = __spreadArray(__spreadArray([], brandList, true), [__assign(__assign({}, brand), { channel_services: [] })], false);
-                    brandList = __spreadArray(__spreadArray([], brandList, true), [OTHER_BRAND], false);
-                    state.data.brandData.selectedBrandItem = brandList[0];
-                }
-                state.data.brandData.responseBody = {
-                    brand_list: brandList,
-                    channel_list: channel_list
-                };
+            var brandList = [];
+            if ((brand_list === null || brand_list === void 0 ? void 0 : brand_list.length) > 0) {
+                var isBrandExist = brand_list.find(function (item) { return item.id === (brand === null || brand === void 0 ? void 0 : brand.id); });
+                brandList = __spreadArray([], brand_list, true);
+                if (!isBrandExist && brand)
+                    brandList = __spreadArray(__spreadArray([], brandList, true), [__assign(__assign({}, brand), { channel_services: [] })], false);
+                brandList = __spreadArray(__spreadArray([], brandList, true), [OTHER_BRAND], false);
+                state.data.brandData.selectedBrandItem = brandList[0];
             }
-            state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, brand_id: brand === null || brand === void 0 ? void 0 : brand.id, name: name, contact: contact, userInfoMissed: userInfoMissed });
+            state.data.brandData.responseBody = {
+                brand_list: brandList,
+                channel_list: channel_list
+            };
+            state.data.otpData.responseBody = __assign(__assign({}, authResponse), { is_new_individual: is_new_individual, lead_id: id, brand_id: brand === null || brand === void 0 ? void 0 : brand.id, name: name, contact: contact });
         })
             .addCase(verifyAuth.pending, function (state) {
             state.loading = true;
@@ -819,15 +797,9 @@ export var connectSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(createNIDAuth.fulfilled, function (state, action) {
-            var _a;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, formData = _b.formData, response = _b.response;
-            var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
-            if (description) {
-                state.error = description;
-                return;
-            }
+            var _a = action.payload, formData = _a.formData, response = _a.response;
             state.data.nidData = formData;
             state.data.nidData.responseBody = response;
             state.data.otpData.authFor = AuthForType.NATIONAL_ID;
@@ -841,14 +813,8 @@ export var connectSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(resendOTPNID.fulfilled, function (state, action) {
-            var _a;
             state.error = null;
             var response = action.payload;
-            var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
-            if (description) {
-                state.error = description;
-                return;
-            }
             state.data.nidData.responseBody = response;
             state.data.otpData.authFor = AuthForType.NATIONAL_ID;
         })
@@ -859,22 +825,32 @@ export var connectSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(updateLeadIndividual.fulfilled, function (state, action) {
+            var _a, _b, _c;
             state.loading = false;
             state.error = null;
-            var _a = action.payload, formData = _a.formData, leadResponse = _a.leadResponse;
-            var brand = leadResponse.brand, brand_list = leadResponse.brand_list, channel_list = leadResponse.channel_list, rest = __rest(leadResponse, ["brand", "brand_list", "channel_list"]);
+            var _d = action.payload, formData = _d.formData, leadResponse = _d.leadResponse;
+            var brand = leadResponse.brand, rest = __rest(leadResponse, ["brand"]);
             if (brand) {
                 var channel_services = brand.channel_services, terms = brand.terms;
                 state.data.brandData.salesChannels = channel_services || [];
                 var termAndCondition = (terms || []).find(function (_a) {
                     var term = _a.term, agree = _a.agree;
-                    return term === 'agree' && agree === true;
+                    return term === 'general' && agree === true;
                 });
                 state.data.brandData.termAndConditionChecked = !!termAndCondition;
             }
-            if (channel_list) {
-                state.data.brandData.responseBody = __assign(__assign({}, state.data.brandData.responseBody), { channel_list: channel_list });
-            }
+            var selectedBrand = ((_b = (_a = state.data.brandData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.brand_list[0]) || leadResponse.brand;
+            state.data.brandData.brandName = (_c = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.name) === null || _c === void 0 ? void 0 : _c.en;
+            state.data.brandData.segment = rest.segments_list.find(function (_a) {
+                var _b, _c;
+                var id = _a.id;
+                return ((_c = (_b = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.segment) === null || _b === void 0 ? void 0 : _b.type) === null || _c === void 0 ? void 0 : _c.id) === id;
+            });
+            state.data.brandData.teamSize = rest.team_size_list.find(function (_a) {
+                var _b, _c;
+                var id = _a.id;
+                return ((_c = (_b = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.segment) === null || _b === void 0 ? void 0 : _b.team) === null || _c === void 0 ? void 0 : _c.id) === id;
+            });
             state.data.individualData = formData;
             state.data.individualData.responseBody = rest;
         })