@tap-payments/auth-jsconnect 2.3.64-test → 2.3.67-test

package/build/components/SimpleList/SimpleList.d.ts

@@ -4,14 +4,16 @@ import { ListItemProps } from '@mui/material/ListItem';
 import { SxProps, Theme } from '@mui/material/styles';
 export interface SimpleListProps<T> extends ListProps {
     list: Array<T>;
+    selectedItems?: Array<T>;
     listItemProps?: ListItemProps;
     onSelectItem: (item: T) => void;
     renderItem: (item: T, idx: number) => React.ReactElement;
     searchKeyPath?: string;
     searchValuePath?: string[];
+    getSelectedItemCondition?: (a: T, b: T) => boolean;
     sx?: SxProps<Theme>;
 }
-declare function SimpleList<T>({ list, listItemProps, onSelectItem, renderItem, children, searchKeyPath, searchValuePath, ...rest }: SimpleListProps<T>): JSX.Element;
+declare function SimpleList<T>({ list, listItemProps, onSelectItem, renderItem, children, searchKeyPath, searchValuePath, selectedItems, getSelectedItemCondition, ...rest }: SimpleListProps<T>): JSX.Element;
 declare namespace SimpleList {
     var defaultProps: {
         searchKeyPath: string;

package/build/components/SimpleList/SimpleList.js

@@ -20,6 +20,15 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { createElement as _createElement } from "react";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
@@ -69,11 +78,18 @@ var ListItemStyled = styled(ListItem)(function (_a) {
     });
 });
 function SimpleList(_a) {
-    var list = _a.list, listItemProps = _a.listItemProps, onSelectItem = _a.onSelectItem, renderItem = _a.renderItem, children = _a.children, searchKeyPath = _a.searchKeyPath, searchValuePath = _a.searchValuePath, rest = __rest(_a, ["list", "listItemProps", "onSelectItem", "renderItem", "children", "searchKeyPath", "searchValuePath"]);
+    var list = _a.list, listItemProps = _a.listItemProps, onSelectItem = _a.onSelectItem, renderItem = _a.renderItem, children = _a.children, searchKeyPath = _a.searchKeyPath, searchValuePath = _a.searchValuePath, selectedItems = _a.selectedItems, getSelectedItemCondition = _a.getSelectedItemCondition, rest = __rest(_a, ["list", "listItemProps", "onSelectItem", "renderItem", "children", "searchKeyPath", "searchValuePath", "selectedItems", "getSelectedItemCondition"]);
     var _b = React.useState(list), items = _b[0], setItems = _b[1];
     React.useEffect(function () {
         setItems(list);
     }, [list]);
+    var mapSelectedItemBeginning = React.useMemo(function () {
+        if (getSelectedItemCondition && (selectedItems === null || selectedItems === void 0 ? void 0 : selectedItems.length)) {
+            var mapSelectedListFirst = __spreadArray(__spreadArray([], items.filter(function (a) { return selectedItems.some(function (c) { return getSelectedItemCondition(a, c); }); }), true), items.filter(function (a) { return !selectedItems.some(function (c) { return getSelectedItemCondition(a, c); }); }), true);
+            return mapSelectedListFirst;
+        }
+        return items;
+    }, [items, selectedItems]);
     var filterItemsByKey = function (arr, searchKey) {
         return arr.filter(function (item) {
             var searchValue = get(item, searchKeyPath || '') || '';
@@ -104,7 +120,7 @@ function SimpleList(_a) {
         setItems(list);
     };
     return (_jsxs(_Fragment, { children: [(searchValuePath === null || searchValuePath === void 0 ? void 0 : searchValuePath.length) && _jsx(Search, { onSearchValue: onSearch }), _jsx(ListStyled, __assign({}, rest, { children: children ||
-                    items.map(function (item, idx) {
+                    mapSelectedItemBeginning.map(function (item, idx) {
                         return (_createElement(ListItemStyled, __assign({}, listItemProps, { onClick: function () {
                                 onSelectItem(item);
                             }, disableGutters: true, key: idx }), renderItem(item, idx)));

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

@@ -117,7 +117,7 @@ var ActivitiesList = function (_a) {
     var controlValue = activitiesControl.field.value;
     var _g = React.useState(false), isHovered = _g[0], setIsHovered = _g[1];
     var verify = data.verify;
-    var activities = (verify.responseBody || {}).activities;
+    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) === 'commercial_registration';
     var disabled = false;
     var setSelectedActivitiesBeginning = function (list) {
@@ -132,15 +132,15 @@ var ActivitiesList = function (_a) {
         }
     }, [activities]);
     var onOpenList = function (event) {
-        var _a;
+        var _a, _b;
         if (readOnly)
             return;
-        if ((controlValue === null || controlValue === void 0 ? void 0 : controlValue.length) > (activities === null || activities === void 0 ? void 0 : activities.length)) {
+        if ((controlValue === null || controlValue === void 0 ? void 0 : controlValue.length) > ((_a = brand === null || brand === void 0 ? void 0 : brand.activities) === null || _a === void 0 ? void 0 : _a.length)) {
             var list = __spreadArray([], activitiesMenuList, true);
             setSelectedActivitiesBeginning(list);
         }
         setAnchorEl(event.currentTarget);
-        (_a = rest.onListOpen) === null || _a === void 0 ? void 0 : _a.call(rest);
+        (_b = rest.onListOpen) === null || _b === void 0 ? void 0 : _b.call(rest);
     };
     var onCloseList = function () {
         var _a;

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

@@ -103,7 +103,7 @@ var ExpectedCustomers = function (_a) {
     };
     var expectedCustomersValue = expectedCustomerControl.field.value;
     var expectedCustomersSelected = expectedCustomersValue;
-    return (_jsx(Collapse, __assign({ in: props.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_customers_to_serve') }), _jsx(InputStyled, { readOnly: readOnly, placeholder: t('choose_expected_sales'), value: isAr ? (_c = (_b = expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name) === null || _b === void 0 ? void 0 : _b.ar) !== null && _c !== void 0 ? _c : '' : (_e = (_d = expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name) === null || _d === void 0 ? void 0 : _d.en) !== null && _e !== void 0 ? _e : '', onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsxs(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { searchKeyPath: 'name', list: expectedCustomersList, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: props.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_customers_to_serve') }), _jsx(InputStyled, { readOnly: readOnly, placeholder: t('choose_expected_sales'), value: isAr ? (_c = (_b = expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name) === null || _b === void 0 ? void 0 : _b.ar) !== null && _c !== void 0 ? _c : '' : (_e = (_d = expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.name) === null || _d === void 0 ? void 0 : _d.en) !== null && _e !== void 0 ? _e : '', onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsxs(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { searchKeyPath: 'name.en', searchValuePath: ['name.ar', 'name.en'], list: expectedCustomersList, onSelectItem: onSelectItem, renderItem: function (item) {
                                 return (_jsxs(_Fragment, { children: [_jsx(ListItemContainer, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === (expectedCustomersValue === null || expectedCustomersValue === void 0 ? void 0 : expectedCustomersValue.id) }, { children: isAr ? item.name.ar : item.name.en })) }), item.id === (expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.id) && _jsx(CheckIconStyled, {})] }));
                             } })] }))] }) })));
 };

package/build/features/business/screens/Activities/ActivitiesList.js

@@ -118,16 +118,21 @@ var ActivitiesList = function (_a) {
     var activities = (businessTypeData.responseBody || {}).activities;
     var businessType = (_b = businessTypeData.selectedLicense) === null || _b === void 0 ? void 0 : _b.type;
     var isCR = businessType === BusinessType.CR;
+    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);
+    };
     React.useEffect(function () {
         if ((activities === null || activities === void 0 ? void 0 : activities.length) > 0) {
             var list = __spreadArray([], activities, true);
             var sortedList = sortActivitiesByName(list, isAr ? 'name.ar' : 'name.en');
-            setActivitiesMenuList(sortedList);
+            setSelectedActivitiesBeginning(sortedList);
         }
     }, [activities]);
     var onOpenList = function (event) {
         var _a;
         setAnchorEl(event.currentTarget);
+        setSelectedActivitiesBeginning(activitiesMenuList);
         (_a = rest.onListOpen) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
     var onCloseList = function () {

package/build/hooks/useAppConfig.js

@@ -21,14 +21,16 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { useEffect } from 'react';
-import { handleActiveFlowScreens, handleSetAppConfig, handleLanguage, handleOpen, handleIsTapOrigin, fetchAppSettingsSync, handelBoardMaturity } from '../app/settings';
+import { handleActiveFlowScreens, handleSetAppConfig, handleLanguage, handleOpen, handleIsTapOrigin, fetchAppSettingsSync, handelBoardMaturity, settingsSelector } from '../app/settings';
 import { useAppDispatch } from './useAppDispatch';
+import { useAppSelector } from './useAppSelector';
 import { axiosInstance } from '../api';
 import { isTapDomain, removeRequestHeaders } from '../utils';
 import { ENDPOINT_PATHS } from '../constants';
 export var useAppConfig = function (_a) {
     var appInfo = _a.appInfo, navigation = _a.navigation, publicKey = _a.publicKey, disableCountries = _a.disableCountries, disableLocale = _a.disableLocale, disableSettingFetching = _a.disableSettingFetching, maturity = _a.maturity, boardMaturity = _a.boardMaturity, rest = __rest(_a, ["appInfo", "navigation", "publicKey", "disableCountries", "disableLocale", "disableSettingFetching", "maturity", "boardMaturity"]);
     var dispatch = useAppDispatch();
+    var data = useAppSelector(settingsSelector).data;
     var setBaseUrl = function () {
         var isProd = publicKey.includes('pk_live');
         if (isProd) {
@@ -58,7 +60,8 @@ export var useAppConfig = function (_a) {
         setAppConfig();
         if (typeof boardMaturity === 'boolean')
             dispatch(handelBoardMaturity(boardMaturity));
-        dispatch(handleLanguage(rest.language));
+        if (!data.isMaturityExpress)
+            dispatch(handleLanguage(rest.language));
         if (!disableSettingFetching)
             dispatch(fetchAppSettingsSync({ disableCountries: disableCountries, disableLocale: disableLocale, mdn: rest.merchantDomain, maturity: maturity }));
     }, []);

package/package.json

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