@tap-payments/auth-jsconnect 2.2.5-test → 2.3.2-test

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

@@ -51,7 +51,7 @@ import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
 import { handleNextScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
 import { BRAND_STEP_NAMES } from '../../../constants';
-import { isKW, isTwitter, isWebsite, sleep } from '../../../utils';
+import { findInArrayOrSubArray, isKW, isTwitter, isWebsite, sleep } from '../../../utils';
 export var verifyLeadToken = createAsyncThunk('brandVerifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -284,19 +284,19 @@ export var updateBrand = createAsyncThunk('brandUpdateBrand', function (params,
                 };
                 return [4, API.brandService.updateBrandInfo(requestBody)];
             case 1:
-                brandData = (_f.sent()).data;
+                brandData = (_f.sent()).brand;
                 activities = (((_c = brand.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.entity) || {}).activities;
                 return [4, thunkApi.dispatch(retrieveDataList())];
             case 2:
                 _f.sent();
                 if (activities) {
-                    brandData = __assign(__assign({}, brandData), { brand_activities: activities || {} });
+                    brandData = __assign(__assign({}, brandData), { entity_activities: activities || {} });
                 }
                 if (!!activities) return [3, 4];
                 return [4, API.dataService.getActivities()];
             case 3:
                 activityList = (_f.sent()).list;
-                brandData = __assign(__assign({}, brandData), { brand_activities: activityList || {} });
+                brandData = __assign(__assign({}, brandData), { entity_activities: activityList || {} });
                 _f.label = 4;
             case 4:
                 thunkApi.dispatch(handleNextScreenStep());
@@ -317,7 +317,7 @@ export var retrieveEntityList = createAsyncThunk('retrieveEntityList', function
     });
 }); });
 export var updateBrandActivities = createAsyncThunk('brandUpdateBrandActivities', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, brand, brandResponse, id, isActivitiesEditable, isCustomerLocationEditable, isSalesRangeEditable, activities, customerLocations, expectedCustomer, expectedSale, customerLocation, customerBase, sales, stepName, requestBody, brandData;
+    var _a, settings, brand, brandResponse, id, isActivitiesEditable, isCustomerLocationEditable, isSalesRangeEditable, activities, customerLocations, expectedCustomer, expectedSale, requestBody, customerLocation, customerBaseId, salesId, customerBase, brandData;
     var _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -329,28 +329,26 @@ export var updateBrandActivities = createAsyncThunk('brandUpdateBrandActivities'
                 isCustomerLocationEditable = true;
                 isSalesRangeEditable = true;
                 activities = params.activities, customerLocations = params.customerLocations, expectedCustomer = params.expectedCustomer, expectedSale = params.expectedSale;
-                customerLocation = customerLocations.map(function (location) { return ({
-                    id: location.id
-                }); });
-                customerBase = ((expectedCustomer === null || expectedCustomer === void 0 ? void 0 : expectedCustomer.id) || customerLocation) && __assign(__assign({}, ((expectedCustomer === null || expectedCustomer === void 0 ? void 0 : expectedCustomer.id) && { id: expectedCustomer.id, period: 'monthly' })), (isCustomerLocationEditable && { location: customerLocation }));
-                sales = (expectedSale === null || expectedSale === void 0 ? void 0 : expectedSale.id) && { id: expectedSale.id, period: 'monthly' };
-                stepName = BRAND_STEP_NAMES.BRAND_ACTIVITIES;
                 requestBody = {
                     id: id,
                     activities: isActivitiesEditable && activities,
-                    operations: {
-                        customer_base: customerBase,
-                        sales: (isSalesRangeEditable && sales)
-                    },
                     term: ['general', 'refund', 'chargeback'],
-                    step_name: stepName
+                    step_name: BRAND_STEP_NAMES.BRAND_ACTIVITIES
                 };
+                customerLocation = customerLocations.map(function (location) { return ({
+                    id: location.id
+                }); });
+                customerBaseId = (expectedCustomer === null || expectedCustomer === void 0 ? void 0 : expectedCustomer.id) && { id: expectedCustomer.id, period: 'monthly' };
+                salesId = (expectedSale === null || expectedSale === void 0 ? void 0 : expectedSale.id) && { id: expectedSale.id, period: 'monthly' };
+                customerBase = (customerBaseId || customerLocation.length) && __assign(__assign({}, (customerBaseId && { id: expectedCustomer.id, period: 'monthly' })), (customerLocation.length && { location: customerLocation }));
+                if (customerBase)
+                    requestBody = __assign(__assign({}, requestBody), { operations: __assign(__assign({}, requestBody.operations), { customer_base: customerBase }) });
+                if (salesId && isSalesRangeEditable) {
+                    requestBody = __assign(__assign({}, requestBody), { operations: __assign(__assign({}, requestBody.operations), { sales: salesId }) });
+                }
                 return [4, API.brandService.updateBrandInfo(requestBody)];
             case 1:
                 brandData = (_d.sent()).data;
-                return [4, thunkApi.dispatch(retrieveDataList())];
-            case 2:
-                _d.sent();
                 thunkApi.dispatch(handleNextScreenStep());
                 (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, id);
                 return [2, { data: __assign({}, brandData), formData: params }];
@@ -402,14 +400,12 @@ export var updateBoardSuccess = createAsyncThunk('updateBoardBrandSuccess', func
                     step_name: BRAND_STEP_NAMES.BRAND_SUCCESS,
                     id: id
                 };
-                return [4, API.boardService.updateBoardInfo(__assign({ id: id, infoId: infoId }, payload))];
-            case 1:
-                data = _g.sent();
+                data = {};
                 return [4, API.boardService.retrieveBoardInfoStatus(id)];
-            case 2:
+            case 1:
                 boardInfoData = _g.sent();
-                return [4, thunkApi.dispatch(retrieveBoardDetails(id))];
-            case 3:
+                return [4, thunkApi.dispatch(retrieveBoardDetails(id)).unwrap()];
+            case 2:
                 _g.sent();
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, {});
                 (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
@@ -577,14 +573,20 @@ export var brandSlice = createSlice({
             state.loading = false;
             state.error = null;
             var _a = action.payload, data = _a.data, formData = _a.formData;
-            var brand = (state.data.verify.responseBody || {}).brand;
-            var activities = data.brand_activities;
-            var selectedActivity = activities === null || activities === void 0 ? void 0 : activities.filter(function (activity) {
-                var activities = (brand || {}).activities;
+            var entity_activities = data.entity_activities, activities = data.activities, operations = data.operations;
+            var selectedActivity = entity_activities === null || entity_activities === void 0 ? void 0 : entity_activities.filter(function (activity) {
                 return activities === null || activities === void 0 ? void 0 : activities.find(function (value) { return activity.id === value.id; });
             });
             state.data.brandData = formData;
             state.data.brandActivities.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [];
+            var _b = operations || {}, customer_base = _b.customer_base, sales = _b.sales;
+            var _c = state.data.brandActivities.responseBody || {}, customerBases = _c.customerBases, expectedSales = _c.expectedSales, expectedCustomerSales = _c.expectedCustomerSales;
+            var findCustomerBase = findInArrayOrSubArray(expectedCustomerSales, customer_base === null || customer_base === void 0 ? void 0 : customer_base.id);
+            var findSale = findInArrayOrSubArray(expectedSales, sales === null || sales === void 0 ? void 0 : sales.id);
+            if (!!findSale)
+                state.data.brandActivities.expectedSale = findSale;
+            if (!!findCustomerBase)
+                state.data.brandActivities.expectedCustomer = findCustomerBase;
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { activities: data === null || data === void 0 ? void 0 : data.brand_activities });
         })
             .addCase(updateBrandActivities.rejected, function (state, action) {
@@ -612,9 +614,9 @@ export var brandSlice = createSlice({
             state.error = null;
             var _a = action.payload, customerBases = _a.customerBases, expectedSales = _a.expectedSales, expectedCustomerSales = _a.expectedCustomerSales, countryISO2 = _a.countryISO2;
             var local = customerBases.at(0);
-            state.data.brandActivities.responseBody = __assign(__assign({}, state.data.brandActivities.responseBody), { customerBases: customerBases, expectedSales: expectedSales, expectedCustomerSales: expectedCustomerSales });
             if (local && isKW(countryISO2))
                 state.data.brandActivities.customerLocations = [local];
+            state.data.brandActivities.responseBody = __assign(__assign({}, state.data.brandActivities.responseBody), { customerBases: customerBases, expectedSales: expectedSales, expectedCustomerSales: expectedCustomerSales });
         })
             .addCase(retrieveDataList.rejected, function (state, action) {
             state.loading = false;
@@ -638,13 +640,7 @@ export var brandSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var response = (action.payload || {}).response;
-            var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
-            if (description) {
-                state.error = description;
-                return;
-            }
-            var flows = response.flows;
+            var flows = (((_a = action.payload) === null || _a === void 0 ? void 0 : _a.response) || {}).flows;
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: flows });
         })
             .addCase(updateBoardSuccess.pending, function (state) {

package/build/features/shared/Button/Button.js

@@ -97,7 +97,7 @@ export default function CustomButton(_a) {
         if (!loading)
             setTimeout(function () {
                 setBtnLoading(false);
-            }, 1500);
+            }, 1000);
     }, [loading]);
     React.useEffect(function () {
         setBtnLoading(false);

package/build/utils/array.d.ts

@@ -63,3 +63,4 @@ export declare const fixBrandList: (items: Array<{
 export declare const findFirstId: (items: Array<SaleChannel>) => string;
 export declare const sortActivitiesByName: (items: Array<Activity>, path: string) => Activity[];
 export declare const getRecentDocumentFiles: (documents: Array<any>, purpose: string) => any;
+export declare const findInArrayOrSubArray: (items: Array<any>, value: string | number) => null;

package/build/utils/array.js

@@ -150,3 +150,17 @@ export var getRecentDocumentFiles = function (documents, purpose) {
         .filter(function (doc) { return (doc.file_details || []).find(function (file) { return file.purpose === purpose; }); })
         .sort(function (a, b) { return b.created - a.created; })[0]) === null || _a === void 0 ? void 0 : _a.file_details) || []);
 };
+export var findInArrayOrSubArray = function (items, value) {
+    var found = null;
+    items.forEach(function (item) {
+        if (item.id === value)
+            found = item;
+        if (Array.isArray(item.sub)) {
+            item.sub.forEach(function (subItem) {
+                if (subItem.id === value)
+                    found = subItem;
+            });
+        }
+    });
+    return found;
+};

package/package.json

@@ -1,129 +1,129 @@
-{
-	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.2.5-test",
-	"description": "connect library, auth",
-	"private": false,
-	"main": "build/index.js",
-	"module": "build/index.js",
-	"types": "build/index.d.ts",
-	"files": [
-		"build",
-		"README.md"
-	],
-	"scripts": {
-		"husky:setup": "npx husky install",
-		"prettier": "prettier --list-different \"src/**/*.{md,mdx,ts,js,tsx,jsx,json}\" *.json *.js",
-		"prettier:fix": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md,css,json}\"  *.json *.js",
-		"lint": "eslint src --color --ext .js,.jsx,.ts,.tsx,.json",
-		"lint:fix": "eslint src --ext .js,.jsx,.ts,.tsx --fix",
-		"start": "cross-env NODE_ENV=development webpack serve",
-		"build": "rm -rf build && cross-env NODE_ENV=production webpack",
-		"copy:files": "copyfiles -u 1 src/**/*.css build/",
-		"tsc:alias": "tsc-alias -p tsconfig.json",
-		"ts:build": "rm -rf build && tsc -p tsconfig.json && tsc-alias -p tsconfig.json && yarn copy:files",
-		"push": "npm publish --access public"
-	},
-	"keywords": [],
-	"author": {
-		"name": "Ahmed Elsharkawy",
-		"email": "a.elsharkawy@tap.company"
-	},
-	"license": "ISC",
-	"devDependencies": {
-		"@babel/core": "^7.18.6",
-		"@babel/preset-env": "^7.18.6",
-		"@babel/preset-react": "^7.18.6",
-		"@babel/preset-typescript": "^7.18.6",
-		"@types/lodash-es": "^4.17.6",
-		"@types/react": "^18.0.15",
-		"@types/react-calendar": "~3.5.1",
-		"@types/react-dom": "^18.0.6",
-		"@typescript-eslint/eslint-plugin": "^5.30.5",
-		"@typescript-eslint/parser": "^5.30.5",
-		"babel-loader": "^8.2.5",
-		"copyfiles": "^2.4.1",
-		"cross-env": "^7.0.3",
-		"css-loader": "^6.7.1",
-		"css-minimizer-webpack-plugin": "^4.0.0",
-		"eslint": "^8.19.0",
-		"eslint-config-airbnb": "^19.0.4",
-		"eslint-config-prettier": "^8.5.0",
-		"eslint-plugin-import": "^2.26.0",
-		"eslint-plugin-jsx-a11y": "^6.6.0",
-		"eslint-plugin-node": "^11.1.0",
-		"eslint-plugin-prettier": "^4.2.1",
-		"eslint-plugin-react": "^7.30.1",
-		"eslint-plugin-react-hooks": "^4.6.0",
-		"file-loader": "^6.2.0",
-		"fork-ts-checker-webpack-plugin": "^7.2.12",
-		"html-loader": "^3.1.2",
-		"html-webpack-plugin": "^5.5.0",
-		"husky": "^8.0.1",
-		"lint-staged": "^13.0.3",
-		"mini-css-extract-plugin": "^2.6.1",
-		"prettier": "^2.7.1",
-		"sass": "^1.53.0",
-		"sass-loader": "^13.0.2",
-		"style-loader": "^3.3.1",
-		"terser-webpack-plugin": "^5.3.3",
-		"tsc-alias": "^1.6.11",
-		"typescript": "^4.7.4",
-		"webpack": "^5.73.0",
-		"webpack-cli": "^4.10.0",
-		"webpack-dev-server": "^4.9.3",
-		"webpack-merge": "^5.8.0"
-	},
-	"dependencies": {
-		"@emotion/react": "^11.9.3",
-		"@emotion/styled": "^11.9.3",
-		"@fingerprintjs/fingerprintjs": "~3.3.4",
-		"@hookform/resolvers": "^2.9.6",
-		"@mui/icons-material": "^5.8.4",
-		"@mui/material": "^5.8.7",
-		"@reduxjs/toolkit": "^1.8.3",
-		"axios": "^0.27.2",
-		"device-detector-js": "^3.0.3",
-		"i18next": "^21.8.14",
-		"i18next-browser-languagedetector": "^6.1.4",
-		"i18next-http-backend": "^1.4.1",
-		"jsencrypt": "^2.3.1",
-		"lodash-es": "^4.17.21",
-		"lottie-web": "^5.9.6",
-		"moment": "^2.29.4",
-		"react": "^18.2.0",
-		"react-calendar": "~3.7.0",
-		"react-device-detect": "^2.2.2",
-		"react-dom": "^18.2.0",
-		"react-dropzone": "^14.2.2",
-		"react-hook-form": "^7.33.1",
-		"react-i18next": "^11.18.1",
-		"react-multi-date-picker": "^3.3.4",
-		"react-otp-input": "^2.4.0",
-		"react-redux": "^8.0.2",
-		"react-spring-bottom-sheet": "^3.4.1",
-		"yup": "^0.32.11"
-	},
-	"peerDependencies": {
-		"react": "^18.2.0",
-		"react-dom": "^18.2.0"
-	},
-	"lint-staged": {
-		"src/**/*.{ts,tsx,json,js,jsx}": [
-			"yarn run prettier:fix",
-			"yarn run lint",
-			"git add ."
-		]
-	},
-	"browserslist": {
-		"production": [
-			">0.2%",
-			"not dead",
-			"not op_mini all"
-		],
-		"development": [
-			"last 1 chrome version",
-			"last 1 firefox version",
-			"last 1 safari version"
-		]
-	}
-}
+{
+	"name": "@tap-payments/auth-jsconnect",
+	"version": "2.3.2-test",
+	"description": "connect library, auth",
+	"private": false,
+	"main": "build/index.js",
+	"module": "build/index.js",
+	"types": "build/index.d.ts",
+	"files": [
+		"build",
+		"README.md"
+	],
+	"scripts": {
+		"husky:setup": "npx husky install",
+		"prettier": "prettier --list-different \"src/**/*.{md,mdx,ts,js,tsx,jsx,json}\" *.json *.js",
+		"prettier:fix": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,md,css,json}\"  *.json *.js",
+		"lint": "eslint src --color --ext .js,.jsx,.ts,.tsx,.json",
+		"lint:fix": "eslint src --ext .js,.jsx,.ts,.tsx --fix",
+		"start": "cross-env NODE_ENV=development webpack serve",
+		"build": "rm -rf build && cross-env NODE_ENV=production webpack",
+		"copy:files": "copyfiles -u 1 src/**/*.css build/",
+		"tsc:alias": "tsc-alias -p tsconfig.json",
+		"ts:build": "rm -rf build && tsc -p tsconfig.json && tsc-alias -p tsconfig.json && yarn copy:files",
+		"push": "npm publish --access public"
+	},
+	"keywords": [],
+	"author": {
+		"name": "Ahmed Elsharkawy",
+		"email": "a.elsharkawy@tap.company"
+	},
+	"license": "ISC",
+	"devDependencies": {
+		"@babel/core": "^7.18.6",
+		"@babel/preset-env": "^7.18.6",
+		"@babel/preset-react": "^7.18.6",
+		"@babel/preset-typescript": "^7.18.6",
+		"@types/lodash-es": "^4.17.6",
+		"@types/react": "^18.0.15",
+		"@types/react-calendar": "~3.5.1",
+		"@types/react-dom": "^18.0.6",
+		"@typescript-eslint/eslint-plugin": "^5.30.5",
+		"@typescript-eslint/parser": "^5.30.5",
+		"babel-loader": "^8.2.5",
+		"copyfiles": "^2.4.1",
+		"cross-env": "^7.0.3",
+		"css-loader": "^6.7.1",
+		"css-minimizer-webpack-plugin": "^4.0.0",
+		"eslint": "^8.19.0",
+		"eslint-config-airbnb": "^19.0.4",
+		"eslint-config-prettier": "^8.5.0",
+		"eslint-plugin-import": "^2.26.0",
+		"eslint-plugin-jsx-a11y": "^6.6.0",
+		"eslint-plugin-node": "^11.1.0",
+		"eslint-plugin-prettier": "^4.2.1",
+		"eslint-plugin-react": "^7.30.1",
+		"eslint-plugin-react-hooks": "^4.6.0",
+		"file-loader": "^6.2.0",
+		"fork-ts-checker-webpack-plugin": "^7.2.12",
+		"html-loader": "^3.1.2",
+		"html-webpack-plugin": "^5.5.0",
+		"husky": "^8.0.1",
+		"lint-staged": "^13.0.3",
+		"mini-css-extract-plugin": "^2.6.1",
+		"prettier": "^2.7.1",
+		"sass": "^1.53.0",
+		"sass-loader": "^13.0.2",
+		"style-loader": "^3.3.1",
+		"terser-webpack-plugin": "^5.3.3",
+		"tsc-alias": "^1.6.11",
+		"typescript": "^4.7.4",
+		"webpack": "^5.73.0",
+		"webpack-cli": "^4.10.0",
+		"webpack-dev-server": "^4.9.3",
+		"webpack-merge": "^5.8.0"
+	},
+	"dependencies": {
+		"@emotion/react": "^11.9.3",
+		"@emotion/styled": "^11.9.3",
+		"@fingerprintjs/fingerprintjs": "~3.3.4",
+		"@hookform/resolvers": "^2.9.6",
+		"@mui/icons-material": "^5.8.4",
+		"@mui/material": "^5.8.7",
+		"@reduxjs/toolkit": "^1.8.3",
+		"axios": "^0.27.2",
+		"device-detector-js": "^3.0.3",
+		"i18next": "^21.8.14",
+		"i18next-browser-languagedetector": "^6.1.4",
+		"i18next-http-backend": "^1.4.1",
+		"jsencrypt": "^2.3.1",
+		"lodash-es": "^4.17.21",
+		"lottie-web": "^5.9.6",
+		"moment": "^2.29.4",
+		"react": "^18.2.0",
+		"react-calendar": "~3.7.0",
+		"react-device-detect": "^2.2.2",
+		"react-dom": "^18.2.0",
+		"react-dropzone": "^14.2.2",
+		"react-hook-form": "^7.33.1",
+		"react-i18next": "^11.18.1",
+		"react-multi-date-picker": "^3.3.4",
+		"react-otp-input": "^2.4.0",
+		"react-redux": "^8.0.2",
+		"react-spring-bottom-sheet": "^3.4.1",
+		"yup": "^0.32.11"
+	},
+	"peerDependencies": {
+		"react": "^18.2.0",
+		"react-dom": "^18.2.0"
+	},
+	"lint-staged": {
+		"src/**/*.{ts,tsx,json,js,jsx}": [
+			"yarn run prettier:fix",
+			"yarn run lint",
+			"git add ."
+		]
+	},
+	"browserslist": {
+		"production": [
+			">0.2%",
+			"not dead",
+			"not op_mini all"
+		],
+		"development": [
+			"last 1 chrome version",
+			"last 1 firefox version",
+			"last 1 safari version"
+		]
+	}
+}