@shopgate/engage 7.31.6 → 7.32.0-beta.10

package/product/components/UnitQuantityPicker/UnitQuantityPicker.js

@@ -3,14 +3,11 @@ import PropTypes from 'prop-types';
 import { i18n, hasNewServices } from '@shopgate/engage/core/helpers';
 import { UIEvents } from '@shopgate/engage/core';
 import { useWidgetSettings } from '@shopgate/engage/core/hooks';
-import { makeStyles } from '@shopgate/engage/styles';
-import { themeConfig } from '@shopgate/engage';
-import { RippleButton, QuantityInput } from '@shopgate/engage/components';
+import { makeStyles, useTheme } from '@shopgate/engage/styles';
+import { QuantityInput } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { broadcastLiveMessage } from '@shopgate/engage/a11y/helpers';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-const {
-  colors
-} = themeConfig;
 const useStyles = makeStyles()((theme, {
   inputColor,
   inputBgColor,
@@ -40,8 +37,8 @@ const useStyles = makeStyles()((theme, {
       display: 'flex',
       alignItems: 'center',
       width: '100%',
-      fontSize: 16,
-      backgroundColor: 'var(--color-background-accent)',
+      fontSize: theme.typography.body1.fontSize,
+      backgroundColor: theme.components.input.background,
       ...(inputColor && {
         color: `${inputColor}`
       }),
@@ -64,6 +61,7 @@ const useStyles = makeStyles()((theme, {
       fontWeight,
       height: '100%',
       width: '100%',
+      color: theme.contrastColor(inputBgColor || theme.components.input.background),
       ...(inputColor && {
         color: `${inputColor}`
       }),
@@ -80,10 +78,8 @@ const useStyles = makeStyles()((theme, {
     },
     button: {
       width: sizeValue,
-      ' &&': {
-        minWidth: sizeValue,
-        padding: 0
-      },
+      minWidth: sizeValue,
+      padding: 0,
       height: sizeValue,
       fontSize: `${Math.floor(sizeValue / 28 * 100)}%`,
       '&:not(:disabled)': {
@@ -95,25 +91,13 @@ const useStyles = makeStyles()((theme, {
         })
       }
     },
-    buttonRipple: {
-      padding: 0
-    },
     buttonNoRadiusLeft: {
-      ' &&': {
-        borderTopLeftRadius: 0,
-        borderBottomLeftRadius: 0
-      }
+      borderTopLeftRadius: 0,
+      borderBottomLeftRadius: 0
     },
     buttonNoRadiusRight: {
-      ' &&': {
-        borderTopRightRadius: 0,
-        borderBottomRightRadius: 0
-      }
-    },
-    disabled: {
-      ' > div': {
-        padding: 0
-      }
+      borderTopRightRadius: 0,
+      borderBottomRightRadius: 0
     }
   };
 });
@@ -140,6 +124,7 @@ const UnitQuantityPicker = ({
   toggleTabBarOnFocus,
   quantityLabel
 }) => {
+  const theme = useTheme();
   const widgetDefaults = useMemo(() => {
     if (hasNewServices()) {
       // The widget configuration was introduced with CCP-2449 in PWA6. It's inactive for now
@@ -148,13 +133,13 @@ const UnitQuantityPicker = ({
       return {};
     }
     return {
-      buttonColor: colors.shade8,
-      buttonBgColor: colors.primary,
-      inputColor: colors.dark,
-      inputBgColor: colors.shade8,
+      buttonColor: theme.palette.primary.contrastText,
+      buttonBgColor: theme.palette.primary.main,
+      inputColor: theme.palette.text.primary,
+      inputBgColor: theme.palette.grey.light,
       showLabel: true
     };
-  }, []);
+  }, [theme]);
   const {
     buttonColor = widgetDefaults.buttonColor,
     buttonBgColor = widgetDefaults.buttonBgColor,
@@ -254,13 +239,10 @@ const UnitQuantityPicker = ({
       className: classes.backdrop
     }), /*#__PURE__*/_jsxs("div", {
       className: cx(classes.root, className),
-      children: [/*#__PURE__*/_jsx(RippleButton, {
-        type: "secondary",
+      children: [/*#__PURE__*/_jsx(Button, {
+        color: "primary",
         disabled: !allowDecrement || disabled,
-        rippleClassName: classes.buttonRipple,
-        className: cx(classes.button, classes.buttonNoRadiusRight, {
-          [classes.disabled]: !allowDecrement || disabled
-        }),
+        className: cx(classes.button, classes.buttonNoRadiusRight),
         onClick: handleDecrement,
         "aria-label": i18n.text('product.decrease_quantity'),
         children: "-"
@@ -285,13 +267,10 @@ const UnitQuantityPicker = ({
           onKeyDown: handleKeyDown,
           ref: inputRef
         })]
-      }), /*#__PURE__*/_jsx(RippleButton, {
-        type: "secondary",
+      }), /*#__PURE__*/_jsx(Button, {
+        color: "primary",
         disabled: !allowIncrement || disabled,
-        rippleClassName: classes.buttonRipple,
-        className: cx(classes.button, classes.buttonNoRadiusLeft, {
-          [classes.disabled]: !allowIncrement || disabled
-        }),
+        className: cx(classes.button, classes.buttonNoRadiusLeft),
         onClick: handleIncrement,
         "aria-label": i18n.text('product.increase_quantity'),
         children: "+"

package/product/helpers/index.js

@@ -1,7 +1,9 @@
 import configuration from '@shopgate/pwa-common/collections/Configuration';
+import { logger } from '@shopgate/pwa-core/helpers';
 import { DEFAULT_PRODUCTS_FETCH_PARAMS } from '@shopgate/pwa-common/constants/Configuration';
 import { getFullImageSource, isBeta, loadImage } from '@shopgate/engage/core/helpers';
 import { getThemeSettings } from '@shopgate/engage/core/config';
+import { PRODUCT_IMAGE_BASE_WIDTHS } from '@shopgate/engage/settings/constants/imageSettings';
 import { buildShowScheduledParams } from "../components/EffectivityDates/helpers";
 export * from '@shopgate/pwa-common-commerce/product/helpers';
 export * from "../components/Media/helpers";
@@ -47,11 +49,23 @@ export const setDefaultProductFetchParams = () => {
   });
 };
 
+/**
+ * Whether the deprecation warning for getProductImageSettings has already been logged. Nulled
+ * after the first log, so a single warning is emitted per session rather than one per render.
+ */
+let productImageSettingsWarning = 'getProductImageSettings() is deprecated. Use the "context" prop of ProductImage, or the useProductImageSettings hook from @shopgate/engage/settings/hooks, so that images follow the configured aspect ratio.';
+
 /**
  * Provides the settings for ProductImages
+ * @deprecated Use the "context" prop of ProductImage, or useProductImageSettings. This accessor
+ * only reads the legacy theme configuration, so it does not pick up admin configured ratios.
  * @return {Object}
  */
 export const getProductImageSettings = () => {
+  if (productImageSettingsWarning) {
+    logger.warn(productImageSettingsWarning);
+    productImageSettingsWarning = null;
+  }
   const appImages = getThemeSettings('AppImages');
   return {
     quality: 75,
@@ -79,18 +93,22 @@ export const getProductImageSettings = () => {
 };
 
 /**
- * Load product image with given resolution
+ * Load product image with given resolution.
+ *
+ * A preload only pays off when it requests the same url the rendered image does, so pass the
+ * resolution and settings that image resolves. Anything omitted falls back to the built-in
+ * defaults.
  * @param {string} src .
- * @param {Object} resolution .
+ * @param {Object} [resolution] The resolution to preload. Falls back to the smallest built-in pdp
+ * resolution at a 1:1 ratio.
+ * @param {Object} [settings] The image service settings, as resolved by useImageServiceSettings.
  * @returns {Promise}
  */
-export const loadProductImage = (src, resolution = null) => {
-  let res = resolution;
-  if (!res) {
-    const {
-      HeroImage: resolutions
-    } = getProductImageSettings();
-    [res] = resolutions;
-  }
-  return loadImage(getFullImageSource(src, res));
+export const loadProductImage = (src, resolution = null, settings = undefined) => {
+  const [baseWidth] = PRODUCT_IMAGE_BASE_WIDTHS.pdp;
+  const res = resolution ?? {
+    width: baseWidth,
+    height: baseWidth
+  };
+  return loadImage(getFullImageSource(src, res, settings));
 };

package/product/hooks/index.js

@@ -1,3 +1,5 @@
 export { useLoadProductImage } from "./useLoadProductImage";
 export { default as useProductListEntry } from "./useProductListEntry";
-export { default as useProductListType } from "./useProductListType";
+export { default as useProductListType } from "./useProductListType";
+export { default as useShowEmptyRatingStars } from "./useShowEmptyRatingStars";
+export { useSlidesPerView } from "../components/ProductSlider/hooks";

package/product/hooks/useLoadProductImage.js

@@ -1,4 +1,5 @@
 import { useState, useEffect } from 'react';
+import { useImageServiceSettings } from '@shopgate/engage/settings/hooks';
 import { loadProductImage } from "../helpers/index";
 
 /**
@@ -9,6 +10,7 @@ import { loadProductImage } from "../helpers/index";
  */
 export function useLoadProductImage(src, resolution = null) {
   const [loadedImage, setLoadedImage] = useState(null);
+  const imageServiceSettings = useImageServiceSettings();
   useEffect(() => {
     if (src) {
       setLoadedImage(null);
@@ -16,8 +18,8 @@ export function useLoadProductImage(src, resolution = null) {
   }, [src]);
   useEffect(() => {
     if (src && !loadedImage) {
-      loadProductImage(src, resolution).then(imageSrc => setLoadedImage(imageSrc));
+      loadProductImage(src, resolution, imageServiceSettings).then(imageSrc => setLoadedImage(imageSrc));
     }
-  }, [loadedImage, resolution, src]);
+  }, [imageServiceSettings, loadedImage, resolution, src]);
   return loadedImage;
 }

package/product/hooks/useShowEmptyRatingStars.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Resolves whether rating stars are also rendered for products without a rating.
+ * @returns Whether empty rating stars are shown.
+ */
+declare const useShowEmptyRatingStars: () => boolean;
+export default useShowEmptyRatingStars;
+//# sourceMappingURL=useShowEmptyRatingStars.d.ts.map

package/product/hooks/useShowEmptyRatingStars.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useShowEmptyRatingStars.d.ts","sourceRoot":"","sources":["../../../product/hooks/useShowEmptyRatingStars.ts"],"names":[],"mappings":"AASA;;;GAGG;AACH,QAAA,MAAM,uBAAuB,QAAO,OAYnC,CAAC;AAEF,eAAe,uBAAuB,CAAC"}

package/product/hooks/useShowEmptyRatingStars.js

@@ -0,0 +1,21 @@
+import { useSelector } from 'react-redux';
+import { useWidgetSettings } from '@shopgate/engage/core/hooks';
+import { getAreAppSettingsHydrated, getShowEmptyRatingStars } from '@shopgate/engage/settings/selectors/appSettings';
+const RATING_WIDGET_ID = '@shopgate/engage/rating';
+
+/**
+ * Resolves whether rating stars are also rendered for products without a rating.
+ * @returns Whether empty rating stars are shown.
+ */
+const useShowEmptyRatingStars = () => {
+  const areAppSettingsHydrated = useSelector(getAreAppSettingsHydrated);
+  const showEmptyStars = useSelector(getShowEmptyRatingStars);
+  const {
+    showEmptyRatingStars: legacyShowEmptyRatingStars = false
+  } = useWidgetSettings(RATING_WIDGET_ID) || {};
+  if (!areAppSettingsHydrated) {
+    return legacyShowEmptyRatingStars;
+  }
+  return showEmptyStars;
+};
+export default useShowEmptyRatingStars;

package/product/index.js

@@ -37,7 +37,6 @@ export * from "./selectors/relations";
 export { ProductContext, VariantContext } from "./components/context";
 export { default as ProductListTypeContext } from "./providers/ProductListType/context";
 export { default as ProductListEntryContext } from "./providers/ProductListEntry/context";
-export * from "./collections";
 export * from "./constants";
 export * from "./helpers";
 export * from "./components";

package/push-opt-in/components/PushOptInModal/index.js

@@ -2,24 +2,22 @@ import React, { useMemo, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import throttle from 'lodash/throttle';
 import { makeStyles } from '@shopgate/engage/styles';
-import { Grid, I18n, Button, Modal } from '@shopgate/engage/components';
-import { appConfig, themeConfig } from '@shopgate/engage';
+import { Grid, I18n, Modal, Typography } from '@shopgate/engage/components';
+import { Button, ButtonBase } from '@shopgate/engage/components/v2';
+import { appConfig } from '@shopgate/engage';
 import pushImage from "./push-opt-in.svg";
 import connect from "./connector";
 import { svgToDataUrl } from "../../../core";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const {
-  colors
-} = themeConfig;
-const useStyles = makeStyles()(() => ({
+const useStyles = makeStyles()(theme => ({
   modalContent: {
     width: '100%'
   },
   modalLayout: {
-    backgroundColor: colors.lightOverlay
+    backgroundColor: theme.palette.background.surface
   },
   container: {
-    backgroundColor: colors.lightOverlay,
+    backgroundColor: theme.palette.background.surface,
     textAlign: 'center',
     padding: '30px',
     justifyContent: 'center',
@@ -27,8 +25,6 @@ const useStyles = makeStyles()(() => ({
     flexDirection: 'column'
   },
   title: {
-    fontWeight: 'bold',
-    fontSize: '1.35rem',
     paddingTop: '30px',
     paddingBottom: '30px'
   },
@@ -45,7 +41,7 @@ const useStyles = makeStyles()(() => ({
     marginTop: '30px'
   },
   buttonText: {
-    color: colors.gray
+    color: theme.palette.text.secondary
   }
 }));
 
@@ -117,24 +113,28 @@ const PushOptInModal = ({
           className: cx(classes.image, 'push-opt-in-modal__image'),
           alt: "",
           "aria-hidden": "true"
-        }), /*#__PURE__*/_jsx(I18n.Text, {
+        }), /*#__PURE__*/_jsx(Typography, {
+          variant: "h3",
+          component: "div",
+          fontWeight: "bold",
           className: cx(classes.title, 'push-opt-in-modal__title'),
-          string: modalTitle || 'pushOptInModal.title',
-          id: "pushOptInDialogTitle"
+          children: /*#__PURE__*/_jsx(I18n.Text, {
+            string: modalTitle || 'pushOptInModal.title',
+            id: "pushOptInDialogTitle"
+          })
         }), /*#__PURE__*/_jsx(I18n.Text, {
           className: cx('push-opt-in-modal__message'),
           string: modalMessage || 'pushOptInModal.message',
           id: "pushOptInDialogMessage"
         }), /*#__PURE__*/_jsx(Button, {
           onClick: handleAllowPushOptIn,
-          type: "primary",
+          color: "secondary",
           className: cx(classes.button, 'push-opt-in-modal__button-allow'),
           children: /*#__PURE__*/_jsx(I18n.Text, {
             string: modalButtonAllow || 'pushOptInModal.buttonAllow'
           })
-        }), /*#__PURE__*/_jsx(Button, {
+        }), /*#__PURE__*/_jsx(ButtonBase, {
           onClick: handleDenyPushOptIn,
-          type: "plain",
           className: cx(classes.button, 'push-opt-in-modal__button-deny'),
           children: /*#__PURE__*/_jsx(I18n.Text, {
             string: modalButtonDeny || 'pushOptInModal.buttonDeny',

package/registration/components/GuestRegistration/GuestRegistrationFormPickup.js

@@ -22,13 +22,13 @@ const useStyles = makeStyles()(theme => ({
     },
     ' .guestFormPickupPerson .label span': {
       color: theme.palette.text.primary,
-      fontWeight: 'bold'
+      fontWeight: theme.typography.fontWeightBold
     },
     ' .guestFormPickupPerson .radioGroup': {
       marginTop: theme.spacing(1),
       flexDirection: 'row',
       ' .uncheckedIcon': {
-        color: 'var(--color-text-medium-emphasis)'
+        color: theme.palette.text.secondary
       }
     },
     ...StylePresets.getOutlinedFormFields(theme)

package/registration/components/Registration/RegistrationContent.js

@@ -1,6 +1,7 @@
 import React, { forwardRef } from 'react';
 import { makeStyles } from '@shopgate/engage/styles';
-import { isIOSTheme, SHOP_SETTING_REGISTRATION_MODE_SIMPLE } from '@shopgate/engage/core';
+import { isIOSTheme } from '@shopgate/engage/core';
+import { SHOP_SETTING_REGISTRATION_MODE_SIMPLE } from '@shopgate/engage/settings/constants/shopSettings';
 import RegistrationFormBase from "./RegistrationFormBase";
 import RegistrationFormBilling from "./RegistrationFormBilling";
 import RegistrationFormShipping from "./RegistrationFormShipping";

package/registration/components/Registration/RegistrationFormActions.js

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { i18n, isIOSTheme } from '@shopgate/engage/core';
 import { makeStyles } from '@shopgate/engage/styles';
-import { RippleButton } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { useRegistration } from "../../hooks";
 import { jsx as _jsx } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
@@ -15,7 +15,6 @@ const useStyles = makeStyles()(theme => ({
     } : null)
   },
   submitButton: {
-    width: '100%',
     marginTop: 8
   }
 }));
@@ -48,8 +47,9 @@ const RegisterFormActions = ({
   }, [guestRegistrationEditMode, isGuest, orderNeedsPayment]);
   return /*#__PURE__*/_jsx("div", {
     className: classes.submitButtonContainer,
-    children: /*#__PURE__*/_jsx(RippleButton, {
-      type: "secondary",
+    children: /*#__PURE__*/_jsx(Button, {
+      color: "primary",
+      fullWidth: true,
       onClick: handleSubmit,
       disabled: isLocked,
       className: classes.submitButton,

package/registration/components/Registration/RegistrationFormBase.config.js

@@ -1,4 +1,5 @@
-import { i18n, SHOP_SETTING_REGISTRATION_MODE_SIMPLE, SHOP_SETTING_REGISTRATION_MODE_EXTENDED } from '@shopgate/engage/core';
+import { i18n } from '@shopgate/engage/core';
+import { SHOP_SETTING_REGISTRATION_MODE_SIMPLE, SHOP_SETTING_REGISTRATION_MODE_EXTENDED } from '@shopgate/engage/settings/constants/shopSettings';
 
 /**
  * Generates form configuration.

package/registration/providers/GuestRegistrationProvider.actions.js

@@ -1,7 +1,7 @@
 import { EVALIDATION } from '@shopgate/engage/core';
 import { updateCheckoutOrder } from '@shopgate/engage/checkout/actions';
 import { extractAttributes, convertPipelineValidationErrors } from '@shopgate/engage/account/helper/form';
-import { getMerchantCustomerAttributes } from '@shopgate/engage/core/selectors/merchantSettings';
+import { getMerchantCustomerAttributes } from '@shopgate/engage/settings/selectors/merchantSettings';
 
 /**
  * Submits guest registration form data.

package/registration/providers/GuestRegistrationProvider.connector.js

@@ -2,11 +2,12 @@ import { connect } from 'react-redux';
 import { getShopSettings, getConfigFetching } from '@shopgate/engage/core/config';
 import { hasDirectShipItems } from '@shopgate/engage/cart';
 import { getPreferredLocationAddress } from '@shopgate/engage/locations/selectors';
-import { getMerchantCustomerAttributes } from '@shopgate/engage/core/selectors/merchantSettings';
+import { getMerchantCustomerAttributes } from '@shopgate/engage/settings/selectors/merchantSettings';
 import { getCheckoutBillingAddress, getCheckoutShippingAddress, getCheckoutPickupAddress, getCheckoutOrderCustomer, getIsReserveOnly, isPickupAndBillingEquals, isShippingBillingEquals, getIsShippingAddressSelectionEnabled, getIsPickupContactSelectionEnabled } from '@shopgate/engage/checkout/selectors/order';
 import { getNeedsPaymentForOrder } from '@shopgate/engage/checkout/selectors/payment';
 import { prepareCheckout } from '@shopgate/engage/checkout/actions';
-import { historyPush, historyPop, makeIsLastStackEntry, getNumberOfAddressLines } from '@shopgate/engage/core';
+import { historyPush, historyPop, makeIsLastStackEntry } from '@shopgate/engage/core';
+import { getNumberOfAddressLines } from '@shopgate/engage/settings/selectors/shopSettings';
 import { submitGuestRegistration } from "./GuestRegistrationProvider.actions";
 
 /**

package/registration/providers/GuestRegistrationProvider.js

@@ -5,7 +5,8 @@ import identity from 'lodash/identity';
 import appConfig from '@shopgate/pwa-common/helpers/config';
 import { useFormState } from '@shopgate/engage/core/hooks/useFormState';
 import { useScrollTo } from '@shopgate/engage/core/hooks/useScrollTo';
-import { LoadingProvider, i18n, useAsyncMemo, useRoute, SHOP_SETTING_REGISTRATION_MODE_EXTENDED } from '@shopgate/engage/core';
+import { LoadingProvider, i18n, useAsyncMemo, useRoute } from '@shopgate/engage/core';
+import { SHOP_SETTING_REGISTRATION_MODE_EXTENDED } from '@shopgate/engage/settings/constants/shopSettings';
 import { ADDRESS_TYPE_SHIPPING, ADDRESS_TYPE_PICKUP } from '@shopgate/engage/checkout';
 import { extractDefaultValues } from "../../account/helper/form";
 import { GUEST_CHECKOUT_PATTERN, GUEST_CHECKOUT_PAYMENT_PATTERN } from "../../checkout/constants/routes";

package/registration/providers/RegistrationProvider.actions.js

@@ -1,6 +1,8 @@
-import { EVALIDATION, getRegistrationMode, SHOP_SETTING_REGISTRATION_MODE_SIMPLE } from '@shopgate/engage/core';
+import { EVALIDATION } from '@shopgate/engage/core';
+import { getRegistrationMode } from '@shopgate/engage/settings/selectors/shopSettings';
+import { SHOP_SETTING_REGISTRATION_MODE_SIMPLE } from '@shopgate/engage/settings/constants/shopSettings';
 import { extractAttributes, convertPipelineValidationErrors } from '@shopgate/engage/account/helper/form';
-import { getMerchantCustomerAttributes } from '@shopgate/engage/core/selectors/merchantSettings';
+import { getMerchantCustomerAttributes } from '@shopgate/engage/settings/selectors/merchantSettings';
 import { submitRegistration as submit } from "../actions";
 
 /**

package/registration/providers/RegistrationProvider.connector.js

@@ -1,9 +1,9 @@
 import { connect } from 'react-redux';
 import { getShopSettings, getConfigFetching } from '@shopgate/engage/core/config';
-import { getNumberOfAddressLines, getRegistrationMode } from '@shopgate/engage/core';
+import { getNumberOfAddressLines, getRegistrationMode } from '@shopgate/engage/settings/selectors/shopSettings';
 import { hasDirectShipItems } from '@shopgate/engage/cart';
 import { getPreferredLocationAddress } from '@shopgate/engage/locations/selectors';
-import { getMerchantCustomerAttributes } from '@shopgate/engage/core/selectors/merchantSettings';
+import { getMerchantCustomerAttributes } from '@shopgate/engage/settings/selectors/merchantSettings';
 import { submitRegistration } from "./RegistrationProvider.actions";
 
 /**

package/registration/providers/RegistrationProvider.constraints.js

@@ -1,4 +1,4 @@
-import { SHOP_SETTING_REGISTRATION_MODE_EXTENDED, SHOP_SETTING_REGISTRATION_MODE_SIMPLE } from '@shopgate/engage/core';
+import { SHOP_SETTING_REGISTRATION_MODE_EXTENDED, SHOP_SETTING_REGISTRATION_MODE_SIMPLE } from '@shopgate/engage/settings/constants/shopSettings';
 import { generateFormConstraints } from '@shopgate/engage/account/helper/form';
 
 /**

package/registration/providers/RegistrationProvider.js

@@ -1,6 +1,7 @@
 import React, { useMemo, useState, useEffect, useCallback } from 'react';
 import { REGISTER_PATH } from '@shopgate/pwa-common/constants/RoutePaths';
-import { LoadingProvider, i18n, useRoute, SHOP_SETTING_REGISTRATION_MODE_SIMPLE } from '@shopgate/engage/core';
+import { LoadingProvider, i18n, useRoute } from '@shopgate/engage/core';
+import { SHOP_SETTING_REGISTRATION_MODE_SIMPLE } from '@shopgate/engage/settings/constants/shopSettings';
 import { useFormState } from '@shopgate/engage/core/hooks/useFormState';
 import appConfig from '@shopgate/pwa-common/helpers/config';
 import PropTypes from 'prop-types';

package/reviews/components/Reviews/components/AllReviewsLink/index.js

@@ -4,17 +4,15 @@ import { bin2hex } from '@shopgate/pwa-common/helpers/data';
 import { I18n } from '@shopgate/engage/components';
 import { ITEM_PATH } from '@shopgate/pwa-common-commerce/product/constants/index';
 import { REVIEW_PREVIEW_COUNT } from '@shopgate/pwa-common-commerce/reviews/constants';
-import ButtonLink from '@shopgate/pwa-ui-shared/ButtonLink';
+import { Button } from '@shopgate/engage/components/v2';
 import { makeStyles } from '@shopgate/engage/styles';
 import connect from "./connector";
 import { jsx as _jsx } from "react/jsx-runtime";
-const useStyles = makeStyles()(theme => ({
+const useStyles = makeStyles()(() => ({
   container: {
     display: 'flex',
     justifyContent: 'flex-end',
-    textAlign: 'right',
-    marginTop: theme.spacing(-1),
-    marginBottom: theme.spacing(-2)
+    textAlign: 'right'
   }
 }));
 
@@ -33,7 +31,9 @@ const AllReviewsLink = props => {
   return /*#__PURE__*/_jsx("div", {
     className: cx(classes.container, 'engage__reviews__all-reviews-link'),
     "data-test-id": "showAllReviewsButton",
-    children: /*#__PURE__*/_jsx(ButtonLink, {
+    children: /*#__PURE__*/_jsx(Button, {
+      variant: "text",
+      color: "primary",
       href: `${ITEM_PATH}/${bin2hex(props.productId)}/reviews`,
       children: /*#__PURE__*/_jsx(I18n.Text, {
         string: "reviews.button_all",

package/reviews/components/Reviews/components/Header/components/NoReviews/index.js

@@ -8,7 +8,7 @@ import WriteReviewLink from "../WriteReviewLink";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
   container: {
-    fontWeight: 500,
+    fontWeight: theme.typography.fontWeightMedium,
     margin: 0
   },
   noReviews: {

package/reviews/components/Reviews/components/Header/components/ReviewsExcerpt/index.js

@@ -8,11 +8,11 @@ import WriteReviewLink from "../WriteReviewLink";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
   container: {
-    fontWeight: 500,
+    fontWeight: theme.typography.fontWeightMedium,
     margin: 0
   },
   withTopGapContainer: {
-    fontWeight: 500,
+    fontWeight: theme.typography.fontWeightMedium,
     margin: 0,
     marginTop: theme.spacing(4)
   },
@@ -24,7 +24,7 @@ const useStyles = makeStyles()(theme => ({
     marginBottom: -2
   },
   averageRatingNumber: {
-    color: 'var(--color-primary)',
+    color: theme.palette.primary.main,
     marginLeft: theme.spacing(1)
   },
   averageRatingText: {

package/reviews/components/Reviews/components/Header/components/WriteReviewLink/index.js

@@ -4,7 +4,7 @@ import { I18n } from '@shopgate/engage/components';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { ITEM_PATH } from '@shopgate/pwa-common-commerce/product/constants';
 import { bin2hex } from '@shopgate/pwa-common/helpers/data';
-import ButtonLink from '@shopgate/pwa-ui-shared/ButtonLink';
+import { Button } from '@shopgate/engage/components/v2';
 
 /**
  * Link to add a review.
@@ -16,9 +16,10 @@ const WriteReviewLink = ({
 }) => /*#__PURE__*/_jsx("div", {
   "data-test-id": "writeReview",
   className: "engage__reviews__write-review-link",
-  children: /*#__PURE__*/_jsx(ButtonLink, {
+  children: /*#__PURE__*/_jsx(Button, {
+    variant: "text",
+    color: "primary",
     href: `${ITEM_PATH}/${bin2hex(productId)}/write_review`,
-    noGap: true,
     "aria-label": i18n.text('reviews.button_add'),
     children: /*#__PURE__*/_jsx(I18n.Text, {
       string: "reviews.button_add"