npm - @tap-payments/auth-jsconnect - Versions diffs - 2.4.69-test → 2.4.70-test - Mend

@tap-payments/auth-jsconnect 2.4.69-test → 2.4.70-test

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/build/@types/app.d.ts CHANGED Viewed

@@ -274,6 +274,15 @@ export type BrandInfo = {
         team: {
             id: string;
         };
+        location_type: {
+            id: string;
+        };
+        profit_type: {
+            id: string;
+        };
+        tech_type: {
+            id: string;
+        };
     };
     id: string;
     name: {

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

@@ -31,7 +31,6 @@ export type IndividualFormValues = {
 export type BrandFormValues = {
     brandName: string;
     brandLogoId?: string;
-    segment?: Segment | undefined;
     segmentLocation?: Segment | undefined;
     segmentProfit?: Segment | undefined;
     segmentTech?: Segment | undefined;

package/build/features/app/brand/brandStore.d.ts CHANGED Viewed

@@ -21,7 +21,6 @@ export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
         notification: any;
     };
     salesChannels: any;
-    segmentsList: any;
     teamSizeList: any;
     segmentLocationList: any;
     segmentProfitList: any;
@@ -65,7 +64,6 @@ export declare const verifyBrandLeadOTP: import("@reduxjs/toolkit").AsyncThunk<{
         notification: any;
     };
     salesChannels: any;
-    segmentsList: any;
     teamSizeList: any;
     segmentLocationList: any;
     segmentProfitList: any;

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

@@ -66,7 +66,7 @@ import { hasNoneEditableValue, isKW, isTwitter, isWebsite, mapSalesChannel, retr
 export var verifyLeadToken = createAsyncThunk('brandVerifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     return __awaiter(void 0, void 0, void 0, function () {
-        var payload, data, countryIso2, _b, board_id, board_info_id, segmentsList, segmentLocationList, segmentProfitList, segmentTechList, salesChannels, teamSizeList, boardData, boardInfoData, individualData, _c, id_1, type_1, serviceCallBack, _d, boardRes, individualRes, _e, segmentLocation, segmentProfit, segmentTech;
+        var payload, data, countryIso2, _b, board_id, board_info_id, segmentLocationList, segmentProfitList, segmentTechList, salesChannels, teamSizeList, boardData, boardInfoData, individualData, _c, id_1, type_1, serviceCallBack, _d, boardRes, individualRes, _e, segmentLocation, segmentProfit, segmentTech;
         var _f, _g, _h, _j;
         return __generator(this, function (_k) {
             switch (_k.label) {
@@ -91,7 +91,7 @@ export var verifyLeadToken = createAsyncThunk('brandVerifyLeadToken', function (
                     individualData = undefined;
                     if (isInternally)
                         data.step_name = BRAND_STEP_NAMES.BRAND_INFO;
-                    if (!(data.step_name !== BRAND_STEP_NAMES.PHONE_AUTH || isInternally)) return [3, 10];
+                    if (!(data.step_name !== BRAND_STEP_NAMES.PHONE_AUTH || isInternally)) return [3, 9];
                     if (!board_info_id) return [3, 3];
                     return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
                 case 2:
@@ -118,18 +118,15 @@ export var verifyLeadToken = createAsyncThunk('brandVerifyLeadToken', function (
                     segmentLocationList = segmentLocation;
                     segmentProfitList = segmentProfit;
                     segmentTechList = segmentTech;
-                    return [4, API.dataService.getSegments({ page: 0 })];
-                case 7:
-                    segmentsList = _k.sent();
                     return [4, API.dataService.getChannelsOfServices({ page: 0 })];
-                case 8:
+                case 7:
                     salesChannels = _k.sent();
                     return [4, API.dataService.getTeamSize({ page: 0 })];
-                case 9:
+                case 8:
                     teamSizeList = _k.sent();
                     thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP'));
-                    _k.label = 10;
-                case 10: return [2, {
+                    _k.label = 9;
+                case 9: return [2, {
                         data: data,
                         individualData: individualData,
                         boardResponse: {
@@ -145,7 +142,6 @@ export var verifyLeadToken = createAsyncThunk('brandVerifyLeadToken', function (
                             notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification
                         },
                         salesChannels: salesChannels,
-                        segmentsList: segmentsList === null || segmentsList === void 0 ? void 0 : segmentsList.list,
                         teamSizeList: teamSizeList === null || teamSizeList === void 0 ? void 0 : teamSizeList.list,
                         segmentLocationList: segmentLocationList,
                         segmentProfitList: segmentProfitList,
@@ -174,7 +170,7 @@ export var resendOTP = createAsyncThunk('brandResendOTP', function (params, thun
     });
 }); });
 export var verifyBrandLeadOTP = createAsyncThunk('verifyBrandLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, brand, settings, responseBody, payload, data, _b, board_id, board_info_id, boardInfoData, individualData, boardData, _c, id, type, serviceCallBack, _d, boardRes, individualRes, _e, segmentLocation, segmentProfit, segmentTech, segmentsList, salesChannels, teamSizeList;
+    var _a, brand, settings, responseBody, payload, data, _b, board_id, board_info_id, boardInfoData, individualData, boardData, _c, id, type, serviceCallBack, _d, boardRes, individualRes, _e, segmentLocation, segmentProfit, segmentTech, salesChannels, teamSizeList;
     var _f, _g, _h, _j, _k, _l, _m;
     return __generator(this, function (_o) {
         switch (_o.label) {
@@ -217,14 +213,11 @@ export var verifyBrandLeadOTP = createAsyncThunk('verifyBrandLeadOTP', function
                 return [4, thunkApi.dispatch(retrieveSegmentDataList()).unwrap()];
             case 6:
                 _e = _o.sent(), segmentLocation = _e.segmentLocation, segmentProfit = _e.segmentProfit, segmentTech = _e.segmentTech;
-                return [4, API.dataService.getSegments({ page: 0 })];
-            case 7:
-                segmentsList = _o.sent();
                 return [4, API.dataService.getChannelsOfServices({ page: 0 })];
-            case 8:
+            case 7:
                 salesChannels = _o.sent();
                 return [4, API.dataService.getTeamSize({ page: 0 })];
-            case 9:
+            case 8:
                 teamSizeList = _o.sent();
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP')); });
                 return [2, {
@@ -243,7 +236,6 @@ export var verifyBrandLeadOTP = createAsyncThunk('verifyBrandLeadOTP', function
                             notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification
                         },
                         salesChannels: salesChannels,
-                        segmentsList: segmentsList === null || segmentsList === void 0 ? void 0 : segmentsList.list,
                         teamSizeList: teamSizeList === null || teamSizeList === void 0 ? void 0 : teamSizeList.list,
                         segmentLocationList: segmentLocation,
                         segmentProfitList: segmentProfit,
@@ -596,7 +588,7 @@ export var brandSlice = createSlice({
             var _a, _b, _c, _d, _e, _f;
             state.error = null;
             state.customLoading = false;
-            var _g = action.payload, data = _g.data, token = _g.token, boardResponse = _g.boardResponse, segmentsList = _g.segmentsList, teamSizeList = _g.teamSizeList, salesChannels = _g.salesChannels, individualData = _g.individualData, segmentLocationList = _g.segmentLocationList, segmentProfitList = _g.segmentProfitList, segmentTechList = _g.segmentTechList;
+            var _g = action.payload, data = _g.data, token = _g.token, boardResponse = _g.boardResponse, teamSizeList = _g.teamSizeList, salesChannels = _g.salesChannels, individualData = _g.individualData, segmentLocationList = _g.segmentLocationList, segmentProfitList = _g.segmentProfitList, segmentTechList = _g.segmentTechList;
             var brand = boardResponse.brand, entity = boardResponse.entity;
             state.data.brandData.brandName = (((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en) || '').trim();
             var selectedSegmentLocation = (_b = segmentLocationList === null || segmentLocationList === void 0 ? void 0 : segmentLocationList.filter(function (location) {
@@ -628,7 +620,7 @@ export var brandSlice = createSlice({
             state.data.brandData.teamSize = selectedTeamSize;
             var mappedSalesChannels = mapSalesChannel((brand === null || brand === void 0 ? void 0 : brand.channel_services) || []);
             state.data.brandData.salesChannels = mappedSalesChannels;
-            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), state.data.verify.responseBody), boardResponse), { board_id: data.id, channel_list: (salesChannels === null || salesChannels === void 0 ? void 0 : salesChannels.list) || [], salesChannels: mappedSalesChannels, activities: entity === null || entity === void 0 ? void 0 : entity.activities, segmentsList: segmentsList, teamSizeList: teamSizeList, individualData: individualData, segmentLocationList: segmentLocationList, segmentProfitList: segmentProfitList, segmentTechList: segmentTechList });
+            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), state.data.verify.responseBody), boardResponse), { board_id: data.id, channel_list: (salesChannels === null || salesChannels === void 0 ? void 0 : salesChannels.list) || [], salesChannels: mappedSalesChannels, activities: entity === null || entity === void 0 ? void 0 : entity.activities, teamSizeList: teamSizeList, individualData: individualData, segmentLocationList: segmentLocationList, segmentProfitList: segmentProfitList, segmentTechList: segmentTechList });
             state.data.verify.token = token;
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
@@ -654,7 +646,7 @@ export var brandSlice = createSlice({
             var _a, _b, _c, _d, _e, _f;
             state.loading = false;
             state.error = null;
-            var _g = action.payload, data = _g.data, boardResponse = _g.boardResponse, formData = _g.formData, segmentsList = _g.segmentsList, teamSizeList = _g.teamSizeList, salesChannels = _g.salesChannels, individualData = _g.individualData, segmentLocationList = _g.segmentLocationList, segmentProfitList = _g.segmentProfitList, segmentTechList = _g.segmentTechList;
+            var _g = action.payload, data = _g.data, boardResponse = _g.boardResponse, formData = _g.formData, teamSizeList = _g.teamSizeList, salesChannels = _g.salesChannels, individualData = _g.individualData, segmentLocationList = _g.segmentLocationList, segmentProfitList = _g.segmentProfitList, segmentTechList = _g.segmentTechList;
             var brand = boardResponse.brand, entity = boardResponse.entity;
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
@@ -688,7 +680,7 @@ export var brandSlice = createSlice({
                     state.data.brandActivities.refundPolicy = element.agree;
                 }
             });
-            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), boardResponse), { board_id: data.id, channel_list: (salesChannels === null || salesChannels === void 0 ? void 0 : salesChannels.list) || [], activities: entity === null || entity === void 0 ? void 0 : entity.activities, salesChannels: mappedSalesChannels, segmentsList: segmentsList, teamSizeList: teamSizeList, individualData: individualData, segmentLocationList: segmentLocationList, segmentProfitList: segmentProfitList, segmentTechList: segmentTechList });
+            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), boardResponse), { board_id: data.id, channel_list: (salesChannels === null || salesChannels === void 0 ? void 0 : salesChannels.list) || [], activities: entity === null || entity === void 0 ? void 0 : entity.activities, salesChannels: mappedSalesChannels, teamSizeList: teamSizeList, individualData: individualData, segmentLocationList: segmentLocationList, segmentProfitList: segmentProfitList, segmentTechList: segmentTechList });
         })
             .addCase(verifyBrandLeadOTP.rejected, function (state, action) {
             state.loading = false;

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

@@ -109,6 +109,20 @@ export declare const updateLeadIndividual: import("@reduxjs/toolkit").AsyncThunk
     fulfilledMeta?: unknown;
     rejectedMeta?: unknown;
 }>;
+export declare const retrieveSegmentDataList: import("@reduxjs/toolkit").AsyncThunk<{
+    segmentLocation: any;
+    segmentProfit: any;
+    segmentTech: any;
+}, void, {
+    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 updateLeadBrand: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: BrandFormValues & {

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

@@ -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, segments, err_3, teamSize, err_4, brand;
-    var _b, _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    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) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 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();
+                phoneCountry = (_d = (_c = params.countryCode) === null || _c === void 0 ? void 0 : _c.idd_prefix) === null || _d === void 0 ? void 0 : _d.toString();
                 payload = {
                     id: lead_id || '',
-                    country_code: (_d = settings.data.businessCountry) === null || _d === void 0 ? void 0 : _d.iso2,
+                    country_code: (_e = settings.data.businessCountry) === null || _e === void 0 ? void 0 : _e.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,52 +381,78 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                leadResponse = _g.sent();
-                _g.label = 2;
+                leadResponse = _h.sent();
+                _h.label = 2;
             case 2:
-                _g.trys.push([2, 4, , 5]);
-                return [4, API.dataService.getSegments({ page: 0 })];
+                _h.trys.push([2, 4, , 5]);
+                return [4, thunkApi.dispatch(retrieveSegmentDataList()).unwrap()];
             case 3:
-                segments = _g.sent();
-                leadResponse.segments_list = segments.list;
+                _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 = _g.sent();
+                err_3 = _h.sent();
                 return [3, 5];
             case 5:
-                _g.trys.push([5, 7, , 8]);
+                _h.trys.push([5, 7, , 8]);
                 return [4, API.dataService.getTeamSize({ page: 0 })];
             case 6:
-                teamSize = _g.sent();
+                teamSize = _h.sent();
                 leadResponse.team_size_list = teamSize.list;
                 return [3, 8];
             case 7:
-                err_4 = _g.sent();
+                err_4 = _h.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;
+                brand = (_h.sent()).brand;
                 leadResponse.brand = __assign(__assign({}, leadResponse.brand), brand);
-                _g.label = 10;
+                _h.label = 10;
             case 10:
-                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
+                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
                 thunkApi.dispatch(handleNextScreenStep());
                 return [2, { leadResponse: leadResponse, formData: params }];
         }
     });
 }); });
+export var retrieveSegmentDataList = createAsyncThunk('connectRetrieveSegmentDataList', function () { return __awaiter(void 0, void 0, void 0, function () {
+    var dataBody, _a, segmentLocation, segmentProfit, segmentTech;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                dataBody = {
+                    page: 0,
+                    limit: 50
+                };
+                return [4, Promise.all([
+                        API.dataService.getSegmentLocation(dataBody),
+                        API.dataService.getSegmentProfit(dataBody),
+                        API.dataService.getSegmentTech(dataBody)
+                    ])];
+            case 1:
+                _a = _b.sent(), segmentLocation = _a[0].list, segmentProfit = _a[1].list, segmentTech = _a[2].list;
+                return [2, {
+                        segmentLocation: segmentLocation,
+                        segmentProfit: segmentProfit,
+                        segmentTech: segmentTech
+                    }];
+        }
+    });
+}); });
 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, _g, _h, _j, _k;
-    return __generator(this, function (_l) {
-        switch (_l.label) {
+    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) {
             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;
+                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;
                 getAddress = function (value, isTwitter, isWeb) {
                     if (isTwitter)
                         return '@' + value;
@@ -455,22 +481,22 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 };
                 return [4, API.leadService.updateLead(payload_1)];
             case 1:
-                _l.sent();
-                _l.label = 2;
+                _g.sent();
+                _g.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) || '' } },
+                    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 = _l.sent();
+                brand_1 = _g.sent();
                 thunkApi.dispatch(updateLeadSuccess());
                 thunkApi.dispatch(handleNextScreenStep());
-                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, params);
+                (_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 }];
             case 4:
                 brandNameBody = {
@@ -489,24 +515,24 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 5:
-                lead = _l.sent();
+                lead = _g.sent();
                 if (!lead.brand) {
                     console.error('Internal server error: brand is not created');
                     throw new Error('Internal server error');
                 }
                 brandReqBody = {
-                    id: ((_f = lead.brand) === null || _f === void 0 ? void 0 : _f.id) || '',
+                    id: ((_d = lead.brand) === null || _d === void 0 ? void 0 : _d.id) || '',
                     channel_services: channel_services,
                     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) || '' } }
+                    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 = _l.sent();
+                brand = _g.sent();
                 thunkApi.dispatch(updateLeadSuccess());
                 thunkApi.dispatch(handleNextScreenStep());
-                (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, params);
+                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, params);
                 return [2, { response: brand, formData: params }];
         }
     });
@@ -616,7 +642,9 @@ var initialState = {
         brandData: {
             brandName: '',
             salesChannels: [],
-            segment: undefined,
+            segmentLocation: undefined,
+            segmentProfit: undefined,
+            segmentTech: undefined,
             teamSize: undefined,
             termAndConditionChecked: false,
             selectedBrandItem: {},
@@ -825,10 +853,10 @@ export var connectSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(updateLeadIndividual.fulfilled, function (state, action) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f;
             state.loading = false;
             state.error = null;
-            var _d = action.payload, formData = _d.formData, leadResponse = _d.leadResponse;
+            var _g = action.payload, formData = _g.formData, leadResponse = _g.leadResponse;
             var brand = leadResponse.brand, rest = __rest(leadResponse, ["brand"]);
             if (brand) {
                 var channel_services = brand.channel_services, terms = brand.terms;
@@ -841,10 +869,17 @@ 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.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.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;
@@ -861,6 +896,18 @@ export var connectSlice = createSlice({
             .addCase(updateLeadIndividual.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(retrieveSegmentDataList.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(retrieveSegmentDataList.fulfilled, function (state) {
+            state.loading = false;
+            state.error = null;
+        })
+            .addCase(retrieveSegmentDataList.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         })
             .addCase(updateLeadBrand.fulfilled, function (state, action) {
             state.loading = false;

package/build/features/brand/screens/BrandInfo/BrandInfo.js CHANGED Viewed

@@ -37,7 +37,6 @@ var FormStyled = styled(Form)(function () { return ({
 }); });
 var ListType;
 (function (ListType) {
-    ListType["SegmentsList"] = "SegmentsList";
     ListType["TeamSizeList"] = "TeamSizeList";
     ListType["SegmentLocationList"] = "SegmentLocationList";
     ListType["SegmentProfitList"] = "SegmentProfitList";

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

@@ -49,7 +49,7 @@ var BrandList = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var data = useAppSelector(connectSelector).data;
-    var _c = data.individualData.responseBody || {}, segments_list = _c.segments_list, team_size_list = _c.team_size_list;
+    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 selectedBrandControl = useController({ control: control, name: 'selectedBrandItem' });
     var selectedBrand = selectedBrandControl.field.value;
@@ -82,10 +82,20 @@ var BrandList = function (_a) {
             setValue('salesChannels', [], { shouldValidate: true });
             setValue('brandName', '');
         }
-        setValue('segment', segments_list.find(function (_a) {
+        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.type) === null || _c === void 0 ? void 0 : _c.id) === 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;

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

@@ -29,10 +29,14 @@ import BrandName from './BrandName';
 import TAC from './TAC';
 import BrandList from './BrandList';
 import SalesChannels from './SalesChannels';
-import Segments from './Segments';
+import SegmentLocations from './SegmentLocations';
+import SegmentProfits from './SegmentProfits';
+import SegmentTechs from './SegmentTechs';
 var ListType;
 (function (ListType) {
-    ListType["SegmentsList"] = "SegmentsList";
+    ListType["SegmentLocationList"] = "SegmentLocationList";
+    ListType["SegmentProfitList"] = "SegmentProfitList";
+    ListType["SegmentTechList"] = "SegmentTechList";
     ListType["TeamSizeList"] = "TeamSizeList";
     ListType["BrandList"] = "BrandList";
     ListType["BusinessList"] = "BusinessList";
@@ -42,7 +46,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, segment = _g.segment, teamSize = _g.teamSize;
+    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 brandList = (responseBody || {}).brand_list;
     var _h = React.useState(), listActive = _h[0], setListActive = _h[1];
     React.useEffect(function () {
@@ -59,7 +63,9 @@ var Merchant = function (_a) {
             selectedBrandItem: selectedBrandItem,
             termAndConditionChecked: termAndConditionChecked,
             salesChannels: salesChannels,
-            segment: segment,
+            segmentLocation: segmentLocation,
+            segmentProfit: segmentProfit,
+            segmentTech: segmentTech,
             teamSize: teamSize
         },
         mode: 'onChange'
@@ -75,11 +81,13 @@ var Merchant = function (_a) {
         dispatch(handlePrevScreenStep('CONNECT_INDIVIDUAL_STEP'));
     };
     React.useEffect(function () {
-        methods.setValue('segment', segment);
+        methods.setValue('segmentLocation', segmentLocation);
+        methods.setValue('segmentProfit', segmentProfit);
+        methods.setValue('segmentTech', segmentTech);
         methods.setValue('teamSize', teamSize);
         if (brandName)
             methods.trigger('brandName');
-    }, [segment, teamSize, brandName]);
+    }, [segmentLocation, segmentProfit, segmentTech, teamSize, brandName]);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -103,9 +111,11 @@ var Merchant = function (_a) {
     var handleMenuClick = function (flag) {
         setListActive(flag);
     };
-    var isSegmentsListActive = listActive === ListType.SegmentsList;
+    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 && !isSegmentsListActive, list: brandList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Segments, { show: !isTeamSizeListActive && !isBrandListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentsList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { show: !isSegmentsListActive && !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 && !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') })) }))] })) })) }));
 };
 export default React.memo(Merchant);

package/build/features/connect/screens/Merchant/SegmentLocations.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+interface SegmentLocationsProps {
+    show: boolean;
+    onListOpen?: () => void;
+    onListClose?: () => void;
+}
+declare const SegmentLocations: ({ show, onListOpen, onListClose }: SegmentLocationsProps) => JSX.Element;
+export default SegmentLocations;

package/build/features/connect/screens/Merchant/SegmentLocations.js ADDED Viewed

@@ -0,0 +1,66 @@
+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, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import { useAppSelector, useLanguage } from '../../../../hooks';
+import SimpleList from '../../../../components/SimpleList';
+import Text from '../../../../components/Text';
+import Collapse from '../../../../components/Collapse';
+import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
+import { ScreenContainer } from '../../../shared/Containers';
+import InputSelect from '../../../shared/InputSelect';
+import CheckIcon from '../../../shared/CheckIcon';
+import { connectSelector } from '../../../app/connect/connectStore';
+var IncomeText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
+    var theme = _a.theme, isSelected = _a.isSelected;
+    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
+});
+var SegmentLocations = function (_a) {
+    var _b, _c, _d, _e;
+    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose;
+    var _f = React.useState([]), segmentList = _f[0], setSegmentList = _f[1];
+    var _g = React.useState(null), anchorEl = _g[0], setAnchorEl = _g[1];
+    var t = useTranslation().t;
+    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 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;
+    React.useEffect(function () {
+        if ((segmentLocationList === null || segmentLocationList === void 0 ? void 0 : segmentLocationList.length) > 0) {
+            setSegmentList(segmentLocationList);
+        }
+    }, [segmentLocationList]);
+    var onOpenList = function (event) {
+        setAnchorEl(event.currentTarget);
+        onListOpen === null || onListOpen === void 0 ? void 0 : onListOpen();
+    };
+    var onCloseList = function () {
+        setAnchorEl(null);
+        onListClose === null || onListClose === void 0 ? void 0 : onListClose();
+    };
+    var onSelectItem = function (segment) {
+        onCloseList();
+        segmentControl.field.onChange(segment);
+    };
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(InputSelect, { required: true, label: t('segment_location_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl }), placeholder: t('choose_any_segment'), value: (isAr ? (_d = segment === null || segment === void 0 ? void 0 : segment.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = segment === null || segment === void 0 ? void 0 : segment.name) === null || _e === void 0 ? void 0 : _e.en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.ar', 'name.en'], list: segmentList, onSelectItem: onSelectItem, renderItem: function (item) {
+                            var _a, _b;
+                            return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (segment === null || segment === void 0 ? void 0 : segment.id) }, { children: isAr ? (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en })) })), item.id === (segment === null || segment === void 0 ? void 0 : segment.id) && _jsx(CheckIcon, {})] }));
+                        } }) }))] })) })));
+};
+export default SegmentLocations;

package/build/features/connect/screens/Merchant/SegmentProfits.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+interface SegmentProfitsProps {
+    show: boolean;
+    onListOpen?: () => void;
+    onListClose?: () => void;
+}
+declare const SegmentProfits: ({ show, onListOpen, onListClose }: SegmentProfitsProps) => JSX.Element;
+export default SegmentProfits;

package/build/features/connect/screens/Merchant/{Segments.js → SegmentProfits.js} RENAMED Viewed

@@ -10,25 +10,25 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { connectSelector } from '../../../app/connect/connectStore';
-import Collapse from '../../../../components/Collapse';
-import { ScreenContainer } from '../../../../features/shared/Containers';
-import InputSelect from '../../../../features/shared/InputSelect';
-import { useAppSelector, useLanguage } from '../../../../hooks';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import SimpleList from '../../../../components/SimpleList';
-import ExpandIcon from '../../../../components/ExpandIcon';
-import CheckIcon from '../../../shared/CheckIcon';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
+import { useAppSelector, useLanguage } from '../../../../hooks';
+import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
+import Collapse from '../../../../components/Collapse';
+import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
+import { ScreenContainer } from '../../../shared/Containers';
+import InputSelect from '../../../shared/InputSelect';
+import CheckIcon from '../../../shared/CheckIcon';
+import { connectSelector } from '../../../app/connect/connectStore';
 var IncomeText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
     var theme = _a.theme, isSelected = _a.isSelected;
     return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
 });
-var Segments = function (_a) {
+var SegmentProfits = function (_a) {
     var _b, _c, _d, _e;
     var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose;
     var _f = React.useState([]), segmentList = _f[0], setSegmentList = _f[1];
@@ -37,15 +37,15 @@ var Segments = function (_a) {
     var isAr = useLanguage().isAr;
     var data = useAppSelector(connectSelector).data;
     var control = useFormContext().control;
-    var segmentsList = ((_b = data.individualData.responseBody) === null || _b === void 0 ? void 0 : _b.segments_list) || [];
-    var segmentControl = useController({ control: control, name: 'segment' });
+    var segmentProfitList = ((_b = data.individualData.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;
     React.useEffect(function () {
-        if ((segmentsList === null || segmentsList === void 0 ? void 0 : segmentsList.length) > 0) {
-            setSegmentList(segmentsList);
+        if ((segmentProfitList === null || segmentProfitList === void 0 ? void 0 : segmentProfitList.length) > 0) {
+            setSegmentList(segmentProfitList);
         }
-    }, [segmentsList]);
+    }, [segmentProfitList]);
     var onOpenList = function (event) {
         setAnchorEl(event.currentTarget);
         onListOpen === null || onListOpen === void 0 ? void 0 : onListOpen();
@@ -58,9 +58,9 @@ var Segments = function (_a) {
         onCloseList();
         segmentControl.field.onChange(segment);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(InputSelect, { required: true, label: t('segment_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_any_segment'), value: (isAr ? (_d = segment === null || segment === void 0 ? void 0 : segment.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = segment === null || segment === void 0 ? void 0 : segment.name) === null || _e === void 0 ? void 0 : _e.en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.ar', 'name.en'], list: segmentList, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(InputSelect, { required: true, label: t('segment_profit_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl }), placeholder: t('choose_any_segment'), value: (isAr ? (_d = segment === null || segment === void 0 ? void 0 : segment.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = segment === null || segment === void 0 ? void 0 : segment.name) === null || _e === void 0 ? void 0 : _e.en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.ar', 'name.en'], list: segmentList, onSelectItem: onSelectItem, renderItem: function (item) {
                             var _a, _b;
                             return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (segment === null || segment === void 0 ? void 0 : segment.id) }, { children: isAr ? (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en })) })), item.id === (segment === null || segment === void 0 ? void 0 : segment.id) && _jsx(CheckIcon, {})] }));
                         } }) }))] })) })));
 };
-export default Segments;
+export default SegmentProfits;

package/build/features/connect/screens/Merchant/SegmentTechs.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+interface SegmentTechsProps {
+    show: boolean;
+    onListOpen?: () => void;
+    onListClose?: () => void;
+}
+declare const SegmentTechs: ({ show, onListOpen, onListClose }: SegmentTechsProps) => JSX.Element;
+export default SegmentTechs;

package/build/features/connect/screens/Merchant/SegmentTechs.js ADDED Viewed

@@ -0,0 +1,66 @@
+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, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import { useAppSelector, useLanguage } from '../../../../hooks';
+import SimpleList from '../../../../components/SimpleList';
+import Text from '../../../../components/Text';
+import Collapse from '../../../../components/Collapse';
+import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
+import { ScreenContainer } from '../../../shared/Containers';
+import InputSelect from '../../../shared/InputSelect';
+import CheckIcon from '../../../shared/CheckIcon';
+import { connectSelector } from '../../../app/connect/connectStore';
+var IncomeText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
+    var theme = _a.theme, isSelected = _a.isSelected;
+    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
+});
+var SegmentTechs = function (_a) {
+    var _b, _c, _d, _e;
+    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose;
+    var _f = React.useState([]), segmentList = _f[0], setSegmentList = _f[1];
+    var _g = React.useState(null), anchorEl = _g[0], setAnchorEl = _g[1];
+    var t = useTranslation().t;
+    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 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;
+    React.useEffect(function () {
+        if ((segmentTechList === null || segmentTechList === void 0 ? void 0 : segmentTechList.length) > 0) {
+            setSegmentList(segmentTechList);
+        }
+    }, [segmentTechList]);
+    var onOpenList = function (event) {
+        setAnchorEl(event.currentTarget);
+        onListOpen === null || onListOpen === void 0 ? void 0 : onListOpen();
+    };
+    var onCloseList = function () {
+        setAnchorEl(null);
+        onListClose === null || onListClose === void 0 ? void 0 : onListClose();
+    };
+    var onSelectItem = function (segment) {
+        onCloseList();
+        segmentControl.field.onChange(segment);
+    };
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(InputSelect, { required: true, label: t('segment_tech_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl }), placeholder: t('choose_any_segment'), value: (isAr ? (_d = segment === null || segment === void 0 ? void 0 : segment.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = segment === null || segment === void 0 ? void 0 : segment.name) === null || _e === void 0 ? void 0 : _e.en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.ar', 'name.en'], list: segmentList, onSelectItem: onSelectItem, renderItem: function (item) {
+                            var _a, _b;
+                            return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (segment === null || segment === void 0 ? void 0 : segment.id) }, { children: isAr ? (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en })) })), item.id === (segment === null || segment === void 0 ? void 0 : segment.id) && _jsx(CheckIcon, {})] }));
+                        } }) }))] })) })));
+};
+export default SegmentTechs;

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

@@ -9,7 +9,9 @@ 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>;
-    segment: 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>>;
+    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, {
@@ -22,7 +24,9 @@ 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>;
-    segment: 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>>;
+    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, {
@@ -35,7 +39,9 @@ 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>;
-    segment: 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>>;
+    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 CHANGED Viewed

@@ -86,7 +86,9 @@ export var MerchantValidationSchema = function (isNewBrand) {
             })
                 .required('enter_brand_name_english_chars_numbers_space'),
             termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond'),
-            segment: yup.object().required('alert_choose_segment'),
+            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()
@@ -128,7 +130,9 @@ export var MerchantValidationSchema = function (isNewBrand) {
             }
         })
             .required('choose_atleast_one_channel'),
-        segment: yup.object().required('alert_choose_segment'),
+        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/package.json CHANGED Viewed

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

package/build/features/connect/screens/Merchant/Segments.d.ts DELETED Viewed

@@ -1,8 +0,0 @@
-/// <reference types="react" />
-interface SegmentsProps {
-    show: boolean;
-    onListOpen?: () => void;
-    onListClose?: () => void;
-}
-declare const Segments: ({ show, onListOpen, onListClose }: SegmentsProps) => JSX.Element;
-export default Segments;