@tap-payments/auth-jsconnect 2.3.3-test → 2.3.3

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

@@ -24,7 +24,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -45,20 +45,31 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
-import { handleNextScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
+import { handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2 } from '../../../app/settings';
 import { BRAND_STEP_NAMES } from '../../../constants';
-import { findInArrayOrSubArray, isKW, isTwitter, isWebsite, sleep } from '../../../utils';
+import { hasNoneEditableValue, isKW, isTwitter, isWebsite, mapSalesChannel, retrieveIndividualData, sleep } from '../../../utils';
 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, board_id, segmentsList, salesChannels, teamSizeList, boardInfoData, boardData;
-        var _b, _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var payload, data, countryIso2, _b, board_id, board_info_id, config, publicKey, 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',
@@ -66,59 +77,66 @@ export var verifyLeadToken = createAsyncThunk('brandVerifyLeadToken', function (
                     };
                     return [4, API.leadService.verifyLeadToken(payload)];
                 case 1:
-                    data = (_e.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);
                     }
                     countryIso2 = data === null || data === void 0 ? void 0 : data.country_code;
                     if (countryIso2)
                         thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                    board_id = data === null || data === void 0 ? void 0 : data.id;
+                    _b = data || {}, board_id = _b.id, board_info_id = _b.board_info_id, config = _b.config;
+                    publicKey = config === null || config === void 0 ? void 0 : config.public_key;
+                    if (publicKey) {
+                        thunkApi.dispatch(handlePublicKey(publicKey));
+                    }
                     if (!board_id) {
                         throw new Error('Internal server error');
                     }
-                    boardData = undefined;
+                    individualData = undefined;
                     if (isInternally)
                         data.step_name = BRAND_STEP_NAMES.BRAND_INFO;
                     if (!(data.step_name !== BRAND_STEP_NAMES.PHONE_AUTH || isInternally)) return [3, 7];
-                    return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
+                    if (!board_info_id) return [3, 3];
+                    return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
                 case 2:
-                    boardInfoData = _e.sent();
-                    return [4, API.boardService.retrieveBoardDetails(board_id)];
-                case 3:
-                    boardData = _e.sent();
+                    boardInfoData = _j.sent();
+                    _j.label = 3;
+                case 3: return [4, API.boardService.retrieveBoardDetails(board_id)];
+                case 4:
+                    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 = _j.sent(), boardRes = _d.boardRes, individualRes = _d.individualRes;
+                    boardData = boardRes;
+                    individualData = individualRes;
                     if (!countryIso2) {
-                        countryIso2 = (_b = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _b === void 0 ? void 0 : _b.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, API.dataService.getSegments({ page: 0 })];
-                case 4:
-                    segmentsList = _e.sent();
                     return [4, API.dataService.getChannelsOfServices({ page: 0 })];
-                case 5:
-                    salesChannels = _e.sent();
-                    return [4, API.dataService.getTeamSize({ page: 0 })];
                 case 6:
-                    teamSizeList = _e.sent();
-                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP')); });
-                    _e.label = 7;
+                    salesChannels = _j.sent();
+                    thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP'));
+                    _j.label = 7;
                 case 7: return [2, {
                         data: data,
+                        individualData: individualData,
                         boardResponse: {
                             user: boardData === null || boardData === void 0 ? void 0 : boardData.user,
                             brand: boardData === null || boardData === void 0 ? void 0 : boardData.brand,
                             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: (_c = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _c === void 0 ? void 0 : _c.names,
-                            contact: (_d = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _d === void 0 ? void 0 : _d.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,
-                            flows: (boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info) || []
+                            business: boardData === null || boardData === void 0 ? void 0 : boardData.business,
+                            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,
                         token: token
                     }];
             }
@@ -143,67 +161,114 @@ 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, board_id, boardInfoData, boardData, segmentsList, salesChannels, teamSizeList;
-    var _b, _c, _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var _a, brand, settings, responseBody, payload, data, publicKey, _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, _m;
+    return __generator(this, function (_o) {
+        switch (_o.label) {
             case 0:
                 _a = thunkApi.getState(), brand = _a.brand, settings = _a.settings;
                 responseBody = brand.data.verify.responseBody;
                 payload = {
                     data: params.otp,
-                    service_name: (_b = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _b === void 0 ? void 0 : _b.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 = (_h.sent()).data;
-                if ((_c = data.errors) === null || _c === void 0 ? void 0 : _c.length)
+                data = (_o.sent()).data;
+                if ((_f = data.errors) === null || _f === void 0 ? void 0 : _f.length)
                     throw new Error(data.errors[0].description);
-                board_id = responseBody === null || responseBody === void 0 ? void 0 : responseBody.id;
+                publicKey = (_g = data === null || data === void 0 ? void 0 : data.config) === null || _g === void 0 ? void 0 : _g.public_key;
+                if (publicKey) {
+                    thunkApi.dispatch(handlePublicKey(publicKey));
+                }
+                _b = responseBody || {}, board_id = _b.id, board_info_id = _b.board_info_id;
                 if (!board_id) {
                     throw new Error('Internal server error');
                 }
-                return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
+                individualData = undefined;
+                if (!board_info_id) return [3, 3];
+                return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 2:
-                boardInfoData = _h.sent();
-                return [4, API.boardService.retrieveBoardDetails(board_id)];
-            case 3:
-                boardData = _h.sent();
-                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, { otp: params.otp });
-                return [4, API.dataService.getSegments({ page: 0 })];
+                boardInfoData = _o.sent();
+                _o.label = 3;
+            case 3: return [4, API.boardService.retrieveBoardDetails(board_id)];
             case 4:
-                segmentsList = _h.sent();
-                return [4, API.dataService.getChannelsOfServices({ page: 0 })];
+                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;
+                serviceCallBack = function () { return API.individualService.retrieveIndividual(id, type); };
+                return [4, retrieveIndividualData(type, boardData, serviceCallBack)];
             case 5:
-                salesChannels = _h.sent();
-                return [4, API.dataService.getTeamSize({ page: 0 })];
+                _d = _o.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, API.dataService.getChannelsOfServices({ page: 0 })];
             case 6:
-                teamSizeList = _h.sent();
-                thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP'));
+                salesChannels = _o.sent();
+                sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP')); });
                 return [2, {
                         data: data,
+                        individualData: individualData,
                         boardResponse: {
                             user: boardData === null || boardData === void 0 ? void 0 : boardData.user,
                             brand: boardData === null || boardData === void 0 ? void 0 : boardData.brand,
                             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: (_f = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _f === void 0 ? void 0 : _f.names,
-                            contact: (_g = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _g === void 0 ? void 0 : _g.contact,
+                            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,
                             individuals: boardData === null || boardData === void 0 ? void 0 : boardData.individuals,
-                            flows: (boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info) || []
+                            business: boardData === null || boardData === void 0 ? void 0 : boardData.business,
+                            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,
                         formData: params
                     }];
         }
     });
 }); });
+export var retrieveSegmentDataList = createAsyncThunk('brandRetrieveSegmentDataList', 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 retrieveBoardStatus = createAsyncThunk('brand/retrieveBoardStatus', function (parmas, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var brand, board_id, data;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                brand = thunkApi.getState().brand;
+                board_id = (brand.data.verify.responseBody || {}).board_id;
+                return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
+            case 1:
+                data = _a.sent();
+                thunkApi.dispatch(handlePrevScreenStep());
+                return [2, { flows: (data === null || data === void 0 ? void 0 : data.info) || [] }];
+        }
+    });
+}); });
 export var retrieveBoardDetails = createAsyncThunk('brandRetrieveBrandInfo', function (boardId) { return __awaiter(void 0, void 0, void 0, function () {
     var data;
     var _a, _b;
@@ -243,68 +308,118 @@ export var checkBrandNameAvailability = createAsyncThunk('checkBrandNameAvailabi
         });
     });
 });
-export var updateBrand = createAsyncThunk('brandUpdateBrand', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, brand, responseBody, id, isNameEditable, isChannelServicesEditable, salesChannels, brandName, segment, teamSize, segmentId, teamSizeId, getAddress, channel_services, requestBody, brandData, activities, activityList;
-    var _b, _c, _d, _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
-            case 0:
-                _a = thunkApi.getState(), settings = _a.settings, brand = _a.brand;
-                responseBody = brand.data.verify.responseBody;
-                id = (_b = responseBody === null || responseBody === void 0 ? void 0 : responseBody.brand) === null || _b === void 0 ? void 0 : _b.id;
-                isNameEditable = true;
-                isChannelServicesEditable = true;
-                salesChannels = params.salesChannels, brandName = params.brandName, segment = params.segment, teamSize = params.teamSize;
-                segmentId = segment && { id: segment.id };
-                teamSizeId = teamSize && { id: teamSize.id };
-                getAddress = function (value, isTwitter, isWeb) {
-                    if (isTwitter)
-                        return '@' + value;
-                    if (isWeb)
-                        return 'https://' + value;
-                    return value;
-                };
-                channel_services = isChannelServicesEditable
-                    ? salesChannels.map(function (channel) {
-                        var _a;
-                        return {
-                            id: channel.id,
-                            address: getAddress(channel.address || '', isTwitter(channel.code), isWebsite(channel.code)),
-                            sub: (_a = channel.sub) === null || _a === void 0 ? void 0 : _a.map(function (sub) {
-                                return { id: sub.id, address: getAddress(sub.address || '', isTwitter(sub.code), isWebsite(sub.code)) };
-                            })
-                        };
-                    })
-                    : undefined;
-                requestBody = {
-                    id: id,
-                    name: isNameEditable ? { en: brandName, ar: brandName } : undefined,
-                    segment: { type: segmentId, team: teamSizeId },
-                    channel_services: channel_services
-                };
-                return [4, API.brandService.updateBrandInfo(requestBody)];
-            case 1:
-                brandData = (_f.sent()).brand;
-                activities = (((_c = brand.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.entity) || {}).activities;
-                return [4, thunkApi.dispatch(retrieveDataList())];
-            case 2:
-                _f.sent();
-                if (activities) {
-                    brandData = __assign(__assign({}, brandData), { entity_activities: activities || {} });
-                }
-                if (!!activities) return [3, 4];
-                return [4, API.dataService.getActivities()];
-            case 3:
-                activityList = (_f.sent()).list;
-                brandData = __assign(__assign({}, brandData), { entity_activities: activityList || {} });
-                _f.label = 4;
-            case 4:
-                thunkApi.dispatch(handleNextScreenStep());
-                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, id);
-                return [2, { data: __assign({}, brandData), formData: params }];
-        }
+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, 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:
+                    _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;
+                    isNameENNonEditable = hasNoneEditableValue(data_status, 'name.en');
+                    isNameARNonEditable = hasNoneEditableValue(data_status, 'name.ar');
+                    isChannelServicesNonEditable = hasNoneEditableValue(data_status, 'channel_services');
+                    salesChannels = formData.salesChannels, brandName = formData.brandName, brandLogoId = formData.brandLogoId;
+                    getAddress = function (value, isTwitter, isWeb) {
+                        if (isTwitter)
+                            return '@' + value.replaceAll('@', '');
+                        if (isWeb)
+                            return 'https://www.' + value.replaceAll('https://www.', '');
+                        return value;
+                    };
+                    channel_services = isChannelServicesNonEditable
+                        ? undefined
+                        : salesChannels === null || salesChannels === void 0 ? void 0 : salesChannels.map(function (channel) {
+                            var _a;
+                            return {
+                                id: channel.id,
+                                address: getAddress(channel.address || '', isTwitter(channel.code), isWebsite(channel.code)),
+                                sub: (_a = channel.sub) === null || _a === void 0 ? void 0 : _a.map(function (sub) {
+                                    return { id: sub.id, address: getAddress(sub.address || '', isTwitter(sub.code), isWebsite(sub.code)) };
+                                })
+                            };
+                        });
+                    brandNameIsEditable = brandName && !(isNameENNonEditable && isNameARNonEditable);
+                    requestBody = __assign(__assign({ id: id }, (brandNameIsEditable && {
+                        name: {
+                            en: !isNameENNonEditable ? brandName : undefined,
+                            ar: !isNameARNonEditable ? brandName : undefined
+                        }
+                    })), { 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 }
+                    }));
+                    return [4, API.brandService.updateBrandInfo(requestBody)];
+                case 1:
+                    brandData = (_g.sent()).brand;
+                    activities = (((_d = brand.data.verify.responseBody) === null || _d === void 0 ? void 0 : _d.entity) || {}).activities;
+                    return [4, thunkApi.dispatch(retrieveDataList())];
+                case 2:
+                    _g.sent();
+                    if (activities) {
+                        brandData = __assign(__assign({}, brandData), { entity_activities: activities || {} });
+                    }
+                    if (!!activities) return [3, 4];
+                    return [4, API.dataService.getActivities()];
+                case 3:
+                    activityList = (_g.sent()).list;
+                    brandData = __assign(__assign({}, brandData), { entity_activities: activityList || {} });
+                    _g.label = 4;
+                case 4:
+                    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 }];
+            }
+        });
+    });
+});
 export var retrieveEntityList = createAsyncThunk('retrieveEntityList', function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var data;
     return __generator(this, function (_a) {
@@ -316,45 +431,63 @@ export var retrieveEntityList = createAsyncThunk('retrieveEntityList', function
         }
     });
 }); });
-export var updateBrandActivities = createAsyncThunk('brandUpdateBrandActivities', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, brand, brandResponse, id, isActivitiesEditable, isCustomerLocationEditable, isSalesRangeEditable, activities, customerLocations, expectedCustomer, expectedSale, requestBody, customerLocation, customerBaseId, salesId, customerBase, brandData;
-    var _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
-            case 0:
-                _a = thunkApi.getState(), settings = _a.settings, brand = _a.brand;
-                brandResponse = (brand.data.verify.responseBody || {}).brand;
-                id = brandResponse === null || brandResponse === void 0 ? void 0 : brandResponse.id;
-                isActivitiesEditable = true;
-                isCustomerLocationEditable = true;
-                isSalesRangeEditable = true;
-                activities = params.activities, customerLocations = params.customerLocations, expectedCustomer = params.expectedCustomer, expectedSale = params.expectedSale;
-                requestBody = {
-                    id: id,
-                    activities: isActivitiesEditable && activities,
-                    term: ['general', 'refund', 'chargeback'],
-                    step_name: BRAND_STEP_NAMES.BRAND_ACTIVITIES
-                };
-                customerLocation = customerLocations.map(function (location) { return ({
-                    id: location.id
-                }); });
-                customerBaseId = (expectedCustomer === null || expectedCustomer === void 0 ? void 0 : expectedCustomer.id) && { id: expectedCustomer.id, period: 'monthly' };
-                salesId = (expectedSale === null || expectedSale === void 0 ? void 0 : expectedSale.id) && { id: expectedSale.id, period: 'monthly' };
-                customerBase = (customerBaseId || customerLocation.length) && __assign(__assign({}, (customerBaseId && { id: expectedCustomer.id, period: 'monthly' })), (customerLocation.length && { location: customerLocation }));
-                if (customerBase)
-                    requestBody = __assign(__assign({}, requestBody), { operations: __assign(__assign({}, requestBody.operations), { customer_base: customerBase }) });
-                if (salesId && isSalesRangeEditable) {
-                    requestBody = __assign(__assign({}, requestBody), { operations: __assign(__assign({}, requestBody.operations), { sales: salesId }) });
-                }
-                return [4, API.brandService.updateBrandInfo(requestBody)];
-            case 1:
-                brandData = (_d.sent()).data;
-                thunkApi.dispatch(handleNextScreenStep());
-                (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, id);
-                return [2, { data: __assign({}, brandData), formData: params }];
-        }
+export var updateBrandActivities = createAsyncThunk('brandUpdateBrandActivities', function (_a, thunkApi) {
+    var formData = _a.formData, originalFormData = _a.originalFormData;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var _b, settings, brand, _c, brandRes, notification, _d, data_status, id, brandActivities, terms, isActivitiesNonEditable, isCustomerBaseLocationNonEditable, isCustomerBaseNonEditable, isTermsNonEditable, isSalesRangeNonEditable, activities, customerLocations, expectedCustomer, expectedSale, termAndConditionChecked, refundPolicy, transactionPolicy, isTermsUndefined, isAllTermsAgreed, isTermsAvailable, removedActivities, payload, requestBody, customerLocation, customerBaseId, salesId, customerBase, brandData;
+        var _e, _f, _g, _h;
+        return __generator(this, function (_j) {
+            switch (_j.label) {
+                case 0:
+                    _b = thunkApi.getState(), settings = _b.settings, brand = _b.brand;
+                    _c = brand.data.verify.responseBody || {}, brandRes = _c.brand, notification = _c.notification;
+                    _d = brandRes || {}, data_status = _d.data_status, id = _d.id, brandActivities = _d.activities, terms = _d.terms;
+                    isActivitiesNonEditable = hasNoneEditableValue(data_status, 'activities');
+                    isCustomerBaseLocationNonEditable = hasNoneEditableValue(data_status === null || data_status === void 0 ? void 0 : data_status.operations, 'customer_base_location');
+                    isCustomerBaseNonEditable = hasNoneEditableValue(data_status === null || data_status === void 0 ? void 0 : data_status.operations, 'customer_base');
+                    isTermsNonEditable = hasNoneEditableValue(data_status, 'terms');
+                    isSalesRangeNonEditable = hasNoneEditableValue(data_status === null || data_status === void 0 ? void 0 : data_status.operations, 'sales_range');
+                    activities = formData.activities, customerLocations = formData.customerLocations, expectedCustomer = formData.expectedCustomer, expectedSale = formData.expectedSale, termAndConditionChecked = formData.termAndConditionChecked, refundPolicy = formData.refundPolicy, transactionPolicy = formData.transactionPolicy;
+                    isTermsUndefined = termAndConditionChecked === undefined && refundPolicy === undefined && transactionPolicy === undefined;
+                    isAllTermsAgreed = ((_e = terms === null || terms === void 0 ? void 0 : terms.filter(function (t) { return t === null || t === void 0 ? void 0 : t.agree; })) === null || _e === void 0 ? void 0 : _e.length) === 3;
+                    isTermsAvailable = !(isTermsNonEditable && isTermsUndefined) && !isAllTermsAgreed;
+                    removedActivities = (activities === null || activities === void 0 ? void 0 : activities.length) > 0 &&
+                        (brandActivities || []).filter(function (brandActivity) { return !(activities || []).some(function (activity) { return activity.id === brandActivity.id; }); });
+                    if (!(!isActivitiesNonEditable && (removedActivities === null || removedActivities === void 0 ? void 0 : removedActivities.length) > 0)) return [3, 2];
+                    payload = {
+                        id: id,
+                        activities: removedActivities
+                    };
+                    return [4, API.brandService.removeBrandActivity(payload)];
+                case 1:
+                    _j.sent();
+                    _j.label = 2;
+                case 2:
+                    requestBody = __assign(__assign({ id: id, activities: isActivitiesNonEditable ? undefined : activities }, (isTermsAvailable && {
+                        term_by: (_f = notification === null || notification === void 0 ? void 0 : notification.recipient) === null || _f === void 0 ? void 0 : _f.id,
+                        term: ['general', 'refund', 'chargeback']
+                    })), { step_name: BRAND_STEP_NAMES.BRAND_ACTIVITIES });
+                    customerLocation = (customerLocations || []).map(function (location) { return ({
+                        id: location.id
+                    }); });
+                    customerBaseId = (expectedCustomer === null || expectedCustomer === void 0 ? void 0 : expectedCustomer.id) && { id: expectedCustomer.id, period: 'monthly' };
+                    salesId = (expectedSale === null || expectedSale === void 0 ? void 0 : expectedSale.id) && { id: expectedSale.id, period: 'monthly' };
+                    customerBase = (customerBaseId || customerLocation.length) && __assign(__assign({}, (customerBaseId && !isCustomerBaseNonEditable && { id: expectedCustomer.id, period: 'monthly' })), (customerLocation.length && !isCustomerBaseLocationNonEditable && { locations: customerLocation }));
+                    if (customerBase && !(isCustomerBaseNonEditable && isCustomerBaseLocationNonEditable))
+                        requestBody = __assign(__assign({}, requestBody), { operations: __assign(__assign({}, requestBody.operations), { customer_base: customerBase }) });
+                    if (salesId && !isSalesRangeNonEditable) {
+                        requestBody = __assign(__assign({}, requestBody), { operations: __assign(__assign({}, requestBody.operations), { sales: salesId }) });
+                    }
+                    return [4, API.brandService.updateBrandInfo(requestBody)];
+                case 3:
+                    brandData = (_j.sent()).data;
+                    thunkApi.dispatch(handleNextScreenStep());
+                    (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, id);
+                    return [2, { data: __assign({}, brandData), formData: originalFormData }];
+            }
+        });
     });
-}); });
+});
 export var retrieveDataList = createAsyncThunk('brandRetrieveDataList', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var settings, countryISO2, dataBody, salesDataBody, _a, customerBases, expectedSales, expectedCustomerSales;
     return __generator(this, function (_b) {
@@ -400,12 +533,14 @@ export var updateBoardSuccess = createAsyncThunk('updateBoardBrandSuccess', func
                     step_name: BRAND_STEP_NAMES.BRAND_SUCCESS,
                     id: id
                 };
-                data = {};
-                return [4, API.boardService.retrieveBoardInfoStatus(id)];
+                return [4, API.boardService.updateBoardInfo(__assign({ id: id, infoId: infoId }, payload))];
             case 1:
+                data = _g.sent();
+                return [4, API.boardService.retrieveBoardInfoStatus(id)];
+            case 2:
                 boardInfoData = _g.sent();
                 return [4, thunkApi.dispatch(retrieveBoardDetails(id)).unwrap()];
-            case 2:
+            case 3:
                 _g.sent();
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, {});
                 (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
@@ -419,6 +554,7 @@ var initialState = {
     loading: false,
     customLoading: false,
     uploading: false,
+    uploadingBrandLogo: false,
     data: {
         flowName: FlowsTypes.BRAND,
         verify: {
@@ -429,9 +565,13 @@ var initialState = {
         },
         brandData: {
             brandName: '',
-            salesChannels: [],
-            termAndConditionChecked: false,
-            selectedBrandItem: {}
+            salesChannels: []
+        },
+        brandSegmentData: {
+            segmentLocation: undefined,
+            segmentTech: undefined,
+            segmentProfit: undefined,
+            teamSize: undefined
         },
         brandActivities: {
             activities: [],
@@ -456,6 +596,13 @@ export var brandSlice = createSlice({
         },
         resetOTPScreen: function (state) {
             state.data.otpData.otp = '';
+        },
+        uploadingBrandLogoStatus: function (state, action) {
+            state.uploadingBrandLogo = action.payload;
+        },
+        clearBrandLogo: function (state) {
+            var brand = (state.data.verify.responseBody || {}).brand;
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { brand: __assign(__assign({}, brand), { logo_details: undefined, logo: undefined }) });
         }
     },
     extraReducers: function (builder) {
@@ -465,35 +612,22 @@ export var brandSlice = createSlice({
             state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
-            var _a, _b, _c, _d;
+            var _a, _b;
             state.error = null;
             state.customLoading = false;
-            var _e = action.payload, data = _e.data, token = _e.token, boardResponse = _e.boardResponse, segmentsList = _e.segmentsList, teamSizeList = _e.teamSizeList, salesChannels = _e.salesChannels;
+            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;
-            var selectedSegment = (_b = segmentsList === null || segmentsList === void 0 ? void 0 : segmentsList.filter(function (segment) {
-                var _a, _b;
-                return segment.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.id);
-            })) === null || _b === void 0 ? void 0 : _b[0];
-            var selectedTeamSize = (_c = 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 || _c === void 0 ? void 0 : _c[0];
-            (_d = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _d === void 0 ? void 0 : _d.forEach(function (element) {
+            state.data.brandData.brandName = (((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en) || '').trim();
+            (_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;
-                }
-                if ((element === null || element === void 0 ? void 0 : element.term) === 'chargeback') {
                     state.data.brandActivities.transactionPolicy = element.agree;
-                }
-                if ((element === null || element === void 0 ? void 0 : element.term) === 'refund') {
                     state.data.brandActivities.refundPolicy = element.agree;
                 }
             });
-            state.data.brandData.segment = selectedSegment;
-            state.data.brandData.teamSize = selectedTeamSize;
-            state.data.brandData.salesChannels = (brand === null || brand === void 0 ? void 0 : brand.channel_services) || [];
-            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: brand === null || brand === void 0 ? void 0 : brand.channel_services, activities: entity === null || entity === void 0 ? void 0 : entity.activities, segmentsList: segmentsList, teamSizeList: teamSizeList });
+            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, individualData: individualData });
             state.data.verify.token = token;
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
@@ -516,37 +650,24 @@ export var brandSlice = createSlice({
             state.error = null;
         })
             .addCase(verifyBrandLeadOTP.fulfilled, function (state, action) {
-            var _a, _b, _c, _d;
+            var _a, _b;
             state.loading = false;
             state.error = null;
-            var _e = action.payload, data = _e.data, boardResponse = _e.boardResponse, formData = _e.formData, segmentsList = _e.segmentsList, teamSizeList = _e.teamSizeList, salesChannels = _e.salesChannels;
+            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;
-            var selectedSegment = (_b = segmentsList === null || segmentsList === void 0 ? void 0 : segmentsList.filter(function (segment) {
-                var _a, _b;
-                return segment.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.id);
-            })) === null || _b === void 0 ? void 0 : _b[0];
-            var selectedTeamSize = (_c = 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 || _c === void 0 ? void 0 : _c[0];
-            state.data.brandData.segment = selectedSegment;
-            state.data.brandData.teamSize = selectedTeamSize;
-            state.data.brandData.salesChannels = (brand === null || brand === void 0 ? void 0 : brand.channel_services) || [];
-            (_d = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _d === void 0 ? void 0 : _d.forEach(function (element) {
+            state.data.brandData.brandName = (((_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en) || '').trim();
+            var mappedSalesChannels = mapSalesChannel((brand === null || brand === void 0 ? void 0 : brand.channel_services) || []);
+            state.data.brandData.salesChannels = mappedSalesChannels;
+            (_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;
-                }
-                if ((element === null || element === void 0 ? void 0 : element.term) === 'chargeback') {
                     state.data.brandActivities.transactionPolicy = element.agree;
-                }
-                if ((element === null || element === void 0 ? void 0 : element.term) === 'refund') {
                     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: brand === null || brand === void 0 ? void 0 : brand.channel_services, segmentsList: segmentsList, teamSizeList: teamSizeList });
+            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;
@@ -572,22 +693,69 @@ 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 || (segmentLocationList === null || segmentLocationList === void 0 ? void 0 : segmentLocationList[0]);
+            state.data.brandSegmentData.segmentProfit = selectedSegmentProfit || (segmentProfitList === null || segmentProfitList === void 0 ? void 0 : segmentProfitList[0]);
+            state.data.brandSegmentData.segmentTech = selectedSegmentTech || (segmentTechList === null || segmentTechList === void 0 ? void 0 : segmentTechList[1]);
+            state.data.brandSegmentData.teamSize = selectedTeamSize;
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { teamSizeList: teamSizeList, segmentLocationList: segmentLocationList, segmentProfitList: segmentProfitList, segmentTechList: segmentTechList });
+        })
+            .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;
+            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 = state.data.brandActivities.responseBody || {}, customerBases = _c.customerBases, expectedSales = _c.expectedSales, expectedCustomerSales = _c.expectedCustomerSales;
-            var findCustomerBase = findInArrayOrSubArray(expectedCustomerSales, customer_base === null || customer_base === void 0 ? void 0 : customer_base.id);
-            var findSale = findInArrayOrSubArray(expectedSales, sales === null || sales === void 0 ? void 0 : sales.id);
-            if (!!findSale)
-                state.data.brandActivities.expectedSale = findSale;
-            if (!!findCustomerBase)
-                state.data.brandActivities.expectedCustomer = findCustomerBase;
-            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { activities: data === null || data === void 0 ? void 0 : data.brand_activities });
+            var _c = customer_base || {}, locations = _c.locations, customerBase = __rest(_c, ["locations"]);
+            if (locations && locations.length)
+                state.data.brandActivities.customerLocations = locations;
+            if (!!sales)
+                state.data.brandActivities.expectedSale = sales;
+            if (!!customerBase)
+                state.data.brandActivities.expectedCustomer = customerBase;
+            terms === null || terms === void 0 ? void 0 : terms.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({}, 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;
@@ -601,7 +769,15 @@ export var brandSlice = createSlice({
             state.loading = false;
             state.error = null;
         })
-            .addCase(updateBrand.rejected, function (state, action) {
+            .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;
         })
@@ -635,13 +811,31 @@ export var brandSlice = createSlice({
             .addCase(retrieveBoardDetails.rejected, function (state, action) {
             state.error = action.error.message;
             state.loading = false;
+        })
+            .addCase(retrieveBoardStatus.pending, function (state) {
+            state.error = null;
+            state.loading = true;
+        })
+            .addCase(retrieveBoardStatus.fulfilled, function (state, action) {
+            state.error = null;
+            state.loading = false;
+            var flows = action.payload.flows;
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: flows });
+        })
+            .addCase(retrieveBoardStatus.rejected, function (state, action) {
+            state.error = action.error.message;
+            state.loading = false;
         })
             .addCase(updateBoardSuccess.fulfilled, function (state, action) {
             var _a;
             state.loading = false;
             state.error = null;
             var flows = (((_a = action.payload) === null || _a === void 0 ? void 0 : _a.response) || {}).flows;
-            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: flows });
+            var _b = state.data.verify.responseBody || {}, individuals = _b.individuals, individualData = _b.individualData;
+            var data_state = (individualData || {}).data_state;
+            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, state.data.verify.responseBody), { flows: flows }), (individualData && { user: individualData })), (data_state && {
+                individuals: __assign(__assign({}, individuals), { data_state: data_state })
+            }));
         })
             .addCase(updateBoardSuccess.pending, function (state) {
             state.loading = true;
@@ -653,6 +847,6 @@ export var brandSlice = createSlice({
         });
     }
 });
-export var clearError = (_a = brandSlice.actions, _a.clearError), stopLoader = _a.stopLoader, resetOTPScreen = _a.resetOTPScreen;
+export var clearError = (_a = brandSlice.actions, _a.clearError), stopLoader = _a.stopLoader, resetOTPScreen = _a.resetOTPScreen, uploadingBrandLogoStatus = _a.uploadingBrandLogoStatus, clearBrandLogo = _a.clearBrandLogo;
 export default brandSlice.reducer;
 export var brandSelector = function (state) { return state.brand; };