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

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

@@ -465,6 +465,7 @@ export type BrandDataStatus = {
     'segment.tech_type': FieldType;
     activities: FieldType;
     channel_services: FieldType;
+    logo: FieldType;
 };
 export interface MerchantInfo {
     id: string;

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

@@ -31,14 +31,17 @@ export type IndividualFormValues = {
 export type BrandFormValues = {
     brandName: string;
     brandLogoId?: string;
+    salesChannels: Array<SaleChannel>;
+    termAndConditionChecked?: boolean;
+    selectedBrandItem: BrandInfo;
+};
+export type BrandSegmentFormValues = {
     segmentLocation?: Segment | undefined;
     segmentProfit?: Segment | undefined;
     segmentTech?: Segment | undefined;
     teamSize?: TeamSize | undefined;
-    salesChannels: Array<SaleChannel>;
-    termAndConditionChecked?: boolean;
-    selectedBrandItem: BrandInfo;
 };
+export type ConnectBrandFormValues = BrandFormValues & BrandSegmentFormValues;
 export type BrandActivitiesFormValues = {
     activities: Array<Activity>;
     customerLocations: Array<CustomerLocation>;

package/build/assets/locales/ar.json

@@ -409,9 +409,9 @@
     "physical_store_label": "متجر",
     "social_media_label": "وسائل التواصل الاجتماعي",
     "selected_activities": "اختر الأنشطة",
-    "section_location_title": "الموقع",
-    "section_tech_title": "التقنية",
-    "section_profit_title": "الربح",
+    "segment_location_title": "الموقع",
+    "segment_tech_title": "التقنية",
+    "segment_profit_title": "الربح",
     "alert_choose_segment_location": "يُرجى تحديد الموقع",
     "alert_choose_segment_profit": "يُرجى تحديد الربح",
     "alert_choose_segment_tech": "الرجاء تحديد التقنية"

package/build/constants/app.d.ts

@@ -157,6 +157,7 @@ export declare const ENTITY_STEP_NAMES: {
 export declare const BRAND_STEP_NAMES: {
     PHONE_AUTH: string;
     BRAND_INFO: string;
+    BRAND_SEGMENT_INFO: string;
     BRAND_ACTIVITIES: string;
     BRAND_SUCCESS: string;
 };

package/build/constants/app.js

@@ -501,33 +501,39 @@ export var BRAND_SCREENS_NAVIGATION = [
     },
     {
         name: 'BRAND_INFO_STEP',
-        next: 'BRAND_ACTIVITIES_STEP',
+        next: 'BRAND_SEGMENT_INFO_STEP',
         prev: 'BRAND_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         order: 2
     },
     {
-        name: 'BRAND_ACTIVITIES_STEP',
-        next: 'BRAND_DETAILS_SUCCESS_STEP',
+        name: 'BRAND_SEGMENT_INFO_STEP',
+        next: 'BRAND_ACTIVITIES_STEP',
         prev: 'BRAND_INFO_STEP',
         order: 3
     },
+    {
+        name: 'BRAND_ACTIVITIES_STEP',
+        next: 'BRAND_DETAILS_SUCCESS_STEP',
+        prev: 'BRAND_SEGMENT_INFO_STEP',
+        order: 4
+    },
     {
         name: 'BRAND_DETAILS_SUCCESS_STEP',
         next: 'BRAND_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         prev: 'BRAND_ACTIVITIES_STEP',
-        order: 4
+        order: 5
     },
     {
         name: 'BRAND_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         next: 'BRAND_RESET_PASSWORD_SUCCESS',
         prev: '',
-        order: 5
+        order: 6
     },
     {
         name: 'BRAND_RESET_PASSWORD_SUCCESS',
         next: '',
         prev: 'BRAND_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
-        order: 5
+        order: 6
     }
 ];
 export var DefaultDeviceInfo = {
@@ -661,6 +667,7 @@ export var ENTITY_STEP_NAMES = {
 export var BRAND_STEP_NAMES = {
     PHONE_AUTH: 'brand_phone_auth',
     BRAND_INFO: 'brand_info',
+    BRAND_SEGMENT_INFO: 'brand_segment_info',
     BRAND_ACTIVITIES: 'brand_activities',
     BRAND_SUCCESS: 'brand_completed'
 };

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

@@ -1,5 +1,5 @@
 import { RootState } from '../../../app/store';
-import { ActionState, AsyncThunkParams, BrandActivitiesFormValues, BrandFormValues, FlowsTypes, OTPFormValues, ResponseData, SharedState } from '../../../@types';
+import { ActionState, AsyncThunkParams, BrandActivitiesFormValues, BrandFormValues, BrandSegmentFormValues, FlowsTypes, OTPFormValues, ResponseData, SharedState } from '../../../@types';
 import { CancelToken } from 'axios';
 interface VerifyLeadTokenProps {
     token: string;
@@ -21,10 +21,6 @@ export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
         notification: any;
     };
     salesChannels: any;
-    teamSizeList: any;
-    segmentLocationList: any;
-    segmentProfitList: any;
-    segmentTechList: any;
     token: string;
 }, VerifyLeadTokenProps, {
     state?: unknown;
@@ -64,10 +60,6 @@ export declare const verifyBrandLeadOTP: import("@reduxjs/toolkit").AsyncThunk<{
         notification: any;
     };
     salesChannels: any;
-    teamSizeList: any;
-    segmentLocationList: any;
-    segmentProfitList: any;
-    segmentTechList: any;
     formData: OTPFormValues;
 }, OTPFormValues, {
     state?: unknown;
@@ -139,6 +131,10 @@ export declare const checkBrandNameAvailability: import("@reduxjs/toolkit").Asyn
 export declare const updateBrand: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: Omit<BrandFormValues, "termAndConditionChecked" | "selectedBrandItem">;
+    teamSizeList: any;
+    segmentLocationList: any;
+    segmentProfitList: any;
+    segmentTechList: any;
 }, AsyncThunkParams<Omit<BrandFormValues, "termAndConditionChecked" | "selectedBrandItem">>, {
     state?: unknown;
     dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
@@ -149,6 +145,19 @@ export declare const updateBrand: import("@reduxjs/toolkit").AsyncThunk<{
     fulfilledMeta?: unknown;
     rejectedMeta?: unknown;
 }>;
+export declare const updateSegmentBrand: import("@reduxjs/toolkit").AsyncThunk<{
+    data: any;
+    formData: BrandSegmentFormValues;
+}, AsyncThunkParams<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 retrieveEntityList: import("@reduxjs/toolkit").AsyncThunk<any, {
     leadId: string;
 }, {
@@ -209,6 +218,7 @@ export interface BrandData {
     verify: ResponseData & VerifyData;
     otpData: OTPFormValues & ResponseData;
     brandData: Omit<BrandFormValues, 'selectedBrandItem' | 'termAndConditionChecked'> & ResponseData;
+    brandSegmentData: BrandSegmentFormValues & ResponseData;
     brandActivities: BrandActivitiesFormValues & ResponseData;
     flowName: FlowsTypes;
 }

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

@@ -66,10 +66,10 @@ 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, 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) {
+        var payload, data, countryIso2, _b, board_id, board_info_id, salesChannels, boardData, boardInfoData, individualData, _c, id_1, type_1, serviceCallBack, _d, boardRes, individualRes;
+        var _e, _f, _g, _h;
+        return __generator(this, function (_j) {
+            switch (_j.label) {
                 case 0:
                     payload = {
                         service_name: 'tap_email',
@@ -77,7 +77,7 @@ export var verifyLeadToken = createAsyncThunk('brandVerifyLeadToken', function (
                     };
                     return [4, API.leadService.verifyLeadToken(payload)];
                 case 1:
-                    data = (_k.sent()).data;
+                    data = (_j.sent()).data;
                     if ((data === null || data === void 0 ? void 0 : data.errors) && (data === null || data === void 0 ? void 0 : data.mw_error)) {
                         throw new Error(data.errors[0].description);
                     }
@@ -91,42 +91,33 @@ 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, 9];
+                    if (!(data.step_name !== BRAND_STEP_NAMES.PHONE_AUTH || isInternally)) return [3, 7];
                     if (!board_info_id) return [3, 3];
                     return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
                 case 2:
-                    boardInfoData = _k.sent();
-                    _k.label = 3;
+                    boardInfoData = _j.sent();
+                    _j.label = 3;
                 case 3: return [4, API.boardService.retrieveBoardDetails(board_id)];
                 case 4:
-                    boardData = _k.sent();
-                    _c = ((_f = boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification) === null || _f === void 0 ? void 0 : _f.recipient) || {}, id_1 = _c.id, type_1 = _c.type;
+                    boardData = _j.sent();
+                    _c = ((_e = boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification) === null || _e === void 0 ? void 0 : _e.recipient) || {}, id_1 = _c.id, type_1 = _c.type;
                     serviceCallBack = function () { return API.individualService.retrieveIndividual(id_1, type_1); };
                     return [4, retrieveIndividualData(type_1, boardData, serviceCallBack)];
                 case 5:
-                    _d = _k.sent(), boardRes = _d.boardRes, individualRes = _d.individualRes;
+                    _d = _j.sent(), boardRes = _d.boardRes, individualRes = _d.individualRes;
                     boardData = boardRes;
                     individualData = individualRes;
                     if (!countryIso2) {
-                        countryIso2 = (_g = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _g === void 0 ? void 0 : _g.country;
+                        countryIso2 = (_f = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _f === void 0 ? void 0 : _f.country;
                         if (countryIso2)
                             thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
                     }
-                    return [4, thunkApi.dispatch(retrieveSegmentDataList()).unwrap()];
-                case 6:
-                    _e = _k.sent(), segmentLocation = _e.segmentLocation, segmentProfit = _e.segmentProfit, segmentTech = _e.segmentTech;
-                    segmentLocationList = segmentLocation;
-                    segmentProfitList = segmentProfit;
-                    segmentTechList = segmentTech;
                     return [4, API.dataService.getChannelsOfServices({ page: 0 })];
-                case 7:
-                    salesChannels = _k.sent();
-                    return [4, API.dataService.getTeamSize({ page: 0 })];
-                case 8:
-                    teamSizeList = _k.sent();
+                case 6:
+                    salesChannels = _j.sent();
                     thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP'));
-                    _k.label = 9;
-                case 9: return [2, {
+                    _j.label = 7;
+                case 7: return [2, {
                         data: data,
                         individualData: individualData,
                         boardResponse: {
@@ -135,17 +126,13 @@ export var verifyLeadToken = createAsyncThunk('brandVerifyLeadToken', function (
                             entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity,
                             bank_account: boardData === null || boardData === void 0 ? void 0 : boardData.bank_account,
                             merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
-                            name: (_h = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _h === void 0 ? void 0 : _h.names,
-                            contact: (_j = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _j === void 0 ? void 0 : _j.contact,
+                            name: (_g = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _g === void 0 ? void 0 : _g.names,
+                            contact: (_h = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _h === void 0 ? void 0 : _h.contact,
                             individuals: boardData === null || boardData === void 0 ? void 0 : boardData.individuals,
                             business: boardData === null || boardData === void 0 ? void 0 : boardData.business,
                             notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification
                         },
                         salesChannels: salesChannels,
-                        teamSizeList: teamSizeList === null || teamSizeList === void 0 ? void 0 : teamSizeList.list,
-                        segmentLocationList: segmentLocationList,
-                        segmentProfitList: segmentProfitList,
-                        segmentTechList: segmentTechList,
                         token: token
                     }];
             }
@@ -170,24 +157,24 @@ 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, salesChannels, teamSizeList;
-    var _f, _g, _h, _j, _k, _l, _m;
-    return __generator(this, function (_o) {
-        switch (_o.label) {
+    var _a, brand, settings, responseBody, payload, data, _b, board_id, board_info_id, boardInfoData, individualData, boardData, _c, id, type, serviceCallBack, _d, boardRes, individualRes, salesChannels;
+    var _e, _f, _g, _h, _j, _k, _l;
+    return __generator(this, function (_m) {
+        switch (_m.label) {
             case 0:
                 _a = thunkApi.getState(), brand = _a.brand, settings = _a.settings;
                 responseBody = brand.data.verify.responseBody;
                 payload = {
                     data: params.otp,
-                    service_name: (_f = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _f === void 0 ? void 0 : _f.service_name,
+                    service_name: (_e = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _e === void 0 ? void 0 : _e.service_name,
                     verify_token: responseBody === null || responseBody === void 0 ? void 0 : responseBody.verify_token,
                     step_name: BRAND_STEP_NAMES.PHONE_AUTH,
                     encryption_contract: ['data']
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                data = (_o.sent()).data;
-                if ((_g = data.errors) === null || _g === void 0 ? void 0 : _g.length)
+                data = (_m.sent()).data;
+                if ((_f = data.errors) === null || _f === void 0 ? void 0 : _f.length)
                     throw new Error(data.errors[0].description);
                 _b = responseBody || {}, board_id = _b.id, board_info_id = _b.board_info_id;
                 if (!board_id) {
@@ -197,28 +184,22 @@ export var verifyBrandLeadOTP = createAsyncThunk('verifyBrandLeadOTP', function
                 if (!board_info_id) return [3, 3];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 2:
-                boardInfoData = _o.sent();
-                _o.label = 3;
+                boardInfoData = _m.sent();
+                _m.label = 3;
             case 3: return [4, API.boardService.retrieveBoardDetails(board_id)];
             case 4:
-                boardData = _o.sent();
-                _c = ((_h = boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification) === null || _h === void 0 ? void 0 : _h.recipient) || {}, id = _c.id, type = _c.type;
+                boardData = _m.sent();
+                _c = ((_g = boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification) === null || _g === void 0 ? void 0 : _g.recipient) || {}, id = _c.id, type = _c.type;
                 serviceCallBack = function () { return API.individualService.retrieveIndividual(id, type); };
                 return [4, retrieveIndividualData(type, boardData, serviceCallBack)];
             case 5:
-                _d = _o.sent(), boardRes = _d.boardRes, individualRes = _d.individualRes;
+                _d = _m.sent(), boardRes = _d.boardRes, individualRes = _d.individualRes;
                 boardData = boardRes;
                 individualData = individualRes;
-                (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, { otp: params.otp });
-                return [4, thunkApi.dispatch(retrieveSegmentDataList()).unwrap()];
-            case 6:
-                _e = _o.sent(), segmentLocation = _e.segmentLocation, segmentProfit = _e.segmentProfit, segmentTech = _e.segmentTech;
+                (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, { otp: params.otp });
                 return [4, API.dataService.getChannelsOfServices({ page: 0 })];
-            case 7:
-                salesChannels = _o.sent();
-                return [4, API.dataService.getTeamSize({ page: 0 })];
-            case 8:
-                teamSizeList = _o.sent();
+            case 6:
+                salesChannels = _m.sent();
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP')); });
                 return [2, {
                         data: data,
@@ -229,17 +210,13 @@ export var verifyBrandLeadOTP = createAsyncThunk('verifyBrandLeadOTP', function
                             entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity,
                             bank_account: boardData === null || boardData === void 0 ? void 0 : boardData.bank_account,
                             merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
-                            name: (_l = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _l === void 0 ? void 0 : _l.names,
-                            contact: (_m = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _m === void 0 ? void 0 : _m.contact,
+                            name: (_k = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _k === void 0 ? void 0 : _k.names,
+                            contact: (_l = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _l === void 0 ? void 0 : _l.contact,
                             individuals: boardData === null || boardData === void 0 ? void 0 : boardData.individuals,
                             business: boardData === null || boardData === void 0 ? void 0 : boardData.business,
                             notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification
                         },
                         salesChannels: salesChannels,
-                        teamSizeList: teamSizeList === null || teamSizeList === void 0 ? void 0 : teamSizeList.list,
-                        segmentLocationList: segmentLocation,
-                        segmentProfitList: segmentProfit,
-                        segmentTechList: segmentTech,
                         formData: params
                     }];
         }
@@ -326,8 +303,8 @@ export var checkBrandNameAvailability = createAsyncThunk('checkBrandNameAvailabi
 export var updateBrand = createAsyncThunk('brandUpdateBrand', function (_a, thunkApi) {
     var formData = _a.formData, originalFormData = _a.originalFormData;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, brand, brandRes, _c, id, data_status, isNameENNonEditable, isNameARNonEditable, isChannelServicesNonEditable, isSegmentLocationNonEditable, isSegmentProfitNonEditable, isSegmentTechNonEditable, isSegmentTeamsNonEditable, salesChannels, brandName, segmentLocation, segmentProfit, segmentTech, teamSize, brandLogoId, segmentLocationId, segmentProfitId, segmentTechId, teamSizeId, hasSegment, getAddress, channel_services, brandNameIsEditable, requestBody, brandData, activities, activityList;
-        var _d, _e, _f;
+        var _b, settings, brand, brandRes, _c, id, data_status, isNameENNonEditable, isNameARNonEditable, isChannelServicesNonEditable, salesChannels, brandName, brandLogoId, getAddress, channel_services, brandNameIsEditable, requestBody, brandData, _d, segmentLocation, segmentProfit, segmentTech, teamSizeList;
+        var _e, _f;
         return __generator(this, function (_g) {
             switch (_g.label) {
                 case 0:
@@ -337,16 +314,7 @@ export var updateBrand = createAsyncThunk('brandUpdateBrand', function (_a, thun
                     isNameENNonEditable = hasNoneEditableValue(data_status, 'name.en');
                     isNameARNonEditable = hasNoneEditableValue(data_status, 'name.ar');
                     isChannelServicesNonEditable = hasNoneEditableValue(data_status, 'channel_services');
-                    isSegmentLocationNonEditable = hasNoneEditableValue(data_status, 'segment.location_type');
-                    isSegmentProfitNonEditable = hasNoneEditableValue(data_status, 'segment.profit_type');
-                    isSegmentTechNonEditable = hasNoneEditableValue(data_status, 'segment.tech_type');
-                    isSegmentTeamsNonEditable = hasNoneEditableValue(data_status, 'segment.teams');
-                    salesChannels = formData.salesChannels, brandName = formData.brandName, segmentLocation = formData.segmentLocation, segmentProfit = formData.segmentProfit, segmentTech = formData.segmentTech, teamSize = formData.teamSize, brandLogoId = formData.brandLogoId;
-                    segmentLocationId = isSegmentLocationNonEditable ? undefined : segmentLocation && { id: segmentLocation.id };
-                    segmentProfitId = isSegmentProfitNonEditable ? undefined : segmentProfit && { id: segmentProfit.id };
-                    segmentTechId = isSegmentTechNonEditable ? undefined : segmentTech && { id: segmentTech.id };
-                    teamSizeId = isSegmentTeamsNonEditable ? undefined : teamSize && { id: teamSize.id };
-                    hasSegment = segmentLocationId || segmentProfitId || segmentTechId || teamSizeId;
+                    salesChannels = formData.salesChannels, brandName = formData.brandName, brandLogoId = formData.brandLogoId;
                     getAddress = function (value, isTwitter, isWeb) {
                         if (isTwitter)
                             return '@' + value.replaceAll('@', '');
@@ -367,14 +335,59 @@ export var updateBrand = createAsyncThunk('brandUpdateBrand', function (_a, thun
                             };
                         });
                     brandNameIsEditable = brandName && !(isNameENNonEditable && isNameARNonEditable);
-                    requestBody = __assign(__assign(__assign(__assign({ id: id }, (brandNameIsEditable && {
+                    requestBody = __assign(__assign({ id: id }, (brandNameIsEditable && {
                         name: {
                             en: !isNameENNonEditable ? brandName : undefined,
                             ar: !isNameARNonEditable ? brandName : undefined
                         }
-                    })), { logo: brandLogoId }), (hasSegment && {
+                    })), { logo: brandLogoId, channel_services: channel_services });
+                    return [4, API.brandService.updateBrandInfo(requestBody)];
+                case 1:
+                    brandData = (_g.sent()).brand;
+                    return [4, thunkApi.dispatch(retrieveSegmentDataList()).unwrap()];
+                case 2:
+                    _d = _g.sent(), segmentLocation = _d.segmentLocation, segmentProfit = _d.segmentProfit, segmentTech = _d.segmentTech;
+                    return [4, API.dataService.getTeamSize({ page: 0 })];
+                case 3:
+                    teamSizeList = _g.sent();
+                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
+                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, id);
+                    return [2, {
+                            data: __assign({}, brandData),
+                            formData: originalFormData,
+                            teamSizeList: teamSizeList === null || teamSizeList === void 0 ? void 0 : teamSizeList.list,
+                            segmentLocationList: segmentLocation,
+                            segmentProfitList: segmentProfit,
+                            segmentTechList: segmentTech
+                        }];
+            }
+        });
+    });
+});
+export var updateSegmentBrand = createAsyncThunk('brandUpdateBrandSegment', function (_a, thunkApi) {
+    var formData = _a.formData, originalFormData = _a.originalFormData;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var _b, settings, brand, brandRes, _c, id, data_status, isSegmentLocationNonEditable, isSegmentProfitNonEditable, isSegmentTechNonEditable, isSegmentTeamsNonEditable, segmentLocation, segmentProfit, segmentTech, teamSize, segmentLocationId, segmentProfitId, segmentTechId, teamSizeId, hasSegment, requestBody, brandData, activities, activityList;
+        var _d, _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
+                case 0:
+                    _b = thunkApi.getState(), settings = _b.settings, brand = _b.brand;
+                    brandRes = (brand.data.verify.responseBody || {}).brand;
+                    _c = brandRes || {}, id = _c.id, data_status = _c.data_status;
+                    isSegmentLocationNonEditable = hasNoneEditableValue(data_status, 'segment.location_type');
+                    isSegmentProfitNonEditable = hasNoneEditableValue(data_status, 'segment.profit_type');
+                    isSegmentTechNonEditable = hasNoneEditableValue(data_status, 'segment.tech_type');
+                    isSegmentTeamsNonEditable = hasNoneEditableValue(data_status, 'segment.teams');
+                    segmentLocation = formData.segmentLocation, segmentProfit = formData.segmentProfit, segmentTech = formData.segmentTech, teamSize = formData.teamSize;
+                    segmentLocationId = isSegmentLocationNonEditable ? undefined : segmentLocation && { id: segmentLocation.id };
+                    segmentProfitId = isSegmentProfitNonEditable ? undefined : segmentProfit && { id: segmentProfit.id };
+                    segmentTechId = isSegmentTechNonEditable ? undefined : segmentTech && { id: segmentTech.id };
+                    teamSizeId = isSegmentTeamsNonEditable ? undefined : teamSize && { id: teamSize.id };
+                    hasSegment = segmentLocationId || segmentProfitId || segmentTechId || teamSizeId;
+                    requestBody = __assign({ id: id }, (hasSegment && {
                         segment: { location_type: segmentLocationId, profit_type: segmentProfitId, tech_type: segmentTechId, team: teamSizeId }
-                    })), { channel_services: channel_services });
+                    }));
                     return [4, API.brandService.updateBrandInfo(requestBody)];
                 case 1:
                     brandData = (_g.sent()).brand;
@@ -546,6 +559,12 @@ var initialState = {
             brandName: '',
             salesChannels: []
         },
+        brandSegmentData: {
+            segmentLocation: undefined,
+            segmentTech: undefined,
+            segmentProfit: undefined,
+            teamSize: undefined
+        },
         brandActivities: {
             activities: [],
             customerLocations: [],
@@ -585,42 +604,22 @@ export var brandSlice = createSlice({
             state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b;
             state.error = null;
             state.customLoading = false;
-            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 _c = action.payload, data = _c.data, token = _c.token, boardResponse = _c.boardResponse, salesChannels = _c.salesChannels, individualData = _c.individualData;
             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) {
-                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);
-            })) === null || _b === void 0 ? void 0 : _b[0];
-            var selectedSegmentProfit = (_c = segmentProfitList === null || segmentProfitList === void 0 ? void 0 : segmentProfitList.filter(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);
-            })) === null || _c === void 0 ? void 0 : _c[0];
-            var selectedSegmentTech = (_d = segmentTechList === null || segmentTechList === void 0 ? void 0 : segmentTechList.filter(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);
-            })) === null || _d === void 0 ? void 0 : _d[0];
-            var selectedTeamSize = (_e = teamSizeList === null || teamSizeList === void 0 ? void 0 : teamSizeList.filter(function (team) {
-                var _a, _b;
-                return team.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.team) === null || _b === void 0 ? void 0 : _b.id);
-            })) === null || _e === void 0 ? void 0 : _e[0];
-            (_f = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _f === void 0 ? void 0 : _f.forEach(function (element) {
+            (_b = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _b === void 0 ? void 0 : _b.forEach(function (element) {
                 if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
                     state.data.brandActivities.termAndConditionChecked = element.agree;
                     state.data.brandActivities.transactionPolicy = element.agree;
                     state.data.brandActivities.refundPolicy = element.agree;
                 }
             });
-            state.data.brandData.segmentLocation = selectedSegmentLocation;
-            state.data.brandData.segmentProfit = selectedSegmentProfit;
-            state.data.brandData.segmentTech = selectedSegmentTech;
-            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, 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, individualData: individualData });
             state.data.verify.token = token;
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
@@ -643,44 +642,24 @@ export var brandSlice = createSlice({
             state.error = null;
         })
             .addCase(verifyBrandLeadOTP.fulfilled, function (state, action) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b;
             state.loading = false;
             state.error = null;
-            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 _c = action.payload, data = _c.data, boardResponse = _c.boardResponse, formData = _c.formData, salesChannels = _c.salesChannels, individualData = _c.individualData;
             var brand = boardResponse.brand, entity = boardResponse.entity;
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
             state.data.brandData.brandName = (((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en) || '').trim();
-            var selectedTeamSize = (_b = teamSizeList === null || teamSizeList === void 0 ? void 0 : teamSizeList.filter(function (team) {
-                var _a, _b;
-                return team.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.team) === null || _b === void 0 ? void 0 : _b.id);
-            })) === null || _b === void 0 ? void 0 : _b[0];
-            var selectedSegmentLocation = (_c = segmentLocationList === null || segmentLocationList === void 0 ? void 0 : segmentLocationList.filter(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);
-            })) === null || _c === void 0 ? void 0 : _c[0];
-            var selectedSegmentProfit = (_d = segmentProfitList === null || segmentProfitList === void 0 ? void 0 : segmentProfitList.filter(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);
-            })) === null || _d === void 0 ? void 0 : _d[0];
-            var selectedSegmentTech = (_e = segmentTechList === null || segmentTechList === void 0 ? void 0 : segmentTechList.filter(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);
-            })) === null || _e === void 0 ? void 0 : _e[0];
-            state.data.brandData.segmentLocation = selectedSegmentLocation;
-            state.data.brandData.segmentProfit = selectedSegmentProfit;
-            state.data.brandData.segmentTech = selectedSegmentTech;
-            state.data.brandData.teamSize = selectedTeamSize;
             var mappedSalesChannels = mapSalesChannel((brand === null || brand === void 0 ? void 0 : brand.channel_services) || []);
             state.data.brandData.salesChannels = mappedSalesChannels;
-            (_f = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _f === void 0 ? void 0 : _f.forEach(function (element) {
+            (_b = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _b === void 0 ? void 0 : _b.forEach(function (element) {
                 if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
                     state.data.brandActivities.termAndConditionChecked = element.agree;
                     state.data.brandActivities.transactionPolicy = element.agree;
                     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, 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, individualData: individualData });
         })
             .addCase(verifyBrandLeadOTP.rejected, function (state, action) {
             state.loading = false;
@@ -706,12 +685,48 @@ export var brandSlice = createSlice({
             .addCase(updateBrand.fulfilled, function (state, action) {
             state.loading = false;
             state.error = null;
+            var _a = action.payload, data = _a.data, formData = _a.formData, segmentLocationList = _a.segmentLocationList, segmentProfitList = _a.segmentProfitList, segmentTechList = _a.segmentTechList, teamSizeList = _a.teamSizeList;
+            var segment = data.segment;
+            state.data.brandData = formData;
+            var selectedSegmentLocation = segmentLocationList === null || segmentLocationList === void 0 ? void 0 : segmentLocationList.find(function (location) {
+                var _a;
+                return location.id === ((_a = segment === null || segment === void 0 ? void 0 : segment.location_type) === null || _a === void 0 ? void 0 : _a.id);
+            });
+            var selectedSegmentProfit = segmentProfitList === null || segmentProfitList === void 0 ? void 0 : segmentProfitList.find(function (profit) {
+                var _a;
+                return profit.id === ((_a = segment === null || segment === void 0 ? void 0 : segment.profit_type) === null || _a === void 0 ? void 0 : _a.id);
+            });
+            var selectedSegmentTech = segmentTechList === null || segmentTechList === void 0 ? void 0 : segmentTechList.find(function (tech) {
+                var _a;
+                return tech.id === ((_a = segment === null || segment === void 0 ? void 0 : segment.tech_type) === null || _a === void 0 ? void 0 : _a.id);
+            });
+            var selectedTeamSize = teamSizeList === null || teamSizeList === void 0 ? void 0 : teamSizeList.find(function (team) {
+                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.teamSize = selectedTeamSize;
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { teamSizeList: teamSizeList, segmentLocationList: segmentLocationList, segmentProfitList: segmentProfitList, segmentTechList: segmentTechList });
+        })
+            .addCase(updateBrand.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(updateSegmentBrand.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(updateSegmentBrand.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
             var _a = action.payload, data = _a.data, formData = _a.formData;
             var entity_activities = data.entity_activities, activities = data.activities, operations = data.operations, terms = data.terms;
             var selectedActivity = entity_activities === null || entity_activities === void 0 ? void 0 : entity_activities.filter(function (activity) {
                 return activities === null || activities === void 0 ? void 0 : activities.find(function (value) { return activity.id === value.id; });
             });
-            state.data.brandData = formData;
+            state.data.brandSegmentData = formData;
             state.data.brandActivities.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [];
             var _b = operations || {}, customer_base = _b.customer_base, sales = _b.sales;
             var _c = customer_base || {}, locations = _c.locations, customerBase = __rest(_c, ["locations"]);
@@ -729,6 +744,10 @@ export var brandSlice = createSlice({
                 }
             });
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { activities: entity_activities });
+        })
+            .addCase(updateSegmentBrand.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         })
             .addCase(updateBrandActivities.rejected, function (state, action) {
             state.loading = false;
@@ -741,10 +760,6 @@ export var brandSlice = createSlice({
             .addCase(updateBrandActivities.fulfilled, function (state) {
             state.loading = false;
             state.error = null;
-        })
-            .addCase(updateBrand.rejected, function (state, action) {
-            state.loading = false;
-            state.error = action.error.message;
         })
             .addCase(retrieveSegmentDataList.pending, function (state) {
             state.loading = true;

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

@@ -1,5 +1,5 @@
 import { RootState } from '../../../app/store';
-import { ActionState, AuthForType, BrandFormValues, CivilFormValues, CountryCode, FlowsTypes, IndividualFormValues, MobileFormValues, NIDFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
+import { ActionState, AuthForType, ConnectBrandFormValues, CivilFormValues, CountryCode, FlowsTypes, IndividualFormValues, MobileFormValues, NIDFormValues, OTPFormValues, ResponseData, SharedState } 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: BrandFormValues & {
+    formData: import("../../../@types").BrandFormValues & import("../../../@types").BrandSegmentFormValues & {
         isNewBrand: boolean;
     };
-}, BrandFormValues & {
+}, import("../../../@types").BrandFormValues & import("../../../@types").BrandSegmentFormValues & {
     isNewBrand: boolean;
 }, {
     state?: unknown;
@@ -199,7 +199,7 @@ export interface ConnectData {
         authFor: AuthForType;
     };
     individualData: IndividualFormValues & ResponseData;
-    brandData: BrandFormValues & ResponseData;
+    brandData: ConnectBrandFormValues & ResponseData;
     flowName: FlowsTypes;
 }
 export interface ConnectState extends SharedState<ConnectData> {

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

@@ -10,57 +10,39 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ScreenContainer } from '../../../shared/Containers';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 import { FormProvider, useForm } from 'react-hook-form';
-import Form from '../../../../components/Form';
 import { styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { BrandValidationSchema } from './validation';
+import Form from '../../../../components/Form';
+import { mapSalesChannel } from '../../../../utils';
 import Button from '../../../shared/Button';
-import { handlePrevScreenStep } from '../../../../app/settings';
 import { clearError, brandSelector, updateBrand, retrieveBoardStatus } from '../../../app/brand/brandStore';
-import { useTranslation } from 'react-i18next';
-import TeamSize from '../../../brand/screens/BrandInfo/TeamSize';
-import Collapse from '../../../../components/Collapse';
-import { mapSalesChannel } from '../../../../utils';
+import { ScreenContainer } from '../../../shared/Containers';
 import BrandName from './BrandName';
 import SalesChannels from './SalesChannels';
 import BrandLogo from './BrandLogo';
-import SegmentLocations from './SegmentLocations';
-import SegmentProfits from './SegmentProfits';
-import SegmentTechs from './SegmentTechs';
+import { BrandValidationSchema } from './validation';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
 }); });
-var ListType;
-(function (ListType) {
-    ListType["TeamSizeList"] = "TeamSizeList";
-    ListType["SegmentLocationList"] = "SegmentLocationList";
-    ListType["SegmentProfitList"] = "SegmentProfitList";
-    ListType["SegmentTechList"] = "SegmentTechList";
-})(ListType || (ListType = {}));
 var BrandInfo = function (_a) {
-    var _b, _c, _d, _e, _f, _g, _h, _j;
-    var _k = React.useState(), listActive = _k[0], setListActive = _k[1];
-    var _l = React.useState(false), brandNameChecking = _l[0], setBrandNameChecking = _l[1];
+    var _b = React.useState(false), brandNameChecking = _b[0], setBrandNameChecking = _b[1];
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _m = useAppSelector(brandSelector), data = _m.data, loading = _m.loading, error = _m.error, uploadingBrandLogo = _m.uploadingBrandLogo;
-    var _o = data.brandData, brandName = _o.brandName, segmentLocation = _o.segmentLocation, segmentProfit = _o.segmentProfit, segmentTech = _o.segmentTech, teamSize = _o.teamSize, salesChannels = _o.salesChannels, brandLogoId = _o.brandLogoId, responseBody = _o.responseBody;
-    var _p = data.verify.responseBody || {}, brand = _p.brand, flows = _p.flows;
-    var _q = brand || {}, logo_details = _q.logo_details, data_status = _q.data_status, data_verification = _q.data_verification, name = _q.name, resSegment = _q.segment;
+    var _c = useAppSelector(brandSelector), data = _c.data, loading = _c.loading, error = _c.error, uploadingBrandLogo = _c.uploadingBrandLogo;
+    var _d = data.brandData, brandName = _d.brandName, salesChannels = _d.salesChannels, brandLogoId = _d.brandLogoId, responseBody = _d.responseBody;
+    var _e = data.verify.responseBody || {}, brand = _e.brand, flows = _e.flows;
+    var _f = brand || {}, logo_details = _f.logo_details, data_status = _f.data_status, data_verification = _f.data_verification, name = _f.name;
     var methods = useForm({
         resolver: yupResolver(BrandValidationSchema()),
         defaultValues: {
             brandName: brandName,
-            segmentLocation: segmentLocation,
-            segmentProfit: segmentProfit,
-            segmentTech: segmentTech,
-            teamSize: teamSize,
             salesChannels: salesChannels,
             brandLogoId: brandLogoId
         },
@@ -70,23 +52,11 @@ var BrandInfo = function (_a) {
     useSetFromDefaultValues(methods, data.brandData, true);
     var defaultBrandLogoFile = React.useMemo(function () { return logo_details && __assign(__assign({}, logo_details), { docId: '' }); }, [logo_details]);
     var originalReadOnly = useFormReadOnly(methods, { brandLogoId: defaultBrandLogoFile });
-    var noneEditable = useDataNoneEditable(data_status, [
-        'name.en',
-        'name.ar',
-        'segment.location_type',
-        'segment.profit_type',
-        'segment.tech_type',
-        'segment.teams',
-        'channel_services'
-    ]);
+    var noneEditable = useDataNoneEditable(data_status, ['name.en', 'name.ar', 'channel_services', 'logo']);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
-    var dataVerified = useDataVerified(data_verification, ['logo', 'name.en', 'name.ar', 'segment.teams', 'segment.type']);
+    var dataVerified = useDataVerified(data_verification, ['logo', 'name.en', 'name.ar']);
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var isBrandNameVerified = dataVerified['name.en'] && dataVerified['name.ar'] && ((name === null || name === void 0 ? void 0 : name.en) === watch('brandName') || (name === null || name === void 0 ? void 0 : name.ar) === watch('brandName'));
-    var isSegmentLocationVerified = dataVerified['segment.location_type'] && ((_b = resSegment === null || resSegment === void 0 ? void 0 : resSegment.location_type) === null || _b === void 0 ? void 0 : _b.id) === ((_c = watch('segmentLocation')) === null || _c === void 0 ? void 0 : _c.id);
-    var isSegmentProfitVerified = dataVerified['segment.profit_type'] && ((_d = resSegment === null || resSegment === void 0 ? void 0 : resSegment.profit_type) === null || _d === void 0 ? void 0 : _d.id) === ((_e = watch('segmentProfit')) === null || _e === void 0 ? void 0 : _e.id);
-    var isSegmentTechVerified = dataVerified['segment.tech_type'] && ((_f = resSegment === null || resSegment === void 0 ? void 0 : resSegment.tech_type) === null || _f === void 0 ? void 0 : _f.id) === ((_g = watch('segmentTech')) === null || _g === void 0 ? void 0 : _g.id);
-    var isTeamSizeVerified = dataVerified['segment.teams'] && ((_h = resSegment === null || resSegment === void 0 ? void 0 : resSegment.team) === null || _h === void 0 ? void 0 : _h.id) === ((_j = watch('teamSize')) === null || _j === void 0 ? void 0 : _j.id);
     var onSubmit = function (data) {
         dispatch(updateBrand(getFelids(data)));
     };
@@ -111,13 +81,6 @@ var BrandInfo = function (_a) {
     }, [responseBody]);
     var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
     var disabled = brandErrChecks || brandNameChecking || uploadingBrandLogo;
-    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(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandName, { readOnly: readOnly['brandName'] || (noneEditable['name.en'] && noneEditable['name.ar']), show: !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking, isVerified: isBrandNameVerified }), _jsx(BrandLogo, { defaultFile: defaultBrandLogoFile, readOnly: readOnly['brandLogoId'], show: !listActive, isVerified: dataVerified['logo'] }), _jsx(SegmentLocations, { readOnly: readOnly['segmentLocation'], show: !isTeamSizeListActive && !isSegmentProfitListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentLocationList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isSegmentLocationVerified }), _jsx(SegmentProfits, { readOnly: readOnly['segmentProfit'], show: !isTeamSizeListActive && !isSegmentLocationListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentProfitList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isSegmentProfitVerified }), _jsx(SegmentTechs, { readOnly: readOnly['segmentTech'], show: !isTeamSizeListActive && !isSegmentLocationListActive && !isSegmentProfitListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentTechList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isSegmentTechVerified }), _jsx(TeamSize, { readOnly: readOnly['teamSize'] || noneEditable['segment.teams'], show: !isSegmentLocationListActive && !isSegmentProfitListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isTeamSizeVerified }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(SalesChannels, { readOnly: readOnly['salesChannels'] || noneEditable['channel_services'] }), _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(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandName, { readOnly: readOnly['brandName'] || (noneEditable['name.en'] && noneEditable['name.ar']), brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking, isVerified: isBrandNameVerified }), _jsx(BrandLogo, { defaultFile: defaultBrandLogoFile, readOnly: readOnly['brandLogoId'], isVerified: dataVerified['logo'] }), _jsx(SalesChannels, { readOnly: readOnly['salesChannels'] || noneEditable['channel_services'] }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') }))] })) })) }));
 };
 export default BrandInfo;

package/build/features/brand/screens/BrandInfo/BrandLogo.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="react" />
 import { FileDetails } from '../../../../@types';
 type BrandLogoProps = {
-    show: boolean;
     readOnly?: boolean;
     defaultFile?: FileDetails;
     isVerified?: boolean;
 };
-declare const BrandLogo: ({ show, readOnly, defaultFile, isVerified }: BrandLogoProps) => JSX.Element;
+declare const BrandLogo: ({ readOnly, defaultFile, isVerified }: BrandLogoProps) => JSX.Element;
 export default BrandLogo;

package/build/features/brand/screens/BrandInfo/BrandLogo.js

@@ -1,14 +1,3 @@
-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 } from "react/jsx-runtime";
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
@@ -16,7 +5,6 @@ import { styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { DocumentPurpose } from '../../../../@types';
 import { FileRemoveType, VALID_FILE_FORMATS_FOR_IMAGE } from '../../../../constants';
-import Collapse from '../../../../components/Collapse';
 import { ScreenContainer } from '../../../shared/Containers';
 import { UploadWrapper } from '../../../shared/UploadFile';
 import { brandSelector, uploadingBrandLogoStatus, clearBrandLogo, clearError } from '../../../app/brand/brandStore';
@@ -28,7 +16,7 @@ var FeatureStyled = styled(ScreenContainer)(function (_a) {
 });
 var BrandLogo = function (_a) {
     var _b;
-    var show = _a.show, readOnly = _a.readOnly, defaultFile = _a.defaultFile, isVerified = _a.isVerified;
+    var readOnly = _a.readOnly, defaultFile = _a.defaultFile, isVerified = _a.isVerified;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var brandLogoIdControl = useController({ name: 'brandLogoId', control: control });
@@ -48,6 +36,6 @@ var BrandLogo = function (_a) {
             dispatch(clearBrandLogo());
         brandLogoIdControl.field.onChange(undefined);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(FeatureStyled, { children: _jsx(UploadWrapper, { id: 'brandLogoId', readOnly: readOnly, fileRemoveType: FileRemoveType.BRAND_LOGO_FILE_ID, control: control, label: t('title_brand_logo'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('description_brand_logo'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_bank_statement'), onFileUploaded: handleBrandLogoChange, isSubmitting: loading, onDeleteFile: handleReset, defaultFile: defaultFile, purpose: DocumentPurpose.BRAND_LOGO, validFileFormats: VALID_FILE_FORMATS_FOR_IMAGE, fileUploadingStatus: function (uploading) { return dispatch(uploadingBrandLogoStatus(uploading)); }, isVerified: isVerified && !id }) }) })));
+    return (_jsx(FeatureStyled, { children: _jsx(UploadWrapper, { id: 'brandLogoId', readOnly: readOnly, fileRemoveType: FileRemoveType.BRAND_LOGO_FILE_ID, control: control, label: t('title_brand_logo'), title: t('drag_and_drop'), subTitle: t('subtitle_drop'), dragDescription: t('description_brand_logo'), uploadingTitle: t('file_uploading_title'), successTitle: t('success_upload_bank_statement'), onFileUploaded: handleBrandLogoChange, isSubmitting: loading, onDeleteFile: handleReset, defaultFile: defaultFile, purpose: DocumentPurpose.BRAND_LOGO, validFileFormats: VALID_FILE_FORMATS_FOR_IMAGE, fileUploadingStatus: function (uploading) { return dispatch(uploadingBrandLogoStatus(uploading)); }, isVerified: isVerified && !id }) }));
 };
 export default BrandLogo;

package/build/features/brand/screens/BrandInfo/BrandName.d.ts

@@ -1,10 +1,9 @@
 import * as React from 'react';
 interface BrandNameProps {
-    show: boolean;
     fetchingBrandName: (flag: boolean) => void;
     brandNameChecking: boolean;
     readOnly?: boolean;
     isVerified?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, brandNameChecking, fetchingBrandName, readOnly, isVerified }: BrandNameProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ brandNameChecking, fetchingBrandName, readOnly, isVerified }: BrandNameProps) => JSX.Element>;
 export default _default;

package/build/features/brand/screens/BrandInfo/BrandName.js

@@ -58,7 +58,6 @@ import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
 import { FieldType } from '../../../../@types';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Tooltip from '../../../../components/Tooltip';
-import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
 import Input from '../../../shared/Input';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -97,7 +96,7 @@ var InfoIconStyled = styled(InfoIcon)(function (_a) {
 var cancelToken = null;
 var BrandName = function (_a) {
     var _b, _c;
-    var show = _a.show, brandNameChecking = _a.brandNameChecking, fetchingBrandName = _a.fetchingBrandName, readOnly = _a.readOnly, isVerified = _a.isVerified;
+    var brandNameChecking = _a.brandNameChecking, fetchingBrandName = _a.fetchingBrandName, readOnly = _a.readOnly, isVerified = _a.isVerified;
     var dispatch = useAppDispatch();
     var _d = React.useState(false), isHovered = _d[0], setIsHovered = _d[1];
     var t = useTranslation().t;
@@ -136,6 +135,6 @@ var BrandName = function (_a) {
     var clearBrandName = function () {
         brandControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsxs(LabelContainerStyled, { children: [_jsx(InputLabelStyled, { children: t('signup_brand_name_label') }), _jsx(Tooltip, __assign({ title: t('brand_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), _jsx(Input, { readOnly: readOnly, onChange: handleBrandNameChange, value: brandNameValue || '', disabled: isNonEditable, placeholder: t('signup_brand_name_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: brandNameValue, loading: brandNameChecking, isVerified: isVerified, error: error, onClear: clearBrandName }) })] })) })));
+    return (_jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsxs(LabelContainerStyled, { children: [_jsx(InputLabelStyled, { children: t('signup_brand_name_label') }), _jsx(Tooltip, __assign({ title: t('brand_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), _jsx(Input, { readOnly: readOnly, onChange: handleBrandNameChange, value: brandNameValue || '', disabled: isNonEditable, placeholder: t('signup_brand_name_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: brandNameValue, loading: brandNameChecking, isVerified: isVerified, error: error, onClear: clearBrandName }) })] })));
 };
 export default React.memo(BrandName);

package/build/features/brand/screens/BrandInfo/validation.d.ts

@@ -1,10 +1,6 @@
 import * as yup from 'yup';
 export declare const BrandValidationSchema: () => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     brandName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    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>>;
     salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
@@ -16,10 +12,6 @@ export declare const BrandValidationSchema: () => yup.ObjectSchema<import("yup/l
     }>>[] | undefined>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     brandName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    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>>;
     salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
@@ -31,10 +23,6 @@ export declare const BrandValidationSchema: () => yup.ObjectSchema<import("yup/l
     }>>[] | undefined>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     brandName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    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>>;
     salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {

package/build/features/brand/screens/BrandInfo/validation.js

@@ -83,10 +83,6 @@ export var BrandValidationSchema = function () {
             }
         })
             .required('enter_brand_name_english_chars_numbers_space'),
-        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')

package/build/features/brand/screens/BrandSegmentInfo/BrandSegmentInfo.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+export interface BrandProps {
+}
+declare const BrandInfo: ({}: BrandProps) => JSX.Element;
+export default BrandInfo;

package/build/features/brand/screens/BrandSegmentInfo/BrandSegmentInfo.js

@@ -0,0 +1,102 @@
+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 React from 'react';
+import { useTranslation } from 'react-i18next';
+import { FormProvider, useForm } from 'react-hook-form';
+import { styled } from '@mui/material/styles';
+import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { yupResolver } from '@hookform/resolvers/yup';
+import Collapse from '../../../../components/Collapse';
+import Form from '../../../../components/Form';
+import { ScreenContainer } from '../../../shared/Containers';
+import { clearError, brandSelector, updateSegmentBrand } from '../../../app/brand/brandStore';
+import Button from '../../../shared/Button';
+import SegmentLocations from './SegmentLocations';
+import SegmentProfits from './SegmentProfits';
+import SegmentTechs from './SegmentTechs';
+import { BrandValidationSchema } from './validation';
+import TeamSize from './TeamSize';
+var FormStyled = styled(Form)(function () { return ({
+    display: 'flex',
+    flexDirection: 'column'
+}); });
+var ListType;
+(function (ListType) {
+    ListType["TeamSizeList"] = "TeamSizeList";
+    ListType["SegmentLocationList"] = "SegmentLocationList";
+    ListType["SegmentProfitList"] = "SegmentProfitList";
+    ListType["SegmentTechList"] = "SegmentTechList";
+})(ListType || (ListType = {}));
+var BrandInfo = function (_a) {
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    var _k = React.useState(), listActive = _k[0], setListActive = _k[1];
+    var dispatch = useAppDispatch();
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var _l = useAppSelector(brandSelector), data = _l.data, loading = _l.loading, error = _l.error;
+    var _m = data.brandSegmentData, segmentLocation = _m.segmentLocation, segmentProfit = _m.segmentProfit, segmentTech = _m.segmentTech, teamSize = _m.teamSize;
+    var brand = (data.verify.responseBody || {}).brand;
+    var _o = brand || {}, data_status = _o.data_status, data_verification = _o.data_verification, resSegment = _o.segment;
+    var methods = useForm({
+        resolver: yupResolver(BrandValidationSchema()),
+        defaultValues: {
+            segmentLocation: segmentLocation,
+            segmentProfit: segmentProfit,
+            segmentTech: segmentTech,
+            teamSize: teamSize
+        },
+        mode: 'onChange'
+    });
+    var watch = methods.watch;
+    useSetFromDefaultValues(methods, data.brandSegmentData, true);
+    var originalReadOnly = useFormReadOnly(methods);
+    var noneEditable = useDataNoneEditable(data_status, [
+        'segment.location_type',
+        'segment.profit_type',
+        'segment.tech_type',
+        'segment.teams'
+    ]);
+    var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
+    var dataVerified = useDataVerified(data_verification, [
+        'segment.location_type',
+        'segment.profit_type',
+        'segment.tech_type',
+        'segment.teams'
+    ]);
+    var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
+    var isSegmentLocationVerified = dataVerified['segment.location_type'] && ((_b = resSegment === null || resSegment === void 0 ? void 0 : resSegment.location_type) === null || _b === void 0 ? void 0 : _b.id) === ((_c = watch('segmentLocation')) === null || _c === void 0 ? void 0 : _c.id);
+    var isSegmentProfitVerified = dataVerified['segment.profit_type'] && ((_d = resSegment === null || resSegment === void 0 ? void 0 : resSegment.profit_type) === null || _d === void 0 ? void 0 : _d.id) === ((_e = watch('segmentProfit')) === null || _e === void 0 ? void 0 : _e.id);
+    var isSegmentTechVerified = dataVerified['segment.tech_type'] && ((_f = resSegment === null || resSegment === void 0 ? void 0 : resSegment.tech_type) === null || _f === void 0 ? void 0 : _f.id) === ((_g = watch('segmentTech')) === null || _g === void 0 ? void 0 : _g.id);
+    var isTeamSizeVerified = dataVerified['segment.teams'] && ((_h = resSegment === null || resSegment === void 0 ? void 0 : resSegment.team) === null || _h === void 0 ? void 0 : _h.id) === ((_j = watch('teamSize')) === null || _j === void 0 ? void 0 : _j.id);
+    var onSubmit = function (data) {
+        dispatch(updateSegmentBrand(getFelids(data)));
+    };
+    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(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(SegmentLocations, { readOnly: readOnly['segmentLocation'], show: !isTeamSizeListActive && !isSegmentProfitListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentLocationList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isSegmentLocationVerified }), _jsx(SegmentProfits, { readOnly: readOnly['segmentProfit'], show: !isTeamSizeListActive && !isSegmentLocationListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentProfitList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isSegmentProfitVerified }), _jsx(SegmentTechs, { readOnly: readOnly['segmentTech'], show: !isTeamSizeListActive && !isSegmentLocationListActive && !isSegmentProfitListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentTechList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isSegmentTechVerified }), _jsx(TeamSize, { readOnly: readOnly['teamSize'] || noneEditable['segment.teams'], show: !isSegmentLocationListActive && !isSegmentProfitListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isTeamSizeVerified }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
+};
+export default BrandInfo;

package/build/features/brand/screens/BrandSegmentInfo/index.d.ts

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

package/build/features/brand/screens/BrandSegmentInfo/index.js

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

package/build/features/brand/screens/BrandSegmentInfo/validation.d.ts

@@ -0,0 +1,17 @@
+import * as yup from 'yup';
+export declare const BrandValidationSchema: () => 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>>;
+    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>>;
+    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>>;
+    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>>;
+    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>>;
+    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>>;
+    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>>;
+    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>>;
+    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>>;
+    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/brand/screens/BrandSegmentInfo/validation.js

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

package/build/features/featuresScreens.js

@@ -72,6 +72,7 @@ import EntityResetPasswordSuccessPage from './entity/screens/ResetPasswordSucces
 import EntityDataLoadingPage from './entity/screens/PrepareDataLoading';
 import BrandVerifyPage from './brand/screens/Verify';
 import BrandInfoPage from './brand/screens/BrandInfo';
+import BrandSegmentPage from './brand/screens/BrandSegmentInfo';
 import BrandActivitiesPage from './brand/screens/BrandActivities';
 import BrandSuccessPage from './brand/screens/Success';
 import BrandSuccessWithFlowPage from './brand/screens/SuccessWithFlowButtons';
@@ -369,6 +370,10 @@ export var brandFeatureScreens = [
         name: 'BRAND_INFO_STEP',
         element: BrandInfoPage
     },
+    {
+        name: 'BRAND_SEGMENT_INFO_STEP',
+        element: BrandSegmentPage
+    },
     {
         name: 'BRAND_ACTIVITIES_STEP',
         element: BrandActivitiesPage

package/package.json

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