@tap-payments/auth-jsconnect 2.4.71-test → 2.4.73-test

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

@@ -41,7 +41,6 @@ export type BrandSegmentFormValues = {
     segmentTech?: Segment | undefined;
     teamSize?: TeamSize | undefined;
 };
-export type ConnectBrandFormValues = BrandFormValues & BrandSegmentFormValues;
 export type BrandActivitiesFormValues = {
     activities: Array<Activity>;
     customerLocations: Array<CustomerLocation>;

package/build/constants/app.d.ts

@@ -85,6 +85,7 @@ export declare const CONNECT_STEP_NAMES: {
     UPDATE_LEAD_INDIVIDUAL: string;
     UPDATE_LEAD_BRAND: string;
     UPDATE_BRAND_INFO: string;
+    UPDATE_BRAND_SEGMENT_INFO: string;
     CREATE_AUTH_PASSWORD: string;
     VERIFY_AUTH_PASSWORD: string;
     CONNECT_SUCCESS: string;

package/build/constants/app.js

@@ -55,15 +55,21 @@ export var CONNECT_SCREENS_NAVIGATION = [
     },
     {
         name: 'CONNECT_MERCHANT_INFO_STEP',
-        next: 'CONNECT_THANK_YOU_STEP',
+        next: 'CONNECT_BRAND_SEGMENT_INFO_STEP',
         prev: ['CONNECT_INDIVIDUAL_STEP', 'CONNECT_NID_STEP', 'CONNECT_MOBILE_STEP', 'CONNECT_CIVIL_ID_STEP'],
         order: 4
     },
     {
-        name: 'CONNECT_THANK_YOU_STEP',
-        next: '',
+        name: 'CONNECT_BRAND_SEGMENT_INFO_STEP',
+        next: 'CONNECT_THANK_YOU_STEP',
         prev: 'CONNECT_MERCHANT_INFO_STEP',
         order: 5
+    },
+    {
+        name: 'CONNECT_THANK_YOU_STEP',
+        next: '',
+        prev: 'CONNECT_BRAND_SEGMENT_INFO_STEP',
+        order: 6
     }
 ];
 export var CONNECT_EXPRESS_SCREENS_NAVIGATION = [
@@ -595,6 +601,7 @@ export var CONNECT_STEP_NAMES = {
     UPDATE_LEAD_INDIVIDUAL: 'connect_update_lead_individual',
     UPDATE_LEAD_BRAND: 'connect_update_lead_brand',
     UPDATE_BRAND_INFO: 'connect_update_brand_info',
+    UPDATE_BRAND_SEGMENT_INFO: 'connect_update_brand_segment_info',
     CREATE_AUTH_PASSWORD: 'connect_create_auth_password',
     VERIFY_AUTH_PASSWORD: 'connect_verify_auth_password',
     CONNECT_SUCCESS: 'connect_completed'

package/build/features/app/brand/brandStore.js

@@ -704,9 +704,9 @@ export var brandSlice = createSlice({
                 var _a;
                 return team.id === ((_a = segment === null || segment === void 0 ? void 0 : segment.team) === null || _a === void 0 ? void 0 : _a.id);
             });
-            state.data.brandSegmentData.segmentLocation = selectedSegmentLocation;
-            state.data.brandSegmentData.segmentProfit = selectedSegmentProfit;
-            state.data.brandSegmentData.segmentTech = selectedSegmentTech;
+            state.data.brandSegmentData.segmentLocation = selectedSegmentLocation || (segmentLocationList === null || segmentLocationList === void 0 ? void 0 : segmentLocationList[0]);
+            state.data.brandSegmentData.segmentProfit = selectedSegmentProfit || (segmentProfitList === null || segmentProfitList === void 0 ? void 0 : segmentProfitList[0]);
+            state.data.brandSegmentData.segmentTech = selectedSegmentTech || (segmentTechList === null || segmentTechList === void 0 ? void 0 : segmentTechList[1]);
             state.data.brandSegmentData.teamSize = selectedTeamSize;
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { teamSizeList: teamSizeList, segmentLocationList: segmentLocationList, segmentProfitList: segmentProfitList, segmentTechList: segmentTechList });
         })

package/build/features/app/connect/connectStore.d.ts

@@ -1,5 +1,5 @@
 import { RootState } from '../../../app/store';
-import { ActionState, AuthForType, ConnectBrandFormValues, CivilFormValues, CountryCode, FlowsTypes, IndividualFormValues, MobileFormValues, NIDFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
+import { ActionState, AuthForType, CivilFormValues, CountryCode, FlowsTypes, IndividualFormValues, MobileFormValues, NIDFormValues, OTPFormValues, ResponseData, SharedState, BrandFormValues, BrandSegmentFormValues } from '../../../@types';
 import { CancelToken } from 'axios';
 export declare const createMobileAuth: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
@@ -125,10 +125,10 @@ export declare const retrieveSegmentDataList: import("@reduxjs/toolkit").AsyncTh
 }>;
 export declare const updateLeadBrand: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
-    formData: import("../../../@types").BrandFormValues & import("../../../@types").BrandSegmentFormValues & {
+    formData: BrandFormValues & {
         isNewBrand: boolean;
     };
-}, import("../../../@types").BrandFormValues & import("../../../@types").BrandSegmentFormValues & {
+}, BrandFormValues & {
     isNewBrand: boolean;
 }, {
     state?: unknown;
@@ -140,6 +140,19 @@ export declare const updateLeadBrand: import("@reduxjs/toolkit").AsyncThunk<{
     fulfilledMeta?: unknown;
     rejectedMeta?: unknown;
 }>;
+export declare const updateLeadBrandSegment: import("@reduxjs/toolkit").AsyncThunk<{
+    response: any;
+    formData: BrandSegmentFormValues;
+}, BrandSegmentFormValues, {
+    state?: unknown;
+    dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
+    extra?: unknown;
+    rejectValue?: unknown;
+    serializedErrorType?: unknown;
+    pendingMeta?: unknown;
+    fulfilledMeta?: unknown;
+    rejectedMeta?: unknown;
+}>;
 export declare const checkEmailAvailability: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: string;
@@ -199,7 +212,8 @@ export interface ConnectData {
         authFor: AuthForType;
     };
     individualData: IndividualFormValues & ResponseData;
-    brandData: ConnectBrandFormValues & ResponseData;
+    brandData: BrandFormValues & ResponseData;
+    brandSegmentData: BrandSegmentFormValues & ResponseData;
     flowName: FlowsTypes;
 }
 export interface ConnectState extends SharedState<ConnectData> {

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

@@ -363,17 +363,17 @@ export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params,
     });
 }); });
 export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, lead_id, phoneCountry, payload, leadResponse, _b, segmentLocation, segmentProfit, segmentTech, err_3, teamSize, err_4, brand;
-    var _c, _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var _a, settings, connect, lead_id, phoneCountry, payload, leadResponse, 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;
                 lead_id = (connect.data.otpData.responseBody || {}).lead_id;
-                phoneCountry = (_d = (_c = params.countryCode) === null || _c === void 0 ? void 0 : _c.idd_prefix) === null || _d === void 0 ? void 0 : _d.toString();
+                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: (_e = settings.data.businessCountry) === null || _e === void 0 ? void 0 : _e.iso2,
+                    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,
@@ -381,39 +381,15 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                leadResponse = _h.sent();
-                _h.label = 2;
-            case 2:
-                _h.trys.push([2, 4, , 5]);
-                return [4, thunkApi.dispatch(retrieveSegmentDataList()).unwrap()];
-            case 3:
-                _b = _h.sent(), segmentLocation = _b.segmentLocation, segmentProfit = _b.segmentProfit, segmentTech = _b.segmentTech;
-                leadResponse.segment_location_list = segmentLocation;
-                leadResponse.segment_profit_list = segmentProfit;
-                leadResponse.segment_tech_list = segmentTech;
-                return [3, 5];
-            case 4:
-                err_3 = _h.sent();
-                return [3, 5];
-            case 5:
-                _h.trys.push([5, 7, , 8]);
-                return [4, API.dataService.getTeamSize({ page: 0 })];
-            case 6:
-                teamSize = _h.sent();
-                leadResponse.team_size_list = teamSize.list;
-                return [3, 8];
-            case 7:
-                err_4 = _h.sent();
-                return [3, 8];
-            case 8:
-                if (!leadResponse.brand) return [3, 10];
+                leadResponse = _g.sent();
+                if (!leadResponse.brand) return [3, 3];
                 return [4, API.brandService.retrieveBrand(leadResponse.brand.id)];
-            case 9:
-                brand = (_h.sent()).brand;
+            case 2:
+                brand = (_g.sent()).brand;
                 leadResponse.brand = __assign(__assign({}, leadResponse.brand), brand);
-                _h.label = 10;
-            case 10:
-                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
+                _g.label = 3;
+            case 3:
+                (_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 }];
         }
@@ -444,15 +420,15 @@ export var retrieveSegmentDataList = createAsyncThunk('connectRetrieveSegmentDat
     });
 }); });
 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, brandLogoId, segmentLocation, segmentProfit, segmentTech, teamSize, termAndConditionChecked, 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 _a, settings, connect, responseBody, leadBrandId, isNewBrand, brandName, salesChannels, selectedBrandItem, brandLogoId, termAndConditionChecked, getAddress, channel_services, payload_1, brandReqBody_1, brand_1, _b, segmentLocation, segmentProfit, segmentTech, err_3, teamSize, err_4, brandNameBody, payload, lead, brandReqBody, brand, _c, segmentLocation, segmentProfit, segmentTech, err_5, teamSize, err_6;
+    var _d, _e, _f, _g, _h;
+    return __generator(this, function (_j) {
+        switch (_j.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 responseBody = connect.data.otpData.responseBody;
                 leadBrandId = responseBody === null || responseBody === void 0 ? void 0 : responseBody.brand_id;
-                isNewBrand = params.isNewBrand, brandName = params.brandName, salesChannels = params.salesChannels, selectedBrandItem = params.selectedBrandItem, brandLogoId = params.brandLogoId, segmentLocation = params.segmentLocation, segmentProfit = params.segmentProfit, segmentTech = params.segmentTech, teamSize = params.teamSize, termAndConditionChecked = params.termAndConditionChecked;
+                isNewBrand = params.isNewBrand, brandName = params.brandName, salesChannels = params.salesChannels, selectedBrandItem = params.selectedBrandItem, brandLogoId = params.brandLogoId, termAndConditionChecked = params.termAndConditionChecked;
                 getAddress = function (value, isTwitter, isWeb) {
                     if (isTwitter)
                         return '@' + value;
@@ -470,7 +446,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                         })
                     };
                 });
-                if (!!isNewBrand) return [3, 4];
+                if (!!isNewBrand) return [3, 11];
                 if (!(leadBrandId !== (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id))) return [3, 2];
                 payload_1 = {
                     brand: {
@@ -481,24 +457,46 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 };
                 return [4, API.leadService.updateLead(payload_1)];
             case 1:
-                _g.sent();
-                _g.label = 2;
+                _j.sent();
+                _j.label = 2;
             case 2:
                 brandReqBody_1 = {
                     id: (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id) || '',
                     channel_services: channel_services,
                     term: ['general'],
-                    segment: __assign(__assign(__assign(__assign({}, ((segmentLocation === null || segmentLocation === void 0 ? void 0 : segmentLocation.id) && { location_type: { id: segmentLocation.id } })), ((segmentProfit === null || segmentProfit === void 0 ? void 0 : segmentProfit.id) && { profit_type: { id: segmentProfit.id } })), ((segmentTech === null || segmentTech === void 0 ? void 0 : segmentTech.id) && { tech_type: { id: segmentTech.id } })), { team: { id: (teamSize === null || teamSize === void 0 ? void 0 : teamSize.id) || '' } }),
                     step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO
                 };
                 return [4, API.brandService.updateBrandInfo(brandReqBody_1)];
             case 3:
-                brand_1 = _g.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);
-                return [2, { response: brand_1, formData: params }];
+                brand_1 = _j.sent();
+                _j.label = 4;
             case 4:
+                _j.trys.push([4, 6, , 7]);
+                return [4, thunkApi.dispatch(retrieveSegmentDataList()).unwrap()];
+            case 5:
+                _b = _j.sent(), segmentLocation = _b.segmentLocation, segmentProfit = _b.segmentProfit, segmentTech = _b.segmentTech;
+                brand_1.segment_location_list = segmentLocation;
+                brand_1.segment_profit_list = segmentProfit;
+                brand_1.segment_tech_list = segmentTech;
+                return [3, 7];
+            case 6:
+                err_3 = _j.sent();
+                return [3, 7];
+            case 7:
+                _j.trys.push([7, 9, , 10]);
+                return [4, API.dataService.getTeamSize({ page: 0 })];
+            case 8:
+                teamSize = _j.sent();
+                brand_1.team_size_list = teamSize.list;
+                return [3, 10];
+            case 9:
+                err_4 = _j.sent();
+                return [3, 10];
+            case 10:
+                sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
+                (_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 11:
                 brandNameBody = {
                     id: '',
                     name: {
@@ -514,25 +512,72 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                     encryption_contract: ['brand.name.en', 'brand.name.ar', 'brand.name.zh']
                 };
                 return [4, API.leadService.updateLead(payload)];
-            case 5:
-                lead = _g.sent();
+            case 12:
+                lead = _j.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: ['general'],
-                    step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO,
+                    step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO
+                };
+                return [4, API.brandService.updateBrandInfo(brandReqBody)];
+            case 13:
+                brand = _j.sent();
+                _j.label = 14;
+            case 14:
+                _j.trys.push([14, 16, , 17]);
+                return [4, thunkApi.dispatch(retrieveSegmentDataList()).unwrap()];
+            case 15:
+                _c = _j.sent(), segmentLocation = _c.segmentLocation, segmentProfit = _c.segmentProfit, segmentTech = _c.segmentTech;
+                brand.segment_location_list = segmentLocation;
+                brand.segment_profit_list = segmentProfit;
+                brand.segment_tech_list = segmentTech;
+                return [3, 17];
+            case 16:
+                err_5 = _j.sent();
+                return [3, 17];
+            case 17:
+                _j.trys.push([17, 19, , 20]);
+                return [4, API.dataService.getTeamSize({ page: 0 })];
+            case 18:
+                teamSize = _j.sent();
+                brand.team_size_list = teamSize.list;
+                return [3, 20];
+            case 19:
+                err_6 = _j.sent();
+                return [3, 20];
+            case 20:
+                sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
+                (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, params);
+                return [2, { response: brand, formData: params }];
+        }
+    });
+}); });
+export var updateLeadBrandSegment = createAsyncThunk('updateLeadBrandSegment', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connect, responseBody, leadBrandId, segmentLocation, segmentProfit, segmentTech, teamSize, brandReqBody, brand;
+    var _b, _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
+                responseBody = connect.data.brandData.responseBody;
+                leadBrandId = (_b = responseBody === null || responseBody === void 0 ? void 0 : responseBody.brand) === null || _b === void 0 ? void 0 : _b.id;
+                segmentLocation = params.segmentLocation, segmentProfit = params.segmentProfit, segmentTech = params.segmentTech, teamSize = params.teamSize;
+                brandReqBody = {
+                    id: leadBrandId || '',
+                    step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_SEGMENT_INFO,
                     segment: __assign(__assign(__assign(__assign({}, ((segmentLocation === null || segmentLocation === void 0 ? void 0 : segmentLocation.id) && { location_type: { id: segmentLocation.id } })), ((segmentProfit === null || segmentProfit === void 0 ? void 0 : segmentProfit.id) && { profit_type: { id: segmentProfit.id } })), ((segmentTech === null || segmentTech === void 0 ? void 0 : segmentTech.id) && { tech_type: { id: segmentTech.id } })), { team: { id: (teamSize === null || teamSize === void 0 ? void 0 : teamSize.id) || '' } })
                 };
                 return [4, API.brandService.updateBrandInfo(brandReqBody)];
-            case 6:
-                brand = _g.sent();
+            case 1:
+                brand = _e.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);
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
                 return [2, { response: brand, formData: params }];
         }
     });
@@ -642,15 +687,17 @@ var initialState = {
         brandData: {
             brandName: '',
             salesChannels: [],
-            segmentLocation: undefined,
-            segmentProfit: undefined,
-            segmentTech: undefined,
-            teamSize: undefined,
             termAndConditionChecked: false,
             selectedBrandItem: {},
             responseBody: {
                 brand_list: []
             }
+        },
+        brandSegmentData: {
+            segmentLocation: undefined,
+            segmentProfit: undefined,
+            segmentTech: undefined,
+            teamSize: undefined
         }
     }
 };
@@ -853,10 +900,10 @@ export var connectSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(updateLeadIndividual.fulfilled, function (state, action) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c;
             state.loading = false;
             state.error = null;
-            var _g = action.payload, formData = _g.formData, leadResponse = _g.leadResponse;
+            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;
@@ -869,23 +916,6 @@ export var connectSlice = createSlice({
             }
             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.segmentLocation = (_d = rest.segment_location_list) === null || _d === void 0 ? void 0 : _d.find(function (location) {
-                var _a, _b;
-                return location.id === ((_b = (_a = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.segment) === null || _a === void 0 ? void 0 : _a.location_type) === null || _b === void 0 ? void 0 : _b.id);
-            });
-            state.data.brandData.segmentProfit = (_e = rest.segment_profit_list) === null || _e === void 0 ? void 0 : _e.find(function (profit) {
-                var _a, _b;
-                return profit.id === ((_b = (_a = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.segment) === null || _a === void 0 ? void 0 : _a.profit_type) === null || _b === void 0 ? void 0 : _b.id);
-            });
-            state.data.brandData.segmentTech = (_f = rest.segment_tech_list) === null || _f === void 0 ? void 0 : _f.find(function (tech) {
-                var _a, _b;
-                return tech.id === ((_b = (_a = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.segment) === null || _a === void 0 ? void 0 : _a.tech_type) === null || _b === void 0 ? void 0 : _b.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;
         })
@@ -913,8 +943,30 @@ export var connectSlice = createSlice({
             state.loading = false;
             state.error = null;
             var _a = action.payload, formData = _a.formData, response = _a.response;
-            state.data.brandData = formData;
-            state.data.brandData.responseBody = response;
+            var _b = response || {}, segment_location_list = _b.segment_location_list, segment_profit_list = _b.segment_profit_list, segment_tech_list = _b.segment_tech_list, team_size_list = _b.team_size_list, brand = _b.brand;
+            var selectedSegmentLocation = segment_location_list === null || segment_location_list === void 0 ? void 0 : segment_location_list.find(function (location) {
+                var _a, _b;
+                return location.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.location_type) === null || _b === void 0 ? void 0 : _b.id);
+            });
+            var selectedSegmentProfit = segment_profit_list === null || segment_profit_list === void 0 ? void 0 : segment_profit_list.find(function (profit) {
+                var _a, _b;
+                return profit.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.profit_type) === null || _b === void 0 ? void 0 : _b.id);
+            });
+            var selectedSegmentTech = segment_tech_list === null || segment_tech_list === void 0 ? void 0 : segment_tech_list.find(function (tech) {
+                var _a, _b;
+                return tech.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.tech_type) === null || _b === void 0 ? void 0 : _b.id);
+            });
+            var selectedTeamSize = team_size_list === null || team_size_list === void 0 ? void 0 : team_size_list.find(function (_a) {
+                var _b, _c;
+                var id = _a.id;
+                return ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.team) === null || _c === void 0 ? void 0 : _c.id) === id;
+            });
+            state.data.brandSegmentData.segmentLocation = selectedSegmentLocation || (segment_location_list === null || segment_location_list === void 0 ? void 0 : segment_location_list[0]);
+            state.data.brandSegmentData.segmentProfit = selectedSegmentProfit || (segment_profit_list === null || segment_profit_list === void 0 ? void 0 : segment_profit_list[0]);
+            state.data.brandSegmentData.segmentTech = selectedSegmentTech || (segment_tech_list === null || segment_tech_list === void 0 ? void 0 : segment_tech_list[1]);
+            state.data.brandSegmentData.teamSize = selectedTeamSize;
+            state.data.brandData = __assign(__assign({}, formData), { responseBody: __assign(__assign({}, state.data.brandData.responseBody), { brand: brand }) });
+            state.data.brandSegmentData.responseBody = { segment_location_list: segment_location_list, segment_profit_list: segment_profit_list, segment_tech_list: segment_tech_list, team_size_list: team_size_list };
         })
             .addCase(updateLeadBrand.pending, function (state) {
             state.loading = true;
@@ -923,6 +975,21 @@ export var connectSlice = createSlice({
             .addCase(updateLeadBrand.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(updateLeadBrandSegment.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            var _a = action.payload, formData = _a.formData, response = _a.response;
+            state.data.brandSegmentData = formData;
+            state.data.brandSegmentData.responseBody = __assign(__assign({}, state.data.brandSegmentData.responseBody), response);
+        })
+            .addCase(updateLeadBrandSegment.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(updateLeadBrandSegment.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         })
             .addCase(checkEmailAvailability.fulfilled, function (state, action) {
             var _a;

package/build/features/connect/screens/BrandSegment/BrandSegment.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export interface BrandSegmentProps {
+}
+declare const _default: React.MemoExoticComponent<({}: BrandSegmentProps) => JSX.Element>;
+export default _default;

package/build/features/connect/screens/BrandSegment/BrandSegment.js

@@ -0,0 +1,84 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
+import { useForm, FormProvider } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+import Collapse from '@mui/material/Collapse';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { sendCustomEventToGTM } from '../../../../utils';
+import Form from '../../../../components/Form';
+import { ScreenContainer } from '../../../shared/Containers';
+import Button from '../../../shared/Button';
+import { clearError, connectSelector, updateLeadBrandSegment } from '../../../app/connect/connectStore';
+import { useLanguage } from '../../../../hooks';
+import { BrandSegmentValidationSchema } from './validation';
+import SegmentLocations from './SegmentLocations';
+import SegmentProfits from './SegmentProfits';
+import SegmentTechs from './SegmentTechs';
+import TeamSize from './TeamSize';
+var ListType;
+(function (ListType) {
+    ListType["SegmentLocationList"] = "SegmentLocationList";
+    ListType["SegmentProfitList"] = "SegmentProfitList";
+    ListType["SegmentTechList"] = "SegmentTechList";
+    ListType["TeamSizeList"] = "TeamSizeList";
+    ListType["BrandList"] = "BrandList";
+    ListType["BusinessList"] = "BusinessList";
+})(ListType || (ListType = {}));
+var BrandSegment = function (_a) {
+    var _b = useAppSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var _c = data.brandSegmentData, segmentLocation = _c.segmentLocation, segmentProfit = _c.segmentProfit, segmentTech = _c.segmentTech, teamSize = _c.teamSize;
+    var _d = React.useState(), listActive = _d[0], setListActive = _d[1];
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Brand Segment Details Step'
+        });
+    }, []);
+    var methods = useForm({
+        resolver: yupResolver(BrandSegmentValidationSchema()),
+        defaultValues: {
+            segmentLocation: segmentLocation,
+            segmentProfit: segmentProfit,
+            segmentTech: segmentTech,
+            teamSize: teamSize
+        },
+        mode: 'onChange'
+    });
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var dispatch = useAppDispatch();
+    var onSubmit = function (formData) {
+        dispatch(updateLeadBrandSegment(formData));
+    };
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
+    var disabled = !methods.formState.isValid || !!error;
+    var handleMenuClick = function (flag) {
+        setListActive(flag);
+    };
+    var isSegmentLocationListActive = listActive === ListType.SegmentLocationList;
+    var isSegmentProfitListActive = listActive === ListType.SegmentProfitList;
+    var isSegmentTechListActive = listActive === ListType.SegmentTechList;
+    var isTeamSizeListActive = listActive === ListType.TeamSizeList;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(SegmentLocations, { show: !isTeamSizeListActive && !isSegmentProfitListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentLocationList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(SegmentProfits, { show: !isTeamSizeListActive && !isSegmentLocationListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentProfitList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(SegmentTechs, { show: !isTeamSizeListActive && !isSegmentLocationListActive && !isSegmentProfitListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentTechList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { show: !isSegmentLocationListActive && !isSegmentProfitListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
+};
+export default React.memo(BrandSegment);

package/build/features/connect/screens/{Merchant → BrandSegment}/SegmentLocations.js

@@ -37,7 +37,7 @@ var SegmentLocations = function (_a) {
     var isAr = useLanguage().isAr;
     var data = useAppSelector(connectSelector).data;
     var control = useFormContext().control;
-    var segmentLocationList = ((_b = data.individualData.responseBody) === null || _b === void 0 ? void 0 : _b.segment_location_list) || [];
+    var segmentLocationList = ((_b = data.brandSegmentData.responseBody) === null || _b === void 0 ? void 0 : _b.segment_location_list) || [];
     var segmentControl = useController({ control: control, name: 'segmentLocation' });
     var segment = segmentControl.field.value;
     var error = (_c = segmentControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;

package/build/features/connect/screens/{Merchant → BrandSegment}/SegmentProfits.js

@@ -37,7 +37,7 @@ var SegmentProfits = function (_a) {
     var isAr = useLanguage().isAr;
     var data = useAppSelector(connectSelector).data;
     var control = useFormContext().control;
-    var segmentProfitList = ((_b = data.individualData.responseBody) === null || _b === void 0 ? void 0 : _b.segment_profit_list) || [];
+    var segmentProfitList = ((_b = data.brandSegmentData.responseBody) === null || _b === void 0 ? void 0 : _b.segment_profit_list) || [];
     var segmentControl = useController({ control: control, name: 'segmentProfit' });
     var segment = segmentControl.field.value;
     var error = (_c = segmentControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;

package/build/features/connect/screens/{Merchant → BrandSegment}/SegmentTechs.js

@@ -37,7 +37,7 @@ var SegmentTechs = function (_a) {
     var isAr = useLanguage().isAr;
     var data = useAppSelector(connectSelector).data;
     var control = useFormContext().control;
-    var segmentTechList = ((_b = data.individualData.responseBody) === null || _b === void 0 ? void 0 : _b.segment_tech_list) || [];
+    var segmentTechList = ((_b = data.brandSegmentData.responseBody) === null || _b === void 0 ? void 0 : _b.segment_tech_list) || [];
     var segmentControl = useController({ control: control, name: 'segmentTech' });
     var segment = segmentControl.field.value;
     var error = (_c = segmentControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;

package/build/features/connect/screens/{Merchant → BrandSegment}/TeamSize.js

@@ -37,7 +37,7 @@ var TeamSize = function (_a) {
     var isAr = useLanguage().isAr;
     var data = useAppSelector(connectSelector).data;
     var control = useFormContext().control;
-    var teamSizesList = ((_b = data.individualData.responseBody) === null || _b === void 0 ? void 0 : _b.team_size_list) || [];
+    var teamSizesList = ((_b = data.brandSegmentData.responseBody) === null || _b === void 0 ? void 0 : _b.team_size_list) || [];
     var teamSizeControl = useController({ control: control, name: 'teamSize' });
     var teamSize = teamSizeControl.field.value;
     var error = (_c = teamSizeControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;

package/build/features/connect/screens/BrandSegment/index.d.ts

@@ -0,0 +1,3 @@
+import BrandSegment, { BrandSegmentProps } from './BrandSegment';
+export type { BrandSegmentProps };
+export default BrandSegment;

package/build/features/connect/screens/BrandSegment/index.js

@@ -0,0 +1,2 @@
+import BrandSegment from './BrandSegment';
+export default BrandSegment;

package/build/features/connect/screens/BrandSegment/validation.d.ts

@@ -0,0 +1,17 @@
+import * as yup from 'yup';
+export declare const BrandSegmentValidationSchema: () => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    segmentLocation: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    segmentProfit: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    segmentTech: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+}>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    segmentLocation: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    segmentProfit: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    segmentTech: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    segmentLocation: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    segmentProfit: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    segmentTech: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+    teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+}>>>;

package/build/features/connect/screens/BrandSegment/validation.js

@@ -0,0 +1,9 @@
+import * as yup from 'yup';
+export var BrandSegmentValidationSchema = function () {
+    return yup.object().shape({
+        segmentLocation: yup.object().required('alert_choose_segment_location'),
+        segmentProfit: yup.object().required('alert_choose_segment_profit'),
+        segmentTech: yup.object().required('alert_choose_segment_tech'),
+        teamSize: yup.object().required('alert_choose_teamSize')
+    });
+};

package/build/features/connect/screens/Merchant/BrandList.js

@@ -21,13 +21,12 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { connectSelector } from '../../../app/connect/connectStore';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useFormContext, useController } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import { useAppSelector, useLanguage } from '../../../../hooks';
+import { useLanguage } from '../../../../hooks';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import InputSelect from '../../../shared/InputSelect';
 import CheckIcon from '../../../shared/CheckIcon';
@@ -48,9 +47,7 @@ var BrandList = function (_a) {
     var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var data = useAppSelector(connectSelector).data;
-    var _c = data.individualData.responseBody || {}, segment_location_list = _c.segment_location_list, segment_profit_list = _c.segment_profit_list, segment_tech_list = _c.segment_tech_list, team_size_list = _c.team_size_list;
-    var _d = useFormContext(), control = _d.control, setValue = _d.setValue;
+    var _c = useFormContext(), control = _c.control, setValue = _c.setValue;
     var selectedBrandControl = useController({ control: control, name: 'selectedBrandItem' });
     var selectedBrand = selectedBrandControl.field.value;
     var onOpenBrandList = function (event) {
@@ -82,26 +79,6 @@ var BrandList = function (_a) {
             setValue('salesChannels', [], { shouldValidate: true });
             setValue('brandName', '');
         }
-        setValue('segmentLocation', segment_location_list.find(function (_a) {
-            var _b, _c;
-            var id = _a.id;
-            return ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.location_type) === null || _c === void 0 ? void 0 : _c.id) === id;
-        }), { shouldValidate: true });
-        setValue('segmentProfit', segment_profit_list.find(function (_a) {
-            var _b, _c;
-            var id = _a.id;
-            return ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.profit_type) === null || _c === void 0 ? void 0 : _c.id) === id;
-        }), { shouldValidate: true });
-        setValue('segmentTech', segment_tech_list.find(function (_a) {
-            var _b, _c;
-            var id = _a.id;
-            return ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.tech_type) === null || _c === void 0 ? void 0 : _c.id) === id;
-        }), { shouldValidate: true });
-        setValue('teamSize', team_size_list.find(function (_a) {
-            var _b, _c;
-            var id = _a.id;
-            return ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.team) === null || _c === void 0 ? void 0 : _c.id) === id;
-        }), { shouldValidate: true });
         onCloseBrandList();
     };
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputSelect, { label: t('select_brand_label'), onClick: !!anchorEl ? onCloseBrandList : onOpenBrandList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_brand'), value: t(getBrandName(selectedBrand)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', space: 140, list: list, onSelectItem: onSelectItem, renderItem: function (item) {

package/build/features/connect/screens/Merchant/Merchant.js

@@ -10,7 +10,6 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import TeamSize from '../../../connect/screens/Merchant/TeamSize';
 import * as React from 'react';
 import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
@@ -29,15 +28,8 @@ import BrandName from './BrandName';
 import TAC from './TAC';
 import BrandList from './BrandList';
 import SalesChannels from './SalesChannels';
-import SegmentLocations from './SegmentLocations';
-import SegmentProfits from './SegmentProfits';
-import SegmentTechs from './SegmentTechs';
 var ListType;
 (function (ListType) {
-    ListType["SegmentLocationList"] = "SegmentLocationList";
-    ListType["SegmentProfitList"] = "SegmentProfitList";
-    ListType["SegmentTechList"] = "SegmentTechList";
-    ListType["TeamSizeList"] = "TeamSizeList";
     ListType["BrandList"] = "BrandList";
     ListType["BusinessList"] = "BusinessList";
 })(ListType || (ListType = {}));
@@ -46,7 +38,7 @@ var Merchant = function (_a) {
     var _d = React.useState(false), brandNameChecking = _d[0], setBrandNameChecking = _d[1];
     var _e = React.useState(false), isRequiredNewBrand = _e[0], setIsRequiredNewBrand = _e[1];
     var _f = useAppSelector(connectSelector), data = _f.data, loading = _f.loading, error = _f.error;
-    var _g = data.brandData, brandName = _g.brandName, selectedBrandItem = _g.selectedBrandItem, termAndConditionChecked = _g.termAndConditionChecked, responseBody = _g.responseBody, salesChannels = _g.salesChannels, segmentLocation = _g.segmentLocation, segmentProfit = _g.segmentProfit, segmentTech = _g.segmentTech, teamSize = _g.teamSize;
+    var _g = data.brandData, brandName = _g.brandName, selectedBrandItem = _g.selectedBrandItem, termAndConditionChecked = _g.termAndConditionChecked, responseBody = _g.responseBody, salesChannels = _g.salesChannels;
     var brandList = (responseBody || {}).brand_list;
     var _h = React.useState(), listActive = _h[0], setListActive = _h[1];
     React.useEffect(function () {
@@ -62,11 +54,7 @@ var Merchant = function (_a) {
             brandName: brandName || ((_b = selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.name) === null || _b === void 0 ? void 0 : _b.en),
             selectedBrandItem: selectedBrandItem,
             termAndConditionChecked: termAndConditionChecked,
-            salesChannels: salesChannels,
-            segmentLocation: segmentLocation,
-            segmentProfit: segmentProfit,
-            segmentTech: segmentTech,
-            teamSize: teamSize
+            salesChannels: salesChannels
         },
         mode: 'onChange'
     });
@@ -81,13 +69,9 @@ var Merchant = function (_a) {
         dispatch(handlePrevScreenStep('CONNECT_INDIVIDUAL_STEP'));
     };
     React.useEffect(function () {
-        methods.setValue('segmentLocation', segmentLocation);
-        methods.setValue('segmentProfit', segmentProfit);
-        methods.setValue('segmentTech', segmentTech);
-        methods.setValue('teamSize', teamSize);
         if (brandName)
             methods.trigger('brandName');
-    }, [segmentLocation, segmentProfit, segmentTech, teamSize, brandName]);
+    }, [brandName]);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -111,11 +95,6 @@ var Merchant = function (_a) {
     var handleMenuClick = function (flag) {
         setListActive(flag);
     };
-    var isSegmentLocationListActive = listActive === ListType.SegmentLocationList;
-    var isSegmentProfitListActive = listActive === ListType.SegmentProfitList;
-    var isSegmentTechListActive = listActive === ListType.SegmentTechList;
-    var isTeamSizeListActive = listActive === ListType.TeamSizeList;
-    var isBrandListActive = listActive === ListType.BrandList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: hasBrandList && !isTeamSizeListActive && !isSegmentLocationListActive && !isSegmentProfitListActive && !isSegmentTechListActive, list: brandList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(SegmentLocations, { show: !isTeamSizeListActive && !isBrandListActive && !isSegmentProfitListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentLocationList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(SegmentProfits, { show: !isTeamSizeListActive && !isBrandListActive && !isSegmentLocationListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentProfitList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(SegmentTechs, { show: !isTeamSizeListActive && !isBrandListActive && !isSegmentLocationListActive && !isSegmentProfitListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentTechList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { show: !isSegmentLocationListActive && !isSegmentProfitListActive && !isSegmentTechListActive && !isBrandListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(SalesChannels, {}) })), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !listActive }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: hasBrandList, list: brandList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(SalesChannels, {}) })), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !listActive }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(Merchant);

package/build/features/connect/screens/Merchant/validation.d.ts

@@ -9,10 +9,6 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.Obj
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>>[] | undefined>;
-    segmentLocation: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    segmentProfit: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    segmentTech: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
@@ -24,10 +20,6 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.Obj
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>>[] | undefined>;
-    segmentLocation: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    segmentProfit: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    segmentTech: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
@@ -39,9 +31,5 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.Obj
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>>[] | undefined>;
-    segmentLocation: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    segmentProfit: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    segmentTech: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
 }>>>;

package/build/features/connect/screens/Merchant/validation.js

@@ -86,10 +86,6 @@ export var MerchantValidationSchema = function (isNewBrand) {
             })
                 .required('enter_brand_name_english_chars_numbers_space'),
             termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond'),
-            segmentLocation: yup.object().required('alert_choose_segment_location'),
-            segmentProfit: yup.object().required('alert_choose_segment_profit'),
-            segmentTech: yup.object().required('alert_choose_segment_tech'),
-            teamSize: yup.object().required('alert_choose_teamSize'),
             salesChannels: yup
                 .array()
                 .min(1, 'choose_atleast_one_channel')
@@ -130,10 +126,6 @@ export var MerchantValidationSchema = function (isNewBrand) {
             }
         })
             .required('choose_atleast_one_channel'),
-        segmentLocation: yup.object().required('alert_choose_segment_location'),
-        segmentProfit: yup.object().required('alert_choose_segment_profit'),
-        segmentTech: yup.object().required('alert_choose_segment_tech'),
-        teamSize: yup.object().required('alert_choose_teamSize'),
         brandName: yup.string().optional()
     });
 };

package/build/features/featuresScreens.js

@@ -4,6 +4,7 @@ import ConnectCivilIDScreen from '../features/connect/screens/CivilID';
 import ConnectVerifyPACIScreen from './connect/screens/VerifyPACI';
 import IndividualScreen from './connect/screens/Individual';
 import MerchantInfoScreen from './connect/screens/Merchant';
+import BrandSegmentInfoScreen from './connect/screens/BrandSegment';
 import ConnectOTPScreen from './connect/screens/OTP';
 import ThankYouScreen from './connect/screens/ThankYou';
 import ConnectExpressMobileScreen from './connectExpress/screens/Mobile';
@@ -107,6 +108,10 @@ export var connectFeatureScreens = [
         name: 'CONNECT_MERCHANT_INFO_STEP',
         element: MerchantInfoScreen
     },
+    {
+        name: 'CONNECT_BRAND_SEGMENT_INFO_STEP',
+        element: BrandSegmentInfoScreen
+    },
     {
         name: 'CONNECT_THANK_YOU_STEP',
         element: ThankYouScreen

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.4.71-test",
+	"version": "2.4.73-test",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",