@tap-payments/auth-jsconnect 2.4.37-test → 2.4.39-test

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

@@ -121,7 +121,7 @@ export var verifyLeadToken = createAsyncThunk('brandVerifyLeadToken', function (
                     return [4, API.dataService.getTeamSize({ page: 0 })];
                 case 8:
                     teamSizeList = _j.sent();
-                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP')); });
+                    thunkApi.dispatch(handleNextScreenStep('BRAND_INFO_STEP'));
                     _j.label = 9;
                 case 9: return [2, {
                         data: data,

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

@@ -1094,13 +1094,14 @@ export var businessSlice = createSlice({
             }
             state.data.businessTypeData.responseBody = __assign(__assign(__assign(__assign(__assign({}, data), state.data.businessTypeData.responseBody), { activityList: isicActivityList }), accountData), documentData);
             var terms = (brand || {}).terms;
+            var entity_id = (accountData || {}).entity_id;
             terms === null || terms === void 0 ? void 0 : terms.forEach(function (element) {
                 if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
                     state.data.customersData.transactionPolicy = element.agree;
                     state.data.customersData.refundPolicy = element.agree;
                 }
             });
-            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), { entity: entity }), (brand && { brand: brand }));
+            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), { entity: __assign(__assign({}, entity), (entity_id && { id: entity_id })) }), (brand && { brand: brand }));
         })
             .addCase(updateLeadBusinessType.rejected, function (state, action) {
             state.loading = false;

package/build/features/brand/screens/BrandActivities/ActivitiesList.js

@@ -112,7 +112,6 @@ var ActivitiesList = function (_a) {
     var verify = data.verify;
     var _h = verify.responseBody || {}, activities = _h.activities, brand = _h.brand;
     var isCR = ((_d = (_c = (_b = verify.responseBody) === null || _b === void 0 ? void 0 : _b.entity) === null || _c === void 0 ? void 0 : _c.license) === null || _d === void 0 ? void 0 : _d.type) === LicenseType.CR;
-    var disabled = false;
     var setSelectedActivitiesBeginning = function (list) {
         var mapSelectedListFirst = __spreadArray(__spreadArray([], list.filter(function (a) { return (controlValue || []).some(function (c) { return a.id === c.id; }); }), true), list.filter(function (a) { return !(controlValue || []).some(function (c) { return a.id === c.id; }); }), true);
         setActivitiesMenuList(mapSelectedListFirst);
@@ -144,19 +143,31 @@ var ActivitiesList = function (_a) {
         var isActivityExists = controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (activity) { return activity.id === item.id; });
         if (isActivityExists) {
             var updatedIdList = controlValue === null || controlValue === void 0 ? void 0 : controlValue.filter(function (activity) { return activity.id !== (item === null || item === void 0 ? void 0 : item.id); });
+            if (!updatedIdList.length) {
+                activitiesControl.field.onChange([]);
+                return;
+            }
             if (updatedIdList.length >= 1)
                 activitiesControl.field.onChange(updatedIdList);
             return;
         }
         activitiesControl.field.onChange(__spreadArray(__spreadArray([], controlValue, true), [item], false));
     };
+    var getSelectedActivityName = function (item) {
+        var _a, _b, _c;
+        var code = item === null || item === void 0 ? void 0 : item.isic_code;
+        var name = isAr ? ((_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar) || ((_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en) : (_c = item === null || item === void 0 ? void 0 : item.name) === null || _c === void 0 ? void 0 : _c.en;
+        return code ? "".concat(code, " - ").concat(name) : name;
+    };
     var getSelectedActivities = function () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         if ((controlValue === null || controlValue === void 0 ? void 0 : controlValue.length) > 1) {
             return (controlValue === null || controlValue === void 0 ? void 0 : controlValue.length) + ' ' + t('activities_selected');
         }
         var item = controlValue[0];
-        return isAr ? (_b = (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar) !== null && _b !== void 0 ? _b : '' : (_d = (_c = item === null || item === void 0 ? void 0 : item.name) === null || _c === void 0 ? void 0 : _c.en) !== null && _d !== void 0 ? _d : '';
+        var code = item === null || item === void 0 ? void 0 : item.isic_code;
+        var name = isAr ? ((_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar) || ((_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en) : (_c = item === null || item === void 0 ? void 0 : item.name) === null || _c === void 0 ? void 0 : _c.en;
+        return code ? "".concat(code, " - ").concat(name) : name;
     };
     var getSelectedActivityFlag = function (item) {
         return controlValue === null || controlValue === void 0 ? void 0 : controlValue.find(function (activity) { return activity.id === item.id; });
@@ -164,9 +175,9 @@ var ActivitiesList = function (_a) {
     var isActivityVerified = function (item) {
         return hasVerifiedValue(brand === null || brand === void 0 ? void 0 : brand.data_verification, "activities.".concat(item.id));
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(LabelContainerStyled, { children: [_jsxs(InputLabelStyled, { children: [t(isCR ? 'activities' : 'category'), " ", _jsx(MandatoryStyled, { children: "*" })] }), _jsx(Tooltip, __assign({ title: t('activities_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), _jsxs(Box, { children: [_jsx(InputStyled, { readOnly: readOnly, disabled: disabled, value: getSelectedActivities(), placeholder: isCR ? t('choose_activities') : t('category_name'), onClick: disabled ? undefined : !!anchorEl ? onCloseList : onOpenList, endAdornment: disabled ? _jsx(_Fragment, {}) : _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name.en', searchValuePath: ['name.ar', 'name.en'], list: activitiesMenuList, onSelectItem: onSelectItem, renderItem: function (item) {
-                                    var _a, _b, _c;
-                                    return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(NameContainer, __assign({ isSelected: item.id === ((_a = getSelectedActivityFlag(item)) === null || _a === void 0 ? void 0 : _a.id) }, { children: isAr ? (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = item === null || item === void 0 ? void 0 : item.name) === null || _c === void 0 ? void 0 : _c.en })) })), getSelectedActivityFlag(item) && _jsx(CheckIcon, { isVerified: isActivityVerified(item) })] }));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(LabelContainerStyled, { children: [_jsxs(InputLabelStyled, { children: [t(isCR ? 'activities' : 'category'), " ", _jsx(MandatoryStyled, { children: "*" })] }), _jsx(Tooltip, __assign({ title: t('activities_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), _jsxs(Box, { children: [_jsx(InputStyled, { readOnly: readOnly, value: getSelectedActivities() || '', placeholder: isCR ? t('choose_activities') : t('category_name'), onClick: !!anchorEl ? onCloseList : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name.en', searchValuePath: ['name.ar', 'name.en'], list: activitiesMenuList, onSelectItem: onSelectItem, renderItem: function (item) {
+                                    var _a;
+                                    return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(NameContainer, __assign({ isSelected: item.id === ((_a = getSelectedActivityFlag(item)) === null || _a === void 0 ? void 0 : _a.id) }, { children: getSelectedActivityName(item) })) })), getSelectedActivityFlag(item) && _jsx(CheckIcon, { isVerified: isActivityVerified(item) })] }));
                                 } }) }))] })] }) })));
 };
 export default ActivitiesList;

package/build/utils/array.d.ts

@@ -61,7 +61,7 @@ export declare const fixBrandList: (items: Array<{
     channel_services: any[];
 }[];
 export declare const findFirstId: (items: Array<SaleChannel>) => string;
-export declare const sortActivitiesByName: (items: Array<Activity>, path: string) => Activity[];
+export declare const sortActivitiesByName: (items: Array<ActivityParams>, path: string) => ActivityParams[];
 export declare const getFileDetailsFromDocument: (documents: Array<any>, purpose: string) => any;
 export declare const getRecentDocumentBasedOnPurpose: (documents: Array<any>, purpose: string) => any;
 export declare const findInArrayOrSubArray: (items: Array<any>, value: string | number) => null;

package/package.json

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