@tap-payments/auth-jsconnect 2.8.62-beta → 2.8.62-development

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

@@ -62,14 +62,14 @@ import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
 import { handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../../app/settings';
 import { BRAND_STEP_NAMES, EXPECTED_SALES_LIST } from '../../../constants';
-import { hasNoneEditableValue, isKW, isTwitter, isWebsite, mapSalesChannel, retrieveIndividualData, sleep } from '../../../utils';
-export var verifyLeadToken = createAsyncThunk('brandVerifyLeadToken', function (_a, thunkApi) {
+import { hasNoneEditableValue, isKW, isTwitter, isWebsite, mapSalesChannel, retrieveIndividualData, sendCustomEventToGTM, sleep } from '../../../utils';
+export var verifyLeadToken = createAsyncThunk('brand/verifyLeadToken', 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, 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) {
+        var payload, data, _b, config, brand_id, entity_id, board_id, country_code, publicKey, salesChannels, brandData, data_1;
+        var _c, _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     payload = __assign({ service_name: 'tap_email', verify_token: token }, (isInternally && {
                         notification: {
@@ -78,69 +78,47 @@ export var verifyLeadToken = createAsyncThunk('brandVerifyLeadToken', function (
                     }));
                     return [4, API.leadService.verifyLeadToken(payload)];
                 case 1:
-                    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));
-                    _b = data || {}, board_id = _b.id, board_info_id = _b.board_info_id, config = _b.config;
+                    data = (_f.sent()).data;
+                    if (((_c = data === null || data === void 0 ? void 0 : data.errors) === null || _c === void 0 ? void 0 : _c.length) || (data === null || data === void 0 ? void 0 : data.mw_error))
+                        throw new Error(data.errors[0].description || (data === null || data === void 0 ? void 0 : data.mw_error));
+                    _b = data || {}, config = _b.config, brand_id = _b.brand_id, entity_id = _b.entity_id, board_id = _b.id, country_code = _b.country_code;
                     publicKey = config === null || config === void 0 ? void 0 : config.public_key;
-                    if (publicKey) {
+                    if (country_code)
+                        thunkApi.dispatch(handleSetCountryByIso2(country_code));
+                    if (publicKey)
                         thunkApi.dispatch(handlePublicKey(publicKey));
-                    }
-                    if (!board_id) {
-                        throw new Error('Internal server error');
-                    }
-                    individualData = undefined;
+                    brandData = undefined;
                     if (isInternally)
                         data.step_name = BRAND_STEP_NAMES.BRAND_INFO;
                     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 })];
+                    if (!(!brand_id || !country_code)) return [3, 3];
+                    return [4, API.boardService.retrieveBoardDetails(board_id)];
                 case 2:
-                    boardInfoData = _j.sent();
-                    _j.label = 3;
-                case 3: return [4, API.boardService.retrieveBoardDetails(board_id)];
+                    data_1 = _f.sent();
+                    if (!country_code && ((_d = data_1 === null || data_1 === void 0 ? void 0 : data_1.entity) === null || _d === void 0 ? void 0 : _d.country))
+                        thunkApi.dispatch(handleSetCountryByIso2(data_1.entity.country));
+                    if (!((_e = data_1 === null || data_1 === void 0 ? void 0 : data_1.brand) === null || _e === void 0 ? void 0 : _e.id))
+                        throw new Error('brand_id_missing');
+                    brandData = data_1 === null || data_1 === void 0 ? void 0 : data_1.brand;
+                    return [3, 5];
+                case 3: return [4, API.brandService.retrieveBrand(brand_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 && ((_f = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _f === void 0 ? void 0 : _f.country)) {
-                        countryIso2 = boardData.entity.country;
-                        thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                    }
-                    return [4, API.dataService.getChannelsOfServices({ page: 0 })];
+                    brandData = _f.sent();
+                    _f.label = 5;
+                case 5: return [4, API.dataService.getChannelsOfServices({ page: 0 })];
                 case 6:
-                    salesChannels = _j.sent();
+                    salesChannels = _f.sent();
                     if (isInternally)
                         sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP')); });
                     else
                         thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP'));
-                    _j.label = 7;
+                    _f.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: (_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
-                        },
+                        brandData: brandData === null || brandData === void 0 ? void 0 : brandData.brand,
                         salesChannels: salesChannels,
-                        token: token
+                        token: token,
+                        entityInfoId: entity_id
                     }];
             }
         });
@@ -163,78 +141,58 @@ 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, countryIso2, 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, _o;
-    return __generator(this, function (_p) {
-        switch (_p.label) {
+export var verifyBrandLeadOTP = createAsyncThunk('brand/verifyLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, brand, settings, responseBody, payload, data, publicKey, countryIso2, _b, brand_id, entity_id, boardId, brandData, data_2, salesChannels;
+    var _c, _d, _e, _f, _g, _h, _j;
+    return __generator(this, function (_k) {
+        switch (_k.label) {
             case 0:
                 _a = thunkApi.getState(), brand = _a.brand, settings = _a.settings;
                 responseBody = brand.data.verify.responseBody;
                 payload = {
                     data: params.otp,
-                    service_name: (_e = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _e === void 0 ? void 0 : _e.service_name,
+                    service_name: (_c = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _c === void 0 ? void 0 : _c.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 = (_p.sent()).data;
-                if ((_f = data.errors) === null || _f === void 0 ? void 0 : _f.length)
+                data = (_k.sent()).data;
+                if ((_d = data.errors) === null || _d === void 0 ? void 0 : _d.length)
                     throw new Error(data.errors[0].description);
-                countryIso2 = data === null || data === void 0 ? void 0 : data.country_code;
+                publicKey = (_e = data === null || data === void 0 ? void 0 : data.config) === null || _e === void 0 ? void 0 : _e.public_key;
+                countryIso2 = (data === null || data === void 0 ? void 0 : data.country_code) || (responseBody === null || responseBody === void 0 ? void 0 : responseBody.country_code);
+                if (publicKey)
+                    thunkApi.dispatch(handlePublicKey(publicKey));
                 if (countryIso2)
                     thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                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');
-                }
-                individualData = undefined;
-                if (!board_info_id) return [3, 3];
-                return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
+                _b = data || {}, brand_id = _b.brand_id, entity_id = _b.entity_id, boardId = _b.id;
+                brandData = undefined;
+                if (!(!brand_id || !countryIso2)) return [3, 3];
+                return [4, API.boardService.retrieveBoardDetails(boardId)];
             case 2:
-                boardInfoData = _p.sent();
-                _p.label = 3;
-            case 3: return [4, API.boardService.retrieveBoardDetails(board_id)];
+                data_2 = _k.sent();
+                if (!countryIso2 && ((_f = data_2 === null || data_2 === void 0 ? void 0 : data_2.entity) === null || _f === void 0 ? void 0 : _f.country))
+                    thunkApi.dispatch(handleSetCountryByIso2(data_2.entity.country));
+                if (!((_g = data_2 === null || data_2 === void 0 ? void 0 : data_2.brand) === null || _g === void 0 ? void 0 : _g.id))
+                    throw new Error('brand_id_missing');
+                brandData = data_2;
+                return [3, 5];
+            case 3: return [4, API.brandService.retrieveBrand(brand_id)];
             case 4:
-                boardData = _p.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:
-                _d = _p.sent(), boardRes = _d.boardRes, individualRes = _d.individualRes;
-                boardData = boardRes;
-                individualData = individualRes;
-                if (!countryIso2 && ((_j = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _j === void 0 ? void 0 : _j.country)) {
-                    countryIso2 = boardData.entity.country;
-                    thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                }
-                (_l = (_k = settings.data.appConfig).onStepCompleted) === null || _l === void 0 ? void 0 : _l.call(_k, settings.data.activeScreen.name, { otp: params.otp });
-                return [4, API.dataService.getChannelsOfServices({ page: 0 })];
+                brandData = _k.sent();
+                _k.label = 5;
+            case 5: return [4, API.dataService.getChannelsOfServices({ page: 0 })];
             case 6:
-                salesChannels = _p.sent();
+                salesChannels = _k.sent();
+                (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, { otp: params.otp });
                 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: (_m = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _m === void 0 ? void 0 : _m.names,
-                            contact: (_o = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _o === void 0 ? void 0 : _o.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
-                        },
+                        brandData: brandData === null || brandData === void 0 ? void 0 : brandData.brand,
                         salesChannels: salesChannels,
+                        entityInfoId: entity_id,
                         formData: params
                     }];
         }
@@ -264,35 +222,52 @@ export var retrieveSegmentDataList = createAsyncThunk('brandRetrieveSegmentDataL
         }
     });
 }); });
-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) {
+export var retrieveBoardStatus = createAsyncThunk('brand/retrieveBoardStatus', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var brand, _a, board_id, board_info_id, recipient, _b, id, type, data;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 brand = thunkApi.getState().brand;
-                board_id = (brand.data.verify.responseBody || {}).board_id;
-                return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
+                _a = brand.data.verify.responseBody || {}, board_id = _a.board_id, board_info_id = _a.board_info_id, recipient = _a.recipient;
+                if (!board_id || !board_info_id)
+                    throw new Error('Internal server error');
+                _b = recipient || {}, id = _b.id, type = _b.type;
+                return [4, Promise.all([
+                        API.boardService.retrieveBoardInfoStatus(board_id),
+                        thunkApi.dispatch(retrieveBoardDetails({ boardId: board_id, individualId: id, individualType: type })).unwrap()
+                    ])];
             case 1:
-                data = _a.sent();
+                data = (_c.sent())[0];
                 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;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0: return [4, API.boardService.retrieveBoardDetails(boardId)];
-            case 1:
-                data = _c.sent();
-                return [2, {
-                        data: __assign(__assign({}, data), { user: data === null || data === void 0 ? void 0 : data.user, brand: data === null || data === void 0 ? void 0 : data.brand, bank_account: data === null || data === void 0 ? void 0 : data.bank_account, entity: data === null || data === void 0 ? void 0 : data.entity, merchant: data === null || data === void 0 ? void 0 : data.merchant, name: (_a = data === null || data === void 0 ? void 0 : data.user) === null || _a === void 0 ? void 0 : _a.names, individuals: data === null || data === void 0 ? void 0 : data.individuals, contact: (_b = data === null || data === void 0 ? void 0 : data.user) === null || _b === void 0 ? void 0 : _b.contact, board_status: data === null || data === void 0 ? void 0 : data.status })
-                    }];
-        }
+export var retrieveBoardDetails = createAsyncThunk('brand/retrieveBoardDetails', function (_a) {
+    var boardId = _a.boardId, id = _a.individualId, type = _a.individualType;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var data, individualData, boardData, serviceCallBack, _b, boardRes, individualRes;
+        var _c, _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
+                case 0: return [4, API.boardService.retrieveBoardDetails(boardId)];
+                case 1:
+                    data = _f.sent();
+                    individualData = data === null || data === void 0 ? void 0 : data.user;
+                    boardData = data;
+                    if (!(((_c = data === null || data === void 0 ? void 0 : data.user) === null || _c === void 0 ? void 0 : _c.id) !== id)) return [3, 3];
+                    serviceCallBack = function () { return API.individualService.retrieveIndividual(id, type); };
+                    return [4, retrieveIndividualData(type, data, serviceCallBack)];
+                case 2:
+                    _b = _f.sent(), boardRes = _b.boardRes, individualRes = _b.individualRes;
+                    individualData = individualRes;
+                    boardData = boardRes;
+                    _f.label = 3;
+                case 3: return [2, __assign(__assign({}, boardData), { brand: boardData === null || boardData === void 0 ? void 0 : boardData.brand, bank_account: boardData === null || boardData === void 0 ? void 0 : boardData.bank_account, entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity, merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant, name: (_d = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _d === void 0 ? void 0 : _d.names, individuals: boardData === null || boardData === void 0 ? void 0 : boardData.individuals, contact: (_e = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _e === void 0 ? void 0 : _e.contact, user: individualData, board_status: boardData === null || boardData === void 0 ? void 0 : boardData.status })];
+            }
+        });
     });
-}); });
+});
 export var checkBrandNameAvailability = createAsyncThunk('checkBrandNameAvailability', function (_a, thunkApi) {
     var cancelToken = _a.cancelToken, name = _a.name, onSuccess = _a.onSuccess;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -319,12 +294,12 @@ export var checkBrandNameAvailability = createAsyncThunk('checkBrandNameAvailabi
     });
 });
 export var updateBrand = createAsyncThunk('brandUpdateBrand', function (_a, thunkApi) {
-    var formData = _a.formData, originalFormData = _a.originalFormData;
+    var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
     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) {
+        var _b, settings, brand, brandRes, _c, id, data_status, isNameENNonEditable, isNameARNonEditable, isChannelServicesNonEditable, salesChannels, brandName, brandLogoId, brandData, getAddress, channel_services, brandNameIsEditable, requestBody, brand_1, _d, teamSizeList, _e, segmentLocation, segmentProfit, segmentTech, _f, _g, _h;
+        var _j, _k;
+        return __generator(this, function (_l) {
+            switch (_l.label) {
                 case 0:
                     _b = thunkApi.getState(), settings = _b.settings, brand = _b.brand;
                     brandRes = (brand.data.verify.responseBody || {}).brand;
@@ -333,6 +308,7 @@ export var updateBrand = createAsyncThunk('brandUpdateBrand', function (_a, thun
                     isNameARNonEditable = hasNoneEditableValue(data_status, 'name.ar');
                     isChannelServicesNonEditable = hasNoneEditableValue(data_status, 'channel_services');
                     salesChannels = formData.salesChannels, brandName = formData.brandName, brandLogoId = formData.brandLogoId;
+                    brandData = brandRes;
                     getAddress = function (value, isTwitter, isWeb) {
                         if (isTwitter)
                             return '@' + value.replaceAll('@', '');
@@ -359,17 +335,23 @@ export var updateBrand = createAsyncThunk('brandUpdateBrand', function (_a, thun
                             ar: !isNameARNonEditable ? brandName : undefined
                         }
                     })), { logo: brandLogoId, channel_services: channel_services });
+                    if (!isDirty) return [3, 2];
                     return [4, API.brandService.updateBrandInfo(requestBody)];
                 case 1:
-                    brandData = (_g.sent()).brand;
-                    return [4, thunkApi.dispatch(retrieveSegmentDataList()).unwrap()];
+                    brand_1 = (_l.sent()).brand;
+                    brandData = brand_1;
+                    _l.label = 2;
                 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();
+                    _g = (_f = Promise).all;
+                    _h = [API.dataService.getTeamSize({ page: 0 })];
+                    return [4, thunkApi.dispatch(retrieveSegmentDataList()).unwrap()];
+                case 3: return [4, _g.apply(_f, [_h.concat([
+                            _l.sent()
+                        ])])];
+                case 4:
+                    _d = _l.sent(), teamSizeList = _d[0], _e = _d[1], segmentLocation = _e.segmentLocation, segmentProfit = _e.segmentProfit, segmentTech = _e.segmentTech;
                     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);
+                    (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, id);
                     return [2, {
                             data: __assign({}, brandData),
                             formData: originalFormData,
@@ -383,16 +365,16 @@ export var updateBrand = createAsyncThunk('brandUpdateBrand', function (_a, thun
     });
 });
 export var updateSegmentBrand = createAsyncThunk('brandUpdateBrandSegment', function (_a, thunkApi) {
-    var formData = _a.formData, originalFormData = _a.originalFormData;
+    var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
     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;
+        var _b, settings, brand, _c, brandRes, entityInfoId, _d, id, data_status, isSegmentLocationNonEditable, isSegmentProfitNonEditable, isSegmentTechNonEditable, isSegmentTeamsNonEditable, segmentLocation, segmentProfit, segmentTech, teamSize, segmentLocationId, segmentProfitId, segmentTechId, teamSizeId, hasSegment, requestBody, entityData, brandData, brand_2, entity, activityList;
+        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;
+                    _c = brand.data.verify.responseBody || {}, brandRes = _c.brand, entityInfoId = _c.entityInfoId;
+                    _d = brandRes || {}, id = _d.id, data_status = _d.data_status;
                     isSegmentLocationNonEditable = hasNoneEditableValue(data_status, 'segment.location_type');
                     isSegmentProfitNonEditable = hasNoneEditableValue(data_status, 'segment.profit_type');
                     isSegmentTechNonEditable = hasNoneEditableValue(data_status, 'segment.tech_type');
@@ -406,26 +388,37 @@ export var updateSegmentBrand = createAsyncThunk('brandUpdateBrandSegment', func
                     requestBody = __assign({ id: id }, (hasSegment && {
                         segment: { location_type: segmentLocationId, profit_type: segmentProfitId, tech_type: segmentTechId, team: teamSizeId }
                     }));
+                    entityData = undefined;
+                    brandData = brandRes;
+                    if (!isDirty) return [3, 2];
                     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())];
+                    brand_2 = (_g.sent()).brand;
+                    brandData = brand_2;
+                    _g.label = 2;
                 case 2:
-                    _g.sent();
-                    if (activities) {
-                        brandData = __assign(__assign({}, brandData), { entity_activities: activities || {} });
-                    }
-                    if (!!activities) return [3, 4];
-                    return [4, API.dataService.getActivities()];
+                    if (!entityInfoId) return [3, 4];
+                    return [4, API.entityService.retrieveEntity(entityInfoId)];
                 case 3:
-                    activityList = (_g.sent()).list;
-                    brandData = __assign(__assign({}, brandData), { entity_activities: activityList || {} });
+                    entity = (_g.sent()).entity;
+                    entityData = entity;
                     _g.label = 4;
                 case 4:
+                    if (entityData === null || entityData === void 0 ? void 0 : entityData.activities) {
+                        entityData = __assign(__assign({}, entityData), { entity_activities: entityData.activities });
+                    }
+                    if (!!(entityData === null || entityData === void 0 ? void 0 : entityData.activities)) return [3, 6];
+                    return [4, API.dataService.getActivities()];
+                case 5:
+                    activityList = (_g.sent()).list;
+                    entityData = __assign(__assign({}, entityData), { entity_activities: activityList });
+                    _g.label = 6;
+                case 6: return [4, thunkApi.dispatch(retrieveDataList())];
+                case 7:
+                    _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 }];
+                    return [2, { data: __assign({}, brandData), entityData: entityData, formData: originalFormData }];
             }
         });
     });
@@ -442,15 +435,15 @@ export var retrieveEntityList = createAsyncThunk('retrieveEntityList', function
     });
 }); });
 export var updateBrandActivities = createAsyncThunk('brandUpdateBrandActivities', function (_a, thunkApi) {
-    var formData = _a.formData, originalFormData = _a.originalFormData;
+    var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
     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) {
+        var _b, settings, brand, _c, brandRes, recipient, _d, data_status, id, brandActivities, terms, isActivitiesNonEditable, isCustomerBaseLocationNonEditable, isCustomerBaseNonEditable, isTermsNonEditable, isSalesRangeNonEditable, activities, customerLocations, expectedCustomer, expectedSale, termAndConditionChecked, refundPolicy, transactionPolicy, isTermsUndefined, isAllTermsAgreed, isTermsAvailable, brandData, removedActivities, payload, requestBody, customerLocation, customerBaseId, salesId, customerBase, brand_3;
+        var _e, _f, _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
                 case 0:
                     _b = thunkApi.getState(), settings = _b.settings, brand = _b.brand;
-                    _c = brand.data.verify.responseBody || {}, brandRes = _c.brand, notification = _c.notification;
+                    _c = brand.data.verify.responseBody || {}, brandRes = _c.brand, recipient = _c.recipient;
                     _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');
@@ -461,9 +454,10 @@ export var updateBrandActivities = createAsyncThunk('brandUpdateBrandActivities'
                     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;
+                    brandData = brandRes;
                     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];
+                    if (!(!isActivitiesNonEditable && (removedActivities === null || removedActivities === void 0 ? void 0 : removedActivities.length) > 0 && isDirty)) return [3, 2];
                     payload = {
                         id: id,
                         activities: removedActivities.map(function (a) { return ({
@@ -472,11 +466,11 @@ export var updateBrandActivities = createAsyncThunk('brandUpdateBrandActivities'
                     };
                     return [4, API.brandService.removeBrandActivity(payload)];
                 case 1:
-                    _j.sent();
-                    _j.label = 2;
+                    _h.sent();
+                    _h.label = 2;
                 case 2:
                     requestBody = __assign(__assign({ id: id, activities: isActivitiesNonEditable ? undefined : (activities || []).map(function (a) { return ({ id: a.id }); }) }, (isTermsAvailable && {
-                        term_by: (_f = notification === null || notification === void 0 ? void 0 : notification.recipient) === null || _f === void 0 ? void 0 : _f.id,
+                        term_by: recipient === null || recipient === void 0 ? void 0 : recipient.id,
                         term: ['general', 'refund', 'chargeback']
                     })), { step_name: BRAND_STEP_NAMES.BRAND_ACTIVITIES });
                     customerLocation = (customerLocations || []).map(function (location) { return ({
@@ -490,11 +484,15 @@ export var updateBrandActivities = createAsyncThunk('brandUpdateBrandActivities'
                     if (salesId && !isSalesRangeNonEditable) {
                         requestBody = __assign(__assign({}, requestBody), { operations: __assign(__assign({}, requestBody.operations), { sales: salesId }) });
                     }
+                    if (!isDirty) return [3, 4];
                     return [4, API.brandService.updateBrandInfo(requestBody)];
                 case 3:
-                    brandData = (_j.sent()).data;
+                    brand_3 = (_h.sent()).brand;
+                    brandData = brand_3;
+                    _h.label = 4;
+                case 4:
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, id);
+                    (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, id);
                     return [2, { data: __assign({}, brandData), formData: originalFormData }];
             }
         });
@@ -531,39 +529,45 @@ export var retrieveDataList = createAsyncThunk('brandRetrieveDataList', function
     });
 }); });
 export var updateBoardSuccess = createAsyncThunk('updateBoardBrandSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, brand, _b, id, infoId, _c, showBoard, mode, payload, data, boardInfoData;
-    var _d, _e, _f, _g, _h, _j, _k, _l;
-    return __generator(this, function (_m) {
-        switch (_m.label) {
+    var _a, settings, brand, _b, board_id, infoId, _c, showBoard, mode, payload, data, _d, id, type, boardInfoStatusData;
+    var _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    return __generator(this, function (_p) {
+        switch (_p.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, brand = _a.brand;
-                _b = brand.data.verify.responseBody || {}, id = _b.board_id, infoId = _b.board_info_id;
+                _b = brand.data.verify.responseBody || {}, board_id = _b.board_id, infoId = _b.board_info_id;
                 _c = settings.data.appConfig, showBoard = _c.showBoard, mode = _c.mode;
-                if (!id)
+                if (!board_id)
                     return [2];
                 payload = {
                     lang: settings.data.language,
-                    step_name: BRAND_STEP_NAMES.BRAND_SUCCESS,
-                    id: id
+                    step_name: BRAND_STEP_NAMES.BRAND_SUCCESS
                 };
-                return [4, API.boardService.updateBoardInfo(__assign({ id: id, infoId: infoId }, payload))];
+                return [4, API.boardService.updateBoardInfo(__assign({ id: board_id, infoId: infoId }, payload))];
             case 1:
-                data = _m.sent();
+                data = _p.sent();
+                sendCustomEventToGTM({
+                    event: 'Send Event',
+                    event_category: 'Board Flows - Brand',
+                    event_action: 'Brand Update Success Page',
+                    event_label: settings.data.businessCountry.iso2
+                });
                 if (!showBoard && mode === 'content') {
-                    (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, {});
-                    (_g = (_f = settings.data.appConfig).onFlowCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, { data: data });
-                    return [2, { response: __assign({}, data), formData: params }];
+                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, {});
+                    (_h = (_g = settings.data.appConfig).onFlowCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, { data: data });
+                    return [2, { data: data }];
                 }
-                return [4, API.boardService.retrieveBoardInfoStatus(id)];
+                _d = ((_j = data === null || data === void 0 ? void 0 : data.notification) === null || _j === void 0 ? void 0 : _j.recipient) || {}, id = _d.id, type = _d.type;
+                return [4, Promise.all([
+                        API.boardService.retrieveBoardInfoStatus(board_id),
+                        thunkApi.dispatch(retrieveBoardDetails({ boardId: board_id, individualId: id, individualType: type })).unwrap()
+                    ])];
             case 2:
-                boardInfoData = _m.sent();
-                return [4, thunkApi.dispatch(retrieveBoardDetails(id)).unwrap()];
-            case 3:
-                _m.sent();
-                (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, {});
-                (_l = (_k = settings.data.appConfig).onFlowCompleted) === null || _l === void 0 ? void 0 : _l.call(_k, { data: data });
+                boardInfoStatusData = (_p.sent())[0];
+                (_l = (_k = settings.data.appConfig).onStepCompleted) === null || _l === void 0 ? void 0 : _l.call(_k, settings.data.activeScreen.name, {});
+                (_o = (_m = settings.data.appConfig).onFlowCompleted) === null || _o === void 0 ? void 0 : _o.call(_m, { data: data });
                 thunkApi.dispatch(handleNextScreenStep());
-                return [2, { response: __assign(__assign({}, data), { flows: (boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info) || [] }), formData: params }];
+                return [2, { data: data, flows: (boardInfoStatusData === null || boardInfoStatusData === void 0 ? void 0 : boardInfoStatusData.info) || [] }];
         }
     });
 }); });
@@ -644,22 +648,18 @@ export var brandSlice = createSlice({
             state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
-            var _a, _b;
+            var _a, _b, _c;
             state.error = null;
             state.customLoading = false;
-            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;
+            var _d = action.payload, data = _d.data, brand = _d.brandData, token = _d.token, salesChannels = _d.salesChannels, entityInfoId = _d.entityInfoId;
             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;
-                    state.data.brandActivities.transactionPolicy = element.agree;
-                    state.data.brandActivities.refundPolicy = element.agree;
-                }
-            });
+            var termFlag = ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _b === void 0 ? void 0 : _b.find(function (element) { return (element === null || element === void 0 ? void 0 : element.term) === 'general'; })) === null || _c === void 0 ? void 0 : _c.agree) || false;
+            state.data.brandActivities.termAndConditionChecked = termFlag;
+            state.data.brandActivities.transactionPolicy = termFlag;
+            state.data.brandActivities.refundPolicy = termFlag;
             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.responseBody = __assign(__assign(__assign({}, data), state.data.verify.responseBody), { brand: brand, board_id: data.id, channel_list: (salesChannels === null || salesChannels === void 0 ? void 0 : salesChannels.list) || [], salesChannels: mappedSalesChannels, entityInfoId: entityInfoId });
             state.data.verify.token = token;
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
@@ -682,24 +682,20 @@ export var brandSlice = createSlice({
             state.error = null;
         })
             .addCase(verifyBrandLeadOTP.fulfilled, function (state, action) {
-            var _a, _b;
+            var _a, _b, _c;
             state.loading = false;
             state.error = null;
-            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;
+            var _d = action.payload, data = _d.data, brand = _d.brandData, formData = _d.formData, salesChannels = _d.salesChannels, entityInfoId = _d.entityInfoId;
             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 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;
-                    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, individualData: individualData });
+            var termFlag = ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _b === void 0 ? void 0 : _b.find(function (element) { return (element === null || element === void 0 ? void 0 : element.term) === 'general'; })) === null || _c === void 0 ? void 0 : _c.agree) || false;
+            state.data.brandActivities.termAndConditionChecked = termFlag;
+            state.data.brandActivities.transactionPolicy = termFlag;
+            state.data.brandActivities.refundPolicy = termFlag;
+            state.data.verify.responseBody = __assign(__assign(__assign({}, data), state.data.verify.responseBody), { brand: brand, board_id: data.id, channel_list: (salesChannels === null || salesChannels === void 0 ? void 0 : salesChannels.list) || [], salesChannels: mappedSalesChannels, entityInfoId: entityInfoId });
         })
             .addCase(verifyBrandLeadOTP.rejected, function (state, action) {
             state.loading = false;
@@ -728,27 +724,32 @@ export var brandSlice = createSlice({
             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 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) {
+            })) || (segmentLocationList === null || segmentLocationList === void 0 ? void 0 : segmentLocationList[0]);
+            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) {
+            })) || (segmentProfitList === null || segmentProfitList === void 0 ? void 0 : segmentProfitList[0]);
+            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);
-            });
+            })) || (segmentTechList === null || segmentTechList === void 0 ? void 0 : segmentTechList[1]);
             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.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 });
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { brand: data, teamSizeList: teamSizeList, segmentLocationList: segmentLocationList, segmentProfitList: segmentProfitList, segmentTechList: segmentTechList, segmentDefaultValues: {
+                    segmentLocation: selectedSegmentLocation,
+                    segmentProfit: selectedSegmentProfit,
+                    segmentTech: selectedSegmentTech,
+                    teamSize: selectedTeamSize
+                } });
         })
             .addCase(updateBrand.rejected, function (state, action) {
             state.loading = false;
@@ -759,31 +760,38 @@ export var brandSlice = createSlice({
             state.error = null;
         })
             .addCase(updateSegmentBrand.fulfilled, function (state, action) {
+            var _a;
             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 _b = action.payload, data = _b.data, entityData = _b.entityData, formData = _b.formData;
+            var activities = data.activities, operations = data.operations, terms = data.terms;
+            var entity_activities = (entityData || {}).entity_activities;
             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.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"]);
+            var _c = operations || {}, customer_base = _c.customer_base, sales = _c.sales;
+            var _d = customer_base || {}, locations = _d.locations, customerBase = __rest(_d, ["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 });
+            var termFlag = ((_a = terms === null || terms === void 0 ? void 0 : terms.find(function (element) { return (element === null || element === void 0 ? void 0 : element.term) === 'general'; })) === null || _a === void 0 ? void 0 : _a.agree) || false;
+            state.data.brandActivities.termAndConditionChecked = termFlag;
+            state.data.brandActivities.transactionPolicy = termFlag;
+            state.data.brandActivities.refundPolicy = termFlag;
+            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, state.data.verify.responseBody), { activities: entity_activities }), (entityData && { entity: entityData })), { activitiesDefaultValues: {
+                    activities: selectedActivity,
+                    customerLocations: locations,
+                    expectedSale: sales,
+                    expectedCustomer: customerBase,
+                    termAndConditionChecked: termFlag,
+                    transactionPolicy: termFlag,
+                    refundPolicy: termFlag
+                }, segmentDefaultValues: formData });
         })
             .addCase(updateSegmentBrand.rejected, function (state, action) {
             state.loading = false;
@@ -837,7 +845,7 @@ export var brandSlice = createSlice({
             .addCase(retrieveBoardDetails.fulfilled, function (state, action) {
             state.error = null;
             state.loading = false;
-            var data = (action.payload || {}).data;
+            var data = action.payload || {};
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), data);
         })
             .addCase(retrieveBoardDetails.rejected, function (state, action) {
@@ -851,7 +859,7 @@ export var brandSlice = createSlice({
             .addCase(retrieveBoardStatus.fulfilled, function (state, action) {
             state.error = null;
             state.loading = false;
-            var flows = action.payload.flows;
+            var flows = (action.payload || {}).flows;
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: flows });
         })
             .addCase(retrieveBoardStatus.rejected, function (state, action) {
@@ -862,12 +870,8 @@ export var brandSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var flows = (((_a = action.payload) === null || _a === void 0 ? void 0 : _a.response) || {}).flows;
-            var _b = state.data.verify.responseBody || {}, individuals = _b.individuals, individualData = _b.individualData;
-            var data_state = (((individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized) ? individuals : 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 })
-            }));
+            var _b = action.payload || {}, flows = _b.flows, data = _b.data;
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: flows, recipient: (_a = data === null || data === void 0 ? void 0 : data.notification) === null || _a === void 0 ? void 0 : _a.recipient });
         })
             .addCase(updateBoardSuccess.pending, function (state) {
             state.loading = true;