npm - @tap-payments/auth-jsconnect - Versions diffs - 2.0.55 → 2.0.56 - Mend

@tap-payments/auth-jsconnect 2.0.55 → 2.0.56

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

Files changed (53) hide show

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

@@ -12,3 +12,7 @@ export interface ResponseData {
         [key: string]: any;
     };
 }
+export interface AsyncThunkParams<T> {
+    formData: T;
+    originalFormData: T;
+}

package/build/constants/app.js CHANGED Viewed

@@ -234,7 +234,7 @@ export var BUSINESS_SCREENS_NAVIGATION = [
     {
         name: 'BUSINESS_RESET_PASSWORD_SUCCESS',
         next: '',
-        prev: '',
+        prev: 'BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         order: 8
     }
 ];
@@ -290,7 +290,7 @@ export var INDIVIDUAL_SCREENS_NAVIGATION = [
     {
         name: 'INDIVIDUAL_RESET_PASSWORD_SUCCESS',
         next: '',
-        prev: '',
+        prev: 'INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         order: 6
     }
 ];
@@ -298,13 +298,13 @@ export var PASSWORD_SCREENS_NAVIGATION = [
     {
         name: 'PASSWORD_VERIFY_STEP',
         next: ['PASSWORD_CREATE_PASSWORD_STEP', 'PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'],
-        prev: '',
+        prev: 'PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         order: 1
     },
     {
         name: 'PASSWORD_CREATE_PASSWORD_STEP',
         next: ['PASSWORD_SUCCESS_STEP', 'PASSWORD_RESET_PASSWORD_OTP_STEP'],
-        prev: '',
+        prev: 'PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         order: 2
     },
     {
@@ -328,7 +328,7 @@ export var PASSWORD_SCREENS_NAVIGATION = [
     {
         name: 'PASSWORD_RESET_PASSWORD_SUCCESS',
         next: '',
-        prev: '',
+        prev: 'PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         order: 6
     }
 ];
@@ -366,7 +366,7 @@ export var BANK_SCREENS_NAVIGATION = [
     {
         name: 'BANK_RESET_PASSWORD_SUCCESS',
         next: '',
-        prev: '',
+        prev: 'BANK_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         order: 5
     }
 ];
@@ -404,7 +404,7 @@ export var TAX_SCREENS_NAVIGATION = [
     {
         name: 'TAX_RESET_PASSWORD_SUCCESS',
         next: '',
-        prev: '',
+        prev: 'TAX_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         order: 5
     }
 ];
@@ -474,7 +474,7 @@ export var ENTITY_SCREENS_NAVIGATION = [
     {
         name: 'ENTITY_RESET_PASSWORD_SUCCESS',
         next: '',
-        prev: '',
+        prev: 'ENTITY_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         order: 5
     }
 ];
@@ -518,7 +518,7 @@ export var BRAND_SCREENS_NAVIGATION = [
     {
         name: 'BRAND_RESET_PASSWORD_SUCCESS',
         next: '',
-        prev: '',
+        prev: 'BRAND_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
         order: 5
     }
 ];

package/build/features/app/bank/bankStore.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { CancelToken } from 'axios';
 import { RootState } from '../../../app/store';
-import { ActionState, BankFormValues, FlowsTypes, OTPFormValues, ResponseData, SharedState } from '../../../@types';
+import { ActionState, BankFormValues, FlowsTypes, OTPFormValues, ResponseData, SharedState, AsyncThunkParams } from '../../../@types';
 interface VerifyLeadTokenProps {
     token: string;
     isInternally?: boolean;
@@ -36,7 +36,7 @@ export declare const retrieveBoardDetails: import("@reduxjs/toolkit").AsyncThunk
 export declare const createBankAccount: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: BankFormValues;
-}, BankFormValues, {}>;
+}, AsyncThunkParams<BankFormValues>, {}>;
 export declare const checkIbanBank: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
 }, {

package/build/features/app/bank/bankStore.js CHANGED Viewed

@@ -51,7 +51,7 @@ import API from '../../../api';
 import { DocumentPurpose, FlowsTypes } from '../../../@types';
 import { handleCurrentActiveScreen, handleNextScreenStep, handlePrevScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
 import { BANK_STEP_NAMES } from '../../../constants';
-import { hasNoneEditableValue, isStringMasked, sleep } from '../../../utils';
+import { hasNoneEditableValue, isStringHasOneAsterisk, sleep } from '../../../utils';
 export var verifyLeadToken = createAsyncThunk('bankVerifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -179,57 +179,60 @@ export var retrieveBoardDetails = createAsyncThunk('bank/retrieveBoardDetails',
         }
     });
 }); });
-export var createBankAccount = createAsyncThunk('createBankAccount', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, bank, iban, beneficiaryName, bankName, bankStatementId, confirmPolicy, _b, data_status, document, isIBANMasked, isIBANNonEditable, isBeneficiaryNameNonEditable, isBankNameNonEditable, isBankStatementIdNonEditable, isConfirmPolicyNonEditable, documentResponse, hasDocument, documentId, requestBody, data, documentBody;
-    var _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    return __generator(this, function (_m) {
-        switch (_m.label) {
-            case 0:
-                _a = thunkApi.getState(), settings = _a.settings, bank = _a.bank;
-                iban = params.iban, beneficiaryName = params.beneficiaryName, bankName = params.bankName, bankStatementId = params.bankStatementId, confirmPolicy = params.confirmPolicy;
-                _b = ((_c = bank.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.bank_account) || {}, data_status = _b.data_status, document = _b.document;
-                isIBANMasked = isStringMasked(iban);
-                isIBANNonEditable = hasNoneEditableValue(data_status, 'iban');
-                isBeneficiaryNameNonEditable = hasNoneEditableValue(data_status, 'beneficiary_name');
-                isBankNameNonEditable = hasNoneEditableValue(data_status, 'bank_name');
-                isBankStatementIdNonEditable = hasNoneEditableValue(data_status, 'bank_statement_file_id');
-                isConfirmPolicyNonEditable = hasNoneEditableValue(data_status, 'is_acknowledged');
-                documentResponse = undefined;
-                hasDocument = (bankStatementId || []).length > 0;
-                documentId = document === null || document === void 0 ? void 0 : document.id;
-                requestBody = {
-                    wallet_id: (_h = (_g = (_f = (_e = (_d = bank.data.verify.responseBody) === null || _d === void 0 ? void 0 : _d.business) === null || _e === void 0 ? void 0 : _e.entity) === null || _f === void 0 ? void 0 : _f.merchant) === null || _g === void 0 ? void 0 : _g.wallet) === null || _h === void 0 ? void 0 : _h.id,
-                    bank_account: __assign({ iban: isIBANNonEditable || isIBANMasked ? undefined : iban, beneficiary_name: isBeneficiaryNameNonEditable ? undefined : beneficiaryName, bank_name: isBankNameNonEditable ? undefined : bankName, is_acknowledged: isConfirmPolicyNonEditable ? undefined : confirmPolicy }, (!(isBankStatementIdNonEditable || documentId || !hasDocument) && {
-                        document: {
-                            type: DocumentPurpose.BANK_STATEMENT,
-                            files: bankStatementId || []
-                        }
-                    })),
-                    step_name: BANK_STEP_NAMES.BANK_INFO,
-                    encryption_contract: ['bank_account.iban', 'bank_account.beneficiary_name', 'bank_account.bank_name']
-                };
-                return [4, API.entityService.createBankAccount(requestBody)];
-            case 1:
-                data = (_m.sent()).data;
-                if ((_j = data.errors) === null || _j === void 0 ? void 0 : _j.length)
-                    throw new Error(data.errors[0].description);
-                if (!(!isBankStatementIdNonEditable && documentId && hasDocument)) return [3, 3];
-                documentBody = {
-                    id: documentId,
-                    files: bankStatementId || []
-                };
-                return [4, API.documentService.addFilesToExistingDocument(documentBody)];
-            case 2:
-                documentResponse = _m.sent();
-                _m.label = 3;
-            case 3:
-                data.documentData = documentResponse;
-                thunkApi.dispatch(handleNextScreenStep());
-                (_l = (_k = settings.data.appConfig).onStepCompleted) === null || _l === void 0 ? void 0 : _l.call(_k, settings.data.activeScreen.name, requestBody);
-                return [2, { data: data, formData: params }];
-        }
+export var createBankAccount = createAsyncThunk('createBankAccount', function (_a, thunkApi) {
+    var formData = _a.formData, originalFormData = _a.originalFormData;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var _b, settings, bank, iban, beneficiaryName, bankName, bankStatementId, confirmPolicy, _c, data_status, document, isIBANMasked, isIBANNonEditable, isBeneficiaryNameNonEditable, isBankNameNonEditable, isBankStatementIdNonEditable, isConfirmPolicyNonEditable, documentResponse, hasDocument, documentId, requestBody, data, documentBody;
+        var _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        return __generator(this, function (_o) {
+            switch (_o.label) {
+                case 0:
+                    _b = thunkApi.getState(), settings = _b.settings, bank = _b.bank;
+                    iban = formData.iban, beneficiaryName = formData.beneficiaryName, bankName = formData.bankName, bankStatementId = formData.bankStatementId, confirmPolicy = formData.confirmPolicy;
+                    _c = ((_d = bank.data.verify.responseBody) === null || _d === void 0 ? void 0 : _d.bank_account) || {}, data_status = _c.data_status, document = _c.document;
+                    isIBANMasked = isStringHasOneAsterisk(iban);
+                    isIBANNonEditable = hasNoneEditableValue(data_status, 'iban');
+                    isBeneficiaryNameNonEditable = hasNoneEditableValue(data_status, 'beneficiary_name');
+                    isBankNameNonEditable = hasNoneEditableValue(data_status, 'bank_name');
+                    isBankStatementIdNonEditable = hasNoneEditableValue(data_status, 'bank_statement_file_id');
+                    isConfirmPolicyNonEditable = hasNoneEditableValue(data_status, 'is_acknowledged');
+                    documentResponse = undefined;
+                    hasDocument = (bankStatementId || []).length > 0;
+                    documentId = document === null || document === void 0 ? void 0 : document.id;
+                    requestBody = {
+                        wallet_id: (_j = (_h = (_g = (_f = (_e = bank.data.verify.responseBody) === null || _e === void 0 ? void 0 : _e.business) === null || _f === void 0 ? void 0 : _f.entity) === null || _g === void 0 ? void 0 : _g.merchant) === null || _h === void 0 ? void 0 : _h.wallet) === null || _j === void 0 ? void 0 : _j.id,
+                        bank_account: __assign({ iban: isIBANNonEditable || isIBANMasked ? undefined : iban, beneficiary_name: isBeneficiaryNameNonEditable ? undefined : beneficiaryName, bank_name: isBankNameNonEditable ? undefined : bankName, is_acknowledged: isConfirmPolicyNonEditable ? undefined : confirmPolicy }, (!(isBankStatementIdNonEditable || documentId || !hasDocument) && {
+                            document: {
+                                type: DocumentPurpose.BANK_STATEMENT,
+                                files: bankStatementId || []
+                            }
+                        })),
+                        step_name: BANK_STEP_NAMES.BANK_INFO,
+                        encryption_contract: ['bank_account.iban', 'bank_account.beneficiary_name', 'bank_account.bank_name']
+                    };
+                    return [4, API.entityService.createBankAccount(requestBody)];
+                case 1:
+                    data = (_o.sent()).data;
+                    if ((_k = data.errors) === null || _k === void 0 ? void 0 : _k.length)
+                        throw new Error(data.errors[0].description);
+                    if (!(!isBankStatementIdNonEditable && documentId && hasDocument)) return [3, 3];
+                    documentBody = {
+                        id: documentId,
+                        files: bankStatementId || []
+                    };
+                    return [4, API.documentService.addFilesToExistingDocument(documentBody)];
+                case 2:
+                    documentResponse = _o.sent();
+                    _o.label = 3;
+                case 3:
+                    data.documentData = documentResponse;
+                    thunkApi.dispatch(handleNextScreenStep());
+                    (_m = (_l = settings.data.appConfig).onStepCompleted) === null || _m === void 0 ? void 0 : _m.call(_l, settings.data.activeScreen.name, requestBody);
+                    return [2, { data: data, formData: originalFormData }];
+            }
+        });
     });
-}); });
+});
 export var checkIbanBank = createAsyncThunk('checkIbanBank', function (_a) {
     var iban = _a.iban, cancelToken = _a.cancelToken, onSuccess = _a.onSuccess;
     return __awaiter(void 0, void 0, void 0, function () {

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

@@ -1,5 +1,5 @@
 import { RootState } from '../../../app/store';
-import { ActionState, BrandActivitiesFormValues, BrandFormValues, FlowsTypes, OTPFormValues, ResponseData, SharedState } from '../../../@types';
+import { ActionState, AsyncThunkParams, BrandActivitiesFormValues, BrandFormValues, FlowsTypes, OTPFormValues, ResponseData, SharedState } from '../../../@types';
 import { CancelToken } from 'axios';
 interface VerifyLeadTokenProps {
     token: string;
@@ -63,14 +63,14 @@ export declare const checkBrandNameAvailability: import("@reduxjs/toolkit").Asyn
 export declare const updateBrand: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: Omit<BrandFormValues, "termAndConditionChecked" | "selectedBrandItem">;
-}, Omit<BrandFormValues, "termAndConditionChecked" | "selectedBrandItem">, {}>;
+}, AsyncThunkParams<Omit<BrandFormValues, "termAndConditionChecked" | "selectedBrandItem">>, {}>;
 export declare const retrieveEntityList: import("@reduxjs/toolkit").AsyncThunk<any, {
     leadId: string;
 }, {}>;
 export declare const updateBrandActivities: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: BrandActivitiesFormValues;
-}, BrandActivitiesFormValues, {}>;
+}, AsyncThunkParams<BrandActivitiesFormValues>, {}>;
 export declare const retrieveDataList: import("@reduxjs/toolkit").AsyncThunk<{
     customerBases: any;
     expectedSales: any;

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

@@ -263,70 +263,73 @@ 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, _b, id, data_status, isNameNonEditable, isChannelServicesNonEditable, isSegmentTypeNonEditable, isSegmentTeamsNonEditable, salesChannels, brandName, segment, teamSize, brandLogoId, segmentId, teamSizeId, getAddress, channel_services, requestBody, brandData, activities, activityList;
-    var _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
-            case 0:
-                _a = thunkApi.getState(), settings = _a.settings, brand = _a.brand;
-                _b = ((_c = brand.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.brand) || {}, id = _b.id, data_status = _b.data_status;
-                isNameNonEditable = hasNoneEditableValue(data_status, 'name');
-                isChannelServicesNonEditable = hasNoneEditableValue(data_status, 'channel_services');
-                isSegmentTypeNonEditable = hasNoneEditableValue(data_status, 'segment.type');
-                isSegmentTeamsNonEditable = hasNoneEditableValue(data_status, 'segment.teams');
-                salesChannels = params.salesChannels, brandName = params.brandName, segment = params.segment, teamSize = params.teamSize, brandLogoId = params.brandLogoId;
-                segmentId = isSegmentTypeNonEditable ? undefined : segment && { id: segment.id };
-                teamSizeId = isSegmentTeamsNonEditable ? undefined : teamSize && { id: teamSize.id };
-                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.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)) };
-                            })
-                        };
-                    });
-                requestBody = {
-                    id: id,
-                    name: isNameNonEditable || !brandName ? undefined : { en: brandName, ar: brandName },
-                    logo: brandLogoId,
-                    segment: !segmentId && !teamSizeId ? undefined : { type: segmentId, team: teamSizeId },
-                    channel_services: channel_services
-                };
-                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: 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, _c, id, data_status, isNameNonEditable, isChannelServicesNonEditable, isSegmentTypeNonEditable, isSegmentTeamsNonEditable, salesChannels, brandName, segment, teamSize, brandLogoId, segmentId, teamSizeId, getAddress, channel_services, requestBody, brandData, activities, activityList;
+        var _d, _e, _f, _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
+                case 0:
+                    _b = thunkApi.getState(), settings = _b.settings, brand = _b.brand;
+                    _c = ((_d = brand.data.verify.responseBody) === null || _d === void 0 ? void 0 : _d.brand) || {}, id = _c.id, data_status = _c.data_status;
+                    isNameNonEditable = hasNoneEditableValue(data_status, 'name');
+                    isChannelServicesNonEditable = hasNoneEditableValue(data_status, 'channel_services');
+                    isSegmentTypeNonEditable = hasNoneEditableValue(data_status, 'segment.type');
+                    isSegmentTeamsNonEditable = hasNoneEditableValue(data_status, 'segment.teams');
+                    salesChannels = formData.salesChannels, brandName = formData.brandName, segment = formData.segment, teamSize = formData.teamSize, brandLogoId = formData.brandLogoId;
+                    segmentId = isSegmentTypeNonEditable ? undefined : segment && { id: segment.id };
+                    teamSizeId = isSegmentTeamsNonEditable ? undefined : teamSize && { id: teamSize.id };
+                    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)) };
+                                })
+                            };
+                        });
+                    requestBody = {
+                        id: id,
+                        name: isNameNonEditable || !brandName ? undefined : { en: brandName, ar: brandName },
+                        logo: brandLogoId,
+                        segment: !segmentId && !teamSizeId ? undefined : { type: segmentId, team: teamSizeId },
+                        channel_services: channel_services
+                    };
+                    return [4, API.brandService.updateBrandInfo(requestBody)];
+                case 1:
+                    brandData = (_h.sent()).brand;
+                    activities = (((_e = brand.data.verify.responseBody) === null || _e === void 0 ? void 0 : _e.entity) || {}).activities;
+                    return [4, thunkApi.dispatch(retrieveDataList())];
+                case 2:
+                    _h.sent();
+                    if (activities) {
+                        brandData = __assign(__assign({}, brandData), { entity_activities: activities || {} });
+                    }
+                    if (!!activities) return [3, 4];
+                    return [4, API.dataService.getActivities()];
+                case 3:
+                    activityList = (_h.sent()).list;
+                    brandData = __assign(__assign({}, brandData), { entity_activities: activityList || {} });
+                    _h.label = 4;
+                case 4:
+                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
+                    (_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 }];
+            }
+        });
     });
-}); });
+});
 export var retrieveEntityList = createAsyncThunk('retrieveEntityList', function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var data;
     return __generator(this, function (_a) {
@@ -338,57 +341,62 @@ 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, _b, data_status, id, brandActivities, isActivitiesNonEditable, isCustomerBaseLocationNonEditable, isCustomerBaseNonEditable, isTermsNonEditable, isSalesRangeNonEditable, activities, customerLocations, expectedCustomer, expectedSale, removedActivities, payload, requestBody, customerLocation, customerBaseId, salesId, customerBase, brandData;
-    var _c, _d, _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
-            case 0:
-                _a = thunkApi.getState(), settings = _a.settings, brand = _a.brand;
-                _b = ((_c = brand.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.brand) || {}, data_status = _b.data_status, id = _b.id, brandActivities = _b.activities;
-                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 = params.activities, customerLocations = params.customerLocations, expectedCustomer = params.expectedCustomer, expectedSale = params.expectedSale;
-                removedActivities = (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:
-                _f.sent();
-                _f.label = 2;
-            case 2:
-                requestBody = {
-                    id: id,
-                    activities: isActivitiesNonEditable ? undefined : activities,
-                    term: isTermsNonEditable ? undefined : ['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 = (_f.sent()).data;
-                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 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, data_status, id, brandActivities, isActivitiesNonEditable, isCustomerBaseLocationNonEditable, isCustomerBaseNonEditable, isTermsNonEditable, isSalesRangeNonEditable, activities, customerLocations, expectedCustomer, expectedSale, termAndConditionChecked, refundPolicy, transactionPolicy, isTermsUndefined, removedActivities, payload, requestBody, customerLocation, customerBaseId, salesId, customerBase, brandData;
+        var _d, _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
+                case 0:
+                    _b = thunkApi.getState(), settings = _b.settings, brand = _b.brand;
+                    _c = ((_d = brand.data.verify.responseBody) === null || _d === void 0 ? void 0 : _d.brand) || {}, data_status = _c.data_status, id = _c.id, brandActivities = _c.activities;
+                    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;
+                    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:
+                    _g.sent();
+                    _g.label = 2;
+                case 2:
+                    requestBody = {
+                        id: id,
+                        activities: isActivitiesNonEditable ? undefined : activities,
+                        term: isTermsNonEditable || isTermsUndefined ? undefined : ['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 = (_g.sent()).data;
+                    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 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) {
@@ -617,7 +625,7 @@ export var brandSlice = createSlice({
             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; });
             });
@@ -631,6 +639,17 @@ export var brandSlice = createSlice({
                 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;
+                }
+                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({}, state.data.verify.responseBody), { activities: entity_activities });
         })
             .addCase(updateBrandActivities.rejected, function (state, action) {

package/build/features/app/business/businessStore.js CHANGED Viewed

@@ -475,10 +475,9 @@ export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', f
                 isNonSA = !isSA(settings.data.businessCountry.iso2);
                 selectedLicense = params.selectedLicense, licenseNumber = params.licenseNumber, entityLegalName = params.entityLegalName, certificateId = params.certificateId, articleId = params.articleId, selectedEntityLicense = params.selectedEntityLicense;
                 isFL = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.FL;
-                payload = __assign(__assign(__assign(__assign(__assign({ id: ((_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.lead_id) || '' }, ((selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id) &&
-                    (isNonSA ? !isFL : true) && {
-                    entity: { id: selectedEntityLicense.id }
-                })), (!(selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id) && {
+                payload = __assign(__assign(__assign(__assign({ id: ((_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.lead_id) || '', entity: {
+                        id: (selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id) && (isNonSA ? !isFL : true) ? selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id : ''
+                    } }, (!(selectedEntityLicense === null || selectedEntityLicense === void 0 ? void 0 : selectedEntityLicense.id) && {
                     license_number: isNonSA && isFL ? '' : licenseNumber,
                     license_type: isFL ? LicenseType.FL : LicenseType.CR,
                     business_type: selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type

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

@@ -413,7 +413,7 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
     });
 }); });
 export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, responseBody, leadBrandId, isNewBrand, brandName, salesChannels, selectedBrandItem, termAndConditionChecked, getAddress, channel_services, payload_1, brandReqBody_1, brand_1, brandNameBody, payload, lead, brandReqBody, brand;
+    var _a, settings, connect, responseBody, leadBrandId, isNewBrand, brandName, salesChannels, selectedBrandItem, getAddress, channel_services, payload_1, brandReqBody_1, brand_1, brandNameBody, payload, lead, brandReqBody, brand;
     var _b, _c, _d, _e, _f, _g, _h, _j, _k;
     return __generator(this, function (_l) {
         switch (_l.label) {
@@ -421,7 +421,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 responseBody = connect.data.otpData.responseBody;
                 leadBrandId = responseBody === null || responseBody === void 0 ? void 0 : responseBody.brand_id;
-                isNewBrand = params.isNewBrand, brandName = params.brandName, salesChannels = params.salesChannels, selectedBrandItem = params.selectedBrandItem, termAndConditionChecked = params.termAndConditionChecked;
+                isNewBrand = params.isNewBrand, brandName = params.brandName, salesChannels = params.salesChannels, selectedBrandItem = params.selectedBrandItem;
                 getAddress = function (value, isTwitter, isWeb) {
                     if (isTwitter)
                         return '@' + value;
@@ -468,6 +468,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 return [2, { response: brand_1, formData: params }];
             case 4:
                 brandNameBody = {
+                    id: '',
                     name: {
                         en: brandName,
                         ar: brandName,

package/build/features/app/connectExpress/connectExpressStore.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { RootState } from '../../../app/store';
-import { MobileFormValues, NIDFormValues, CivilFormValues, OTPFormValues, IndividualFormValues, SharedState, FlowsTypes, ActionState, CountryCode, AuthForType, BusinessDataFormValues } from '../../../@types';
+import { MobileFormValues, NIDFormValues, CivilFormValues, OTPFormValues, IndividualFormValues, SharedState, FlowsTypes, ActionState, CountryCode, AuthForType, BusinessDataFormValues, AsyncThunkParams } from '../../../@types';
 import { CancelToken } from 'axios';
 export declare const retrieveLeadIdentityByIdAsync: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
@@ -87,11 +87,11 @@ interface verifyPACIAsyncParams {
 export declare const updateLeadIndividualAsync: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: IndividualFormValues;
-}, IndividualFormValues, {}>;
+}, AsyncThunkParams<IndividualFormValues>, {}>;
 export declare const updateLeadBusinessDataAsync: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: BusinessDataFormValues;
-}, BusinessDataFormValues, {}>;
+}, AsyncThunkParams<BusinessDataFormValues>, {}>;
 interface ResponseData {
     responseData?: Record<string, any>;
 }