@commercetools-frontend/experimental-components 5.4.3 → 5.4.5

package/dist/commercetools-frontend-experimental-components.esm.js

@@ -26,14 +26,12 @@ import { formatLocalizedString, transformLocalizedFieldToLocalizedString, applyT
 import _slicedToArray from '@babel/runtime-corejs3/helpers/esm/slicedToArray';
 import _reduceInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/reduce';
 import camelCase from 'lodash/camelCase';
-import _concatInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/concat';
 import _sliceInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/slice';
 import _sortInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/sort';
 import _indexOfInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/index-of';
 import { deepEqual } from 'fast-equals';
 import { defineMessages, useIntl, injectIntl, FormattedMessage } from 'react-intl';
 import omitEmpty from 'omit-empty-es';
-import _taggedTemplateLiteral from '@babel/runtime-corejs3/helpers/esm/taggedTemplateLiteral';
 import oneLine from 'common-tags/lib/oneLine';
 import moment from 'moment-timezone';
 import isNil$1 from 'lodash/isNil';
@@ -68,15 +66,14 @@ import has from 'lodash/has';
 import _toArray from '@babel/runtime-corejs3/helpers/esm/toArray';
 import _reverseInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/reverse';
 import { useAsyncDispatch, actions } from '@commercetools-frontend/sdk';
-import { useApolloClient as useApolloClient$1, useQuery as useQuery$2 } from '@apollo/client';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/esm/objectWithoutProperties';
+import { useApolloClient as useApolloClient$1, useQuery as useQuery$2 } from '@apollo/client';
 import _Object$entries from '@babel/runtime-corejs3/core-js-stable/object/entries';
 import _parseFloat from '@babel/runtime-corejs3/core-js-stable/parse-float';
 import omit from 'lodash/omit';
 import isEmpty$3 from 'lodash/isEmpty';
 import _Object$freeze from '@babel/runtime-corejs3/core-js-stable/object/freeze';
 import originalOmitDeep from 'omit-deep';
-import _findIndexInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/find-index';
 import _Object$values from '@babel/runtime-corejs3/core-js-stable/object/values';
 import _parseInt from '@babel/runtime-corejs3/core-js-stable/parse-int';
 import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array';
@@ -104,12 +101,14 @@ import flatMap from 'lodash/flatMap';
 import { connect } from 'react-redux';
 import { oneLineTrim } from 'common-tags';
 import warning from 'tiny-warning';
+import _concatInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/concat';
 import _Math$trunc from '@babel/runtime-corejs3/core-js-stable/math/trunc';
 import _Number$isNaN from '@babel/runtime-corejs3/core-js-stable/number/is-nan';
 import isUndefined from 'lodash/isUndefined';
 import isFinite from 'lodash/isFinite';
 import Cleave from 'cleave.js/react';
 import _Object$assign from '@babel/runtime-corejs3/core-js-stable/object/assign';
+import _findIndexInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/find-index';
 import compact from 'lodash/compact';
 import _Set from '@babel/runtime-corejs3/core-js-stable/set';
 import '@babel/runtime-corejs3/helpers/get';
@@ -208,7 +207,7 @@ function filterDataAttributes(obj) {
 *                         duplicated in original values
 */
 function unique(values, properties) {
-  var _context2;
+  var _context;
   let ignoredValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ['', null, undefined];
   const duplicateValues = [];
   let realValues;
@@ -217,20 +216,19 @@ function unique(values, properties) {
   realValues = _filterInstanceProperty(values).call(values, value => !_includesInstanceProperty(ignoredValues).call(ignoredValues, value));
   if (!realValues.length) return [];
   if (properties) realValues = _mapInstanceProperty(realValues).call(realValues, value => _reduceInstanceProperty(properties).call(properties, (prev, curr) => {
-    var _context;
     const currentValue = value[curr] || '';
-    return _concatInstanceProperty(_context = "".concat(prev, ":")).call(_context, currentValue);
+    return `${prev}:${currentValue}`;
   }, ''));else realValues = _sliceInstanceProperty(values).call(values, 0);
 
   // TODO: checking for dupes like this is slow, find a better way
-  _reduceInstanceProperty(_context2 = _sortInstanceProperty(realValues).call(realValues)).call(_context2, (prev, curr) => {
+  _reduceInstanceProperty(_context = _sortInstanceProperty(realValues).call(realValues)).call(_context, (prev, curr) => {
     if (curr === null) return curr;
     if (curr !== '' && prev === curr && _indexOfInstanceProperty(duplicateValues).call(duplicateValues, curr) === -1) duplicateValues.push(curr);
     return curr;
   });
   if (properties) return _mapInstanceProperty(duplicateValues).call(duplicateValues, value => {
-    var _context3;
-    const parts = _sliceInstanceProperty(_context3 = value.split(':')).call(_context3, 1);
+    var _context2;
+    const parts = _sliceInstanceProperty(_context2 = value.split(':')).call(_context2, 1);
     return _reduceInstanceProperty(properties).call(properties, (prev, curr, index) => {
       // eslint-disable-next-line no-param-reassign
       prev[curr] = parts[index];
@@ -249,14 +247,14 @@ function unique(values, properties) {
  * @return Array<Object> returns an array of objects with all duplicated values
  */
 function uniqueObjects(items) {
-  var _context4;
+  var _context3;
   const emptyValues = [undefined, null, ''];
-  const itemsWorkingSet = items && items.length ? _filterInstanceProperty(_context4 = _sliceInstanceProperty(items).call(items)).call(_context4, x => !_includesInstanceProperty(emptyValues).call(emptyValues, x)) : [];
+  const itemsWorkingSet = items && items.length ? _filterInstanceProperty(_context3 = _sliceInstanceProperty(items).call(items)).call(_context3, x => !_includesInstanceProperty(emptyValues).call(emptyValues, x)) : [];
   const duplicateValues = _reduceInstanceProperty(itemsWorkingSet).call(itemsWorkingSet, (acc, item, index) => {
-    var _context5;
+    var _context4;
     if (item === null) return acc;
-    const isDuplicate = _reduceInstanceProperty(_context5 = _sliceInstanceProperty(itemsWorkingSet).call(itemsWorkingSet, index + 1) // get sub-array after this index
-    ).call(_context5, (duplicateAcc, comparisonItem, comparisonIndex) => {
+    const isDuplicate = _reduceInstanceProperty(_context4 = _sliceInstanceProperty(itemsWorkingSet).call(itemsWorkingSet, index + 1) // get sub-array after this index
+    ).call(_context4, (duplicateAcc, comparisonItem, comparisonIndex) => {
       if (comparisonItem === null) return duplicateAcc;
 
       // check if its a dupe
@@ -347,16 +345,18 @@ function getIndexesOfInvalidValues(values) {
 
 const withoutEmptyErrorsByField = errorsByField => omitEmpty(errorsByField);
 
-var _templateObject$4;
 function formatDateRangeValue(value, type) {
   let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
     locale: 'en',
     timeZone: moment.tz.guess()
   };
   if (value.from === value.to) return formatDateTime$1(type, value.from, options);
-  if (value.from && value.to) return oneLine(_templateObject$4 || (_templateObject$4 = _taggedTemplateLiteral(["\n      ", " -\n      ", "\n    "])), formatDateTime$1(type, value.from, options), formatDateTime$1(type, value.to, options));
-  if (value.from) return "from ".concat(formatDateTime$1(type, value.from, options));
-  if (value.to) return "to ".concat(formatDateTime$1(type, value.to, options));
+  if (value.from && value.to) return oneLine`
+      ${formatDateTime$1(type, value.from, options)} -
+      ${formatDateTime$1(type, value.to, options)}
+    `;
+  if (value.from) return `from ${formatDateTime$1(type, value.from, options)}`;
+  if (value.to) return `to ${formatDateTime$1(type, value.to, options)}`;
   return '';
 }
 function formatDateTime$1(type, value) {
@@ -1592,13 +1592,13 @@ const getData = (code, field) => {
 const getFractionDigit = code => getData(code, 'fractionDigit');
 
 function ownKeys$1p(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1p(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys$1p(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys$1p(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread$1p(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys$1p(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys$1p(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function formatMoneyRangeValue(value, intl) {
-  var _context;
   if (value.from === value.to) return formatMoneyValue(value.from, value.currency, intl);
-  if (value.from && value.to) return _concatInstanceProperty(_context = "".concat(formatMoneyValue(value.from, value.currency, intl), " -\n      ")).call(_context, formatMoneyValue(value.to, value.currency, intl));
-  if (value.from) return "from ".concat(formatMoneyValue(value.from, value.currency, intl));
-  if (value.to) return "to ".concat(formatMoneyValue(value.to, value.currency, intl));
+  if (value.from && value.to) return `${formatMoneyValue(value.from, value.currency, intl)} -
+      ${formatMoneyValue(value.to, value.currency, intl)}`;
+  if (value.from) return `from ${formatMoneyValue(value.from, value.currency, intl)}`;
+  if (value.to) return `to ${formatMoneyValue(value.to, value.currency, intl)}`;
   return '';
 }
 function formatMoneyValue(amount, currency, intl) {
@@ -1618,8 +1618,7 @@ function getFractionedAmount(moneyValue) {
   return amount / 10 ** fractionDigits;
 }
 function formatMoney$2(moneyValue, intl, options) {
-  var _moneyValue$fractione;
-  return intl.formatNumber((_moneyValue$fractione = moneyValue.fractionedAmount) !== null && _moneyValue$fractione !== void 0 ? _moneyValue$fractione : getFractionedAmount(moneyValue), _objectSpread$1p({
+  return intl.formatNumber(moneyValue.fractionedAmount ?? getFractionedAmount(moneyValue), _objectSpread$1p({
     style: 'currency',
     currency: moneyValue.currencyCode,
     minimumFractionDigits: moneyValue.fractionDigits
@@ -1640,13 +1639,11 @@ var messages$J = defineMessages({
 });
 
 const formatEnum = _ref => {
-  var _context;
   let value = _ref.value,
     fallbackValue = _ref.fallbackValue;
-  return value.label || _concatInstanceProperty(_context = "".concat(fallbackValue, " (")).call(_context, value.key, ")");
+  return value.label || `${fallbackValue} (${value.key})`;
 };
 const formatLenum = _ref2 => {
-  var _context2;
   let value = _ref2.value,
     language = _ref2.language,
     languages = _ref2.languages,
@@ -1654,7 +1651,7 @@ const formatLenum = _ref2 => {
   return formatLocalizedString(value, {
     key: 'label',
     locale: language,
-    fallback: _concatInstanceProperty(_context2 = "".concat(fallbackValue, " (")).call(_context2, value.key, ")"),
+    fallback: `${fallbackValue} (${value.key})`,
     fallbackOrder: languages
   });
 };
@@ -1690,7 +1687,6 @@ const formatDate = _ref6 => {
   });
 };
 const formatDateTime = _ref7 => {
-  var _context3;
   let value = _ref7.value,
     userTimeZone = _ref7.userTimeZone,
     intl = _ref7.intl;
@@ -1706,7 +1702,7 @@ const formatDateTime = _ref7 => {
     // defaults to utc if timeZone is not provided
     timeZone: userTimeZone || 'utc'
   });
-  return _concatInstanceProperty(_context3 = "".concat(date, " (")).call(_context3, time, ")");
+  return `${date} (${time})`;
 };
 const formatBoolean = _ref8 => {
   let value = _ref8.value,
@@ -1729,7 +1725,7 @@ const formatUnknown = _ref10 => {
     fallbackValue = _ref10.fallbackValue;
   // NOTE This is reporting within the render function, which is supposed to
   // be pure. This is quite bad as this is a side-effect in the render fn.
-  reportErrorToSentry(new Error("Unhandled custom attribute type '".concat(type.name, "' for value")), {
+  reportErrorToSentry(new Error(`Unhandled custom attribute type '${type.name}' for value`), {
     extra: {
       value
     }
@@ -1802,10 +1798,9 @@ const attributeTypeNames = {
   Number: 'number'
 };
 const convertToAttributeType = customFieldType => {
-  var _customFieldType$elem;
   if (isNil$1(customFieldType)) return customFieldType;
   const attributeTypeName = attributeTypeNames[customFieldType.name];
-  const elementTypeName = attributeTypeNames[(_customFieldType$elem = customFieldType.elementType) === null || _customFieldType$elem === void 0 ? void 0 : _customFieldType$elem.name];
+  const elementTypeName = attributeTypeNames[customFieldType.elementType?.name];
   return {
     name: attributeTypeName,
     elementType: {
@@ -1868,25 +1863,21 @@ const setDisplayName = nextDisplayName => Component => {
   return Component;
 };
 
-const wrapDisplayName = (BaseComponent, hocName) => {
-  var _context;
-  return _concatInstanceProperty(_context = "".concat(hocName, "(")).call(_context, getDisplayName(BaseComponent), ")");
-};
+const wrapDisplayName = (BaseComponent, hocName) => `${hocName}(${getDisplayName(BaseComponent)})`;
 
 function ownKeys$1o(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1o(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys$1o(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys$1o(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 const injectDataTablePaginationState = initialValues => Component => {
   const WithDataTablePaginationState = props => {
-    var _initialValues$tableS, _initialValues$tableS2;
     const _usePaginationState = usePaginationState({
-        page: initialValues === null || initialValues === void 0 ? void 0 : initialValues.page,
-        perPage: initialValues === null || initialValues === void 0 ? void 0 : initialValues.perPage
+        page: initialValues?.page,
+        perPage: initialValues?.perPage
       }),
       page = _usePaginationState.page,
       perPage = _usePaginationState.perPage;
     const tableSorting = useDataTableSortingState({
-      key: initialValues === null || initialValues === void 0 || (_initialValues$tableS = initialValues.tableSorting) === null || _initialValues$tableS === void 0 ? void 0 : _initialValues$tableS.key,
-      order: initialValues === null || initialValues === void 0 || (_initialValues$tableS2 = initialValues.tableSorting) === null || _initialValues$tableS2 === void 0 ? void 0 : _initialValues$tableS2.order
+      key: initialValues?.tableSorting?.key,
+      order: initialValues?.tableSorting?.order
     });
     return jsx(Component, _objectSpread$1o(_objectSpread$1o({}, props), {}, {
       dataTablePaginationState: {
@@ -1920,7 +1911,7 @@ const injectNotifications = function () {
         [propName]: notifications
       }));
     };
-    WrappedComponent.displayName = "withNotifications(".concat(getDisplayName(Component));
+    WrappedComponent.displayName = `withNotifications(${getDisplayName(Component)}`;
     return WrappedComponent;
   };
 };
@@ -2029,10 +2020,7 @@ const isNil = value => typeof value === 'undefined' || value === null;
 const useStorage = (storageKey, initialStorageValue, options) => {
   var _context;
   const mergedOptions = _objectSpread$1i(_objectSpread$1i({}, defaultOptions$2), options);
-  const userId = useApplicationContext(context => {
-    var _context$user;
-    return (_context$user = context.user) === null || _context$user === void 0 ? void 0 : _context$user.id;
-  });
+  const userId = useApplicationContext(context => context.user?.id);
   const scopedStorageKey = _filterInstanceProperty(_context = [mergedOptions.segregateByUser && userId, storageKey]).call(_context, Boolean).join('/');
   const readFromStorage = useCallback(() => {
     const rawStorageValue = getStorage(mergedOptions.storageType).getItem(scopedStorageKey);
@@ -2051,9 +2039,8 @@ const useStorage = (storageKey, initialStorageValue, options) => {
     return parsedStorageValue;
   }, [mergedOptions.storageType, scopedStorageKey]);
   const initializeStorageValue = () => {
-    var _ref, _readFromStorage;
     // default the storage value to the initial provided value when provided
-    return (_ref = (_readFromStorage = readFromStorage()) !== null && _readFromStorage !== void 0 ? _readFromStorage : initialStorageValue) !== null && _ref !== void 0 ? _ref : null;
+    return readFromStorage() ?? initialStorageValue ?? null;
   };
   const _useState = useState(initializeStorageValue),
     _useState2 = _slicedToArray(_useState, 2),
@@ -2152,16 +2139,14 @@ function ownKeys$1g(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertyS
 function _objectSpread$1g(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys$1g(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys$1g(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var FetchStoresQuery = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "FetchStoresQuery" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "limit" } }, type: { kind: "NamedType", name: { kind: "Name", value: "Int" } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "offset" } }, type: { kind: "NamedType", name: { kind: "Name", value: "Int" } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "sort" } }, type: { kind: "ListType", type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "where" } }, type: { kind: "NamedType", name: { kind: "Name", value: "String" } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "excludeExtendedStoresList" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "excludeProductSelections" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "stores" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "limit" }, value: { kind: "Variable", name: { kind: "Name", value: "limit" } } }, { kind: "Argument", name: { kind: "Name", value: "offset" }, value: { kind: "Variable", name: { kind: "Name", value: "offset" } } }, { kind: "Argument", name: { kind: "Name", value: "sort" }, value: { kind: "Variable", name: { kind: "Name", value: "sort" } } }, { kind: "Argument", name: { kind: "Name", value: "where" }, value: { kind: "Variable", name: { kind: "Name", value: "where" } } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "count" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "offset" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "results" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "FragmentSpread", name: { kind: "Name", value: "StoreBasicInfo" }, directives: [] }, { kind: "Field", name: { kind: "Name", value: "countries" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "code" }, arguments: [], directives: [] }] } }, { kind: "Field", name: { kind: "Name", value: "languages" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "skip" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "excludeExtendedStoresList" } } }] }] }, { kind: "Field", name: { kind: "Name", value: "distributionChannelsRef" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }] } }, { kind: "Field", name: { kind: "Name", value: "distributionChannels" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "skip" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "excludeExtendedStoresList" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }, { kind: "Field", name: { kind: "Name", value: "supplyChannels" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "skip" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "excludeExtendedStoresList" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }, { kind: "Field", name: { kind: "Name", value: "productSelections" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "skip" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "excludeProductSelections" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "active" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "productSelection" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "mode" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }] } }] } }] } }] } }, { kind: "FragmentDefinition", name: { kind: "Name", value: "StoreBasicInfo" }, typeCondition: { kind: "NamedType", name: { kind: "Name", value: "Store" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "version" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }, { kind: "Field", name: { kind: "Name", value: "createdAt" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "lastModifiedAt" }, arguments: [], directives: [] }] } }], loc: { start: 0, end: 1089, source: { body: "#import '../../utils/graphql/fragments/store-basic-info.ctp.graphql'\n\nquery FetchStoresQuery(\n  $limit: Int\n  $offset: Int\n  $sort: [String!]\n  $where: String\n  $excludeExtendedStoresList: Boolean!\n  $excludeProductSelections: Boolean!\n) {\n  stores(limit: $limit, offset: $offset, sort: $sort, where: $where) {\n    total\n    count\n    offset\n    results {\n      ...StoreBasicInfo\n      countries {\n        code\n      }\n      languages @skip(if: $excludeExtendedStoresList)\n      distributionChannelsRef {\n        id\n      }\n      distributionChannels @skip(if: $excludeExtendedStoresList) {\n        id\n        key\n        nameAllLocales {\n          locale\n          value\n        }\n      }\n      supplyChannels @skip(if: $excludeExtendedStoresList) {\n        id\n        key\n        nameAllLocales {\n          locale\n          value\n        }\n      }\n      productSelections @skip(if: $excludeProductSelections) {\n        active\n        productSelection {\n          id\n          mode\n          nameAllLocales {\n            locale\n            value\n          }\n        }\n      }\n    }\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 const filterStoresOutdatedDanglingProductSelections = storesQueryResult => {
-  var _storesQueryResult$re;
   if (!storesQueryResult) return null;
   return {
     total: storesQueryResult.total,
     count: storesQueryResult.count,
     offset: storesQueryResult.offset,
-    results: (_storesQueryResult$re = storesQueryResult.results) === null || _storesQueryResult$re === void 0 ? void 0 : _mapInstanceProperty(_storesQueryResult$re).call(_storesQueryResult$re, store => {
-      var _store$productSelecti;
+    results: storesQueryResult.results?.map(store => {
       return _objectSpread$1g(_objectSpread$1g({}, store), {}, {
-        productSelections: (_store$productSelecti = store.productSelections) === null || _store$productSelecti === void 0 ? void 0 : _filterInstanceProperty(_store$productSelecti).call(_store$productSelecti, productSelectionRef => Boolean(productSelectionRef.productSelection))
+        productSelections: store.productSelections?.filter(productSelectionRef => Boolean(productSelectionRef.productSelection))
       });
     })
   };
@@ -2173,7 +2158,7 @@ const createQueryVariables$6 = ownProps => {
     offset: ownProps.offset,
     sort: _sortInstanceProperty(ownProps)
   }, Boolean(ownProps.stores) && {
-    where: "key in (".concat(_mapInstanceProperty(_context = ownProps.stores).call(_context, store => "\"".concat(store, "\"")).join(', '), ")")
+    where: `key in (${_mapInstanceProperty(_context = ownProps.stores).call(_context, store => `"${store}"`).join(', ')})`
   }), {}, {
     excludeExtendedStoresList: ownProps.excludeExtendedStoresList,
     excludeProductSelections: ownProps.excludeProductSelections
@@ -2198,10 +2183,7 @@ const useStoresListFetcher = props => {
         projectKey: props.projectKey
       },
       fetchPolicy: 'network-only',
-      onError: graphqlErrorResponse => {
-        var _props$onError;
-        return (_props$onError = props.onError) === null || _props$onError === void 0 ? void 0 : _props$onError.call(props, graphqlErrorResponse);
-      }
+      onError: graphqlErrorResponse => props.onError?.(graphqlErrorResponse)
     }),
     data = _useQuery.data,
     refetch = _useQuery.refetch,
@@ -2209,7 +2191,7 @@ const useStoresListFetcher = props => {
   return {
     isLoading: loading,
     refetch,
-    stores: filterStoresOutdatedDanglingProductSelections(data === null || data === void 0 ? void 0 : data.stores),
+    stores: filterStoresOutdatedDanglingProductSelections(data?.stores),
     refetchQuery: {
       query: FetchStoresQuery,
       variables: queryVariables,
@@ -2273,16 +2255,10 @@ const handlers$5 = {
   }
 };
 
-const toPermission = (permission, resourceName) => {
-  var _context;
-  return camelCase(_concatInstanceProperty(_context = "can ".concat(permission, " ")).call(_context, resourceName));
-};
-const createComposePath = resourceName => permission => {
-  var _context2;
-  return (// e.g applicationContext.dataFences?.store?.orders?.canViewOrders?.values
-    _concatInstanceProperty(_context2 = "dataFences.store.".concat(resourceName, ".")).call(_context2, permission, ".values")
-  );
-};
+const toPermission = (permission, resourceName) => camelCase(`can ${permission} ${resourceName}`);
+const createComposePath = resourceName => permission =>
+// e.g applicationContext.dataFences?.store?.orders?.canViewOrders?.values
+`dataFences.store.${resourceName}.${permission}.values`;
 const useStoreKeysInDataFences = _ref => {
   let resourceName = _ref.resourceName,
     _ref$permission = _ref.permission,
@@ -2680,7 +2656,7 @@ const usePersistedTableConfiguration = props => {
    * Therefore, if it will be missing from the local storage and hence we use the [] as default.
    */
   const getVisibleColumns = useCallback(() => {
-    if (cachedVisibleTableConfiguration !== null && cachedVisibleTableConfiguration !== void 0 && cachedVisibleTableConfiguration.columnsConfig) {
+    if (cachedVisibleTableConfiguration?.columnsConfig) {
       return retrieveColumnsWithCachedConfiguration({
         allAvailableColumnsConfiguration,
         cachedVisibleTableConfiguration: cachedVisibleTableConfiguration.columnsConfig,
@@ -2694,8 +2670,8 @@ const usePersistedTableConfiguration = props => {
   return {
     visibleColumns,
     visibleColumnKeys,
-    cachedVisibleColumnsConfiguration: cachedVisibleTableConfiguration === null || cachedVisibleTableConfiguration === void 0 ? void 0 : cachedVisibleTableConfiguration.columnsConfig,
-    cachedDisplaySettings: cachedVisibleTableConfiguration === null || cachedVisibleTableConfiguration === void 0 ? void 0 : cachedVisibleTableConfiguration.displaySettings,
+    cachedVisibleColumnsConfiguration: cachedVisibleTableConfiguration?.columnsConfig,
+    cachedDisplaySettings: cachedVisibleTableConfiguration?.displaySettings,
     handleCachedTableConfigurationUpdate: update => handleCacheUpdate({
       update,
       cachedVisibleTableConfiguration,
@@ -2706,7 +2682,6 @@ const usePersistedTableConfiguration = props => {
 
 var FetchProductSelectionsTotal = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "FetchProductSelectionsTotal" }, variableDefinitions: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "productSelections" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [] }] } }] } }], loc: { start: 0, end: 74, source: { body: "query FetchProductSelectionsTotal {\n  productSelections {\n    total\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 const useProductSelectionsTotalFetcher = props => {
-  var _data$productSelectio;
   const _useQuery = useQuery$1(FetchProductSelectionsTotal, {
       context: {
         target: GRAPHQL_TARGETS.COMMERCETOOLS_PLATFORM
@@ -2716,7 +2691,7 @@ const useProductSelectionsTotalFetcher = props => {
     data = _useQuery.data;
   return {
     isLoading: loading,
-    total: data === null || data === void 0 || (_data$productSelectio = data.productSelections) === null || _data$productSelectio === void 0 ? void 0 : _data$productSelectio.total
+    total: data?.productSelections?.total
   };
 };
 
@@ -2737,7 +2712,7 @@ function _objectSpread$1c(e) { for (var r = 1; r < arguments.length; r++) { var
 // eslint-disable-next-line import/prefer-default-export
 const convertProductSelectionsFromGraphQl = productSelections => {
   var _context;
-  return (productSelections === null || productSelections === void 0 ? void 0 : productSelections.results) && _objectSpread$1c(_objectSpread$1c({}, productSelections), {}, {
+  return productSelections?.results && _objectSpread$1c(_objectSpread$1c({}, productSelections), {}, {
     results: _mapInstanceProperty(_context = productSelections.results).call(_context, productSelection => _objectSpread$1c({}, applyTransformedLocalizedFields(productSelection, [{
       from: 'nameAllLocales',
       to: 'name'
@@ -2771,7 +2746,7 @@ const useProductSelectionsFetcher = props => {
     refetch = _useQuery.refetch;
   return {
     isLoading: loading,
-    productSelections: convertProductSelectionsFromGraphQl(data === null || data === void 0 ? void 0 : data.productSelections) || emptyProductSelections,
+    productSelections: convertProductSelectionsFromGraphQl(data?.productSelections) || emptyProductSelections,
     refetch
   };
 };
@@ -2796,7 +2771,6 @@ function validateSingleFilter(_ref) {
   return _includesInstanceProperty(invalidValues).call(invalidValues, value);
 }
 
-var _templateObject$3, _templateObject2$2;
 const dateFormatDayStart$1 = 'YYYY-MM-DDT00:00:00.000';
 const dateFormatDayEnd$1 = 'YYYY-MM-DDT23:59:59.999';
 const getDateTimeInUTC = (date, timezone, format) => {
@@ -2806,8 +2780,7 @@ const getDateTimeInUTC = (date, timezone, format) => {
   const noTimeSpecified = momentDate.hours() === 0 && momentDate.minutes() === 0 && momentDate.seconds() === 0;
   // if it's a date then convert it to UTC datetime based on timezone
   if (noTimeSpecified) {
-    var _moment$tz;
-    const offset = ((_moment$tz = moment$1(date).tz(timezone)) === null || _moment$tz === void 0 ? void 0 : _moment$tz.utcOffset()) || 0;
+    const offset = moment$1(date).tz(timezone)?.utcOffset() || 0;
     const formattedDate = momentDate.format(format);
     const formattedDateWithOffset = moment$1(formattedDate).add(offset, 'minutes').format(dateFormat);
     // console.log(formattedDateWithOffset);
@@ -2820,7 +2793,6 @@ const getDateTimeInUTC = (date, timezone, format) => {
 function dateTransformer$1(filterKey, filters) {
   let filterValidator = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : defaultFilterValidator$1;
   const queries = _mapInstanceProperty(filters).call(filters, _ref => {
-    var _context, _context2;
     let type = _ref.type,
       value = _ref.value,
       timezone = _ref.timezone;
@@ -2830,13 +2802,19 @@ function dateTransformer$1(filterKey, filters) {
     })) return '';
     switch (type) {
       case FILTER_TYPES.lessThan:
-        return _concatInstanceProperty(_context = "".concat(filterKey, " < \"")).call(_context, getDateTimeInUTC(value, timezone, dateFormatDayStart$1), "\"");
+        return `${filterKey} < "${getDateTimeInUTC(value, timezone, dateFormatDayStart$1)}"`;
       case FILTER_TYPES.moreThan:
-        return _concatInstanceProperty(_context2 = "".concat(filterKey, " > \"")).call(_context2, getDateTimeInUTC(value, timezone, dateFormatDayEnd$1), "\"");
+        return `${filterKey} > "${getDateTimeInUTC(value, timezone, dateFormatDayEnd$1)}"`;
       case FILTER_TYPES.equalTo:
-        return oneLine(_templateObject$3 || (_templateObject$3 = _taggedTemplateLiteral(["\n            (", " >= \"", "\"\n            and ", " <= \"", "\")\n          "])), filterKey, getDateTimeInUTC(value, timezone, dateFormatDayStart$1), filterKey, getDateTimeInUTC(value, timezone, dateFormatDayEnd$1));
+        return oneLine`
+            (${filterKey} >= "${getDateTimeInUTC(value, timezone, dateFormatDayStart$1)}"
+            and ${filterKey} <= "${getDateTimeInUTC(value, timezone, dateFormatDayEnd$1)}")
+          `;
       case FILTER_TYPES.range:
-        return oneLine(_templateObject2$2 || (_templateObject2$2 = _taggedTemplateLiteral(["\n            (", " >= \"", "\"\n            and ", " <= \"", "\")\n          "])), filterKey, getDateTimeInUTC(value.from, timezone, dateFormatDayStart$1), filterKey, getDateTimeInUTC(value.to, timezone, dateFormatDayEnd$1));
+        return oneLine`
+            (${filterKey} >= "${getDateTimeInUTC(value.from, timezone, dateFormatDayStart$1)}"
+            and ${filterKey} <= "${getDateTimeInUTC(value.to, timezone, dateFormatDayEnd$1)}")
+          `;
       default:
         return '';
     }
@@ -2852,7 +2830,7 @@ function dateTransformer$1(filterKey, filters) {
    *  (createdAt >= "2018-02-15T00:00:00.000+01:00" and createdAt <= "2018-02-15T23:59:59.999+01:00")
    * ) or some_more_filters
    */
-  return queryString === '' ? null : "(".concat(queryString, ")");
+  return queryString === '' ? null : `(${queryString})`;
 }
 function defaultFilterValidator$1(_ref2) {
   let type = _ref2.type,
@@ -2868,10 +2846,7 @@ function defaultFilterValidator$1(_ref2) {
 
 var localizedTextTransformer = (localizedString => {
   var _context;
-  return _mapInstanceProperty(_context = _Object$keys(localizedString)).call(_context, locale => {
-    var _context2;
-    return _concatInstanceProperty(_context2 = "".concat(locale, " = \"")).call(_context2, localizedString[locale], "\"");
-  }).join(' and ');
+  return _mapInstanceProperty(_context = _Object$keys(localizedString)).call(_context, locale => `${locale} = "${localizedString[locale]}"`).join(' and ');
 });
 
 var styles$i = {
@@ -2920,7 +2895,6 @@ var GetChannelsQuery = { kind: "Document", definitions: [{ kind: "OperationDefin
 var GetChannelQuery = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "GetChannelQuery" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "id" } }, type: { kind: "NamedType", name: { kind: "Name", value: "String" } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "channel" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "id" }, value: { kind: "Variable", name: { kind: "Name", value: "id" } } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "FragmentSpread", name: { kind: "Name", value: "PickerInputChannel" }, directives: [] }] } }] } }, { kind: "FragmentDefinition", name: { kind: "Name", value: "PickerInputChannel" }, typeCondition: { kind: "NamedType", name: { kind: "Name", value: "Channel" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }], loc: { start: 0, end: 392, source: { body: "fragment PickerInputChannel on Channel {\n  id\n  key\n  nameAllLocales {\n    locale\n    value\n  }\n}\n\nquery GetChannelsQuery($where: String, $sortByNamePath: String!) {\n  channels(where: $where, sort: [$sortByNamePath, \"key\"], limit: 60) {\n    total\n    results {\n      ...PickerInputChannel\n    }\n  }\n}\n\nquery GetChannelQuery($id: String) {\n  channel(id: $id) {\n    ...PickerInputChannel\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 var PickerInputChannel = { kind: "Document", definitions: [{ kind: "FragmentDefinition", name: { kind: "Name", value: "PickerInputChannel" }, typeCondition: { kind: "NamedType", name: { kind: "Name", value: "Channel" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }], loc: { start: 0, end: 392, source: { body: "fragment PickerInputChannel on Channel {\n  id\n  key\n  nameAllLocales {\n    locale\n    value\n  }\n}\n\nquery GetChannelsQuery($where: String, $sortByNamePath: String!) {\n  channels(where: $where, sort: [$sortByNamePath, \"key\"], limit: 60) {\n    total\n    results {\n      ...PickerInputChannel\n    }\n  }\n}\n\nquery GetChannelQuery($id: String) {\n  channel(id: $id) {\n    ...PickerInputChannel\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 const ChannelPickerInput = _ref => {
-  var _currentOption$data$l, _currentOption$data;
   let isClearable = _ref.isClearable,
     isDisabled = _ref.isDisabled,
     isReadOnly = _ref.isReadOnly,
@@ -2937,9 +2911,9 @@ const ChannelPickerInput = _ref => {
     formatMessage = _useIntl.formatMessage;
   const dataLocale = useApplicationContext(applicationContext => applicationContext.dataLocale);
   const variables = useMemo(() => _objectSpread$1b({
-    sortByNamePath: "name.".concat(dataLocale)
+    sortByNamePath: `name.${dataLocale}`
   }, role && {
-    where: "roles contains any (\"".concat(role, "\")")
+    extraWhere: `roles contains any ("${role}")`
   }), [dataLocale, role]);
   const _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -2957,7 +2931,7 @@ const ChannelPickerInput = _ref => {
     }
     return channel;
   }, [formatLocalizedFieldToString]);
-  const prefixSearchFields = useMemo(() => ["name.".concat(dataLocale), 'key'], [dataLocale]);
+  const prefixSearchFields = useMemo(() => [`name.${dataLocale}`, 'key'], [dataLocale]);
   const loadOptions = useLoadOptions({
     query: GetChannelsQuery,
     variables,
@@ -2992,13 +2966,13 @@ const ChannelPickerInput = _ref => {
     setLoadingError(null);
     handleInternalInputChange(event);
   }, [handleInternalInputChange]);
-  const isCurrentOptionLoadingFailed = Boolean(currentOption === null || currentOption === void 0 ? void 0 : currentOption.error);
+  const isCurrentOptionLoadingFailed = Boolean(currentOption?.error);
   useEffect(() => {
     if (isCurrentOptionLoadingFailed) onError(currentOption.error);
   }, [isCurrentOptionLoadingFailed, onError, currentOption]);
   const isLoadingFailed = isCurrentOptionLoadingFailed || Boolean(loadingError);
   const handleNoOptions = useCallback(() => loadingError ? null : formatMessage(messages$G.noChannelsFound), [loadingError, formatMessage]);
-  const tooltipTitle = (_currentOption$data$l = currentOption === null || currentOption === void 0 || (_currentOption$data = currentOption.data) === null || _currentOption$data === void 0 ? void 0 : _currentOption$data.label) !== null && _currentOption$data$l !== void 0 ? _currentOption$data$l : '';
+  const tooltipTitle = currentOption?.data?.label ?? '';
   return jsx(Constraints.Horizontal, {
     max: "scale",
     children: jsxs(Spacings.Stack, {
@@ -3008,7 +2982,7 @@ const ChannelPickerInput = _ref => {
         children: jsx(AsyncSelectInput, {
           id: name,
           name: name,
-          placeholder: placeholder !== null && placeholder !== void 0 ? placeholder : formatMessage(messages$G.placeholder),
+          placeholder: placeholder ?? formatMessage(messages$G.placeholder),
           loadOptions: loadOptionsDebounced,
           defaultOptions: true,
           showOptionGroupDivider: true,
@@ -3048,10 +3022,9 @@ let FormattedDateTime = /*#__PURE__*/function (_PureComponent) {
     value: function render() {
       return jsx(ApplicationContext, {
         render: _ref => {
-          var _this$props;
           let user = _ref.user;
           return formatDateTime$1(this.props.type, this.props.value, {
-            timeZone: (this === null || this === void 0 || (_this$props = this.props) === null || _this$props === void 0 ? void 0 : _this$props.timeZone) || (user === null || user === void 0 ? void 0 : user.timeZone),
+            timeZone: this?.props?.timeZone || user?.timeZone,
             locale: this.props.intl.locale
           });
         }
@@ -3182,7 +3155,7 @@ let ThrottledField = /*#__PURE__*/function (_PureComponent) {
     };
     _this.doDelayedUpdate = (updateFunction, event, eventType) => {
       const self = _assertThisInitialized(_this);
-      const timeoutKey = "".concat(eventType, "Timeout");
+      const timeoutKey = `${eventType}Timeout`;
       // TODO: can't we just use one variable?
       clearTimeout(_this[timeoutKey]);
       _this[timeoutKey] = _setTimeout(() => {
@@ -3212,7 +3185,7 @@ let ThrottledField = /*#__PURE__*/function (_PureComponent) {
       }, this.props.onEnter ? {
         onKeyDown: this.handleEnter
       } : {}), filterDataAttributes(this.props));
-      const inputId = "throttled-field-".concat(this.props.name);
+      const inputId = `throttled-field-${this.props.name}`;
       return jsxs(Fragment, {
         children: [jsx(AccessibleHidden, {
           children: jsx("label", {
@@ -3221,7 +3194,7 @@ let ThrottledField = /*#__PURE__*/function (_PureComponent) {
           })
         }), this.props.as === 'textarea' ? jsx(Textarea, _objectSpread$19(_objectSpread$19({}, commonProps), {}, {
           id: inputId,
-          className: classnames(styles$h.textarea, styles$h["textarea-".concat(this.props.style)], {
+          className: classnames(styles$h.textarea, styles$h[`textarea-${this.props.style}`], {
             [styles$h.invalid]: !this.props.isValid,
             [styles$h.disabled]: this.props.disabled
           }),
@@ -3232,7 +3205,7 @@ let ThrottledField = /*#__PURE__*/function (_PureComponent) {
           id: inputId,
           ref: this.props.inputRef,
           type: this.props.as,
-          className: classnames(styles$h["input-".concat(this.props.style)], {
+          className: classnames(styles$h[`input-${this.props.style}`], {
             [styles$h.invalid]: !this.props.isValid,
             [styles$h.disabled]: this.props.disabled,
             [styles$h.granular]: this.props.isGranular
@@ -3332,8 +3305,7 @@ let SearchInput = /*#__PURE__*/function (_Component) {
       });
     };
     _this.handleClear = () => {
-      var _this$inputRef;
-      (_this$inputRef = _this.inputRef) === null || _this$inputRef === void 0 || _this$inputRef.focus();
+      _this.inputRef?.focus();
       _this.props.onChange(null);
       _this.props.onReset();
       _this.setState({
@@ -3445,12 +3417,12 @@ const useExecuteGraphQLRequest = () => {
 };
 const createSearchProductsFromPIMAction = (searchTerm, projectKey) => actions.post({
   mcApiProxyTarget: MC_API_PROXY_TARGETS.PIM_SEARCH,
-  uri: "/".concat(projectKey, "/search/product-types"),
+  uri: `/${projectKey}/search/product-types`,
   payload: {
     query: {
       wildcard: {
         field: 'name',
-        value: "*".concat(searchTerm, "*"),
+        value: `*${searchTerm}*`,
         caseInsensitive: true
       }
     },
@@ -3464,9 +3436,8 @@ const useFetchProductTypesFromPIM = _ref => {
   const dispatch = useAsyncDispatch();
   const executeGraphQLRequest = useExecuteGraphQLRequest();
   const fetchProductTypesFromPim = useCallback(async searchTerm => {
-    var _result$hits$map, _result$hits;
     const result = await dispatch(createSearchProductsFromPIMAction(searchTerm, projectKey));
-    const ids = (_result$hits$map = result === null || result === void 0 || (_result$hits = result.hits) === null || _result$hits === void 0 ? void 0 : _mapInstanceProperty(_result$hits).call(_result$hits, hit => hit.id)) !== null && _result$hits$map !== void 0 ? _result$hits$map : [];
+    const ids = result?.hits?.map(hit => hit.id) ?? [];
     // Avoid sending any requests if it's clear that nothing is found
     if (ids.length === 0) {
       return {
@@ -3501,22 +3472,19 @@ const useFetchProductTypesFromPIM = _ref => {
  */
 const constructNestedExpression = (reversedPath, predicate) => {
   if (reversedPath.length > 0) {
-    return _reduceInstanceProperty(reversedPath).call(reversedPath, (nextNestedValue, nestedSelection) => {
-      var _context;
-      return _concatInstanceProperty(_context = "".concat(nestedSelection, "(")).call(_context, nextNestedValue, ")");
-    }, predicate);
+    return _reduceInstanceProperty(reversedPath).call(reversedPath, (nextNestedValue, nestedSelection) => `${nestedSelection}(${nextNestedValue})`, predicate);
   }
   return predicate;
 };
 const constructPrefixSearchPredicate$1 = (prefixSearchFields, lowerBound, upperBound) => {
   const constructPrefixSearchExpression = field => {
-    var _context2, _context3, _context4, _context5;
+    var _context;
     const parts = field.split('.');
-    const _parts$slice$reverse = _reverseInstanceProperty(_context2 = _sliceInstanceProperty(parts).call(parts)).call(_context2),
+    const _parts$slice$reverse = _reverseInstanceProperty(_context = _sliceInstanceProperty(parts).call(parts)).call(_context),
       _parts$slice$reverse2 = _toArray(_parts$slice$reverse),
       valueToNest = _parts$slice$reverse2[0],
       reversedPathToNestedValue = _sliceInstanceProperty(_parts$slice$reverse2).call(_parts$slice$reverse2, 1);
-    const predicateExpression = _concatInstanceProperty(_context3 = _concatInstanceProperty(_context4 = _concatInstanceProperty(_context5 = "".concat(valueToNest, " >= \"")).call(_context5, lowerBound, "\" and ")).call(_context4, valueToNest, " < \"")).call(_context3, upperBound, "\"");
+    const predicateExpression = `${valueToNest} >= "${lowerBound}" and ${valueToNest} < "${upperBound}"`;
     return constructNestedExpression(reversedPathToNestedValue, predicateExpression);
   };
   return _mapInstanceProperty(prefixSearchFields).call(prefixSearchFields, constructPrefixSearchExpression).join(' or ');
@@ -3524,7 +3492,7 @@ const constructPrefixSearchPredicate$1 = (prefixSearchFields, lowerBound, upperB
 const constructWherePredicate = (inputValue, prefixSearchFields) => {
   const wherePredicate = function () {
     if (inputValue.length) {
-      if (isUUID(inputValue)) return "id = \"".concat(inputValue, "\"");else {
+      if (isUUID(inputValue)) return `id = "${inputValue}"`;else {
         const _getPrefixSearchBound = getPrefixSearchBounds(inputValue),
           _getPrefixSearchBound2 = _slicedToArray(_getPrefixSearchBound, 2),
           lowerBound = _getPrefixSearchBound2[0],
@@ -3549,7 +3517,6 @@ const useFetchProductTypessFromCTP = _ref2 => {
   }, [prefixSearchFields, executeGraphQLRequest]);
 };
 const usePimStatus = () => {
-  var _data$indicesExist;
   const _useQuery = useQuery(FetchIndicesExist$1, {
       context: {
         target: GRAPHQL_TARGETS.PIM_INDEXER
@@ -3559,20 +3526,17 @@ const usePimStatus = () => {
     data = _useQuery.data;
   return {
     data,
-    isProjectIndexed: Boolean(data === null || data === void 0 || (_data$indicesExist = data.indicesExist) === null || _data$indicesExist === void 0 || (_data$indicesExist = _data$indicesExist.productTypes) === null || _data$indicesExist === void 0 ? void 0 : _data$indicesExist.searchableIndexExists)
+    isProjectIndexed: Boolean(data?.indicesExist?.productTypes?.searchableIndexExists)
   };
 };
 const useProductTypeOptions = _ref3 => {
   let prefixSearchFields = _ref3.prefixSearchFields;
   const _usePimStatus = usePimStatus(),
     isProjectIndexed = _usePimStatus.isProjectIndexed;
-  const _useApplicationContex = useApplicationContext(context => {
-      var _context$project;
-      return {
-        dataLocale: context.dataLocale,
-        projectKey: (_context$project = context.project) === null || _context$project === void 0 ? void 0 : _context$project.key
-      };
-    }),
+  const _useApplicationContex = useApplicationContext(context => ({
+      dataLocale: context.dataLocale,
+      projectKey: context.project?.key
+    })),
     dataLocale = _useApplicationContex.dataLocale,
     projectKey = _useApplicationContex.projectKey;
   const fetchProductTypesFromPim = useFetchProductTypesFromPIM({
@@ -3636,10 +3600,9 @@ const useHandlers = onChange => {
     setInputValue(changedValue);
   }, []);
   const handleChange = useEventCallback(event => {
-    var _event$target$value;
     const eventWithExtractedValue = _objectSpread$17(_objectSpread$17({}, event), {}, {
       target: _objectSpread$17(_objectSpread$17({}, event.target), {}, {
-        value: (_event$target$value = event.target.value) === null || _event$target$value === void 0 ? void 0 : _event$target$value.value
+        value: event.target.value?.value
       })
     });
     onChange(eventWithExtractedValue);
@@ -3647,25 +3610,23 @@ const useHandlers = onChange => {
   return [handleInputChange, handleChange];
 };
 
+const _excluded$1 = ["extraWhere"];
 function ownKeys$16(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$16(e) { for (var r = 1; r < arguments.length; r++) { var _context6, _context7; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context6 = ownKeys$16(Object(t), !0)).call(_context6, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context7 = ownKeys$16(Object(t))).call(_context7, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread$16(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys$16(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys$16(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 const constructPrefixSearchPredicate = function () {
   let prefixSearchFields = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   let lowerBound = arguments.length > 1 ? arguments[1] : undefined;
   let upperBound = arguments.length > 2 ? arguments[2] : undefined;
   const constructPrefixSearchExpression = field => {
-    var _context, _context2, _context3, _context4;
+    var _context;
     const path = field.split('.');
     const _path$slice$reverse = _reverseInstanceProperty(_context = _sliceInstanceProperty(path).call(path)).call(_context),
       _path$slice$reverse2 = _toArray(_path$slice$reverse),
       finalValueInPath = _path$slice$reverse2[0],
       remainPathInReverse = _sliceInstanceProperty(_path$slice$reverse2).call(_path$slice$reverse2, 1);
-    const comparison = _concatInstanceProperty(_context2 = _concatInstanceProperty(_context3 = _concatInstanceProperty(_context4 = "".concat(finalValueInPath, " >= \"")).call(_context4, lowerBound, "\" and ")).call(_context3, finalValueInPath, " < \"")).call(_context2, upperBound, "\"");
+    const comparison = `${finalValueInPath} >= "${lowerBound}" and ${finalValueInPath} < "${upperBound}"`;
     if (remainPathInReverse.length) {
-      return _reduceInstanceProperty(remainPathInReverse).call(remainPathInReverse, (nestedPath, nextPath) => {
-        var _context5;
-        return _concatInstanceProperty(_context5 = "".concat(nextPath, "(")).call(_context5, nestedPath, ")");
-      }, comparison);
+      return _reduceInstanceProperty(remainPathInReverse).call(remainPathInReverse, (nestedPath, nextPath) => `${nextPath}(${nestedPath})`, comparison);
     }
     return comparison;
   };
@@ -3678,22 +3639,29 @@ const useLoadOptions = _ref => {
   const client = useApolloClient$1();
   const loadOptions = useCallback(function () {
     let inputValue = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-    const where = function () {
-      if (inputValue.length) {
-        if (isUUID(inputValue)) return "id = \"".concat(inputValue, "\"");else {
-          const _getPrefixSearchBound = getPrefixSearchBounds(inputValue),
-            _getPrefixSearchBound2 = _slicedToArray(_getPrefixSearchBound, 2),
-            lowerBound = _getPrefixSearchBound2[0],
-            upperBound = _getPrefixSearchBound2[1];
-          return constructPrefixSearchPredicate(prefixSearchFields, lowerBound, upperBound);
-        }
+    let where;
+    if (inputValue.length) {
+      if (isUUID(inputValue)) {
+        where = `id = "${inputValue}"`;
+      } else {
+        const _getPrefixSearchBound = getPrefixSearchBounds(inputValue),
+          _getPrefixSearchBound2 = _slicedToArray(_getPrefixSearchBound, 2),
+          lowerBound = _getPrefixSearchBound2[0],
+          upperBound = _getPrefixSearchBound2[1];
+        where = constructPrefixSearchPredicate(prefixSearchFields, lowerBound, upperBound);
       }
-    }();
+    }
+    const _ref2 = variables ?? {},
+      extraWhere = _ref2.extraWhere,
+      restVariables = _objectWithoutProperties(_ref2, _excluded$1);
+    if (typeof extraWhere === 'string') {
+      where = where ? `(${where}) and ${variables.extraWhere}` : variables.extraWhere;
+    }
     return client.query({
       query,
       variables: _objectSpread$16({
         where
-      }, variables),
+      }, restVariables),
       context: {
         target: MC_API_PROXY_TARGETS.COMMERCETOOLS_PLATFORM
       },
@@ -3704,7 +3672,6 @@ const useLoadOptions = _ref => {
 };
 
 function useCurrentOption(_ref) {
-  var _context;
   let id = _ref.id,
     typename = _ref.typename,
     query = _ref.query,
@@ -3716,7 +3683,7 @@ function useCurrentOption(_ref) {
   // load from cache when possible to speed up initial render
   const canReadFromCache = id && typename && fragment;
   const cacheItem = canReadFromCache ? apolloClient.readFragment({
-    id: _concatInstanceProperty(_context = "".concat(typename, ":")).call(_context, id),
+    id: `${typename}:${id}`,
     fragment
   }) : undefined;
 
@@ -3734,7 +3701,7 @@ function useCurrentOption(_ref) {
     queryData = _useQuery.data,
     queryError = _useQuery.error;
   const queryItem = queryData && queryDataToItem(queryData);
-  const item = queryItem !== null && queryItem !== void 0 ? queryItem : cacheItem;
+  const item = queryItem ?? cacheItem;
   const loading = item ? false : queryLoading;
   const error = item ? undefined : queryError;
   const data = item && itemToOption(item);
@@ -3773,7 +3740,6 @@ const convertProductTypeToOption = productType => {
   };
 };
 const ProductTypePickerInput = _ref => {
-  var _currentOption$data$l, _currentOption$data;
   let isClearable = _ref.isClearable,
     isDisabled = _ref.isDisabled,
     isReadOnly = _ref.isReadOnly,
@@ -3804,9 +3770,8 @@ const ProductTypePickerInput = _ref => {
     itemToOption: convertProductTypeToOption
   });
   const handleLoadOptions = useCallback(inputValue => loadProductTypes(inputValue).then(_ref3 => {
-    var _data$productTypes;
     let data = _ref3.data;
-    return ((_data$productTypes = data.productTypes) === null || _data$productTypes === void 0 ? void 0 : _data$productTypes.results) || [];
+    return data.productTypes?.results || [];
   }).then(productTypes => _mapInstanceProperty(productTypes).call(productTypes, convertProductTypeToOption)).catch(error => {
     setLoadingError(error);
     onError(error);
@@ -3820,12 +3785,12 @@ const ProductTypePickerInput = _ref => {
     setLoadingError(null);
     handleInternalInputChange(event);
   }, [handleInternalInputChange]);
-  const isCurrentOptionLoadingFailed = Boolean(currentOption === null || currentOption === void 0 ? void 0 : currentOption.error);
+  const isCurrentOptionLoadingFailed = Boolean(currentOption?.error);
   useEffect(() => {
     if (isCurrentOptionLoadingFailed) onError(currentOption.error);
   }, [isCurrentOptionLoadingFailed, onError, currentOption]);
   const isLoadingFailed = isCurrentOptionLoadingFailed || Boolean(loadingError);
-  const tooltipTitle = (_currentOption$data$l = currentOption === null || currentOption === void 0 || (_currentOption$data = currentOption.data) === null || _currentOption$data === void 0 ? void 0 : _currentOption$data.label) !== null && _currentOption$data$l !== void 0 ? _currentOption$data$l : '';
+  const tooltipTitle = currentOption?.data?.label ?? '';
   return jsx(Constraints.Horizontal, {
     max: "scale",
     children: currentOption.loading ? jsx(CenteredLoadingSpinner, {}) : jsxs(Spacings.Stack, {
@@ -3876,7 +3841,6 @@ var messages$C = defineMessages({
 var GetStatesQuery = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "GetStatesQuery" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "where" } }, type: { kind: "NamedType", name: { kind: "Name", value: "String" } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "sortByNamePath" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "states" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "where" }, value: { kind: "Variable", name: { kind: "Name", value: "where" } } }, { kind: "Argument", name: { kind: "Name", value: "sort" }, value: { kind: "ListValue", values: [{ kind: "Variable", name: { kind: "Name", value: "sortByNamePath" } }, { kind: "StringValue", value: "key", block: false }] } }, { kind: "Argument", name: { kind: "Name", value: "limit" }, value: { kind: "IntValue", value: "60" } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "results" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }] } }] } }], loc: { start: 0, end: 377, source: { body: "query GetStatesQuery($where: String, $sortByNamePath: String!) {\n  states(where: $where, sort: [$sortByNamePath, \"key\"], limit: 60) {\n    total\n    results {\n      id\n      key\n      nameAllLocales {\n        locale\n        value\n      }\n    }\n  }\n}\n\nquery GetStateQuery($id: String) {\n  state(id: $id) {\n    id\n    key\n    nameAllLocales {\n      locale\n      value\n    }\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 var GetStateQuery = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "GetStateQuery" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "id" } }, type: { kind: "NamedType", name: { kind: "Name", value: "String" } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "state" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "id" }, value: { kind: "Variable", name: { kind: "Name", value: "id" } } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }] } }], loc: { start: 0, end: 377, source: { body: "query GetStatesQuery($where: String, $sortByNamePath: String!) {\n  states(where: $where, sort: [$sortByNamePath, \"key\"], limit: 60) {\n    total\n    results {\n      id\n      key\n      nameAllLocales {\n        locale\n        value\n      }\n    }\n  }\n}\n\nquery GetStateQuery($id: String) {\n  state(id: $id) {\n    id\n    key\n    nameAllLocales {\n      locale\n      value\n    }\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 const StatePickerInput = _ref => {
-  var _currentOption$data$l, _currentOption$data;
   let isClearable = _ref.isClearable,
     isDisabled = _ref.isDisabled,
     isReadOnly = _ref.isReadOnly,
@@ -3891,7 +3855,7 @@ const StatePickerInput = _ref => {
     formatMessage = _useIntl.formatMessage;
   const dataLocale = useApplicationContext(applicationContext => applicationContext.dataLocale);
   const variables = useMemo(() => ({
-    sortByNamePath: "name.".concat(dataLocale)
+    sortByNamePath: `name.${dataLocale}`
   }), [dataLocale]);
   const convertStateToOption = useCallback(state => {
     const localizedName = formatLocalizedFieldToString(state.nameAllLocales);
@@ -3906,7 +3870,7 @@ const StatePickerInput = _ref => {
     _useState2 = _slicedToArray(_useState, 2),
     loadingError = _useState2[0],
     setLoadingError = _useState2[1];
-  const prefixSearchFields = useMemo(() => ["name.".concat(dataLocale), 'key'], [dataLocale]);
+  const prefixSearchFields = useMemo(() => [`name.${dataLocale}`, 'key'], [dataLocale]);
   const loadOptions = useLoadOptions({
     query: GetStatesQuery,
     variables,
@@ -3939,13 +3903,13 @@ const StatePickerInput = _ref => {
     setLoadingError(null);
     handleInternalInputChange(event);
   }, [handleInternalInputChange]);
-  const isCurrentOptionLoadingFailed = Boolean(currentOption === null || currentOption === void 0 ? void 0 : currentOption.error);
+  const isCurrentOptionLoadingFailed = Boolean(currentOption?.error);
   useEffect(() => {
     if (isCurrentOptionLoadingFailed) onError(currentOption.error);
   }, [isCurrentOptionLoadingFailed, onError, currentOption]);
   const isLoadingFailed = isCurrentOptionLoadingFailed || Boolean(loadingError);
   const handleNoOptions = useCallback(() => loadingError ? null : formatMessage(messages$C.noStatesFound), [loadingError, formatMessage]);
-  const tooltipTitle = (_currentOption$data$l = currentOption === null || currentOption === void 0 || (_currentOption$data = currentOption.data) === null || _currentOption$data === void 0 ? void 0 : _currentOption$data.label) !== null && _currentOption$data$l !== void 0 ? _currentOption$data$l : '';
+  const tooltipTitle = currentOption?.data?.label ?? '';
   return jsx(Constraints.Horizontal, {
     max: "scale",
     children: currentOption.loading ? jsx(CenteredLoadingSpinner, {}) : jsxs(Spacings.Stack, {
@@ -4010,26 +3974,23 @@ const CustomFieldTooltip = _ref => {
 
 const setToArray = function () {
   let values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return "id in (".concat(_mapInstanceProperty(values).call(values, value => "\"".concat(value, "\"")).join(', '), ")");
+  return `id in (${_mapInstanceProperty(values).call(values, value => `"${value}"`).join(', ')})`;
 };
 
 function capitalizeFirst(text) {
   return text.charAt(0).toUpperCase() + _sliceInstanceProperty(text).call(text, 1);
 }
 
-const getCentAmountClause = (value, operator, locale) => {
-  var _context;
-  return _concatInstanceProperty(_context = "centAmount ".concat(operator, " ")).call(_context, MoneyInput.convertToMoneyValue(value, locale).centAmount);
-};
+const getCentAmountClause = (value, operator, locale) => `centAmount ${operator} ${MoneyInput.convertToMoneyValue(value, locale).centAmount}`;
 function moneyTransformer(value, option, locale) {
   const clauses = [];
   if (option === FILTER_TYPES.range) {
-    clauses[0] = "currencyCode = \"".concat(value.from.currencyCode, "\"");
+    clauses[0] = `currencyCode = "${value.from.currencyCode}"`;
     clauses[1] = getCentAmountClause(value.from, '>=', locale);
     clauses[2] = getCentAmountClause(value.to, '<=', locale);
     return clauses.join(' and ');
   }
-  clauses[0] = "currencyCode = \"".concat(value.currencyCode, "\"");
+  clauses[0] = `currencyCode = "${value.currencyCode}"`;
   switch (option) {
     case FILTER_TYPES.lessThan:
       clauses[1] = getCentAmountClause(value, '<', locale);
@@ -4046,7 +4007,6 @@ function moneyTransformer(value, option, locale) {
   return clauses.join(' and ');
 }
 
-var _templateObject$2, _templateObject2$1;
 const formatTime = 'HH:mm:ss.SSS';
 
 /* TimeInput only allows HH:mm:ss and adds the seconds as 00 and
@@ -4068,7 +4028,6 @@ const defaultFilterValidator = _ref => {
 const timeTransformer = function (filterKey, filters) {
   let filterValidator = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : defaultFilterValidator;
   const queries = _mapInstanceProperty(filters).call(filters, _ref2 => {
-    var _context, _context2;
     let type = _ref2.type,
       value = _ref2.value;
     if (!filterValidator({
@@ -4077,13 +4036,19 @@ const timeTransformer = function (filterKey, filters) {
     })) return '';
     switch (type) {
       case FILTER_TYPES.lessThan:
-        return _concatInstanceProperty(_context = "".concat(filterKey, " < \"")).call(_context, value, "\"");
+        return `${filterKey} < "${value}"`;
       case FILTER_TYPES.moreThan:
-        return _concatInstanceProperty(_context2 = "".concat(filterKey, " > \"")).call(_context2, value, "\"");
+        return `${filterKey} > "${value}"`;
       case FILTER_TYPES.equalTo:
-        return oneLine(_templateObject$2 || (_templateObject$2 = _taggedTemplateLiteral(["\n          (", " >= \"", "\"\n          and ", " <= \"", "\")\n          "])), filterKey, value, filterKey, getEndOfSecond(value));
+        return oneLine`
+          (${filterKey} >= "${value}"
+          and ${filterKey} <= "${getEndOfSecond(value)}")
+          `;
       case FILTER_TYPES.range:
-        return oneLine(_templateObject2$1 || (_templateObject2$1 = _taggedTemplateLiteral(["\n          (", " >= \"", "\"\n          and ", " <= \"", "\")\n          "])), filterKey, value.from, filterKey, getEndOfSecond(value.to));
+        return oneLine`
+          (${filterKey} >= "${value.from}"
+          and ${filterKey} <= "${getEndOfSecond(value.to)}")
+          `;
       default:
         return '';
     }
@@ -4099,7 +4064,7 @@ const timeTransformer = function (filterKey, filters) {
    *  (pickUpTime >= "14:00" and pickUpTime <= "15:00")
    * ) or some_more_filters
    */
-  return queryString === '' ? null : "(".concat(queryString, ")");
+  return queryString === '' ? null : `(${queryString})`;
 };
 
 // FIXME: delete once prefix search is supported in ctp api
@@ -4116,9 +4081,8 @@ const timeTransformer = function (filterKey, filters) {
 // e.g
 // where: `masterData(current(name(en >= "${lowerBound}" and en < "${upperBound}")))`
 const getPrefixSearchBounds = input => {
-  var _context;
   const getNextCharacter = character => String.fromCharCode(character.charCodeAt() + 1);
-  return [input, _concatInstanceProperty(_context = "".concat(_sliceInstanceProperty(input).call(input, 0, input.length - 1))).call(_context, getNextCharacter(_sliceInstanceProperty(input).call(input, input.length - 1)))];
+  return [input, `${_sliceInstanceProperty(input).call(input, 0, input.length - 1)}${getNextCharacter(_sliceInstanceProperty(input).call(input, input.length - 1))}`];
 };
 
 const _excluded = ["action"];
@@ -4311,7 +4275,7 @@ const convertChangeValueAction = actionPayload => {
  * as its dynamic content can not be typed in SDL for the mutation.
  */
 const convertAction = (actionName, actionPayload) => {
-  var _actionPayload$type, _context3, _actionPayload$geoLoc, _actionPayload$geoLoc2, _actionPayload$shippi, _context4, _context5;
+  var _context3, _context4, _context5;
   const getNameFromPayload = payload => {
     // changeName for `Organizations`
     if (typeof payload.name === 'string') return payload;
@@ -4369,7 +4333,7 @@ const convertAction = (actionName, actionPayload) => {
     case 'setCustomType':
       return {
         [actionName]: {
-          typeId: (_actionPayload$type = actionPayload.type) === null || _actionPayload$type === void 0 ? void 0 : _actionPayload$type.id,
+          typeId: actionPayload.type?.id,
           fields: actionPayload.fields ? _mapInstanceProperty(_context3 = _Object$entries(actionPayload.fields)).call(_context3, _ref => {
             let _ref2 = _slicedToArray(_ref, 2),
               customField = _ref2[0],
@@ -4399,10 +4363,10 @@ const convertAction = (actionName, actionPayload) => {
       };
     case 'setGeoLocation':
       return {
-        [actionName]: actionPayload !== null && actionPayload !== void 0 && actionPayload.geoLocation ? {
+        [actionName]: actionPayload?.geoLocation ? {
           geoLocation: {
             type: 'Point',
-            coordinates: [_parseFloat((_actionPayload$geoLoc = actionPayload.geoLocation) === null || _actionPayload$geoLoc === void 0 ? void 0 : _actionPayload$geoLoc.longitude), _parseFloat((_actionPayload$geoLoc2 = actionPayload.geoLocation) === null || _actionPayload$geoLoc2 === void 0 ? void 0 : _actionPayload$geoLoc2.latitude)]
+            coordinates: [_parseFloat(actionPayload.geoLocation?.longitude), _parseFloat(actionPayload.geoLocation?.latitude)]
           }
         } : {
           undefined
@@ -4538,7 +4502,7 @@ const convertAction = (actionName, actionPayload) => {
     case 'setShippingRateInputType':
       return {
         [actionName]: {
-          shippingRateInputType: (_actionPayload$shippi = actionPayload.shippingRateInputType) !== null && _actionPayload$shippi !== void 0 && _actionPayload$shippi.type ? {
+          shippingRateInputType: actionPayload.shippingRateInputType?.type ? {
             [actionPayload.shippingRateInputType.type]: {
               values: actionPayload.shippingRateInputType.type === 'CartClassification' ? _mapInstanceProperty(_context4 = _valuesInstanceProperty(actionPayload.shippingRateInputType)).call(_context4, value => ({
                 key: value.key,
@@ -4592,8 +4556,8 @@ const convertAction = (actionName, actionPayload) => {
     case 'addAddress':
     case 'changeAddress':
       {
-        var _actionPayload$addres, _context6, _actionPayload$addres2;
-        const _ref3 = ((_actionPayload$addres = actionPayload.address) === null || _actionPayload$addres === void 0 ? void 0 : _actionPayload$addres.custom) || {},
+        var _context6;
+        const _ref3 = actionPayload.address?.custom || {},
           _ref3$fields = _ref3.fields,
           fields = _ref3$fields === void 0 ? {} : _ref3$fields;
         const customFields = isEmpty$3(fields) ? null : _mapInstanceProperty(_context6 = _Object$entries(fields)).call(_context6, _ref4 => {
@@ -4605,7 +4569,7 @@ const convertAction = (actionName, actionPayload) => {
             value: _JSON$stringify(value)
           };
         });
-        const custom = (_actionPayload$addres2 = actionPayload.address) !== null && _actionPayload$addres2 !== void 0 && (_actionPayload$addres2 = _actionPayload$addres2.custom) !== null && _actionPayload$addres2 !== void 0 && (_actionPayload$addres2 = _actionPayload$addres2.type) !== null && _actionPayload$addres2 !== void 0 && _actionPayload$addres2.id ? {
+        const custom = actionPayload.address?.custom?.type?.id ? {
           type: {
             id: actionPayload.address.custom.type.id
           },
@@ -4636,7 +4600,7 @@ const convertAction = (actionName, actionPayload) => {
             value: _JSON$stringify(value)
           };
         });
-        const customType = type !== null && type !== void 0 && type.id ? {
+        const customType = type?.id ? {
           id: type.id
         } : null;
         return {
@@ -4659,11 +4623,10 @@ const createGraphQlUpdateActions = actions => _reduceInstanceProperty(actions).c
   return [...previousActions, convertAction(actionName, actionPayload)];
 }, []);
 const extractErrorFromGraphQlResponse = graphQlResponse => {
-  var _graphQlResponse$netw, _graphQlResponse$grap;
-  if (((_graphQlResponse$netw = graphQlResponse.networkError) === null || _graphQlResponse$netw === void 0 || (_graphQlResponse$netw = _graphQlResponse$netw.result) === null || _graphQlResponse$netw === void 0 || (_graphQlResponse$netw = _graphQlResponse$netw.errors) === null || _graphQlResponse$netw === void 0 ? void 0 : _graphQlResponse$netw.length) > 0) {
+  if (graphQlResponse.networkError?.result?.errors?.length > 0) {
     return graphQlResponse.networkError.result.errors;
   }
-  if (((_graphQlResponse$grap = graphQlResponse.graphQLErrors) === null || _graphQlResponse$grap === void 0 ? void 0 : _graphQlResponse$grap.length) > 0) {
+  if (graphQlResponse.graphQLErrors?.length > 0) {
     return graphQlResponse.graphQLErrors;
   }
   return graphQlResponse;
@@ -4692,16 +4655,14 @@ function omitDeep(obj, fieldsToOmit) {
 function ownKeys$13(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$13(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys$13(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys$13(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function getPriceChannelName(price) {
-  var _ref, _price$channel$name, _price$channel, _price$channel2;
-  return (_ref = (_price$channel$name = (_price$channel = price.channel) === null || _price$channel === void 0 ? void 0 : _price$channel.name) !== null && _price$channel$name !== void 0 ? _price$channel$name : (_price$channel2 = price.channel) === null || _price$channel2 === void 0 ? void 0 : _price$channel2.key) !== null && _ref !== void 0 ? _ref : null;
+  return price.channel?.name ?? price.channel?.key ?? null;
 }
 function getDiscountValue(price) {
-  var _price$value, _price$value2, _price$discounted;
   let preciseAmount;
   let fractionedAmount;
-  if (((_price$value = price.value) === null || _price$value === void 0 ? void 0 : _price$value.type) === PRECISION_TYPES.highPrecision && price.discounted.value.type === PRECISION_TYPES.highPrecision) {
+  if (price.value?.type === PRECISION_TYPES.highPrecision && price.discounted.value.type === PRECISION_TYPES.highPrecision) {
     preciseAmount = price.value.preciseAmount - price.discounted.value.preciseAmount;
-  } else if (((_price$value2 = price.value) === null || _price$value2 === void 0 ? void 0 : _price$value2.type) === PRECISION_TYPES.highPrecision && ((_price$discounted = price.discounted) === null || _price$discounted === void 0 || (_price$discounted = _price$discounted.value) === null || _price$discounted === void 0 ? void 0 : _price$discounted.type) === PRECISION_TYPES.centPrecision) {
+  } else if (price.value?.type === PRECISION_TYPES.highPrecision && price.discounted?.value?.type === PRECISION_TYPES.centPrecision) {
     fractionedAmount = getFractionedAmount(price.value) - getFractionedAmount(price.discounted.value);
   }
   return price.discounted ? _objectSpread$13(_objectSpread$13({}, price.value), {}, {
@@ -4715,28 +4676,23 @@ function getDiscountValue(price) {
 function getSelectedPrice(price) {
   return price.discounted ? price.discounted : price;
 }
-function getNetUnitPrice(_ref2) {
-  var _lineItem$perMethodTa, _filteredPerMethodTax;
-  let lineItem = _ref2.lineItem,
-    shouldRoundAmount = _ref2.shouldRoundAmount;
+function getNetUnitPrice(_ref) {
+  let lineItem = _ref.lineItem,
+    shouldRoundAmount = _ref.shouldRoundAmount;
   const price = getSelectedPrice(lineItem.price);
-  const filteredPerMethodTaxRate = lineItem === null || lineItem === void 0 || (_lineItem$perMethodTa = lineItem.perMethodTaxRate) === null || _lineItem$perMethodTa === void 0 ? void 0 : _filterInstanceProperty(_lineItem$perMethodTa).call(_lineItem$perMethodTa, perMethodTax => {
-    var _lineItem$shippingDet;
-    return (lineItem === null || lineItem === void 0 || (_lineItem$shippingDet = lineItem.shippingDetails) === null || _lineItem$shippingDet === void 0 || (_lineItem$shippingDet = _lineItem$shippingDet.targets) === null || _lineItem$shippingDet === void 0 ? void 0 : _findIndexInstanceProperty(_lineItem$shippingDet).call(_lineItem$shippingDet, target => (target === null || target === void 0 ? void 0 : target.shippingMethodKey) === (perMethodTax === null || perMethodTax === void 0 ? void 0 : perMethodTax.shippingMethodKey))) >= 0;
-  });
+  const filteredPerMethodTaxRate = lineItem?.perMethodTaxRate?.filter(perMethodTax => lineItem?.shippingDetails?.targets?.findIndex(target => target?.shippingMethodKey === perMethodTax?.shippingMethodKey) >= 0);
 
   // when shipping mode is multi with the same tax rate
-  if ((filteredPerMethodTaxRate === null || filteredPerMethodTaxRate === void 0 ? void 0 : filteredPerMethodTaxRate.length) > 0 && (_filteredPerMethodTax = filteredPerMethodTaxRate[0]) !== null && _filteredPerMethodTax !== void 0 && (_filteredPerMethodTax = _filteredPerMethodTax.taxRate) !== null && _filteredPerMethodTax !== void 0 && _filteredPerMethodTax.includedInPrice) {
-    var _price$value3, _price$value4;
+  if (filteredPerMethodTaxRate?.length > 0 && filteredPerMethodTaxRate[0]?.taxRate?.includedInPrice) {
     const taxRate = filteredPerMethodTaxRate[0].taxRate;
     let centAmount;
     // should accept 0 value
-    if (typeof ((_price$value3 = price.value) === null || _price$value3 === void 0 ? void 0 : _price$value3.centAmount) === 'number') {
+    if (typeof price.value?.centAmount === 'number') {
       const amount = price.value.centAmount / (1 + taxRate.amount);
       centAmount = shouldRoundAmount ? Math.round(amount) : amount;
     }
     let preciseAmount;
-    if (((_price$value4 = price.value) === null || _price$value4 === void 0 ? void 0 : _price$value4.type) === PRECISION_TYPES.highPrecision) preciseAmount = price.value.preciseAmount / (1 + taxRate.amount);
+    if (price.value?.type === PRECISION_TYPES.highPrecision) preciseAmount = price.value.preciseAmount / (1 + taxRate.amount);
     return _objectSpread$13(_objectSpread$13({}, price.value), {}, {
       centAmount,
       preciseAmount
@@ -4745,15 +4701,14 @@ function getNetUnitPrice(_ref2) {
 
   // when shipping mode is single
   if (lineItem.taxRate && lineItem.taxRate.includedInPrice) {
-    var _price$value5, _price$value6;
     let centAmount;
     // should accept 0 value
-    if (typeof ((_price$value5 = price.value) === null || _price$value5 === void 0 ? void 0 : _price$value5.centAmount) === 'number') {
+    if (typeof price.value?.centAmount === 'number') {
       const amount = price.value.centAmount / (1 + lineItem.taxRate.amount);
       centAmount = shouldRoundAmount ? Math.round(amount) : amount;
     }
     let preciseAmount;
-    if (((_price$value6 = price.value) === null || _price$value6 === void 0 ? void 0 : _price$value6.type) === PRECISION_TYPES.highPrecision) preciseAmount = price.value.preciseAmount / (1 + lineItem.taxRate.amount);
+    if (price.value?.type === PRECISION_TYPES.highPrecision) preciseAmount = price.value.preciseAmount / (1 + lineItem.taxRate.amount);
     return _objectSpread$13(_objectSpread$13({}, price.value), {}, {
       centAmount,
       preciseAmount
@@ -4787,18 +4742,18 @@ const transformCustomFieldFromGraphQLResponse = resource => {
         key: resource.custom.type.key,
         name: transformLocalizedFieldToLocalizedString(resource.custom.type.nameAllLocales),
         fieldDefinitions: _mapInstanceProperty(_context = resource.custom.type.fieldDefinitions).call(_context, fieldDefinition => {
-          var _fieldDefinition$type, _context2, _fieldDefinition$type2, _context3;
+          var _context2, _context3;
           return {
             name: fieldDefinition.name,
             required: fieldDefinition.required,
-            type: ((_fieldDefinition$type = fieldDefinition.type) === null || _fieldDefinition$type === void 0 || (_fieldDefinition$type = _fieldDefinition$type.elementType) === null || _fieldDefinition$type === void 0 ? void 0 : _fieldDefinition$type.name) === 'LocalizedEnum' ? _objectSpread$12(_objectSpread$12({}, fieldDefinition.type), {}, {
+            type: fieldDefinition.type?.elementType?.name === 'LocalizedEnum' ? _objectSpread$12(_objectSpread$12({}, fieldDefinition.type), {}, {
               elementType: _objectSpread$12(_objectSpread$12({}, fieldDefinition.type.elementType), {}, {
                 values: _mapInstanceProperty(_context2 = _valuesInstanceProperty(fieldDefinition.type.elementType)).call(_context2, value => ({
                   key: value.key,
                   label: transformLocalizedFieldToLocalizedString(value.labelAllLocales)
                 }))
               })
-            }) : ((_fieldDefinition$type2 = fieldDefinition.type) === null || _fieldDefinition$type2 === void 0 ? void 0 : _fieldDefinition$type2.name) === 'LocalizedEnum' ? _objectSpread$12(_objectSpread$12({}, fieldDefinition.type), {}, {
+            }) : fieldDefinition.type?.name === 'LocalizedEnum' ? _objectSpread$12(_objectSpread$12({}, fieldDefinition.type), {}, {
               values: _mapInstanceProperty(_context3 = _valuesInstanceProperty(fieldDefinition.type)).call(_context3, value => ({
                 key: value.key,
                 label: transformLocalizedFieldToLocalizedString(value.labelAllLocales)
@@ -4825,7 +4780,7 @@ const convertProductSelectionFromGraphQl = productSelection => {
     from: 'nameAllLocales',
     to: 'name'
   }])), {}, {
-    custom: productSelection !== null && productSelection !== void 0 && productSelection.custom ? transformCustomFieldFromGraphQLResponse(productSelection) : null
+    custom: productSelection?.custom ? transformCustomFieldFromGraphQLResponse(productSelection) : null
   });
 };
 
@@ -4954,7 +4909,7 @@ let CustomFieldDefinitionsConnector = /*#__PURE__*/function (_Component) {
     value: function componentDidMount() {
       var _context;
       const hasUnsupportedResource = _someInstanceProperty(_context = this.props.resources).call(_context, resource => !_includesInstanceProperty(customizableResources$1).call(customizableResources$1, resource));
-      !!hasUnsupportedResource ? process.env.NODE_ENV !== "production" ? invariant(false, "core/components/custom-field-definitions-connector: some of the specified resources are not supported.") : invariant(false) : void 0;
+      !!hasUnsupportedResource ? process.env.NODE_ENV !== "production" ? invariant(false, `core/components/custom-field-definitions-connector: some of the specified resources are not supported.`) : invariant(false) : void 0;
     }
   }, {
     key: "render",
@@ -4973,9 +4928,9 @@ CustomFieldDefinitionsConnector.displayName = 'CustomFieldDefinitionsConnector';
 CustomFieldDefinitionsConnector.defaultProps = {
   resources: []
 };
-const stringifyResources$1 = resources => _mapInstanceProperty(resources).call(resources, resource => "\"".concat(resource, "\"")).join();
+const stringifyResources$1 = resources => _mapInstanceProperty(resources).call(resources, resource => `"${resource}"`).join();
 const mapPropsToOptions = ownProps => {
-  const where = ownProps.resources.length > 0 ? "resourceTypeIds contains any (".concat(stringifyResources$1(ownProps.resources), ")") : undefined;
+  const where = ownProps.resources.length > 0 ? `resourceTypeIds contains any (${stringifyResources$1(ownProps.resources)})` : undefined;
   return {
     variables: {
       where,
@@ -5044,19 +4999,19 @@ const graphQlDocToForm = typeDefinition => {
       key: typeDefinition.key,
       name: transformLocalizedFieldToLocalizedString(typeDefinition.nameAllLocales),
       fieldDefinitions: _mapInstanceProperty(_context = typeDefinition.fieldDefinitions).call(_context, fieldDefinition => {
-        var _fieldDefinition$type, _context2, _fieldDefinition$type2, _context3;
+        var _context2, _context3;
         return {
           name: fieldDefinition.name,
           required: fieldDefinition.required,
           inputHint: fieldDefinition.inputHint,
-          type: ((_fieldDefinition$type = fieldDefinition.type) === null || _fieldDefinition$type === void 0 || (_fieldDefinition$type = _fieldDefinition$type.elementType) === null || _fieldDefinition$type === void 0 ? void 0 : _fieldDefinition$type.name) === 'LocalizedEnum' ? _objectSpread$$(_objectSpread$$({}, fieldDefinition.type), {}, {
+          type: fieldDefinition.type?.elementType?.name === 'LocalizedEnum' ? _objectSpread$$(_objectSpread$$({}, fieldDefinition.type), {}, {
             elementType: _objectSpread$$(_objectSpread$$({}, fieldDefinition.type.elementType), {}, {
               values: _mapInstanceProperty(_context2 = _valuesInstanceProperty(fieldDefinition.type.elementType)).call(_context2, value => ({
                 key: value.key,
                 label: transformLocalizedFieldToLocalizedString(value.labelAllLocales)
               }))
             })
-          }) : ((_fieldDefinition$type2 = fieldDefinition.type) === null || _fieldDefinition$type2 === void 0 ? void 0 : _fieldDefinition$type2.name) === 'LocalizedEnum' ? _objectSpread$$(_objectSpread$$({}, fieldDefinition.type), {}, {
+          }) : fieldDefinition.type?.name === 'LocalizedEnum' ? _objectSpread$$(_objectSpread$$({}, fieldDefinition.type), {}, {
             values: _mapInstanceProperty(_context3 = _valuesInstanceProperty(fieldDefinition.type)).call(_context3, value => ({
               key: value.key,
               label: transformLocalizedFieldToLocalizedString(value.labelAllLocales)
@@ -5088,7 +5043,7 @@ const formToGraphQlDoc = formCustomFields => ({
 // TODO(pa3): find usages and make sure only 1 param is passed
 const createEmptyCustomFields = typeDefinition => ({
   fields: {},
-  type: (typeDefinition === null || typeDefinition === void 0 ? void 0 : typeDefinition.type) || {
+  type: typeDefinition?.type || {
     fieldDefinitions: []
   }
 });
@@ -5114,7 +5069,7 @@ let CustomFieldTypeDefinitionsConnector = /*#__PURE__*/function (_Component) {
     value: function componentDidMount() {
       var _context;
       const hasUnsupportedResource = _someInstanceProperty(_context = this.props.resources).call(_context, resource => !_includesInstanceProperty(customizableResources).call(customizableResources, resource));
-      !!hasUnsupportedResource ? process.env.NODE_ENV !== "production" ? invariant(false, "core/components/custom-field-definitions-connector: some of the specified resources are not supported.") : invariant(false) : void 0;
+      !!hasUnsupportedResource ? process.env.NODE_ENV !== "production" ? invariant(false, `core/components/custom-field-definitions-connector: some of the specified resources are not supported.`) : invariant(false) : void 0;
     }
   }, {
     key: "render",
@@ -5139,9 +5094,9 @@ CustomFieldTypeDefinitionsConnector.graphQlDocToForm = graphQlDocToForm;
 CustomFieldTypeDefinitionsConnector.formToRestDoc = formToRestDoc;
 CustomFieldTypeDefinitionsConnector.formToGraphQlDoc = formToGraphQlDoc;
 CustomFieldTypeDefinitionsConnector.createEmptyCustomFields = createEmptyCustomFields;
-const stringifyResources = resources => _mapInstanceProperty(resources).call(resources, resource => "\"".concat(resource, "\"")).join();
+const stringifyResources = resources => _mapInstanceProperty(resources).call(resources, resource => `"${resource}"`).join();
 const createGraphQlOptions = ownProps => {
-  const where = ownProps.resources.length > 0 ? "resourceTypeIds contains any (".concat(stringifyResources(ownProps.resources), ")") : undefined;
+  const where = ownProps.resources.length > 0 ? `resourceTypeIds contains any (${stringifyResources(ownProps.resources)})` : undefined;
   return {
     variables: {
       where,
@@ -5217,7 +5172,7 @@ const extractDuplicatedValues = (values, type, language, languages) => {
   let validatedValues = [];
   if (type.name.toLowerCase() === 'money') {
     validatedValues = unique(values, ['amount', 'currencyCode']);
-  } else if (type.name.toLowerCase() === 'reference') validatedValues = unique(_filterInstanceProperty(values).call(values, value => value === null || value === void 0 ? void 0 : value.id), ['id']);else if (type.name.toLowerCase() === 'localizedstring') {
+  } else if (type.name.toLowerCase() === 'reference') validatedValues = unique(_filterInstanceProperty(values).call(values, value => value?.id), ['id']);else if (type.name.toLowerCase() === 'localizedstring') {
     validatedValues = unique(values, languages);
   } else validatedValues = unique(values);
   return validatedValues;
@@ -5336,7 +5291,7 @@ const DraggableWrapper = _ref => {
         children: jsxs(Grid, {
           gridTemplateColumns: '1fr 20fr',
           gridTemplateRows: "auto 1fr auto",
-          gridGap: customProperties.spacingL,
+          gridGap: customProperties.spacingM,
           children: [jsx(Grid.Item, {
             children: jsx(DragHandle, _objectSpread$X({}, provided.dragHandleProps))
           }), jsx(Grid.Item, {
@@ -5433,7 +5388,6 @@ const getSubfieldLanguage = subfieldName => {
   return subfieldName.substring(lastDotIndex + 1);
 };
 function CustomLocalizedTextInput(props) {
-  var _value$language;
   const _useApplicationContex = useApplicationContext(applicationContext => ({
       language: applicationContext.dataLocale,
       languages: applicationContext.project.languages
@@ -5458,7 +5412,7 @@ function CustomLocalizedTextInput(props) {
     props.setFieldValue(props.name, nullifiedIfNeeded);
   });
   const InputComponent = isMultiLine ? LocalizedMultilineTextInput : LocalizedTextInput;
-  const tooltipTitle = isMultiLine ? '' : value ? (_value$language = value[language]) !== null && _value$language !== void 0 ? _value$language : '' : '';
+  const tooltipTitle = isMultiLine ? '' : value ? value[language] ?? '' : '';
   return jsx(CustomFieldTooltip, {
     title: tooltipTitle,
     children: jsx(InputComponent, {
@@ -5502,8 +5456,7 @@ function CustomBooleanInput(props) {
 CustomBooleanInput.displayName = 'CustomBooleanInput';
 
 function CustomNumberInput(props) {
-  var _props$value;
-  const value = (_props$value = props.value) !== null && _props$value !== void 0 ? _props$value : '';
+  const value = props.value ?? '';
   const handleChange = makeChangeHandler(rawValue => props.setFieldValue(props.name, !rawValue ? undefined : Number(rawValue)));
   return jsx(NumberInput, {
     id: props.name,
@@ -5548,7 +5501,7 @@ const fixAmount = value => {
 // data user just entered effectively preventing full data from being entered.
 const fixEnteredValue = (newValue, initialValue, currencies) => {
   const withFixedCurrency = fixCurrencyCode(newValue, currencies);
-  if (!(initialValue !== null && initialValue !== void 0 && initialValue.amount)) {
+  if (!initialValue?.amount) {
     return fixAmount(withFixedCurrency);
   }
   return withFixedCurrency;
@@ -5614,13 +5567,12 @@ const convertTypeValuesToOptions$1 = defaultMemoize((type, dataLocale, languages
       key: 'label',
       locale: dataLocale,
       fallbackOrder: languages,
-      fallback: "".concat(value.key, " (key)")
+      fallback: `${value.key} (key)`
     }),
     value: value.key
   }));
 });
 function CustomLocalizedEnumInput(props) {
-  var _options$find$label, _options$find;
   const _useApplicationContex = useApplicationContext(applicationContext => ({
       languages: applicationContext.project.languages,
       dataLocale: applicationContext.dataLocale
@@ -5629,7 +5581,7 @@ function CustomLocalizedEnumInput(props) {
     dataLocale = _useApplicationContex.dataLocale;
   const options = convertTypeValuesToOptions$1(props.fieldDefinition.type, dataLocale, languages);
   const handleChange = makeChangeHandler(rawValue => props.setFieldValue(props.name, rawValue));
-  const tooltipTitle = props.value ? (_options$find$label = (_options$find = _findInstanceProperty(options).call(options, option => option.value === props.value)) === null || _options$find === void 0 ? void 0 : _options$find.label) !== null && _options$find$label !== void 0 ? _options$find$label : '' : '';
+  const tooltipTitle = props.value ? _findInstanceProperty(options).call(options, option => option.value === props.value)?.label ?? '' : '';
   return jsx(CustomFieldTooltip, {
     title: tooltipTitle,
     children: jsx(SelectInput, {
@@ -5649,8 +5601,7 @@ function CustomLocalizedEnumInput(props) {
 CustomLocalizedEnumInput.displayName = 'CustomLocalizedEnumInput';
 
 function CustomRawIdReferenceInput(props) {
-  var _props$value;
-  const value = ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.id) || '';
+  const value = props.value?.id || '';
   return jsx(CustomFieldTooltip, {
     title: value,
     children: jsx(TextInput, {
@@ -5695,7 +5646,7 @@ function getCategoriesByIds(apolloClient, options) {
   return apolloClient.query({
     query: FetchCategoriesByIds,
     variables: {
-      where: "id in (".concat(_mapInstanceProperty(_context2 = options.ids).call(_context2, id => "\"".concat(id, "\"")).join(', '), ")")
+      where: `id in (${_mapInstanceProperty(_context2 = options.ids).call(_context2, id => `"${id}"`).join(', ')})`
     },
     context: {
       target: GRAPHQL_TARGETS.COMMERCETOOLS_PLATFORM
@@ -5794,13 +5745,10 @@ const useReferenceSearchItems = _ref => {
   };
 };
 function ReferenceSearch(props) {
-  const ids = useMemo(() => {
-    var _props$value, _props$value2;
-    return props.value ? props.isMulti ? (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _mapInstanceProperty(_props$value).call(_props$value, _ref2 => {
-      let id = _ref2.id;
-      return id;
-    }) : [(_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.id] : [];
-  }, [props.value, props.isMulti]);
+  const ids = useMemo(() => props.value ? props.isMulti ? props.value?.map(_ref2 => {
+    let id = _ref2.id;
+    return id;
+  }) : [props.value?.id] : [], [props.value, props.isMulti]);
   const _useReferenceSearchIt = useReferenceSearchItems({
       loadItemsBySearchTerm: props.loadItemsBySearchTerm,
       loadItemsByIds: props.loadItemsByIds,
@@ -5811,14 +5759,14 @@ function ReferenceSearch(props) {
     areSomeItemsMissing = _useReferenceSearchIt.areSomeItemsMissing,
     handleLoadItems = _useReferenceSearchIt.handleLoadItems;
   if (areItemsLoading) return null;
-  const value = props.isMulti ? items : items === null || items === void 0 ? void 0 : items[0];
+  const value = props.isMulti ? items : items?.[0];
   let filterValue = null;
   if (value) filterValue = props.isMulti ? _mapInstanceProperty(value).call(value, props.mapItemToOption) : props.mapItemToOption(value);
   const tooltipTitle = value || props.value ? props.mapItemToOption(value || props.value).label : '';
   const loadItems = value => _Promise.resolve(handleLoadItems(value)).then(items => _mapInstanceProperty(items).call(items, item => props.mapItemToOption(item)));
   const handleChange = event => {
-    var _context, _event$target$value;
-    const option = props.isMulti ? _mapInstanceProperty(_context = event.target.value).call(_context, item => item.value) : ((_event$target$value = event.target.value) === null || _event$target$value === void 0 ? void 0 : _event$target$value.value) || null;
+    var _context;
+    const option = props.isMulti ? _mapInstanceProperty(_context = event.target.value).call(_context, item => item.value) : event.target.value?.value || null;
     props.onChange(option);
   };
   return jsxs("div", {
@@ -5889,9 +5837,8 @@ const messages$B = defineMessages({
 });
 
 function ownKeys$T(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$T(e) { for (var r = 1; r < arguments.length; r++) { var _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys$T(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys$T(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread$T(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys$T(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys$T(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function Option$1(props) {
-  var _context, _context2;
   const _useApplicationContex = useApplicationContext(applicationContext => ({
       language: applicationContext.dataLocale,
       languages: applicationContext.project.languages
@@ -5912,19 +5859,19 @@ function Option$1(props) {
           fallbackOrder: languages
         })
       }), category.parent && jsx(Text.Detail, {
-        children: _concatInstanceProperty(_context = "".concat(formatMessage(messages$B.parentCategory), ": ")).call(_context, formatLocalizedString(category.parent, {
+        children: `${formatMessage(messages$B.parentCategory)}: ${formatLocalizedString(category.parent, {
           key: 'name',
           locale: language,
           fallbackOrder: languages
-        }))
+        })}`
       }), jsx(Text.Detail, {
-        children: "Slug: ".concat(formatLocalizedString(category, {
+        children: `Slug: ${formatLocalizedString(category, {
           key: 'slug',
           locale: language,
           fallbackOrder: languages
-        }))
+        })}`
       }), category.externalId && jsx(Text.Detail, {
-        children: _concatInstanceProperty(_context2 = "".concat(formatMessage(messages$B.externalId), ": ")).call(_context2, category.externalId || NO_VALUE_FALLBACK)
+        children: `${formatMessage(messages$B.externalId)}: ${category.externalId || NO_VALUE_FALLBACK}`
       })]
     })
   }));
@@ -5987,7 +5934,7 @@ var CategorySearchPickerOptionFragment$1 = { kind: "Document", definitions: [{ k
 function useCachedCategoryOptions(ids) {
   const apolloClient = useApolloClient$1();
   const fragments = _mapInstanceProperty(ids).call(ids, id => apolloClient.readFragment({
-    id: "CategorySearch:".concat(id),
+    id: `CategorySearch:${id}`,
     fragment: CategorySearchPickerOptionFragment$1
   }));
   return _mapInstanceProperty(fragments).call(fragments, category => transformLocalizedFieldsForCategory(category, [{
@@ -6002,8 +5949,8 @@ function useCachedCategoryOptions(ids) {
 var SearchCartDiscount = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "SearchCartDiscount" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "where" } }, type: { kind: "NamedType", name: { kind: "Name", value: "String" } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "cartDiscounts" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "limit" }, value: { kind: "IntValue", value: "500" } }, { kind: "Argument", name: { kind: "Name", value: "where" }, value: { kind: "Variable", name: { kind: "Name", value: "where" } } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "results" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }] } }] } }], loc: { start: 0, end: 425, source: { body: "query SearchCartDiscount($where: String) {\n  cartDiscounts(limit: 500, where: $where) {\n    total\n    results {\n      id\n      key\n      nameAllLocales {\n        locale\n        value\n      }\n    }\n  }\n}\n\nquery CartDiscountsCount {\n  cartDiscounts {\n    total\n  }\n}\n\nquery FetchCartDiscountById($cartDiscountId: String!) {\n  cartDiscount(id: $cartDiscountId) {\n    id\n    nameAllLocales {\n      locale\n      value\n    }\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 var FetchCartDiscountById = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "FetchCartDiscountById" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "cartDiscountId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "cartDiscount" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "id" }, value: { kind: "Variable", name: { kind: "Name", value: "cartDiscountId" } } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }] } }], loc: { start: 0, end: 425, source: { body: "query SearchCartDiscount($where: String) {\n  cartDiscounts(limit: 500, where: $where) {\n    total\n    results {\n      id\n      key\n      nameAllLocales {\n        locale\n        value\n      }\n    }\n  }\n}\n\nquery CartDiscountsCount {\n  cartDiscounts {\n    total\n  }\n}\n\nquery FetchCartDiscountById($cartDiscountId: String!) {\n  cartDiscount(id: $cartDiscountId) {\n    id\n    nameAllLocales {\n      locale\n      value\n    }\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 const transformCartDiscountResponse = response => {
-  var _context, _response$data;
-  return _mapInstanceProperty(_context = ((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.cartDiscounts.results) || []).call(_context, cartDiscount => transformLocalizedFieldsForCartDiscount(cartDiscount));
+  var _context;
+  return _mapInstanceProperty(_context = response.data?.cartDiscounts.results || []).call(_context, cartDiscount => transformLocalizedFieldsForCartDiscount(cartDiscount));
 };
 function queryCartDiscounts(apolloClient) {
   return apolloClient.query({
@@ -6015,14 +5962,14 @@ function queryCartDiscounts(apolloClient) {
   }).then(transformCartDiscountResponse);
 }
 const getWhereClause = function () {
-  var _context2, _context3, _context4;
+  var _context2, _context3;
   let searchText = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   let language = arguments.length > 1 ? arguments[1] : undefined;
   const query = _trimInstanceProperty(_context2 = _JSON$stringify(searchText)).call(_context2);
-  const idQuery = isUUID(searchText) && "id = ".concat(query);
-  const nameQuery = _concatInstanceProperty(_context3 = "name(".concat(language, " = ")).call(_context3, query, ")");
-  const keyQuery = "key = ".concat(query);
-  return _filterInstanceProperty(_context4 = [idQuery, nameQuery, keyQuery]).call(_context4, Boolean).join(' or ');
+  const idQuery = isUUID(searchText) && `id = ${query}`;
+  const nameQuery = `name(${language} = ${query})`;
+  const keyQuery = `key = ${query}`;
+  return _filterInstanceProperty(_context3 = [idQuery, nameQuery, keyQuery]).call(_context3, Boolean).join(' or ');
 };
 function searchCartDiscountsByExactMatch(apolloClient, options) {
   return apolloClient.query({
@@ -6045,10 +5992,7 @@ function getCartDiscountById(apolloClient, options) {
     context: {
       target: GRAPHQL_TARGETS.COMMERCETOOLS_PLATFORM
     }
-  }).then(response => {
-    var _response$data2;
-    return (_response$data2 = response.data) !== null && _response$data2 !== void 0 && _response$data2.cartDiscount ? transformLocalizedFieldsForCartDiscount(response.data.cartDiscount) : null;
-  });
+  }).then(response => response.data?.cartDiscount ? transformLocalizedFieldsForCartDiscount(response.data.cartDiscount) : null);
 }
 
 const messages$A = defineMessages({
@@ -6125,7 +6069,7 @@ function CartDiscountReferenceSearch(props) {
     }),
     loading = _useQuery.loading,
     data = _useQuery.data;
-  const isExactMatch = (data === null || data === void 0 ? void 0 : data.cartDiscounts.total) > QUERY_MAX_LIMIT;
+  const isExactMatch = data?.cartDiscounts.total > QUERY_MAX_LIMIT;
   const _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   const apolloClient = useApolloClient$1();
@@ -6262,7 +6206,6 @@ const DropdownIndicator = () => jsx(SearchIcon, {
 });
 DropdownIndicator.displayName = 'DropdownIndicator';
 const ProductPickerInput = _ref => {
-  var _currentOption$data$l, _currentOption$data;
   let isClearable = _ref.isClearable,
     isDisabled = _ref.isDisabled,
     isReadOnly = _ref.isReadOnly,
@@ -6282,20 +6225,19 @@ const ProductPickerInput = _ref => {
     loadingError = _useState2[0],
     setLoadingError = _useState2[1];
   const convertProductToOption = useCallback(product => {
-    var _masterData$current;
     if (!product) return null;
     const id = product.id,
       key = product.key,
       masterData = product.masterData;
-    const localizedName = formatLocalizedFieldToString((_masterData$current = masterData.current) === null || _masterData$current === void 0 ? void 0 : _masterData$current.nameAllLocales);
+    const localizedName = formatLocalizedFieldToString(masterData.current?.nameAllLocales);
     return {
-      label: localizedName + (key ? " (key: ".concat(key, ")") : ''),
+      label: localizedName + (key ? ` (key: ${key})` : ''),
       value: id,
       name: localizedName,
       key
     };
   }, [formatLocalizedFieldToString]);
-  const prefixSearchFields = useMemo(() => ["masterData.current.name.".concat(dataLocale), 'key'], [dataLocale]);
+  const prefixSearchFields = useMemo(() => [`masterData.current.name.${dataLocale}`, 'key'], [dataLocale]);
   const loadOptions = useLoadOptions({
     query: GetProductsQuery,
     prefixSearchFields
@@ -6326,12 +6268,12 @@ const ProductPickerInput = _ref => {
     setLoadingError(null);
     handleInternalInputChange(event);
   }, [handleInternalInputChange]);
-  const isCurrentOptionLoadingFailed = Boolean(currentOption === null || currentOption === void 0 ? void 0 : currentOption.error);
+  const isCurrentOptionLoadingFailed = Boolean(currentOption?.error);
   useEffect(() => {
     if (isCurrentOptionLoadingFailed) onError(currentOption.error);
   }, [isCurrentOptionLoadingFailed, onError, currentOption]);
   const isLoadingFailed = isCurrentOptionLoadingFailed || Boolean(loadingError);
-  const tooltipTitle = (_currentOption$data$l = currentOption === null || currentOption === void 0 || (_currentOption$data = currentOption.data) === null || _currentOption$data === void 0 ? void 0 : _currentOption$data.label) !== null && _currentOption$data$l !== void 0 ? _currentOption$data$l : '';
+  const tooltipTitle = currentOption?.data?.label ?? '';
   return jsx(Constraints.Horizontal, {
     max: "scale",
     children: currentOption.loading ? jsx(CenteredLoadingSpinner, {}) : jsxs(Spacings.Stack, {
@@ -6368,8 +6310,7 @@ const ProductPickerInput = _ref => {
 ProductPickerInput.displayName = 'ProductPickerInput';
 
 function CustomProductReferenceInput(props) {
-  var _props$value;
-  const value = ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.id) || '';
+  const value = props.value?.id || '';
   return jsx(ProductPickerInput, {
     value: value,
     name: props.name,
@@ -6386,8 +6327,7 @@ function CustomProductReferenceInput(props) {
 CustomProductReferenceInput.displayName = 'CustomProductReferenceInput';
 
 function CustomProductTypeReferenceInput(props) {
-  var _props$value;
-  const value = ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.id) || '';
+  const value = props.value?.id || '';
   return jsx(ProductTypePickerInput, {
     value: value,
     name: props.name,
@@ -6403,8 +6343,7 @@ function CustomProductTypeReferenceInput(props) {
 CustomProductTypeReferenceInput.displayName = 'CustomProductTypeReferenceInput';
 
 function CustomChannelReferenceInput(props) {
-  var _props$value;
-  const value = ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.id) || '';
+  const value = props.value?.id || '';
   return jsx(ChannelPickerInput, {
     value: value,
     name: props.name,
@@ -6420,8 +6359,7 @@ function CustomChannelReferenceInput(props) {
 CustomChannelReferenceInput.displayName = 'CustomChannelReferenceInput';
 
 function CustomStateReferenceInput(props) {
-  var _props$value;
-  const value = ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.id) || '';
+  const value = props.value?.id || '';
   return jsx(StatePickerInput, {
     value: value,
     name: props.name,
@@ -6530,14 +6468,13 @@ function CustomTimeInput(props) {
 CustomTimeInput.displayName = 'CustomTimeInput';
 
 const convertTypeValuesToOptions = defaultMemoize(typeValues => _mapInstanceProperty(typeValues).call(typeValues, typeValue => ({
-  label: typeValue.label || "".concat(typeValue.key, " (key)"),
+  label: typeValue.label || `${typeValue.key} (key)`,
   value: typeValue.key
 })));
 function CustomEnumInput(props) {
-  var _options$find$label, _options$find;
   const options = convertTypeValuesToOptions(_valuesInstanceProperty(props.fieldDefinition.type));
   const handleChange = makeChangeHandler(rawValue => props.setFieldValue(props.name, rawValue));
-  const tooltipTitle = props.value ? (_options$find$label = (_options$find = _findInstanceProperty(options).call(options, option => option.value === props.value)) === null || _options$find === void 0 ? void 0 : _options$find.label) !== null && _options$find$label !== void 0 ? _options$find$label : '' : '';
+  const tooltipTitle = props.value ? _findInstanceProperty(options).call(options, option => option.value === props.value)?.label ?? '' : '';
   return jsx(CustomFieldTooltip, {
     title: tooltipTitle,
     children: jsx(SelectInput, {
@@ -6609,9 +6546,9 @@ function ownKeys$P(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySy
 function _objectSpread$P(e) { for (var r = 1; r < arguments.length; r++) { var _context7, _context8; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context7 = ownKeys$P(Object(t), !0)).call(_context7, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context8 = ownKeys$P(Object(t))).call(_context8, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 const getTypeName = type => type.name.toLowerCase();
 const findLabel = (enumType, key) => {
-  var _enumType$values$find, _enumType$values$find2, _context;
+  var _context;
   const emptyValue = getTypeName(enumType) === 'enum' ? '' : {};
-  return (_enumType$values$find = (_enumType$values$find2 = _findInstanceProperty(_context = _valuesInstanceProperty(enumType)).call(_context, value => value.key === key)) === null || _enumType$values$find2 === void 0 ? void 0 : _enumType$values$find2.label) !== null && _enumType$values$find !== void 0 ? _enumType$values$find : emptyValue;
+  return _findInstanceProperty(_context = _valuesInstanceProperty(enumType)).call(_context, value => value.key === key)?.label ?? emptyValue;
 };
 const convertEnumValues = (value, attributeDefinition) => {
   var _context2, _context3;
@@ -6675,7 +6612,7 @@ const attributesMapToNameValuePairs = map => {
 
 const getAttributeShortName = (fullName, attributesPrefix) => {
   if (!attributesPrefix) return fullName;
-  return fullName.replace("".concat(attributesPrefix, "."), '');
+  return fullName.replace(`${attributesPrefix}.`, '');
 };
 function ProductAttributes(props) {
   const formik = useFormikContext();
@@ -6757,19 +6694,19 @@ function ownKeys$O(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySy
 function _objectSpread$O(e) { for (var r = 1; r < arguments.length; r++) { var _context6, _context7; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context6 = ownKeys$O(Object(t), !0)).call(_context6, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context7 = ownKeys$O(Object(t))).call(_context7, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var FetchProductTypeQuery = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "FetchProductTypeQuery" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "id" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "productType" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "id" }, value: { kind: "Variable", name: { kind: "Name", value: "id" } } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "name" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "attributeDefinitions" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "limit" }, value: { kind: "IntValue", value: "100" } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "results" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "name" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "isRequired" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "inputHint" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "inputTipAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }] } }, { kind: "Field", name: { kind: "Name", value: "labelAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }] } }, { kind: "Field", name: { kind: "Name", value: "type" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "name" }, arguments: [], directives: [] }, { kind: "InlineFragment", typeCondition: { kind: "NamedType", name: { kind: "Name", value: "SetAttributeDefinitionType" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "elementType" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "name" }, arguments: [], directives: [] }, { kind: "InlineFragment", typeCondition: { kind: "NamedType", name: { kind: "Name", value: "NestedAttributeDefinitionType" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "typeRef" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }] } }] } }, { kind: "InlineFragment", typeCondition: { kind: "NamedType", name: { kind: "Name", value: "EnumAttributeDefinitionType" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "values" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "results" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "label" }, arguments: [], directives: [] }] } }] } }] } }, { kind: "InlineFragment", typeCondition: { kind: "NamedType", name: { kind: "Name", value: "LocalizableEnumAttributeDefinitionType" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "values" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "results" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "labelAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }] } }] } }, { kind: "InlineFragment", typeCondition: { kind: "NamedType", name: { kind: "Name", value: "ReferenceAttributeDefinitionType" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "referenceTypeId" }, arguments: [], directives: [] }] } }] } }] } }, { kind: "InlineFragment", typeCondition: { kind: "NamedType", name: { kind: "Name", value: "ReferenceAttributeDefinitionType" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "referenceTypeId" }, arguments: [], directives: [] }] } }, { kind: "InlineFragment", typeCondition: { kind: "NamedType", name: { kind: "Name", value: "NestedAttributeDefinitionType" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "typeRef" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }] } }] } }, { kind: "InlineFragment", typeCondition: { kind: "NamedType", name: { kind: "Name", value: "EnumAttributeDefinitionType" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "values" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "results" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "label" }, arguments: [], directives: [] }] } }] } }] } }, { kind: "InlineFragment", typeCondition: { kind: "NamedType", name: { kind: "Name", value: "LocalizableEnumAttributeDefinitionType" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "values" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "results" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "labelAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }] } }] } }] } }] } }] } }] } }] } }], loc: { start: 0, end: 1905, source: { body: "query FetchProductTypeQuery($id: String!) {\n  productType(id: $id) {\n    name\n    attributeDefinitions(limit: 100) {\n      results {\n        name\n        isRequired\n        inputHint\n        inputTipAllLocales {\n          value\n          locale\n        }\n        labelAllLocales {\n          value\n          locale\n        }\n        type {\n          name\n          ... on SetAttributeDefinitionType {\n            elementType {\n              name\n              ... on NestedAttributeDefinitionType {\n                typeRef {\n                  id\n                }\n              }\n              ... on EnumAttributeDefinitionType {\n                values {\n                  results {\n                    key\n                    label\n                  }\n                }\n              }\n              ... on LocalizableEnumAttributeDefinitionType {\n                values {\n                  results {\n                    key\n                    labelAllLocales {\n                      locale\n                      value\n                    }\n                  }\n                }\n              }\n              ... on ReferenceAttributeDefinitionType {\n                referenceTypeId\n              }\n            }\n          }\n          ... on ReferenceAttributeDefinitionType {\n            referenceTypeId\n          }\n          ... on NestedAttributeDefinitionType {\n            typeRef {\n              id\n            }\n          }\n          ... on EnumAttributeDefinitionType {\n            values {\n              results {\n                key\n                label\n              }\n            }\n          }\n          ... on LocalizableEnumAttributeDefinitionType {\n            values {\n              results {\n                key\n                labelAllLocales {\n                  locale\n                  value\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 const mapAttributeDefinition = definition => {
-  var _context, _definition$type, _context2, _context3, _definition$type2, _context4;
+  var _context, _context2, _context3, _context4;
   return _objectSpread$O(_objectSpread$O({}, definition), {}, {
     required: definition.isRequired,
     inputTip: transformLocalizedFieldToLocalizedString(definition.inputTipAllLocales),
     label: transformLocalizedFieldToLocalizedString(definition.labelAllLocales),
-    type: _includesInstanceProperty(_context = ['enum', 'lenum']).call(_context, (_definition$type = definition.type) === null || _definition$type === void 0 || (_definition$type = _definition$type.elementType) === null || _definition$type === void 0 ? void 0 : _definition$type.name) ? _objectSpread$O(_objectSpread$O({}, definition.type), {}, {
+    type: _includesInstanceProperty(_context = ['enum', 'lenum']).call(_context, definition.type?.elementType?.name) ? _objectSpread$O(_objectSpread$O({}, definition.type), {}, {
       elementType: _objectSpread$O(_objectSpread$O({}, definition.type.elementType), {}, {
         values: _mapInstanceProperty(_context2 = _valuesInstanceProperty(definition.type.elementType).results).call(_context2, value => ({
           key: value.key,
           label: value.label || transformLocalizedFieldToLocalizedString(value.labelAllLocales)
         }))
       })
-    }) : _includesInstanceProperty(_context3 = ['enum', 'lenum']).call(_context3, (_definition$type2 = definition.type) === null || _definition$type2 === void 0 ? void 0 : _definition$type2.name) ? _objectSpread$O(_objectSpread$O({}, definition.type), {}, {
+    }) : _includesInstanceProperty(_context3 = ['enum', 'lenum']).call(_context3, definition.type?.name) ? _objectSpread$O(_objectSpread$O({}, definition.type), {}, {
       values: _mapInstanceProperty(_context4 = _valuesInstanceProperty(definition.type).results).call(_context4, value => ({
         key: value.key,
         label: value.label || transformLocalizedFieldToLocalizedString(value.labelAllLocales)
@@ -7092,15 +7029,21 @@ CustomNestedInput.displayName = 'CustomNestedInput';
 
 var styles$d = {
   "divider": "divider-module__divider___4-vdy",
+  "divider-horizontal": "divider-module__divider-horizontal___RuUcj",
+  "divider-vertical": "divider-module__divider-vertical___32kJG",
   "divider-solid": "divider-module__divider-solid___3Fs4q divider-module__divider___4-vdy",
   "divider-dashed": "divider-module__divider-dashed___2Em8A divider-module__divider___4-vdy"
 };
 function Divider(_ref) {
-  let isDashed = _ref.isDashed;
+  let isDashed = _ref.isDashed,
+    _ref$orientation = _ref.orientation,
+    orientation = _ref$orientation === void 0 ? 'horizontal' : _ref$orientation;
   return jsx("hr", {
     className: classnames({
       [styles$d['divider-solid']]: !isDashed,
-      [styles$d['divider-dashed']]: isDashed
+      [styles$d['divider-dashed']]: isDashed,
+      [styles$d['divider-horizontal']]: orientation === 'horizontal',
+      [styles$d['divider-vertical']]: orientation === 'vertical'
     })
   });
 }
@@ -7114,7 +7057,7 @@ const ExpandButton = props => props.totalValues > 1 ? jsxs(Spacings.Stack, {
   }), jsx(FlatButton, {
     tone: "primary",
     icon: props.isExpanded ? jsx(AngleUpIcon, {}) : jsx(AngleDownIcon, {}),
-    label: props.isExpanded ? "Hide set items (".concat(props.totalValues, ")") : "Show all set items (".concat(props.totalValues, ")"),
+    label: props.isExpanded ? `Hide set items (${props.totalValues})` : `Show all set items (${props.totalValues})`,
     onClick: props.onExpand
   })]
 }) : null;
@@ -7149,7 +7092,7 @@ const SetButtons = props => {
 SetButtons.displayName = 'SetButtons';
 
 function ownKeys$M(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$M(e) { for (var r = 1; r < arguments.length; r++) { var _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys$M(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys$M(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread$M(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys$M(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys$M(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 const getDuplicateErrors = setValues => {
   /* eslint-disable no-plusplus */
   const result = [];
@@ -7190,13 +7133,10 @@ const getItemIndex = name => {
   return _parseInt(rawIndex, 10);
 };
 const makeKeys = amount => times(amount, () => v4());
-const makeItemFieldName = (fieldName, index) => {
-  var _context;
-  return _concatInstanceProperty(_context = "".concat(fieldName, ".[")).call(_context, index, "]");
-};
+const makeItemFieldName = (fieldName, index) => `${fieldName}.[${index}]`;
 const makeMapForAllItems = (fieldName, items, value) => _reduceInstanceProperty(items).call(items, (result, item, index) => set(result, makeItemFieldName(fieldName, index), value), {});
 function CustomInputSet(props) {
-  var _context2;
+  var _context;
   const _useToggleState = useToggleState(false),
     _useToggleState2 = _slicedToArray(_useToggleState, 2),
     isExpanded = _useToggleState2[0],
@@ -7218,7 +7158,7 @@ function CustomInputSet(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     keys = _useState4[0],
     setKeys = _useState4[1];
-  const totalAmount = internalValue === null || internalValue === void 0 ? void 0 : internalValue.length;
+  const totalAmount = internalValue?.length;
   const amountToRender = isExpanded ? totalAmount : 1;
   const updateInternalValue = newValue => {
     const valueToSet = isEmpty$1(newValue) ? [undefined] : newValue;
@@ -7265,8 +7205,8 @@ function CustomInputSet(props) {
   // in <CustomFieldComponent /> where proper component for given field/attribute
   // type is selected.
   const type = getType(props.fieldDefinition);
-  const typeName = type === null || type === void 0 ? void 0 : type.name.toLowerCase();
-  const areButtonsTopAligned = _includesInstanceProperty(_context2 = [CUSTOM_FIELD_TYPES.lenum, CUSTOM_FIELD_TYPES.localizedenum, CUSTOM_FIELD_TYPES.localizedstring, CUSTOM_FIELD_TYPES.string, CUSTOM_FIELD_TYPES.text, CUSTOM_FIELD_TYPES.ltext, CUSTOM_FIELD_TYPES.reference]).call(_context2, typeName);
+  const typeName = type?.name.toLowerCase();
+  const areButtonsTopAligned = _includesInstanceProperty(_context = [CUSTOM_FIELD_TYPES.lenum, CUSTOM_FIELD_TYPES.localizedenum, CUSTOM_FIELD_TYPES.localizedstring, CUSTOM_FIELD_TYPES.string, CUSTOM_FIELD_TYPES.text, CUSTOM_FIELD_TYPES.ltext, CUSTOM_FIELD_TYPES.reference]).call(_context, typeName);
   return jsxs(Fragment, {
     children: [jsx(AccessibleHidden, {
       children: jsx("label", {
@@ -7344,14 +7284,12 @@ const nonSetComponents = {
 };
 const CustomFieldInput = /*#__PURE__*/memo(props => {
   const InputComponent = useMemo(() => {
-    var _props$fieldDefinitio;
-    const typeName = (_props$fieldDefinitio = props.fieldDefinition.type) === null || _props$fieldDefinitio === void 0 ? void 0 : _props$fieldDefinitio.name.toLowerCase();
+    const typeName = props.fieldDefinition.type?.name.toLowerCase();
     if (typeName === 'set') {
-      var _getSetElementType;
       // Boolean is the only set element with peculiarities (i.e. way more
       // convenient for user to work with it as with select input with three values:
       // [true], [false] and [true, false]).
-      if (((_getSetElementType = getType(props.fieldDefinition)) === null || _getSetElementType === void 0 ? void 0 : _getSetElementType.name.toLowerCase()) === CUSTOM_FIELD_TYPES.boolean) {
+      if (getType(props.fieldDefinition)?.name.toLowerCase() === CUSTOM_FIELD_TYPES.boolean) {
         return CustomBooleanInputSet;
       }
       // All the rest sets are just a fancy wrapper around single-item components
@@ -7442,9 +7380,9 @@ const CustomFieldErrors = props => {
   const didFormValidationFail = useDidFormValidationFail();
   const errors = _Array$isArray(props.errors) ? mergeSetItemsErrors(props.errors) : props.errors;
   return jsxs(Fragment, {
-    children: [props.isTouched || didFormValidationFail && (errors === null || errors === void 0 ? void 0 : errors.missing) && jsx(ErrorMessage, {
+    children: [props.isTouched || didFormValidationFail && errors?.missing && jsx(ErrorMessage, {
       intlMessage: messages$K.required
-    }), props.isTouched || didFormValidationFail && (errors === null || errors === void 0 ? void 0 : errors.duplicated) && jsx(ErrorMessage, {
+    }), props.isTouched || didFormValidationFail && errors?.duplicated && jsx(ErrorMessage, {
       intlMessage: messages$K.unique
     })]
   });
@@ -7494,10 +7432,9 @@ function _objectSpread$J(e) { for (var r = 1; r < arguments.length; r++) { var _
 function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringify object returned from `css` function. It isn't supposed to be used directly (e.g. as value of the `className` prop), but rather handed to emotion so it can handle it (e.g. as value of `css` prop)."; }
 var CartDiscountsCount = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "CartDiscountsCount" }, variableDefinitions: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "cartDiscounts" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [] }] } }] } }], loc: { start: 0, end: 61, source: { body: "query CartDiscountsCount {\n  cartDiscounts {\n    total\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 const CustomFieldsLabelHint = _ref2 => {
-  var _type$name;
   let fieldDefinition = _ref2.fieldDefinition;
   const type = getType(fieldDefinition);
-  const isReference = ((_type$name = type.name) === null || _type$name === void 0 ? void 0 : _type$name.toLowerCase()) === 'reference';
+  const isReference = type.name?.toLowerCase() === 'reference';
   const referenceTypeId = type.referenceTypeId;
   const isCartDiscountsReference = isReference && referenceTypeId === SEARCHABLE_REFERENCES.cartDiscount;
   const _useApplicationContex = useApplicationContext(applicationContext => ({
@@ -7515,7 +7452,7 @@ const CustomFieldsLabelHint = _ref2 => {
     data = _useQuery.data,
     loading = _useQuery.loading;
   if (loading) return null;
-  if ((data === null || data === void 0 ? void 0 : data.cartDiscounts.total) > QUERY_MAX_LIMIT) {
+  if (data?.cartDiscounts.total > QUERY_MAX_LIMIT) {
     return jsxs(Spacings.Inline, {
       alignItems: "center",
       children: [jsx(WarningIcon, {
@@ -7542,17 +7479,17 @@ function CustomFieldsProductTypeReferenceSubtitle() {
 // TODO(pa3): this logic may be misplaced and probably
 // should belong to <CustomReferenceInput /> component instead.
 function CustomFieldsLabelSubtitle(_ref3) {
-  var _type$name2, _context;
+  var _context;
   let fieldDefinition = _ref3.fieldDefinition;
   const _useIntl2 = useIntl(),
     formatMessage = _useIntl2.formatMessage;
   const type = getType(fieldDefinition);
-  const isReference = ((_type$name2 = type.name) === null || _type$name2 === void 0 ? void 0 : _type$name2.toLowerCase()) === 'reference';
+  const isReference = type.name?.toLowerCase() === 'reference';
   if (!isReference) return null;
   const referenceTypeId = type.referenceTypeId;
   const referenceTypeName = capitalizeFirst(referenceTypeId);
   if (_includesInstanceProperty(_context = [SEARCHABLE_REFERENCES.category, SEARCHABLE_REFERENCES.cartDiscount]).call(_context, referenceTypeId)) return referenceTypeName;
-  return referenceTypeId === SEARCHABLE_REFERENCES.product ? formatMessage(messages$v.productReferenceLabel) : referenceTypeId === SEARCHABLE_REFERENCES.productType ? jsx(CustomFieldsProductTypeReferenceSubtitle, {}) : referenceTypeId === SEARCHABLE_REFERENCES.channel ? formatMessage(messages$v.channelReferenceLabel) : referenceTypeId === SEARCHABLE_REFERENCES.state ? formatMessage(messages$v.stateReferenceLabel) : "".concat(referenceTypeName, " ID");
+  return referenceTypeId === SEARCHABLE_REFERENCES.product ? formatMessage(messages$v.productReferenceLabel) : referenceTypeId === SEARCHABLE_REFERENCES.productType ? jsx(CustomFieldsProductTypeReferenceSubtitle, {}) : referenceTypeId === SEARCHABLE_REFERENCES.channel ? formatMessage(messages$v.channelReferenceLabel) : referenceTypeId === SEARCHABLE_REFERENCES.state ? formatMessage(messages$v.stateReferenceLabel) : `${referenceTypeName} ID`;
 }
 const Portal = props => /*#__PURE__*/ReactDOM.createPortal(props.children, document.body);
 var _ref = process.env.NODE_ENV === "production" ? {
@@ -7569,7 +7506,7 @@ function CustomFieldsCountIndicator(_ref4) {
   const formatLocalizedField = useFormatLocalizedFieldToString();
   const _useIntl3 = useIntl(),
     formatMessage = _useIntl3.formatMessage;
-  return (assignedAttributeGroups === null || assignedAttributeGroups === void 0 ? void 0 : assignedAttributeGroups.length) > 1 ? jsx(Tooltip, {
+  return assignedAttributeGroups?.length > 1 ? jsx(Tooltip, {
     title: formatMessage(messages$v.attributeGroupCountTooltip, {
       attributeGroups: _mapInstanceProperty(assignedAttributeGroups).call(assignedAttributeGroups, assignedAttributeGroup => formatLocalizedField(assignedAttributeGroup.nameAllLocales)).join(', '),
       count: assignedAttributeGroups.length
@@ -7627,9 +7564,8 @@ const CustomFieldsLabel = /*#__PURE__*/memo(_ref5 => {
 CustomFieldsLabel.displayName = 'CustomFieldsTitle';
 
 const getFieldName = (parentName, fieldName) => {
-  var _context;
   if (!parentName) return fieldName;
-  return _concatInstanceProperty(_context = "".concat(parentName, ".")).call(_context, fieldName);
+  return `${parentName}.${fieldName}`;
 };
 const isNested = fieldDefinition => {
   const type = fieldDefinition.type;
@@ -7654,7 +7590,6 @@ const CustomFieldsInternal = props => {
     isDragAndDropMode = _useDnDContext.isDragAndDropMode;
   return jsx(DroppableWrapper, {
     children: _mapInstanceProperty(fieldDefinitions).call(fieldDefinitions, (fieldDefinition, index) => {
-      var _context2;
       const fieldName = getFieldName(props.name, fieldDefinition.name);
       const isTouched = Boolean(getIn(touched, fieldName));
       const fieldErrors = getIn(errors, fieldName);
@@ -7671,51 +7606,48 @@ const CustomFieldsInternal = props => {
       return jsx(FastField, {
         name: fieldName,
         validate: validate,
-        children: () => {
-          var _context3, _context4;
-          return jsx(DraggableWrapper, {
-            draggableKey: _concatInstanceProperty(_context3 = "".concat(fieldName, "-")).call(_context3, index),
-            draggableId: _concatInstanceProperty(_context4 = "".concat(fieldName, "-")).call(_context4, index),
-            index: index,
-            children: jsx(Spacings.Stack, {
-              scale: "xs",
-              children: jsxs("div", {
-                "aria-invalid": _Object$keys(fieldErrors !== null && fieldErrors !== void 0 ? fieldErrors : {}).length > 0,
-                "aria-errormessage": "".concat(fieldName, "-error"),
-                id: "".concat(fieldName, "-error"),
-                children: [jsx(CustomFieldsLabel, {
+        children: () => jsx(DraggableWrapper, {
+          draggableKey: `${fieldName}-${index}`,
+          draggableId: `${fieldName}-${index}`,
+          index: index,
+          children: jsx(Spacings.Stack, {
+            scale: "xs",
+            children: jsxs("div", {
+              "aria-invalid": _Object$keys(fieldErrors ?? {}).length > 0,
+              "aria-errormessage": `${fieldName}-error`,
+              id: `${fieldName}-error`,
+              children: [jsx(CustomFieldsLabel, {
+                name: fieldName,
+                fieldDefinition: fieldDefinition
+              }), jsxs(Spacings.Stack, {
+                scale: "xs",
+                alignItems: "stretch",
+                children: [isNested(fieldDefinition) ? jsx(CustomNestedFieldInput, {
                   name: fieldName,
-                  fieldDefinition: fieldDefinition
-                }), jsxs(Spacings.Stack, {
-                  scale: "xs",
-                  alignItems: "stretch",
-                  children: [isNested(fieldDefinition) ? jsx(CustomNestedFieldInput, {
-                    name: fieldName,
-                    value: value,
-                    fieldDefinition: fieldDefinition,
-                    isDisabled: props.isDisabled || isDragAndDropMode,
-                    isReadOnly: props.isReadOnly,
-                    onBlur: handleBlur,
-                    setFieldValue: props.setFieldValue
-                  }) : jsx(CustomFieldInput, {
-                    name: fieldName,
-                    value: value,
-                    fieldDefinition: fieldDefinition,
-                    isDisabled: props.isDisabled || isDragAndDropMode,
-                    isReadOnly: props.isReadOnly,
-                    onBlur: handleBlur,
-                    setFieldValue: props.setFieldValue,
-                    hasError: hasError
-                  }), jsx(CustomFieldErrors, {
-                    isTouched: isTouched,
-                    errors: fieldErrors
-                  })]
+                  value: value,
+                  fieldDefinition: fieldDefinition,
+                  isDisabled: props.isDisabled || isDragAndDropMode,
+                  isReadOnly: props.isReadOnly,
+                  onBlur: handleBlur,
+                  setFieldValue: props.setFieldValue
+                }) : jsx(CustomFieldInput, {
+                  name: fieldName,
+                  value: value,
+                  fieldDefinition: fieldDefinition,
+                  isDisabled: props.isDisabled || isDragAndDropMode,
+                  isReadOnly: props.isReadOnly,
+                  onBlur: handleBlur,
+                  setFieldValue: props.setFieldValue,
+                  hasError: hasError
+                }), jsx(CustomFieldErrors, {
+                  isTouched: isTouched,
+                  errors: fieldErrors
                 })]
-              })
+              })]
             })
-          });
-        }
-      }, _concatInstanceProperty(_context2 = "".concat(fieldName, "-")).call(_context2, index));
+          })
+        })
+      }, `${fieldName}-${index}`);
     })
   });
 };
@@ -7771,7 +7703,7 @@ var pickerMessages = defineMessages({
 });
 
 function ownKeys$I(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$I(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys$I(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys$I(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread$I(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys$I(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys$I(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 const PRODUCT_SELECTION_MODES = {
   INCLUSION: 'Individual',
   EXCLUSION: 'IndividualExclusion'
@@ -7782,11 +7714,10 @@ const PRODUCT_SELECTION_MODES_LABELS = {
 };
 const getMode = mode => mode === PRODUCT_SELECTION_MODES.INCLUSION || mode === PRODUCT_SELECTION_MODES_LABELS.INCLUSION ? 'inclusion' : 'exclusion';
 const addModeToLabel = function (ps) {
-  var _context;
   let enableExcludingProducts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (!ps) return undefined;
   return _objectSpread$I(_objectSpread$I({}, ps), {}, {
-    label: _concatInstanceProperty(_context = "".concat(ps === null || ps === void 0 ? void 0 : ps.label)).call(_context, enableExcludingProducts ? " (type: ".concat(getMode(ps === null || ps === void 0 ? void 0 : ps.mode), ")") : '')
+    label: `${ps?.label}${enableExcludingProducts ? ` (type: ${getMode(ps?.mode)})` : ''}`
   });
 };
 
@@ -7798,7 +7729,6 @@ const mapProductSelectionsToOptions$1 = memoize(function () {
   let enableExcludingProducts = arguments.length > 4 ? arguments[4] : undefined;
   const selectedPSList = _Array$isArray(selectedPS) ? selectedPS : [selectedPS];
   return _mapInstanceProperty(productSelections).call(productSelections, productSelection => {
-    var _context;
     const label = formatLocalizedString(productSelection, {
       key: 'name',
       locale: dataLocale,
@@ -7807,14 +7737,13 @@ const mapProductSelectionsToOptions$1 = memoize(function () {
     return {
       id: productSelection.id,
       value: productSelection.id,
-      label: _concatInstanceProperty(_context = "".concat(label)).call(_context, _includesInstanceProperty(selectedPSList).call(selectedPSList, productSelection.id) && enableExcludingProducts ? " (type: ".concat(getMode(productSelection.mode), ")") : ''),
+      label: `${label}${_includesInstanceProperty(selectedPSList).call(selectedPSList, productSelection.id) && enableExcludingProducts ? ` (type: ${getMode(productSelection.mode)})` : ''}`,
       key: productSelection.key,
       mode: getMode(productSelection.mode)
     };
   });
 });
 function ProductSelectionBasicSelectDropdown(props) {
-  var _productSelectionsFet, _productSelectionsFet2;
   const intl = useIntl();
   const enableExcludingProducts = useFeatureToggle(EXCLUDING_PRODUCTS);
   const productSelectionsFetcher = useProductSelectionsFetcher({
@@ -7827,10 +7756,10 @@ function ProductSelectionBasicSelectDropdown(props) {
     projectLanguages = _useApplicationContex.projectLanguages,
     dataLocale = _useApplicationContex.dataLocale;
   if (productSelectionsFetcher.isLoading) return jsx(CenteredLoadingSpinner, {});
-  const productSelections = (_productSelectionsFet = (_productSelectionsFet2 = productSelectionsFetcher.productSelections) === null || _productSelectionsFet2 === void 0 ? void 0 : _productSelectionsFet2.results) !== null && _productSelectionsFet !== void 0 ? _productSelectionsFet : [];
+  const productSelections = productSelectionsFetcher.productSelections?.results ?? [];
   const filteredProductSelections = _filterInstanceProperty(productSelections).call(productSelections, ps => {
-    var _context2;
-    return !_includesInstanceProperty(_context2 = props.excludedProductSelectionIds).call(_context2, ps.id);
+    var _context;
+    return !_includesInstanceProperty(_context = props.excludedProductSelectionIds).call(_context, ps.id);
   });
   const onOptionClick = event => {
     const productSelectionId = event.target.value;
@@ -7879,7 +7808,7 @@ const getValueFromOptions$3 = _ref => {
   // handle async-select-field value transformation
   if (isMulti) {
     var _context;
-    return _mapInstanceProperty(_context = _filterInstanceProperty(allProductSelectionOptions).call(allProductSelectionOptions, ps => currentlySelectedProductSelections === null || currentlySelectedProductSelections === void 0 ? void 0 : _includesInstanceProperty(currentlySelectedProductSelections).call(currentlySelectedProductSelections, ps.value))).call(_context, ps => addModeToLabel(ps, enableExcludingProducts));
+    return _mapInstanceProperty(_context = _filterInstanceProperty(allProductSelectionOptions).call(allProductSelectionOptions, ps => currentlySelectedProductSelections?.includes(ps.value))).call(_context, ps => addModeToLabel(ps, enableExcludingProducts));
   }
 
   // in case it is not multiselect, then a single valued async-select-input is being requested and the value should have proper format
@@ -7891,7 +7820,6 @@ const emptyStoreOption$1 = intl => [{
   isDisabled: true
 }];
 function ProductSelectionsAsyncSelectDropdown(props) {
-  var _productSelectionsFet3;
   const intl = useIntl();
   const enableExcludingProducts = useFeatureToggle(EXCLUDING_PRODUCTS);
   const productSelectionsFetcher = useProductSelectionsFetcher({
@@ -7904,17 +7832,13 @@ function ProductSelectionsAsyncSelectDropdown(props) {
     })),
     projectLanguages = _useApplicationContex.projectLanguages,
     dataLocale = _useApplicationContex.dataLocale;
-  const productSelections = useMemo(() => {
-    var _productSelectionsFet, _productSelectionsFet2;
-    return (_productSelectionsFet = (_productSelectionsFet2 = productSelectionsFetcher.productSelections) === null || _productSelectionsFet2 === void 0 ? void 0 : _productSelectionsFet2.results) !== null && _productSelectionsFet !== void 0 ? _productSelectionsFet : [];
-  }, [(_productSelectionsFet3 = productSelectionsFetcher.productSelections) === null || _productSelectionsFet3 === void 0 ? void 0 : _productSelectionsFet3.results]);
+  const productSelections = useMemo(() => productSelectionsFetcher.productSelections?.results ?? [], [productSelectionsFetcher.productSelections?.results]);
   const filteredProductSelections = _filterInstanceProperty(productSelections).call(productSelections, ps => {
     var _context2;
     return !_includesInstanceProperty(_context2 = props.excludedProductSelectionIds).call(_context2, ps.id);
   });
   const onOptionClick = event => {
-    var _event$target$value;
-    const productSelectionId = (_event$target$value = event.target.value) === null || _event$target$value === void 0 ? void 0 : _event$target$value.value;
+    const productSelectionId = event.target.value?.value;
     const currentProductSelection = _findInstanceProperty(productSelections).call(productSelections, productSelection => productSelection.id === productSelectionId);
     props.onChange(currentProductSelection);
   };
@@ -7986,15 +7910,11 @@ function ProductSelectionsAsyncSelectDropdown(props) {
 }
 
 var ProductSelectionsPickerFetcher$1 = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "ProductSelectionsPickerFetcher" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "where" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "productSelections" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "where" }, value: { kind: "Variable", name: { kind: "Name", value: "where" } } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "results" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "version" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }, { kind: "Field", name: { kind: "Name", value: "mode" }, arguments: [], directives: [] }] } }] } }] } }], loc: { start: 0, end: 223, source: { body: "query ProductSelectionsPickerFetcher($where: String!) {\n  productSelections(where: $where) {\n    results {\n      id\n      key\n      version\n      nameAllLocales {\n        locale\n        value\n      }\n      mode\n    }\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
-const createQueryVariables$4 = (productSelections, predicateField) => {
-  var _context;
-  return {
-    where: _concatInstanceProperty(_context = "".concat(predicateField, " in (")).call(_context, _mapInstanceProperty(productSelections).call(productSelections, ps => "\"".concat(ps, "\"")).join(', '), ")"),
-    limit: 500
-  };
-};
+const createQueryVariables$4 = (productSelections, predicateField) => ({
+  where: `${predicateField} in (${_mapInstanceProperty(productSelections).call(productSelections, ps => `"${ps}"`).join(', ')})`,
+  limit: 500
+});
 const useProductSelectionsByFieldFetcher = (productSelections, predicateField) => {
-  var _productSelectionsQue, _productSelectionsQue2;
   const productSelectionList = _Array$isArray(productSelections) ? productSelections : [productSelections];
   const productSelectionsQuery = useQuery(ProductSelectionsPickerFetcher$1, {
     context: {
@@ -8004,7 +7924,7 @@ const useProductSelectionsByFieldFetcher = (productSelections, predicateField) =
     skip: productSelectionList.length === 0
   });
   return {
-    productSelections: (_productSelectionsQue = (_productSelectionsQue2 = productSelectionsQuery.data) === null || _productSelectionsQue2 === void 0 ? void 0 : _productSelectionsQue2.productSelections.results) !== null && _productSelectionsQue !== void 0 ? _productSelectionsQue : [],
+    productSelections: productSelectionsQuery.data?.productSelections.results ?? [],
     isLoading: productSelectionsQuery.loading
   };
 };
@@ -8045,8 +7965,8 @@ const createQueryVariables$3 = _ref3 => {
   var _context;
   let searchText = _ref3.searchText;
   const sanitizedSearchText = sanitize(_trimInstanceProperty(searchText).call(searchText, searchText));
-  const idQuery = isUUID(sanitizedSearchText) && "id = \"".concat(sanitizedSearchText, "\"");
-  const keyQuery = "key = \"".concat(sanitizedSearchText, "\"");
+  const idQuery = isUUID(sanitizedSearchText) && `id = "${sanitizedSearchText}"`;
+  const keyQuery = `key = "${sanitizedSearchText}"`;
   const searchTextQuery = _filterInstanceProperty(_context = [idQuery, keyQuery]).call(_context, Boolean).join(' or ');
   return {
     where: searchTextQuery || undefined
@@ -8069,7 +7989,6 @@ function ProductSelectionsSearchSelectDropdown(props) {
     dataLocale = _useApplicationContex.dataLocale;
   const productSelectionsByFieldFetcher = useProductSelectionsByFieldFetcher(props.value, props.renderSelectInputOptionValuesByField);
   const handleLoadOptions = async searchText => {
-    var _data$productSelectio, _data$productSelectio2;
     const _await$client$query = await client.query({
         query: ProductSelectionsPickerFetcher,
         variables: createQueryVariables$3({
@@ -8081,7 +8000,7 @@ function ProductSelectionsSearchSelectDropdown(props) {
         fetchPolicy: 'network-only'
       }),
       data = _await$client$query.data;
-    const matchedProductSelections = (_data$productSelectio = data === null || data === void 0 || (_data$productSelectio2 = data.productSelections) === null || _data$productSelectio2 === void 0 ? void 0 : _data$productSelectio2.results) !== null && _data$productSelectio !== void 0 ? _data$productSelectio : [];
+    const matchedProductSelections = data?.productSelections?.results ?? [];
     const updatedProductSelections = _mapInstanceProperty(matchedProductSelections).call(matchedProductSelections, convertProductSelectionFromGraphQl);
     const filteredProductSelections = _filterInstanceProperty(updatedProductSelections).call(updatedProductSelections, ps => {
       var _context2;
@@ -8097,8 +8016,7 @@ function ProductSelectionsSearchSelectDropdown(props) {
   };
   const loadOptionsDebounced = debounce(handleLoadOptions, 500);
   const onOptionClick = event => {
-    var _event$target$value;
-    const productSelectionId = (_event$target$value = event.target.value) === null || _event$target$value === void 0 ? void 0 : _event$target$value.value;
+    const productSelectionId = event.target.value?.value;
     const currentProductSelection = _findInstanceProperty(productionSelectionResults).call(productionSelectionResults, productSelection => productSelection.id === productSelectionId);
     props.onChange(currentProductSelection);
   };
@@ -8146,11 +8064,11 @@ function ModeSelectInputOption(props) {
       scale: "xs",
       children: [jsx(Text.Detail, {
         isBold: true,
-        children: (data === null || data === void 0 ? void 0 : data.label) || noValueFallback
+        children: data?.label || noValueFallback
       }), jsxs(Text.Detail, {
-        children: ["Key: ", (data === null || data === void 0 ? void 0 : data.key) || noValueFallback]
+        children: ["Key: ", data?.key || noValueFallback]
       }), jsxs(Text.Detail, {
-        children: ["Type: ", (data === null || data === void 0 ? void 0 : data.mode) || noValueFallback]
+        children: ["Type: ", data?.mode || noValueFallback]
       })]
     })
   }));
@@ -8251,8 +8169,7 @@ function CountriesAsyncSelectDropdown(props) {
   var _context2;
   const intl = useIntl();
   const handleLoadOptions = async searchTerm => {
-    var _props$options, _props$options2;
-    const filteredOptions = (_props$options = props.options) === null || _props$options === void 0 ? void 0 : _filterInstanceProperty(_props$options).call(_props$options, country => {
+    const filteredOptions = props.options?.filter(country => {
       var _context;
       return _includesInstanceProperty(_context = country.label.toLowerCase()).call(_context, searchTerm.toLowerCase());
     });
@@ -8260,7 +8177,7 @@ function CountriesAsyncSelectDropdown(props) {
       return _sliceInstanceProperty(filteredOptions).call(filteredOptions, 0, props.countriesAsyncLoadingLimit);
     }
     return [{
-      options: (_props$options2 = props.options) === null || _props$options2 === void 0 ? void 0 : _sliceInstanceProperty(_props$options2).call(_props$options2, 0, props.countriesAsyncLoadingLimit)
+      options: props.options?.slice(0, props.countriesAsyncLoadingLimit)
     }, {
       options: emptyCountryOption(intl)
     }];
@@ -8269,10 +8186,7 @@ function CountriesAsyncSelectDropdown(props) {
     const countries = event.target.value;
     props.onChange({
       target: _objectSpread$F(_objectSpread$F({}, event.target), {}, {
-        value: _mapInstanceProperty(countries).call(countries, country => {
-          var _country$value;
-          return (_country$value = country === null || country === void 0 ? void 0 : country.value) !== null && _country$value !== void 0 ? _country$value : country;
-        })
+        value: _mapInstanceProperty(countries).call(countries, country => country?.value ?? country)
       })
     });
   };
@@ -8302,8 +8216,7 @@ function CountriesAsyncSelectDropdown(props) {
 function ownKeys$E(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$E(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys$E(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys$E(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function CountriesPicker(props) {
-  var _props$options;
-  const CustomCountriesPicker = ((_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.length) <= props.countriesAsyncLoadingLimit ? CountriesBasicSelectDropdown : CountriesAsyncSelectDropdown;
+  const CustomCountriesPicker = props.options?.length <= props.countriesAsyncLoadingLimit ? CountriesBasicSelectDropdown : CountriesAsyncSelectDropdown;
   return jsx(Spacings.Stack, {
     children: jsx(CustomCountriesPicker, _objectSpread$E({}, props))
   });
@@ -8332,7 +8245,6 @@ var GetCustomerGroupsQuery = { kind: "Document", definitions: [{ kind: "Operatio
 var GetCustomerGroupQuery = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "GetCustomerGroupQuery" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "id" } }, type: { kind: "NamedType", name: { kind: "Name", value: "String" } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "customerGroup" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "id" }, value: { kind: "Variable", name: { kind: "Name", value: "id" } } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "FragmentSpread", name: { kind: "Name", value: "PickerInputCustomerGroups" }, directives: [] }] } }] } }, { kind: "FragmentDefinition", name: { kind: "Name", value: "PickerInputCustomerGroups" }, typeCondition: { kind: "NamedType", name: { kind: "Name", value: "CustomerGroup" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "name" }, arguments: [], directives: [] }] } }], loc: { start: 0, end: 406, source: { body: "fragment PickerInputCustomerGroups on CustomerGroup {\n  id\n  key\n  name\n}\n\nquery GetCustomerGroupsQuery($where: String, $sortByNamePath: String!) {\n  customerGroups(where: $where, sort: [$sortByNamePath, \"key\"], limit: 60) {\n    total\n    results {\n      ...PickerInputCustomerGroups\n    }\n  }\n}\n\nquery GetCustomerGroupQuery($id: String) {\n  customerGroup(id: $id) {\n    ...PickerInputCustomerGroups\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 var PickerInputCustomerGroups = { kind: "Document", definitions: [{ kind: "FragmentDefinition", name: { kind: "Name", value: "PickerInputCustomerGroups" }, typeCondition: { kind: "NamedType", name: { kind: "Name", value: "CustomerGroup" } }, directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "name" }, arguments: [], directives: [] }] } }], loc: { start: 0, end: 406, source: { body: "fragment PickerInputCustomerGroups on CustomerGroup {\n  id\n  key\n  name\n}\n\nquery GetCustomerGroupsQuery($where: String, $sortByNamePath: String!) {\n  customerGroups(where: $where, sort: [$sortByNamePath, \"key\"], limit: 60) {\n    total\n    results {\n      ...PickerInputCustomerGroups\n    }\n  }\n}\n\nquery GetCustomerGroupQuery($id: String) {\n  customerGroup(id: $id) {\n    ...PickerInputCustomerGroups\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 const CustomerGroupPickerInput = _ref => {
-  var _currentOption$data$l, _currentOption$data;
   let isClearable = _ref.isClearable,
     isDisabled = _ref.isDisabled,
     isReadOnly = _ref.isReadOnly,
@@ -8401,13 +8313,13 @@ const CustomerGroupPickerInput = _ref => {
     setLoadingError(null);
     handleInternalInputChange(event);
   }, [handleInternalInputChange]);
-  const isCurrentOptionLoadingFailed = Boolean(currentOption === null || currentOption === void 0 ? void 0 : currentOption.error);
+  const isCurrentOptionLoadingFailed = Boolean(currentOption?.error);
   useEffect(() => {
     if (isCurrentOptionLoadingFailed) onError(currentOption.error);
   }, [isCurrentOptionLoadingFailed, onError, currentOption]);
   const isLoadingFailed = isCurrentOptionLoadingFailed || Boolean(loadingError);
   const handleNoOptions = useCallback(() => loadingError ? null : formatMessage(messages$t.noCustomerGroupsFound), [loadingError, formatMessage]);
-  const tooltipTitle = (_currentOption$data$l = currentOption === null || currentOption === void 0 || (_currentOption$data = currentOption.data) === null || _currentOption$data === void 0 ? void 0 : _currentOption$data.label) !== null && _currentOption$data$l !== void 0 ? _currentOption$data$l : '';
+  const tooltipTitle = currentOption?.data?.label ?? '';
   return jsx(Constraints.Horizontal, {
     max: "scale",
     children: jsxs(Spacings.Stack, {
@@ -8417,7 +8329,7 @@ const CustomerGroupPickerInput = _ref => {
         children: jsx(AsyncSelectInput, {
           id: name,
           name: name,
-          placeholder: placeholder !== null && placeholder !== void 0 ? placeholder : formatMessage(messages$t.placeholder),
+          placeholder: placeholder ?? formatMessage(messages$t.placeholder),
           loadOptions: loadOptionsDebounced,
           defaultOptions: true,
           showOptionGroupDivider: true,
@@ -8446,12 +8358,11 @@ CustomerGroupPickerInput.displayName = 'CustomerGroupPickerInput';
 const DEFAULT_LENGTH = 50;
 const DEFAULT_END = '...';
 function truncate (text) {
-  var _context;
   let length = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : DEFAULT_LENGTH;
   let end = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : DEFAULT_END;
   if (!text) return '';
   if (text.length < length) return text;
-  return _concatInstanceProperty(_context = "".concat(text.substring(0, length))).call(_context, end);
+  return `${text.substring(0, length)}${end}`;
 }
 
 const LOWER_STORES_LIMIT = 60;
@@ -8459,7 +8370,6 @@ const UPPER_STORES_LIMIT = 500;
 
 // map store to options
 const mapStoresToOptions = _ref => {
-  var _store$productSelecti;
   let store = _ref.store,
     renderSelectInputOptionValuesByField = _ref.renderSelectInputOptionValuesByField,
     dataLocale = _ref.dataLocale;
@@ -8470,14 +8380,14 @@ const mapStoresToOptions = _ref => {
   const localizedName = formatLocalizedString(convertedStore, {
     key: 'name',
     locale: dataLocale,
-    fallback: "".concat(store.key, " (key)")
+    fallback: `${store.key} (key)`
   });
   return {
     label: localizedName,
     value: renderSelectInputOptionValuesByField === 'key' ? store.key : store.id,
     key: store.key,
     id: store.id,
-    productSelections: (_store$productSelecti = store.productSelections) === null || _store$productSelecti === void 0 ? void 0 : _mapInstanceProperty(_store$productSelecti).call(_store$productSelecti, productSelectionRef => productSelectionRef.productSelection.id)
+    productSelections: store.productSelections?.map(productSelectionRef => productSelectionRef.productSelection.id)
   };
 };
 
@@ -8539,7 +8449,7 @@ const getValueFromOptions$1 = _ref => {
     isMulti = _ref.isMulti;
   // handle async-select-field value transformation
   if (isMulti) {
-    return _filterInstanceProperty(mappedStoresListOptions).call(mappedStoresListOptions, store => currentlySelectedStores === null || currentlySelectedStores === void 0 ? void 0 : _includesInstanceProperty(currentlySelectedStores).call(currentlySelectedStores, store.value));
+    return _filterInstanceProperty(mappedStoresListOptions).call(mappedStoresListOptions, store => currentlySelectedStores?.includes(store.value));
   }
 
   // return value as undefined if no options is yet selected. It is needed for cases where users sets initial values as empty string
@@ -8568,13 +8478,13 @@ const StoresAsyncSelectInput = props => {
     sort: 'createdAt asc',
     excludeExtendedStoresList: true,
     excludeProductSelections: !props.shouldFetchProductSelections,
-    stores: (keysOfStores === null || keysOfStores === void 0 ? void 0 : keysOfStores.length) && keysOfStores,
+    stores: keysOfStores?.length && keysOfStores,
     projectKey: props.projectKey
   });
   const hasError = AsyncSelectInput.isTouched(props.touched) && hasErrors$2(props.errors) || props.hasError;
   const mappedStoresListOptions = useMemo(() => {
-    var _context2, _storesListFetcher$st;
-    return _mapInstanceProperty(_context2 = ((_storesListFetcher$st = storesListFetcher.stores) === null || _storesListFetcher$st === void 0 ? void 0 : _storesListFetcher$st.results) || []).call(_context2, store => mapStoresToOptions({
+    var _context2;
+    return _mapInstanceProperty(_context2 = storesListFetcher.stores?.results || []).call(_context2, store => mapStoresToOptions({
       store,
       dataLocale,
       renderSelectInputOptionValuesByField: props.renderSelectInputOptionValuesByField
@@ -8660,21 +8570,20 @@ const StoresBasicSelectInput = props => {
     sort: 'createdAt asc',
     excludeExtendedStoresList: true,
     excludeProductSelections: !props.shouldFetchProductSelections,
-    stores: (keysOfStores === null || keysOfStores === void 0 ? void 0 : keysOfStores.length) && keysOfStores,
+    stores: keysOfStores?.length && keysOfStores,
     projectKey: props.projectKey
   });
   const hasError = SelectInput.isTouched(props.touched) && hasErrors$1(props.errors) || props.hasError;
   const mappedStoresListOptions = useMemo(() => {
-    var _context2, _storesListFetcher$st;
-    return _mapInstanceProperty(_context2 = ((_storesListFetcher$st = storesListFetcher.stores) === null || _storesListFetcher$st === void 0 ? void 0 : _storesListFetcher$st.results) || []).call(_context2, store => mapStoresToOptions({
+    var _context2;
+    return _mapInstanceProperty(_context2 = storesListFetcher.stores?.results || []).call(_context2, store => mapStoresToOptions({
       store,
       dataLocale,
       renderSelectInputOptionValuesByField: props.renderSelectInputOptionValuesByField
     }));
   }, [dataLocale, storesListFetcher.stores, props.renderSelectInputOptionValuesByField]);
   const handleChange = event => {
-    var _event$target$value$v, _event$target$value;
-    const value = (_event$target$value$v = (_event$target$value = event.target.value) === null || _event$target$value === void 0 ? void 0 : _event$target$value.value) !== null && _event$target$value$v !== void 0 ? _event$target$value$v : event.target.value;
+    const value = event.target.value?.value ?? event.target.value;
     const currentStore = _findInstanceProperty(mappedStoresListOptions).call(mappedStoresListOptions, store => store.value === value);
 
     // We need complete store info including productSelections
@@ -8729,7 +8638,6 @@ StoresBasicSelectInput.defaultProps = {
 
 var TotalNumberOfStores = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "TotalNumberOfStores" }, variableDefinitions: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", alias: { kind: "Name", value: "totalNumberOfStores" }, name: { kind: "Name", value: "stores" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [] }] } }] } }], loc: { start: 0, end: 76, source: { body: "query TotalNumberOfStores {\n  totalNumberOfStores: stores {\n    total\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 const useTotalNumberOfStoresFetcher = projectKey => {
-  var _totalNumberOfStoresQ;
   const totalNumberOfStoresQuery = useQuery(TotalNumberOfStores, {
     context: {
       target: GRAPHQL_TARGETS.COMMERCETOOLS_PLATFORM,
@@ -8738,7 +8646,7 @@ const useTotalNumberOfStoresFetcher = projectKey => {
     fetchPolicy: 'network-only'
   });
   return {
-    total: (_totalNumberOfStoresQ = totalNumberOfStoresQuery.data) === null || _totalNumberOfStoresQ === void 0 ? void 0 : _totalNumberOfStoresQ.totalNumberOfStores.total,
+    total: totalNumberOfStoresQuery.data?.totalNumberOfStores.total,
     isLoading: totalNumberOfStoresQuery.loading
   };
 };
@@ -8756,19 +8664,15 @@ const handlers$1 = {
 };
 
 var FetchStoresByField = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "FetchStoresByField" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "where" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "excludeProductSelections" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "limit" } }, type: { kind: "NamedType", name: { kind: "Name", value: "Int" } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", alias: { kind: "Name", value: "storesByField" }, name: { kind: "Name", value: "stores" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "where" }, value: { kind: "Variable", name: { kind: "Name", value: "where" } } }, { kind: "Argument", name: { kind: "Name", value: "limit" }, value: { kind: "Variable", name: { kind: "Name", value: "limit" } } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "results" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }, { kind: "Field", name: { kind: "Name", value: "productSelections" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "skip" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "excludeProductSelections" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "active" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "productSelection" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }] } }] } }] } }] } }], loc: { start: 0, end: 473, source: { body: "query FetchStoresByField(\n  $where: String!\n  $excludeProductSelections: Boolean!\n  $limit: Int\n) {\n  storesByField: stores(where: $where, limit: $limit) {\n    results {\n      id\n      key\n      nameAllLocales {\n        locale\n        value\n      }\n      productSelections @skip(if: $excludeProductSelections) {\n        active\n        productSelection {\n          id\n          nameAllLocales {\n            locale\n            value\n          }\n        }\n      }\n    }\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
-const createQueryVariables$2 = (stores, predicateField, shouldFetchProductSelections) => {
-  var _context;
-  return {
-    where: _concatInstanceProperty(_context = "".concat(predicateField, " in (")).call(_context, _mapInstanceProperty(stores).call(stores, store => "\"".concat(store, "\"")).join(', '), ")"),
-    limit: 500,
-    excludeProductSelections: !shouldFetchProductSelections
-  };
-};
+const createQueryVariables$2 = (stores, predicateField, shouldFetchProductSelections) => ({
+  where: `${predicateField} in (${_mapInstanceProperty(stores).call(stores, store => `"${store}"`).join(', ')})`,
+  limit: 500,
+  excludeProductSelections: !shouldFetchProductSelections
+});
 const emptyStoresQueryResult = {
   results: []
 };
 const useStoresByFieldFetcher = function (stores, predicateField, projectKey) {
-  var _storesQuery$data;
   let shouldFetchProductSelections = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   // incase of single select input stores are sent as single string literal
   const storesList = _Array$isArray(stores) ? stores : [stores];
@@ -8781,29 +8685,29 @@ const useStoresByFieldFetcher = function (stores, predicateField, projectKey) {
     skip: storesList.length === 0
   });
   return {
-    stores: ((_storesQuery$data = storesQuery.data) === null || _storesQuery$data === void 0 ? void 0 : _storesQuery$data.storesByField) || emptyStoresQueryResult,
+    stores: storesQuery.data?.storesByField || emptyStoresQueryResult,
     isLoading: storesQuery.loading
   };
 };
 
 function ownKeys$B(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$B(e) { for (var r = 1; r < arguments.length; r++) { var _context6, _context7; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context6 = ownKeys$B(Object(t), !0)).call(_context6, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context7 = ownKeys$B(Object(t))).call(_context7, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread$B(e) { for (var r = 1; r < arguments.length; r++) { var _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys$B(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys$B(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var FetchStoresByWherePredicate = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "FetchStoresByWherePredicate" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "where" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "skipFetchingStores" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "excludeProductSelections" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", alias: { kind: "Name", value: "storesByWherePredicate" }, name: { kind: "Name", value: "stores" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "where" }, value: { kind: "Variable", name: { kind: "Name", value: "where" } } }], directives: [{ kind: "Directive", name: { kind: "Name", value: "skip" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "skipFetchingStores" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "results" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "key" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }, { kind: "Field", name: { kind: "Name", value: "productSelections" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "skip" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "excludeProductSelections" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "active" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "productSelection" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "nameAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }] } }] } }] } }] } }], loc: { start: 0, end: 525, source: { body: "query FetchStoresByWherePredicate(\n  $where: String!\n  $skipFetchingStores: Boolean!\n  $excludeProductSelections: Boolean!\n) {\n  storesByWherePredicate: stores(where: $where) @skip(if: $skipFetchingStores) {\n    results {\n      id\n      key\n      nameAllLocales {\n        locale\n        value\n      }\n      productSelections @skip(if: $excludeProductSelections) {\n        active\n        productSelection {\n          id\n          nameAllLocales {\n            locale\n            value\n          }\n        }\n      }\n    }\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 const hasErrors = errors => {
   var _context;
   return errors && _someInstanceProperty(_context = _Object$values(errors)).call(_context, Boolean);
 };
 const createQueryVariables$1 = _ref => {
-  var _context2, _context3;
+  var _context2;
   let searchText = _ref.searchText,
     dataLocale = _ref.dataLocale,
     allAccessibleStoreKeysThroughDataFencePermissions = _ref.allAccessibleStoreKeysThroughDataFencePermissions,
     shouldFetchProductSelections = _ref.shouldFetchProductSelections;
   const sanitizedSearchText = sanitize(_trimInstanceProperty(searchText).call(searchText, searchText));
-  const keyQuery = "key = \"".concat(sanitizedSearchText, "\"");
+  const keyQuery = `key = "${sanitizedSearchText}"`;
 
   // if the user has data fence permissions then we only allow stores to fetched that user has access to
-  if (allAccessibleStoreKeysThroughDataFencePermissions !== null && allAccessibleStoreKeysThroughDataFencePermissions !== void 0 && allAccessibleStoreKeysThroughDataFencePermissions.length) {
+  if (allAccessibleStoreKeysThroughDataFencePermissions?.length) {
     // if the current search term match the accessible stores keys, then proceed with fetching the store
     if (_includesInstanceProperty(allAccessibleStoreKeysThroughDataFencePermissions).call(allAccessibleStoreKeysThroughDataFencePermissions, sanitizedSearchText)) {
       return {
@@ -8819,9 +8723,9 @@ const createQueryVariables$1 = _ref => {
       excludeProductSelections: !shouldFetchProductSelections
     };
   }
-  const idQuery = isUUID(sanitizedSearchText) && "id = \"".concat(sanitizedSearchText, "\"");
-  const nameQuery = _concatInstanceProperty(_context2 = "name(".concat(dataLocale, " = \"")).call(_context2, sanitizedSearchText, "\")");
-  const searchTextQuery = _filterInstanceProperty(_context3 = [idQuery, nameQuery, keyQuery]).call(_context3, Boolean).join(' or ');
+  const idQuery = isUUID(sanitizedSearchText) && `id = "${sanitizedSearchText}"`;
+  const nameQuery = `name(${dataLocale} = "${sanitizedSearchText}")`;
+  const searchTextQuery = _filterInstanceProperty(_context2 = [idQuery, nameQuery, keyQuery]).call(_context2, Boolean).join(' or ');
   return {
     skipFetchingStores: false,
     where: searchTextQuery,
@@ -8829,7 +8733,6 @@ const createQueryVariables$1 = _ref => {
   };
 };
 const getValueFromOptions = _ref2 => {
-  var _storesByFieldFetcher, _context4;
   let isMulti = _ref2.isMulti,
     value = _ref2.value,
     dataLocale = _ref2.dataLocale,
@@ -8838,7 +8741,7 @@ const getValueFromOptions = _ref2 => {
   if (!value) {
     return undefined;
   }
-  const selectedOptions = (_storesByFieldFetcher = storesByFieldFetcher.stores) === null || _storesByFieldFetcher === void 0 ? void 0 : _mapInstanceProperty(_context4 = _storesByFieldFetcher.results).call(_context4, store => mapStoresToOptions({
+  const selectedOptions = storesByFieldFetcher.stores?.results.map(store => mapStoresToOptions({
     store,
     dataLocale,
     renderSelectInputOptionValuesByField: renderSelectInputOptionValuesByField
@@ -8876,9 +8779,8 @@ const StoresSearchSelectInput = props => {
       },
       fetchPolicy: 'network-only'
     }).then(_ref3 => {
-      var _data$storesByWherePr, _context5;
       let data = _ref3.data;
-      return (_data$storesByWherePr = data.storesByWherePredicate) === null || _data$storesByWherePr === void 0 ? void 0 : _mapInstanceProperty(_context5 = _data$storesByWherePr.results).call(_context5, store => mapStoresToOptions({
+      return data.storesByWherePredicate?.results.map(store => mapStoresToOptions({
         store,
         dataLocale,
         renderSelectInputOptionValuesByField: props.renderSelectInputOptionValuesByField
@@ -9058,14 +8960,14 @@ var messages$r = defineMessages({
 
 function formatDiscount(discount, currencyCode, intl) {
   var _context;
-  if (discount.type === 'relative') return "".concat(discount.permyriad / 100, "%");
+  if (discount.type === 'relative') return `${discount.permyriad / 100}%`;
   if (!discount.money) return null;
   const moneyForCurrencyCode = _findInstanceProperty(_context = discount.money).call(_context, discountMoney => discountMoney.currencyCode === currencyCode);
   return moneyForCurrencyCode ? formatMoney$2(moneyForCurrencyCode, intl) : null;
 }
 
 function formatPercentage(percentage) {
-  return "".concat(percentage, "%");
+  return `${percentage}%`;
 }
 function convertRatioToPercentage(ratio) {
   return _parseFloat((ratio * 100).toFixed(2));
@@ -9119,8 +9021,8 @@ function validateFilter$2(_ref, intl) {
     };
   }
   if (value.option === FILTER_TYPES.range) {
-    const from = validateValue(filterValue === null || filterValue === void 0 ? void 0 : filterValue.from, typeName, intl);
-    const to = from ? null : validateValue(filterValue === null || filterValue === void 0 ? void 0 : filterValue.to, typeName, intl);
+    const from = validateValue(filterValue?.from, typeName, intl);
+    const to = from ? null : validateValue(filterValue?.to, typeName, intl);
     return from || to ? {
       input: {
         from,
@@ -9157,16 +9059,16 @@ function validateFilter$1(_ref, intl) {
     type = _ref.type;
   if (type === 'range') {
     if (validateSingleFilter({
-      value: value === null || value === void 0 ? void 0 : value.from
+      value: value?.from
     })) return {
       from: intl.formatMessage(messages$p.rangeMissingValue)
     };
     if (validateSingleFilter({
-      value: value === null || value === void 0 ? void 0 : value.to
+      value: value?.to
     })) return {
       to: intl.formatMessage(messages$p.rangeMissingValue)
     };
-    if (moment$1(value === null || value === void 0 ? void 0 : value.to).isBefore(value === null || value === void 0 ? void 0 : value.from)) return {
+    if (moment$1(value?.to).isBefore(value?.from)) return {
       from: intl.formatMessage(messages$p.rangeToSmallerThanFrom)
     };
   } else if (type === 'equalTo' || type === 'lessThan' || type === 'moreThan') {
@@ -9236,10 +9138,8 @@ function isEmptyFilter(_ref) {
 }
 
 function numberTransformer(filterKey, filters) {
-  var _context3;
   let filterValidator = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : isFilterValid$2;
   const queries = _mapInstanceProperty(filters).call(filters, _ref => {
-    var _context, _context2;
     let type = _ref.type,
       value = _ref.value;
     if (!filterValidator({
@@ -9248,19 +9148,19 @@ function numberTransformer(filterKey, filters) {
     })) return '';
     switch (type) {
       case 'lessThan':
-        return "(* to ".concat(value - 1, ")");
+        return `(* to ${value - 1})`;
       case 'moreThan':
-        return "(".concat(value + 1, " to *)");
+        return `(${value + 1} to *)`;
       case 'equalTo':
-        return _concatInstanceProperty(_context = "(".concat(value, " to ")).call(_context, value, ")");
+        return `(${value} to ${value})`;
       case 'range':
-        return _concatInstanceProperty(_context2 = "(".concat(value.from, " to ")).call(_context2, value.to, ")");
+        return `(${value.from} to ${value.to})`;
       default:
         return '';
     }
   });
   const queryString = _filterInstanceProperty(queries).call(queries, q => q !== '').join(', ');
-  return queryString === '' ? null : _concatInstanceProperty(_context3 = "".concat(filterKey, ": range")).call(_context3, queryString);
+  return queryString === '' ? null : `${filterKey}: range${queryString}`;
 }
 function isFilterValid$2(_ref2) {
   let type = _ref2.type,
@@ -9287,11 +9187,9 @@ function graphqlCategoryLevelTransformer(filterKey, filters, filterValidator) {
   return _filterInstanceProperty(_context = [levelFilterQuery, lastLevelFilterQuery]).call(_context, Boolean);
 }
 
-var _templateObject$1, _templateObject2;
 const dateFormatDayStart = 'YYYY-MM-DDT00:00:00.000Z';
 const dateFormatDayEnd = 'YYYY-MM-DDT23:59:59.999Z';
 function dateTransformer(filterKey, filters) {
-  var _context;
   let filterValidator = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : isFilterValid$1;
   const queries = _mapInstanceProperty(filters).call(filters, _ref => {
     let type = _ref.type,
@@ -9302,19 +9200,25 @@ function dateTransformer(filterKey, filters) {
     })) return '';
     switch (type) {
       case 'lessThan':
-        return "(* to \"".concat(moment$1(value).format(dateFormatDayStart), "\")");
+        return `(* to "${moment$1(value).format(dateFormatDayStart)}")`;
       case 'moreThan':
-        return "(\"".concat(moment$1(value).format(dateFormatDayEnd), "\" to *)");
+        return `("${moment$1(value).format(dateFormatDayEnd)}" to *)`;
       case 'equalTo':
-        return oneLine(_templateObject$1 || (_templateObject$1 = _taggedTemplateLiteral(["\n            (\"", "\"\n            to \"", "\")\n          "])), moment$1(value).format(dateFormatDayStart), moment$1(value).format(dateFormatDayEnd));
+        return oneLine`
+            ("${moment$1(value).format(dateFormatDayStart)}"
+            to "${moment$1(value).format(dateFormatDayEnd)}")
+          `;
       case 'range':
-        return oneLine(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            (\"", "\"\n            to \"", "\")\n          "])), moment$1(value.from).format(dateFormatDayStart), moment$1(value.to).format(dateFormatDayEnd));
+        return oneLine`
+            ("${moment$1(value.from).format(dateFormatDayStart)}"
+            to "${moment$1(value.to).format(dateFormatDayEnd)}")
+          `;
       default:
         return '';
     }
   });
   const queryString = _filterInstanceProperty(queries).call(queries, q => q !== '').join(', ');
-  return queryString === '' ? null : _concatInstanceProperty(_context = "".concat(filterKey, ": range")).call(_context, queryString);
+  return queryString === '' ? null : `${filterKey}: range${queryString}`;
 }
 function isFilterValid$1(_ref2) {
   let type = _ref2.type,
@@ -9329,19 +9233,18 @@ function isFilterValid$1(_ref2) {
 }
 
 function missingLocaleTransformer(filterKey, filters) {
-  var _context;
   // Note: we assume for now that there can only be 1 missing filter value,
   // as the API doesn't support yet multiple OR values (for missing).
   if (filters.length === 0) return null;
   const missingLocale = filters[0].value.value;
-  return _concatInstanceProperty(_context = "".concat(filterKey, ".")).call(_context, missingLocale, ":missing");
+  return `${filterKey}.${missingLocale}:missing`;
 }
 
 function missingTransformer(filterKey, filters) {
   // Note: we assume for now that there can only be 1 missing filter value,
   // as the API doesn't support yet multiple OR values (for missing).
   if (filters.length === 0) return null;
-  return "".concat(filterKey, ":missing");
+  return `${filterKey}:missing`;
 }
 
 /**
@@ -9382,7 +9285,6 @@ function graphqlQueryBuilder(_ref) {
 }
 
 function referenceTransformer(filterKey, filters) {
-  var _context;
   let filterValidator = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : isFilterValid;
   const queries = _mapInstanceProperty(filters).call(filters, _ref => {
     let type = _ref.type,
@@ -9393,49 +9295,46 @@ function referenceTransformer(filterKey, filters) {
     })) return '';
     switch (type) {
       case 'equalTo':
-        return "\"".concat(value, "\"");
+        return `"${value}"`;
       default:
         return '';
     }
   });
   const queryString = _filterInstanceProperty(queries).call(queries, q => q !== '').join(', ');
-  return queryString === '' ? null : _concatInstanceProperty(_context = "".concat(filterKey, ".id: ")).call(_context, queryString);
+  return queryString === '' ? null : `${filterKey}.id: ${queryString}`;
 }
 function isFilterValid(_ref2) {
-  var _context2;
+  var _context;
   let type = _ref2.type,
     value = _ref2.value;
-  if (type === 'equalTo' && !_includesInstanceProperty(_context2 = [null, undefined, '']).call(_context2, value)) return true;
+  if (type === 'equalTo' && !_includesInstanceProperty(_context = [null, undefined, '']).call(_context, value)) return true;
   return false;
 }
 
 function textTransformer(filterKey, queries) {
-  var _context;
   if (queries.length === 0) return null;
 
   // Note: we assume for now that there can only be 1 text filter.
   const queryValue = queries[0].value;
-  return queryValue ? _concatInstanceProperty(_context = "".concat(filterKey, ":\"")).call(_context, queryValue, "\"") : null;
+  return queryValue ? `${filterKey}:"${queryValue}"` : null;
 }
 
 const composeNumberPredicateFromFilter = (target, value, option) => {
-  var _context, _context2, _context3, _context4, _context5, _context6;
   switch (option) {
     case FILTER_TYPES.lessThan:
-      return _concatInstanceProperty(_context = "".concat(target, " < ")).call(_context, value);
+      return `${target} < ${value}`;
     case FILTER_TYPES.moreThan:
-      return _concatInstanceProperty(_context2 = "".concat(target, " > ")).call(_context2, value);
+      return `${target} > ${value}`;
     case FILTER_TYPES.equalTo:
-      return _concatInstanceProperty(_context3 = "".concat(target, " = ")).call(_context3, value);
+      return `${target} = ${value}`;
     case FILTER_TYPES.range:
-      return _concatInstanceProperty(_context4 = _concatInstanceProperty(_context5 = _concatInstanceProperty(_context6 = "".concat(target, " >= ")).call(_context6, value.from, " and ")).call(_context5, target, " <= ")).call(_context4, value.to);
+      return `${target} >= ${value.from} and ${target} <= ${value.to}`;
     default:
       return '';
   }
 };
 function customFields (filter, locale) {
   const customFieldsPredicates = _mapInstanceProperty(filter).call(filter, customFieldFilter => {
-    var _context7, _context8, _context9, _context10, _context11;
     const _customFieldFilter$va = customFieldFilter.value,
       target = _customFieldFilter$va.target,
       type = _customFieldFilter$va.type,
@@ -9443,14 +9342,14 @@ function customFields (filter, locale) {
       option = _customFieldFilter$va.option;
     switch (type.name) {
       case FIELD_TYPES.Boolean:
-        return _concatInstanceProperty(_context7 = "".concat(target, " = ")).call(_context7, value.value);
+        return `${target} = ${value.value}`;
       case FIELD_TYPES.String:
-        return _concatInstanceProperty(_context8 = "".concat(target, " = \"")).call(_context8, value, "\"");
+        return `${target} = "${value}"`;
       case FIELD_TYPES.LocalizedString:
-        return _concatInstanceProperty(_context9 = "".concat(target, "(")).call(_context9, localizedTextTransformer(value), ")");
+        return `${target}(${localizedTextTransformer(value)})`;
       case FIELD_TYPES.Enum:
       case FIELD_TYPES.LocalizedEnum:
-        return _concatInstanceProperty(_context10 = "".concat(target, " = \"")).call(_context10, value.value, "\"");
+        return `${target} = "${value.value}"`;
       case FIELD_TYPES.Time:
         return timeTransformer(target, [{
           type: option,
@@ -9465,14 +9364,14 @@ function customFields (filter, locale) {
       case FIELD_TYPES.Number:
         return composeNumberPredicateFromFilter(target, value, option);
       case FIELD_TYPES.Money:
-        return _concatInstanceProperty(_context11 = "".concat(target, "(")).call(_context11, moneyTransformer(value, option, locale), ")");
+        return `${target}(${moneyTransformer(value, option, locale)})`;
       case FIELD_TYPES.Reference:
       case FIELD_TYPES.Set:
       default:
         throw new Error('Custom field type not recognized');
     }
   });
-  return "(custom(fields(".concat(customFieldsPredicates.join(' and '), ")))");
+  return `(custom(fields(${customFieldsPredicates.join(' and ')})))`;
 }
 
 // https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/btoa#Unicode_strings
@@ -9517,7 +9416,7 @@ function ownKeys$z(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySy
 function _objectSpread$z(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys$z(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys$z(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 const resourcesWithPlatformLimits = _Object$keys(RESOURCES_WITH_PLATFORM_LIMITS);
 const createQueryVariables = platformLimit => _reduceInstanceProperty(resourcesWithPlatformLimits).call(resourcesWithPlatformLimits, (previousIncludedLimits, nextNameOfLimit) => _objectSpread$z({
-  [camelCase("should include ".concat(nextNameOfLimit))]: platformLimit ? nextNameOfLimit === platformLimit : true
+  [camelCase(`should include ${nextNameOfLimit}`)]: platformLimit ? nextNameOfLimit === platformLimit : true
 }, previousIncludedLimits), {});
 
 var PlatformLimitsFetcherQuery = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "PlatformLimitsFetcherQuery" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeShoppingLists" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeProductDiscounts" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeCartDiscounts" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeStores" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeCustomers" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeCustomerGroups" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeZones" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeTaxCategories" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeShippingMethods" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeCarts" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "Boolean" } } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limits" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "shoppingLists" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "include" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeShoppingLists" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "current" }, arguments: [], directives: [] }] } }, { kind: "Field", name: { kind: "Name", value: "lineItems" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }] } }, { kind: "Field", name: { kind: "Name", value: "textLineItems" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }] } }] } }, { kind: "Field", name: { kind: "Name", value: "productDiscounts" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "include" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeProductDiscounts" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "totalActive" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "current" }, arguments: [], directives: [] }] } }] } }, { kind: "Field", name: { kind: "Name", value: "cartDiscounts" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "include" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeCartDiscounts" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "totalActiveWithoutDiscountCodes" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "current" }, arguments: [], directives: [] }] } }] } }, { kind: "Field", name: { kind: "Name", value: "stores" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "include" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeStores" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "current" }, arguments: [], directives: [] }] } }, { kind: "Field", name: { kind: "Name", value: "inventorySupplyChannels" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }] } }, { kind: "Field", name: { kind: "Name", value: "productDistributionChannels" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }] } }] } }, { kind: "Field", name: { kind: "Name", value: "customers" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "include" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeCustomers" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "current" }, arguments: [], directives: [] }] } }] } }, { kind: "Field", name: { kind: "Name", value: "customerGroups" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "include" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeCustomerGroups" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "current" }, arguments: [], directives: [] }] } }] } }, { kind: "Field", name: { kind: "Name", value: "zones" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "include" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeZones" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "current" }, arguments: [], directives: [] }] } }] } }, { kind: "Field", name: { kind: "Name", value: "taxCategories" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "include" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeTaxCategories" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "current" }, arguments: [], directives: [] }] } }] } }, { kind: "Field", name: { kind: "Name", value: "shippingMethods" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "include" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeShippingMethods" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "current" }, arguments: [], directives: [] }] } }] } }, { kind: "Field", name: { kind: "Name", value: "carts" }, arguments: [], directives: [{ kind: "Directive", name: { kind: "Name", value: "include" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "if" }, value: { kind: "Variable", name: { kind: "Name", value: "shouldIncludeCarts" } } }] }], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "limit" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "current" }, arguments: [], directives: [] }] } }] } }] } }] } }], loc: { start: 0, end: 1820, source: { body: "query PlatformLimitsFetcherQuery(\n  $shouldIncludeShoppingLists: Boolean!\n  $shouldIncludeProductDiscounts: Boolean!\n  $shouldIncludeCartDiscounts: Boolean!\n  $shouldIncludeStores: Boolean!\n  $shouldIncludeCustomers: Boolean!\n  $shouldIncludeCustomerGroups: Boolean!\n  $shouldIncludeZones: Boolean!\n  $shouldIncludeTaxCategories: Boolean!\n  $shouldIncludeShippingMethods: Boolean!\n  $shouldIncludeCarts: Boolean!\n) {\n  limits {\n    shoppingLists @include(if: $shouldIncludeShoppingLists) {\n      total {\n        limit\n        current\n      }\n      lineItems {\n        limit\n      }\n      textLineItems {\n        limit\n      }\n    }\n    productDiscounts @include(if: $shouldIncludeProductDiscounts) {\n      totalActive {\n        limit\n        current\n      }\n    }\n    cartDiscounts @include(if: $shouldIncludeCartDiscounts) {\n      totalActiveWithoutDiscountCodes {\n        limit\n        current\n      }\n    }\n    stores @include(if: $shouldIncludeStores) {\n      total {\n        limit\n        current\n      }\n      inventorySupplyChannels {\n        limit\n      }\n      productDistributionChannels {\n        limit\n      }\n    }\n    customers @include(if: $shouldIncludeCustomers) {\n      total {\n        limit\n        current\n      }\n    }\n    customerGroups @include(if: $shouldIncludeCustomerGroups) {\n      total {\n        limit\n        current\n      }\n    }\n    zones @include(if: $shouldIncludeZones) {\n      total {\n        limit\n        current\n      }\n    }\n    taxCategories @include(if: $shouldIncludeTaxCategories) {\n      total {\n        limit\n        current\n      }\n    }\n    shippingMethods @include(if: $shouldIncludeShippingMethods) {\n      total {\n        limit\n        current\n      }\n    }\n    carts @include(if: $shouldIncludeCarts) {\n      total {\n        limit\n        current\n      }\n    }\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
@@ -9533,7 +9432,7 @@ const usePlatformLimitsFetcher = platformLimit => {
     error = _useQuery.error,
     data = _useQuery.data,
     refetch = _useQuery.refetch;
-  const platformLimits = !loading ? omit(data === null || data === void 0 ? void 0 : data.limits, '__typename') : {};
+  const platformLimits = !loading ? omit(data?.limits, '__typename') : {};
   return {
     isLoading: loading,
     error,
@@ -9724,11 +9623,10 @@ const getPlatformLimitsStatus = _ref3 => {
     total = _ref3.total,
     intl = _ref3.intl;
   if (limit) {
-    var _context;
-    return _concatInstanceProperty(_context = "(".concat(intl.formatNumber(current), "/")).call(_context, intl.formatNumber(limit), ")");
+    return `(${intl.formatNumber(current)}/${intl.formatNumber(limit)})`;
   }
   if (total) {
-    return "(".concat(intl.formatNumber(total), ")");
+    return `(${intl.formatNumber(total)})`;
   }
   return '';
 };
@@ -9748,18 +9646,17 @@ const useShippingMethodsPlatformLimitsFetcher = () => {
 };
 
 const useShippingMethodsPlatformLimits = () => {
-  var _platformLimits$shipp;
   const _useShippingMethodsPl = useShippingMethodsPlatformLimitsFetcher(),
     platformLimits = _useShippingMethodsPl.platformLimits;
-  if (!(platformLimits !== null && platformLimits !== void 0 && (_platformLimits$shipp = platformLimits.shippingMethods) !== null && _platformLimits$shipp !== void 0 && _platformLimits$shipp.total)) {
+  if (!platformLimits?.shippingMethods?.total) {
     return {
       hasReachedShippingMethodsWarningLimit: false,
       hasReachedShippingMethodsErrorLimit: false
     };
   }
-  const _platformLimits$shipp2 = platformLimits.shippingMethods.total,
-    limit = _platformLimits$shipp2.limit,
-    current = _platformLimits$shipp2.current;
+  const _platformLimits$shipp = platformLimits.shippingMethods.total,
+    limit = _platformLimits$shipp.limit,
+    current = _platformLimits$shipp.current;
   const hasReachedShippingMethodsWarningLimit = getHasExceededWarningThreshold({
     limit,
     current
@@ -9775,13 +9672,12 @@ const useShippingMethodsPlatformLimits = () => {
 };
 
 const PlatformLimitsShippingMethodsNotifications = () => {
-  var _platformLimits$shipp;
   const _useShippingMethodsPl = useShippingMethodsPlatformLimitsFetcher(),
     platformLimits = _useShippingMethodsPl.platformLimits;
   const _useShippingMethodsPl2 = useShippingMethodsPlatformLimits(),
     hasReachedShippingMethodsWarningLimit = _useShippingMethodsPl2.hasReachedShippingMethodsWarningLimit,
     hasReachedShippingMethodsErrorLimit = _useShippingMethodsPl2.hasReachedShippingMethodsErrorLimit;
-  if (!(platformLimits !== null && platformLimits !== void 0 && (_platformLimits$shipp = platformLimits.shippingMethods) !== null && _platformLimits$shipp !== void 0 && _platformLimits$shipp.total)) {
+  if (!platformLimits?.shippingMethods?.total) {
     return null;
   }
   if (hasReachedShippingMethodsErrorLimit) {
@@ -9827,13 +9723,12 @@ var messages$k = defineMessages({
 });
 
 const PlatformLimitsShippingMethodsStatus = _ref => {
-  var _platformLimits$shipp, _platformLimits$shipp2;
   let total = _ref.total;
   const intl = useIntl();
   const _useShippingMethodsPl = useShippingMethodsPlatformLimitsFetcher(),
     platformLimits = _useShippingMethodsPl.platformLimits;
-  const current = platformLimits === null || platformLimits === void 0 || (_platformLimits$shipp = platformLimits.shippingMethods) === null || _platformLimits$shipp === void 0 || (_platformLimits$shipp = _platformLimits$shipp.total) === null || _platformLimits$shipp === void 0 ? void 0 : _platformLimits$shipp.current;
-  const limit = platformLimits === null || platformLimits === void 0 || (_platformLimits$shipp2 = platformLimits.shippingMethods) === null || _platformLimits$shipp2 === void 0 || (_platformLimits$shipp2 = _platformLimits$shipp2.total) === null || _platformLimits$shipp2 === void 0 ? void 0 : _platformLimits$shipp2.limit;
+  const current = platformLimits?.shippingMethods?.total?.current;
+  const limit = platformLimits?.shippingMethods?.total?.limit;
   return jsx(PlatformLimitsStatusText, {
     intlMessage: messages$k.shippingMethodsStatus,
     children: getPlatformLimitsStatus({
@@ -9895,18 +9790,17 @@ const useTaxCategoriesPlatformLimitsFetcher = () => {
 };
 
 const useTaxCategoriesPlatformLimits = () => {
-  var _platformLimits$taxCa;
   const _useTaxCategoriesPlat = useTaxCategoriesPlatformLimitsFetcher(),
     platformLimits = _useTaxCategoriesPlat.platformLimits;
-  if (!(platformLimits !== null && platformLimits !== void 0 && (_platformLimits$taxCa = platformLimits.taxCategories) !== null && _platformLimits$taxCa !== void 0 && _platformLimits$taxCa.total)) {
+  if (!platformLimits?.taxCategories?.total) {
     return {
       hasReachedTaxCategoriesWarningLimit: false,
       hasReachedTaxCategoriesErrorLimit: false
     };
   }
-  const _platformLimits$taxCa2 = platformLimits.taxCategories.total,
-    limit = _platformLimits$taxCa2.limit,
-    current = _platformLimits$taxCa2.current;
+  const _platformLimits$taxCa = platformLimits.taxCategories.total,
+    limit = _platformLimits$taxCa.limit,
+    current = _platformLimits$taxCa.current;
   const hasReachedTaxCategoriesWarningLimit = getHasExceededWarningThreshold({
     limit,
     current
@@ -9922,13 +9816,12 @@ const useTaxCategoriesPlatformLimits = () => {
 };
 
 const PlatformLimitsTaxCategoriesNotifications = () => {
-  var _platformLimits$taxCa;
   const _useTaxCategoriesPlat = useTaxCategoriesPlatformLimitsFetcher(),
     platformLimits = _useTaxCategoriesPlat.platformLimits;
   const _useTaxCategoriesPlat2 = useTaxCategoriesPlatformLimits(),
     hasReachedTaxCategoriesWarningLimit = _useTaxCategoriesPlat2.hasReachedTaxCategoriesWarningLimit,
     hasReachedTaxCategoriesErrorLimit = _useTaxCategoriesPlat2.hasReachedTaxCategoriesErrorLimit;
-  if (!(platformLimits !== null && platformLimits !== void 0 && (_platformLimits$taxCa = platformLimits.taxCategories) !== null && _platformLimits$taxCa !== void 0 && _platformLimits$taxCa.total)) {
+  if (!platformLimits?.taxCategories?.total) {
     return null;
   }
   if (hasReachedTaxCategoriesErrorLimit) {
@@ -9974,13 +9867,12 @@ var messages$i = defineMessages({
 });
 
 const PlatformLimitsTaxCategoriesStatus = _ref => {
-  var _platformLimits$taxCa, _platformLimits$taxCa2;
   let total = _ref.total;
   const intl = useIntl();
   const _useTaxCategoriesPlat = useTaxCategoriesPlatformLimitsFetcher(),
     platformLimits = _useTaxCategoriesPlat.platformLimits;
-  const current = platformLimits === null || platformLimits === void 0 || (_platformLimits$taxCa = platformLimits.taxCategories) === null || _platformLimits$taxCa === void 0 || (_platformLimits$taxCa = _platformLimits$taxCa.total) === null || _platformLimits$taxCa === void 0 ? void 0 : _platformLimits$taxCa.current;
-  const limit = platformLimits === null || platformLimits === void 0 || (_platformLimits$taxCa2 = platformLimits.taxCategories) === null || _platformLimits$taxCa2 === void 0 || (_platformLimits$taxCa2 = _platformLimits$taxCa2.total) === null || _platformLimits$taxCa2 === void 0 ? void 0 : _platformLimits$taxCa2.limit;
+  const current = platformLimits?.taxCategories?.total?.current;
+  const limit = platformLimits?.taxCategories?.total?.limit;
   return jsx(PlatformLimitsStatusText, {
     intlMessage: messages$i.taxCategoriesStatus,
     children: getPlatformLimitsStatus({
@@ -10042,18 +9934,17 @@ const useZonesPlatformLimitsFetcher = () => {
 };
 
 const useZonesPlatformLimits = () => {
-  var _platformLimits$zones;
   const _useZonesPlatformLimi = useZonesPlatformLimitsFetcher(),
     platformLimits = _useZonesPlatformLimi.platformLimits;
-  if (!(platformLimits !== null && platformLimits !== void 0 && (_platformLimits$zones = platformLimits.zones) !== null && _platformLimits$zones !== void 0 && _platformLimits$zones.total)) {
+  if (!platformLimits?.zones?.total) {
     return {
       hasReachedZonesWarningLimit: false,
       hasReachedZonesErrorLimit: false
     };
   }
-  const _platformLimits$zones2 = platformLimits.zones.total,
-    limit = _platformLimits$zones2.limit,
-    current = _platformLimits$zones2.current;
+  const _platformLimits$zones = platformLimits.zones.total,
+    limit = _platformLimits$zones.limit,
+    current = _platformLimits$zones.current;
   const hasReachedZonesWarningLimit = getHasExceededWarningThreshold({
     limit,
     current
@@ -10069,13 +9960,12 @@ const useZonesPlatformLimits = () => {
 };
 
 const PlatformLimitsZonesNotifications = () => {
-  var _platformLimits$zones;
   const _useZonesPlatformLimi = useZonesPlatformLimitsFetcher(),
     platformLimits = _useZonesPlatformLimi.platformLimits;
   const _useZonesPlatformLimi2 = useZonesPlatformLimits(),
     hasReachedZonesWarningLimit = _useZonesPlatformLimi2.hasReachedZonesWarningLimit,
     hasReachedZonesErrorLimit = _useZonesPlatformLimi2.hasReachedZonesErrorLimit;
-  if (!(platformLimits !== null && platformLimits !== void 0 && (_platformLimits$zones = platformLimits.zones) !== null && _platformLimits$zones !== void 0 && _platformLimits$zones.total)) {
+  if (!platformLimits?.zones?.total) {
     return null;
   }
   if (hasReachedZonesErrorLimit) {
@@ -10121,13 +10011,12 @@ var messages$g = defineMessages({
 });
 
 const PlatformLimitsZonesStatus = _ref => {
-  var _platformLimits$zones, _platformLimits$zones2;
   let total = _ref.total;
   const intl = useIntl();
   const _useZonesPlatformLimi = useZonesPlatformLimitsFetcher(),
     platformLimits = _useZonesPlatformLimi.platformLimits;
-  const current = platformLimits === null || platformLimits === void 0 || (_platformLimits$zones = platformLimits.zones) === null || _platformLimits$zones === void 0 || (_platformLimits$zones = _platformLimits$zones.total) === null || _platformLimits$zones === void 0 ? void 0 : _platformLimits$zones.current;
-  const limit = platformLimits === null || platformLimits === void 0 || (_platformLimits$zones2 = platformLimits.zones) === null || _platformLimits$zones2 === void 0 || (_platformLimits$zones2 = _platformLimits$zones2.total) === null || _platformLimits$zones2 === void 0 ? void 0 : _platformLimits$zones2.limit;
+  const current = platformLimits?.zones?.total?.current;
+  const limit = platformLimits?.zones?.total?.limit;
   return jsx(PlatformLimitsStatusText, {
     intlMessage: messages$g.zonesStatus,
     children: getPlatformLimitsStatus({
@@ -10189,18 +10078,17 @@ const useCustomersPlatformLimitsFetcher = () => {
 };
 
 const useCustomersPlatformLimits$1 = () => {
-  var _platformLimits$custo;
   const _useCustomersPlatform = useCustomersPlatformLimitsFetcher(),
     platformLimits = _useCustomersPlatform.platformLimits;
-  if (!(platformLimits !== null && platformLimits !== void 0 && (_platformLimits$custo = platformLimits.customers) !== null && _platformLimits$custo !== void 0 && _platformLimits$custo.total)) {
+  if (!platformLimits?.customers?.total) {
     return {
       hasReachedCustomersWarningLimit: false,
       hasReachedCustomersErrorLimit: false
     };
   }
-  const _platformLimits$custo2 = platformLimits.customers.total,
-    limit = _platformLimits$custo2.limit,
-    current = _platformLimits$custo2.current;
+  const _platformLimits$custo = platformLimits.customers.total,
+    limit = _platformLimits$custo.limit,
+    current = _platformLimits$custo.current;
   const hasReachedCustomersWarningLimit = getHasExceededWarningThreshold({
     limit,
     current
@@ -10229,13 +10117,12 @@ const useCustomersPlatormLimitsModalState = () => {
 };
 
 const PlatformLimitsCustomersNotifications = () => {
-  var _platformLimits$custo;
   const _useCustomersPlatform = useCustomersPlatformLimitsFetcher(),
     platformLimits = _useCustomersPlatform.platformLimits;
   const _useCustomersPlatform2 = useCustomersPlatformLimits$1(),
     hasReachedCustomersWarningLimit = _useCustomersPlatform2.hasReachedCustomersWarningLimit,
     hasReachedCustomersErrorLimit = _useCustomersPlatform2.hasReachedCustomersErrorLimit;
-  if (!(platformLimits !== null && platformLimits !== void 0 && (_platformLimits$custo = platformLimits.customers) !== null && _platformLimits$custo !== void 0 && _platformLimits$custo.total)) {
+  if (!platformLimits?.customers?.total) {
     return jsx("div", {});
   }
   if (hasReachedCustomersErrorLimit) {
@@ -10286,16 +10173,15 @@ var styles$b = {
   "status": "platform-limits-customers-status-module__status___3rXYM"
 };
 const PlatformLimitsCustomersStatus = () => {
-  var _platformLimits$custo;
   const intl = useIntl();
   const _useCustomersPlatform = useCustomersPlatformLimitsFetcher(),
     platformLimits = _useCustomersPlatform.platformLimits;
-  if (!(platformLimits !== null && platformLimits !== void 0 && (_platformLimits$custo = platformLimits.customers) !== null && _platformLimits$custo !== void 0 && _platformLimits$custo.total)) {
+  if (!platformLimits?.customers?.total) {
     return null;
   }
-  const _platformLimits$custo2 = platformLimits.customers.total,
-    current = _platformLimits$custo2.current,
-    limit = _platformLimits$custo2.limit;
+  const _platformLimits$custo = platformLimits.customers.total,
+    current = _platformLimits$custo.current,
+    limit = _platformLimits$custo.limit;
   return jsx("div", {
     className: styles$b.status,
     children: jsx(Text.Detail, {
@@ -10529,18 +10415,17 @@ const useCustomerGroupsPlatformLimitsFetcher = () => {
 };
 
 const useCustomerGroupsPlatformLimitsStatus = () => {
-  var _platformLimits$custo;
   const _useCustomerGroupsPla = useCustomerGroupsPlatformLimitsFetcher(),
     platformLimits = _useCustomerGroupsPla.platformLimits;
-  if (!(platformLimits !== null && platformLimits !== void 0 && (_platformLimits$custo = platformLimits.customerGroups) !== null && _platformLimits$custo !== void 0 && _platformLimits$custo.total)) {
+  if (!platformLimits?.customerGroups?.total) {
     return {
       hasReachedCustomerGroupsWarningLimit: false,
       hasReachedCustomerGroupsErrorLimit: false
     };
   }
-  const _platformLimits$custo2 = platformLimits.customerGroups.total,
-    limit = _platformLimits$custo2.limit,
-    current = _platformLimits$custo2.current;
+  const _platformLimits$custo = platformLimits.customerGroups.total,
+    limit = _platformLimits$custo.limit,
+    current = _platformLimits$custo.current;
   const hasReachedCustomerGroupsWarningLimit = getHasExceededWarningThreshold({
     limit,
     current
@@ -10569,13 +10454,12 @@ const useCustomerGroupsPlatormLimitsModalState = () => {
 };
 
 const PlatformLimitsCustomerGroupsNotifications = () => {
-  var _platformLimits$custo;
   const _useCustomerGroupsPla = useCustomerGroupsPlatformLimitsFetcher(),
     platformLimits = _useCustomerGroupsPla.platformLimits;
   const _useCustomerGroupsPla2 = useCustomerGroupsPlatformLimitsStatus(),
     hasReachedCustomerGroupsWarningLimit = _useCustomerGroupsPla2.hasReachedCustomerGroupsWarningLimit,
     hasReachedCustomerGroupsErrorLimit = _useCustomerGroupsPla2.hasReachedCustomerGroupsErrorLimit;
-  if (!(platformLimits !== null && platformLimits !== void 0 && (_platformLimits$custo = platformLimits.customerGroups) !== null && _platformLimits$custo !== void 0 && _platformLimits$custo.total)) {
+  if (!platformLimits?.customerGroups?.total) {
     return jsx("div", {});
   }
   if (hasReachedCustomerGroupsErrorLimit) {
@@ -10626,16 +10510,15 @@ var styles$9 = {
   "status": "platform-limits-customer-groups-status-module__status___6099G"
 };
 const PlatformLimitsCustomerGroupsStatus = () => {
-  var _platformLimits$custo;
   const intl = useIntl();
   const _useCustomerGroupsPla = useCustomerGroupsPlatformLimitsFetcher(),
     platformLimits = _useCustomerGroupsPla.platformLimits;
-  if (!(platformLimits !== null && platformLimits !== void 0 && (_platformLimits$custo = platformLimits.customerGroups) !== null && _platformLimits$custo !== void 0 && _platformLimits$custo.total)) {
+  if (!platformLimits?.customerGroups?.total) {
     return null;
   }
-  const _platformLimits$custo2 = platformLimits.customerGroups.total,
-    current = _platformLimits$custo2.current,
-    limit = _platformLimits$custo2.limit;
+  const _platformLimits$custo = platformLimits.customerGroups.total,
+    current = _platformLimits$custo.current,
+    limit = _platformLimits$custo.limit;
   return jsx("div", {
     className: styles$9.status,
     children: jsx(Text.Detail, {
@@ -10867,7 +10750,7 @@ var fetchPimIndexStatus = ((apolloClient, projectKey) => async dispatch => {
   try {
     await dispatch(actions.head({
       mcApiProxyTarget: MC_API_PROXY_TARGETS.PIM_SEARCH,
-      uri: "/".concat(projectKey, "/search/products")
+      uri: `/${projectKey}/search/products`
     }));
     return {
       status: 'indexed'
@@ -10958,8 +10841,8 @@ const getIndexingJobIds = _ref => {
     products = _ref$data.products,
     productTypes = _ref$data.productTypes;
   return {
-    productsJobId: (products === null || products === void 0 ? void 0 : products.indexingJobId) || (products === null || products === void 0 ? void 0 : products.existingIndexingJobId),
-    productTypesJobId: (productTypes === null || productTypes === void 0 ? void 0 : productTypes.indexingJobId) || (productTypes === null || productTypes === void 0 ? void 0 : productTypes.existingIndexingJobId)
+    productsJobId: products?.indexingJobId || products?.existingIndexingJobId,
+    productTypesJobId: productTypes?.indexingJobId || productTypes?.existingIndexingJobId
   };
 };
 let PimIndexerProvider = /*#__PURE__*/function (_PureComponent) {
@@ -11223,7 +11106,6 @@ const valueMapping = {
   all: [true, false]
 };
 const BooleanField = props => {
-  var _context;
   let selectedValue;
   if (typeof props.value === 'boolean') selectedValue = getBooleanValue(props.value);else if (props.isMulti && _Array$isArray(props.value) && props.value.length) selectedValue = props.value.length === 2 ? 'all' : getBooleanValue(props.value[0]);
   const yesLabel = props.intl.formatMessage(messages$8.yes);
@@ -11237,7 +11119,7 @@ const BooleanField = props => {
   }];
   if (props.isMulti) options.push({
     value: 'all',
-    label: _concatInstanceProperty(_context = "".concat(yesLabel, " / ")).call(_context, noLabel)
+    label: `${yesLabel} / ${noLabel}`
   });
   return jsx(SelectInput, {
     name: props.name,
@@ -11401,19 +11283,19 @@ const ScrollToFieldError = () => {
     if (isValid) return;
     const firstErrorElement = document.querySelector('[aria-invalid="true"]');
     if (firstErrorElement) {
-      var _ref, _ref2, _document$querySelect, _elementToScrollTo$sc;
       // Get a reference to the label.
       const firstElementId = firstErrorElement.getAttribute('id');
-      const localizedInputIndex = _indexOfInstanceProperty(firstElementId).call(firstElementId, ".".concat(dataLocale));
+      const localizedInputIndex = _indexOfInstanceProperty(firstElementId).call(firstElementId, `.${dataLocale}`);
 
       // check if locale is appended then remove it from id
-      const id = localizedInputIndex > -1 ? firstElementId.replace(".".concat(dataLocale), '') : firstElementId;
+      const id = localizedInputIndex > -1 ? firstElementId.replace(`.${dataLocale}`, '') : firstElementId;
 
       // Scroll to the label (if found), otherwise to the input element itself.
 
-      const elementToScrollTo = //  div is used only for custom fields
-      (_ref = (_ref2 = (_document$querySelect = document.querySelector("div[aria-errormessage=\"".concat(firstElementId, "\"]"))) !== null && _document$querySelect !== void 0 ? _document$querySelect : document.querySelector("label[for=\"".concat(id, "\"]"))) !== null && _ref2 !== void 0 ? _ref2 : document.querySelector("label#".concat(id))) !== null && _ref !== void 0 ? _ref : firstErrorElement;
-      (_elementToScrollTo$sc = elementToScrollTo.scrollIntoView) === null || _elementToScrollTo$sc === void 0 || _elementToScrollTo$sc.call(elementToScrollTo, {
+      const elementToScrollTo =
+      //  div is used only for custom fields
+      document.querySelector(`div[aria-errormessage="${firstElementId}"]`) ?? document.querySelector(`label[for="${id}"]`) ?? document.querySelector(`label#${id}`) ?? firstErrorElement;
+      elementToScrollTo.scrollIntoView?.({
         behavior: 'smooth'
       });
     }
@@ -11439,8 +11321,7 @@ var styles$4 = {
   "search-mode-menu": "selectable-field-search-input-module__search-mode-menu___Od6Le"
 };
 const SelectableFieldSearchInput = props => {
-  var _props$initialValue, _props$placeholder;
-  const _useState = useState((_props$initialValue = props.initialValue) !== null && _props$initialValue !== void 0 ? _props$initialValue : ''),
+  const _useState = useState(props.initialValue ?? ''),
     _useState2 = _slicedToArray(_useState, 2),
     searchText = _useState2[0],
     setSearchText = _useState2[1];
@@ -11476,7 +11357,7 @@ const SelectableFieldSearchInput = props => {
         });
       },
       onReset: props.onReset,
-      placeholder: (_props$placeholder = props.placeholder) !== null && _props$placeholder !== void 0 ? _props$placeholder : intl.formatMessage(messages$5.placeholder),
+      placeholder: props.placeholder ?? intl.formatMessage(messages$5.placeholder),
       isDisabled: props.disabled
     })
   });
@@ -11537,7 +11418,6 @@ StoreSelectField.defaultProps = {
   mappedValueField: 'id'
 };
 
-var _templateObject;
 function ownKeys$b(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var _context5, _context6; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context5 = ownKeys$b(Object(t), !0)).call(_context5, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context6 = ownKeys$b(Object(t))).call(_context6, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createSuper$1(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -11616,7 +11496,10 @@ const VALIDATOR_INTEGER = {
  * has emitted a warning once in the logs, not for every instance
  */
 let hasWarned = false;
-const warningMessage = oneLineTrim(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  `validatedInput` is no longer supported.\n  Please use `formik` instead.\n"], ["\n  \\`validatedInput\\` is no longer supported.\n  Please use \\`formik\\` instead.\n"])));
+const warningMessage = oneLineTrim`
+  \`validatedInput\` is no longer supported.
+  Please use \`formik\` instead.
+`;
 const ToolTipWrapperComponent = /*#__PURE__*/forwardRef((_ref, ref) => {
   let children = _ref.children;
   return jsx(Constraints.Horizontal, {
@@ -11765,7 +11648,7 @@ function validatedInput(InnerComponent, validators) {
     }]);
     return ValidatedInput;
   }(PureComponent);
-  ValidatedInput.displayName = "ValidatedInput(".concat(_InnerComponent.displayName, ")");
+  ValidatedInput.displayName = `ValidatedInput(${_InnerComponent.displayName})`;
   ValidatedInput.defaultProps = {
     isValid: true,
     getInputRef: () => {}
@@ -11907,7 +11790,7 @@ const MultiValueSelectorDropdown = props => {
           truncate: true,
           intlMessage: _objectSpread$8(_objectSpread$8({}, messages$2.filterWholeInput), {}, {
             values: {
-              values: "\"".concat(props.value, "\"")
+              values: `"${props.value}"`
             }
           })
         })
@@ -11920,7 +11803,7 @@ const MultiValueSelectorDropdown = props => {
           truncate: true,
           intlMessage: _objectSpread$8(_objectSpread$8({}, messages$2.filterSeparateValues), {}, {
             values: {
-              values: "\"".concat(props.multiValue.join('", "'), "\"") || props.value
+              values: `"${props.multiValue.join('", "')}"` || props.value
             }
           })
         })
@@ -12212,17 +12095,16 @@ function isEmpty(value) {
 }
 
 const buildSearchQuery = (searchQuery, searchMode, fragments) => {
-  var _fragments$searchMode;
   if (!searchQuery) return '';
   const buildAllFieldsQueryString = query => {
     const fragmentsArray = _Object$values(fragments);
-    return "( ".concat(_mapInstanceProperty(fragmentsArray).call(fragmentsArray, fragment => fragment.getQuery(query)).join(' or '), " )");
+    return `( ${_mapInstanceProperty(fragmentsArray).call(fragmentsArray, fragment => fragment.getQuery(query)).join(' or ')} )`;
   };
   const trimmedSearchQuery = oneLine(searchQuery);
   if (searchMode === 'allFields') {
     return buildAllFieldsQueryString(trimmedSearchQuery);
   }
-  if (!fragments[searchMode] || typeof ((_fragments$searchMode = fragments[searchMode]) === null || _fragments$searchMode === void 0 ? void 0 : _fragments$searchMode.getQuery) !== 'function') {
+  if (!fragments[searchMode] || typeof fragments[searchMode]?.getQuery !== 'function') {
     return '';
   }
   return fragments[searchMode].getQuery(trimmedSearchQuery);
@@ -12453,11 +12335,11 @@ function createResourceReducer(options) {
 
   // TODO: validate constant keys
   const actionsMap = {
-    ["".concat(plural, "_FETCHED")]: (_, action) => ({
+    [`${plural}_FETCHED`]: (_, action) => ({
       currentQueryResult: action.payload
     }),
-    ["".concat(single, "_UPDATED_IN_LIST")]: updateStatusInList(mergeData),
-    ["".concat(single, "_DELETED_IN_LIST")]: (state, _ref) => {
+    [`${single}_UPDATED_IN_LIST`]: updateStatusInList(mergeData),
+    [`${single}_DELETED_IN_LIST`]: (state, _ref) => {
       let payload = _ref.payload;
       const results = state.currentQueryResult.results;
       return {
@@ -12469,27 +12351,27 @@ function createResourceReducer(options) {
         })
       };
     },
-    ["".concat(single, "_FETCHED")]: (_, _ref3) => {
+    [`${single}_FETCHED`]: (_, _ref3) => {
       let payload = _ref3.payload;
       return {
         currentVisible: payload
       };
     },
-    ["".concat(single, "_CREATED")]: (_ref4, _ref5) => {
+    [`${single}_CREATED`]: (_ref4, _ref5) => {
       let currentVisible = _ref4.currentVisible;
       let payload = _ref5.payload;
       return {
         currentVisible: mergeData(payload, currentVisible)
       };
     },
-    ["".concat(single, "_UPDATED")]: (_ref6, _ref7) => {
+    [`${single}_UPDATED`]: (_ref6, _ref7) => {
       let currentVisible = _ref6.currentVisible;
       let payload = _ref7.payload;
       return {
         currentVisible: mergeData(payload, currentVisible)
       };
     },
-    ["".concat(single, "_DELETED")]: () => ({
+    [`${single}_DELETED`]: () => ({
       currentVisible: null
     })
   };
@@ -12506,12 +12388,11 @@ function formatCustomerAddress(_ref) {
 }
 
 function formatCustomerName(_ref) {
-  var _context;
   let firstName = _ref.firstName,
     lastName = _ref.lastName;
   if (firstName && !lastName) return _trimInstanceProperty(firstName).call(firstName);
   if (!firstName && lastName) return _trimInstanceProperty(lastName).call(lastName);
-  if (firstName && lastName) return _concatInstanceProperty(_context = "".concat(_trimInstanceProperty(firstName).call(firstName), " ")).call(_context, _trimInstanceProperty(lastName).call(lastName));
+  if (firstName && lastName) return `${_trimInstanceProperty(firstName).call(firstName)} ${_trimInstanceProperty(lastName).call(lastName)}`;
   return NO_VALUE_FALLBACK;
 }
 
@@ -12561,10 +12442,7 @@ const validateText = (text, intl) => {
  * @returns {boolean}
  */
 const hasErrorCode = (unmappedApiErrors, errorCode) => {
-  return _Array$isArray(unmappedApiErrors) && _someInstanceProperty(unmappedApiErrors).call(unmappedApiErrors, error => {
-    var _error$extensions;
-    return ((_error$extensions = error.extensions) === null || _error$extensions === void 0 ? void 0 : _error$extensions.code) === errorCode;
-  });
+  return _Array$isArray(unmappedApiErrors) && _someInstanceProperty(unmappedApiErrors).call(unmappedApiErrors, error => error.extensions?.code === errorCode);
 };
 
 const hasInvalidInputError = errors => hasErrorCode(errors, ERROR_CODES.invalidInput);
@@ -12576,7 +12454,7 @@ function minusify(value) {
   return minus.concat(value);
 }
 
-const flattenOperator = (operator, clauses) => compact(_reduceInstanceProperty(clauses).call(clauses, (result, clause) => _concatInstanceProperty(result).call(result, (clause === null || clause === void 0 ? void 0 : clause[operator]) || clause), []));
+const flattenOperator = (operator, clauses) => compact(_reduceInstanceProperty(clauses).call(clauses, (result, clause) => _concatInstanceProperty(result).call(result, clause?.[operator] || clause), []));
 const argsToArray = args => _reduceInstanceProperty(args).call(args, (result, item) => _concatInstanceProperty(result).call(result, item), []);
 const exists = (field, attributeType) => ({
   exists: {
@@ -12633,7 +12511,7 @@ const not = function () {
 
 const safelyAddFallback = function (string) {
   let fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : NO_VALUE_FALLBACK;
-  return string === '' ? fallback : string !== null && string !== void 0 ? string : fallback;
+  return string === '' ? fallback : string ?? fallback;
 };
 
 var messages$1 = defineMessages({
@@ -12768,19 +12646,19 @@ const computedProperties = {
     // has been deleted. See MC-1925 for further information.
     const filteredCategories = _filterInstanceProperty(_context6 = product.categories).call(_context6, category => category.obj !== undefined);
     return _mapInstanceProperty(filteredCategories).call(filteredCategories, category => {
-      var _context7;
       const categoryPath = getPathName(category, language, languages);
       const ancestors = getAncestors(category, language);
-      const externalIdValue = category.obj.externalId ? // hardcoding "ext. ID" since this is not part of a message to be
+      const externalIdValue = category.obj.externalId ?
+      // hardcoding "ext. ID" since this is not part of a message to be
       // translated. This has been communicated with Jenn
-      "| ext. ID: ".concat(category.obj.externalId) : '';
+      `| ext. ID: ${category.obj.externalId}` : '';
       return {
         id: category.id,
-        name: _concatInstanceProperty(_context7 = "".concat(formatLocalizedString(category.obj, {
+        name: `${formatLocalizedString(category.obj, {
           key: 'name',
           locale: language,
           fallbackOrder: languages
-        }), " ")).call(_context7, externalIdValue),
+        })} ${externalIdValue}`,
         path: categoryPath,
         level: ancestors.length
       };
@@ -12817,13 +12695,13 @@ const getAttributeValueByType = _ref12 => {
         value: value
       });
     case 'enum':
-      return safelyAddFallback(value.label, "".concat(value.key, " (key)"));
+      return safelyAddFallback(value.label, `${value.key} (key)`);
     case 'lenum':
       return safelyAddFallback(formatLocalizedString(value, {
         key: 'label',
         locale: projectDataLocale,
         fallbackOrder: projectLanguages
-      }), "".concat(value.key, " (key)"));
+      }), `${value.key} (key)`);
     case 'number':
       return safelyAddFallback(value);
     case 'boolean':
@@ -12946,7 +12824,6 @@ const reorderArrayItems = (array, from, to) => {
 const mapTimeZonesToOptions = memoize(timeZones => {
   var _context;
   return _mapInstanceProperty(_context = _Object$entries(timeZones)).call(_context, _ref => {
-    var _context2;
     let _ref2 = _slicedToArray(_ref, 2),
       code = _ref2[0],
       value = _ref2[1];
@@ -12955,7 +12832,7 @@ const mapTimeZonesToOptions = memoize(timeZones => {
       //E.g. `(GMT +02:00) Central European Time - Berlin`
       // unicode clock hex code: \u25F7
       //
-      label: _concatInstanceProperty(_context2 = "(GMT ".concat(value.offset, ") ")).call(_context2, value.name)
+      label: `(GMT ${value.offset}) ${value.name}`
     };
   });
 });
@@ -12963,12 +12840,9 @@ const getTimeZoneId = memoize((selectedTimeZone, timeZones) => {
   if (timeZones[selectedTimeZone]) {
     return selectedTimeZone;
   } else {
-    var _context3;
-    const fallbackTimeZoneId = _findInstanceProperty(_context3 = _Object$keys(timeZones)).call(_context3, timeZoneId => {
-      var _timeZones$timeZoneId;
-      return (_timeZones$timeZoneId = timeZones[timeZoneId]) === null || _timeZones$timeZoneId === void 0 || (_timeZones$timeZoneId = _timeZones$timeZoneId.translationFor) === null || _timeZones$timeZoneId === void 0 ? void 0 : _someInstanceProperty(_timeZones$timeZoneId).call(_timeZones$timeZoneId, fallbackTimeZone => fallbackTimeZone === selectedTimeZone);
-    });
-    if (fallbackTimeZoneId !== null && fallbackTimeZoneId !== void 0 && fallbackTimeZoneId.length) {
+    var _context2;
+    const fallbackTimeZoneId = _findInstanceProperty(_context2 = _Object$keys(timeZones)).call(_context2, timeZoneId => timeZones[timeZoneId]?.translationFor?.some(fallbackTimeZone => fallbackTimeZone === selectedTimeZone));
+    if (fallbackTimeZoneId?.length) {
       return fallbackTimeZoneId.toString();
     } else {
       return 'UTC';
@@ -12976,10 +12850,9 @@ const getTimeZoneId = memoize((selectedTimeZone, timeZones) => {
   }
 });
 const getTimeZoneLabel = memoize((selectedTimeZone, timeZones) => {
-  var _context4;
   const timeZoneId = getTimeZoneId(selectedTimeZone, timeZones);
   const timeZoneData = timeZones[timeZoneId];
-  return _concatInstanceProperty(_context4 = "(GMT ".concat(timeZoneData.offset, ") ")).call(_context4, timeZoneData.name);
+  return `(GMT ${timeZoneData.offset}) ${timeZoneData.name}`;
 });
 
 function ownKeys$3(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -13040,8 +12913,7 @@ const typeDefinitionsExist = typeDefinitions => {
   return typeDefinitions.length > 0;
 };
 const typeDefinitionSelected = formValues => {
-  var _formValues$FIELD_NAM, _formValues$FIELD_NAM2;
-  return ((_formValues$FIELD_NAM = formValues[FIELD_NAME]) === null || _formValues$FIELD_NAM === void 0 ? void 0 : _formValues$FIELD_NAM.type) && ((_formValues$FIELD_NAM2 = formValues[FIELD_NAME]) === null || _formValues$FIELD_NAM2 === void 0 || (_formValues$FIELD_NAM2 = _formValues$FIELD_NAM2.type) === null || _formValues$FIELD_NAM2 === void 0 ? void 0 : _formValues$FIELD_NAM2.obj);
+  return formValues[FIELD_NAME]?.type && formValues[FIELD_NAME]?.type?.obj;
 };
 const typeDefinitionContainsFieldDefinitions = formValues => {
   return formValues[FIELD_NAME].type.obj.key && formValues[FIELD_NAME].type.obj.fieldDefinitions.length > 0;
@@ -13076,7 +12948,7 @@ const CustomFieldsInputWrapper = _ref2 => {
     max: "scale",
     children: jsx(CustomFields, {
       isReadOnly: isReadOnly,
-      name: "".concat(FIELD_NAME, ".fields"),
+      name: `${FIELD_NAME}.fields`,
       fieldDefinitions: isReadOnly && hideEmptyFields ? fieldDefinitionsWithValues(formValues) : formValues[FIELD_NAME].type.obj.fieldDefinitions
     })
   });
@@ -13111,7 +12983,6 @@ const createFormStateFromTypeDefinition = selectedTypeDefinition => {
   };
 };
 const CustomTypeSubform = _ref => {
-  var _formValues$FIELD_NAM3, _formValues$FIELD_NAM4;
   let typeDefinitions = _ref.typeDefinitions,
     isReadOnly = _ref.isReadOnly,
     isCondensed = _ref.isCondensed,
@@ -13143,8 +13014,7 @@ const CustomTypeSubform = _ref => {
     }
   }, [typeDefinitions, setFieldValue, validateForm]);
   const typeDefinitionSelected = formValues => {
-    var _formValues$FIELD_NAM, _formValues$FIELD_NAM2;
-    return ((_formValues$FIELD_NAM = formValues[FIELD_NAME]) === null || _formValues$FIELD_NAM === void 0 ? void 0 : _formValues$FIELD_NAM.type) && ((_formValues$FIELD_NAM2 = formValues[FIELD_NAME]) === null || _formValues$FIELD_NAM2 === void 0 || (_formValues$FIELD_NAM2 = _formValues$FIELD_NAM2.type) === null || _formValues$FIELD_NAM2 === void 0 ? void 0 : _formValues$FIELD_NAM2.obj);
+    return formValues[FIELD_NAME]?.type && formValues[FIELD_NAME]?.type?.obj;
   };
 
   // if the user has read-only permissions, empty fields are hidden, and no type definition is selected, hide the component
@@ -13159,9 +13029,9 @@ const CustomTypeSubform = _ref => {
       children: jsx(SelectInput, {
         isClearable: true,
         "data-testid": "custom-type-select",
-        name: "".concat(FIELD_NAME, ".type.obj.key"),
-        options: mapTypeDefinitionsToOptions(typeDefinitions, language, languages, (_formValues$FIELD_NAM3 = formValues[FIELD_NAME]) === null || _formValues$FIELD_NAM3 === void 0 || (_formValues$FIELD_NAM3 = _formValues$FIELD_NAM3.type) === null || _formValues$FIELD_NAM3 === void 0 ? void 0 : _formValues$FIELD_NAM3.id),
-        value: (_formValues$FIELD_NAM4 = formValues[FIELD_NAME]) === null || _formValues$FIELD_NAM4 === void 0 || (_formValues$FIELD_NAM4 = _formValues$FIELD_NAM4.type) === null || _formValues$FIELD_NAM4 === void 0 || (_formValues$FIELD_NAM4 = _formValues$FIELD_NAM4.obj) === null || _formValues$FIELD_NAM4 === void 0 ? void 0 : _formValues$FIELD_NAM4.key,
+        name: `${FIELD_NAME}.type.obj.key`,
+        options: mapTypeDefinitionsToOptions(typeDefinitions, language, languages, formValues[FIELD_NAME]?.type?.id),
+        value: formValues[FIELD_NAME]?.type?.obj?.key,
         onChange: handleTypeDefinitionSelect,
         placeholder: formatMessage(messages.typesPlaceholder),
         isReadOnly: isReadOnly
@@ -13180,8 +13050,7 @@ CustomTypeSubform.displayName = 'CustomTypeSubform';
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context6, _context7; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context6 = ownKeys(Object(t), !0)).call(_context6, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context7 = ownKeys(Object(t))).call(_context7, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 const transformFieldType = fieldDefinition => {
-  var _fieldDefinition$type, _fieldDefinition$type2;
-  if (((_fieldDefinition$type = fieldDefinition.type) === null || _fieldDefinition$type === void 0 || (_fieldDefinition$type = _fieldDefinition$type.elementType) === null || _fieldDefinition$type === void 0 ? void 0 : _fieldDefinition$type.name) === 'LocalizedEnum') {
+  if (fieldDefinition.type?.elementType?.name === 'LocalizedEnum') {
     var _context;
     return _objectSpread(_objectSpread({}, fieldDefinition.type), {}, {
       elementType: _objectSpread(_objectSpread({}, fieldDefinition.type.elementType), {}, {
@@ -13191,7 +13060,7 @@ const transformFieldType = fieldDefinition => {
         }))
       })
     });
-  } else if (((_fieldDefinition$type2 = fieldDefinition.type) === null || _fieldDefinition$type2 === void 0 ? void 0 : _fieldDefinition$type2.name) === 'LocalizedEnum') {
+  } else if (fieldDefinition.type?.name === 'LocalizedEnum') {
     var _context2;
     return _objectSpread(_objectSpread({}, fieldDefinition.type), {}, {
       values: _mapInstanceProperty(_context2 = _valuesInstanceProperty(fieldDefinition.type)).call(_context2, value => ({