@shopgate/engage 7.31.4-beta.1 → 7.32.0-beta.1

package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotDialog.js

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { makeStyles } from '@shopgate/engage/styles';
 import groupBy from 'lodash/groupBy';
-import { SheetDrawer, Button } from '@shopgate/engage/components';
+import { SheetDrawer, Button, Typography } from '@shopgate/engage/components';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { getActiveFulfillmentSlot } from '@shopgate/engage/cart/cart.selectors';
 import { makeGetFulfillmentSlotsForLocation, getPreferredLocation } from "../../selectors";
@@ -33,7 +33,7 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = dispatch => ({
   fetch: locationCode => dispatch(fetchFulfillmentSlots(locationCode))
 });
-const useStyles = makeStyles()({
+const useStyles = makeStyles()(theme => ({
   root: {
     position: 'relative',
     display: 'flex',
@@ -42,13 +42,9 @@ const useStyles = makeStyles()({
     paddingBottom: 0
   },
   title: {
-    fontSize: 24,
-    fontWeight: '500',
     marginBottom: 8
   },
   subtitle: {
-    fontSize: 20,
-    fontWeight: '500',
     marginBottom: 8,
     marginTop: 16
   },
@@ -66,15 +62,15 @@ const useStyles = makeStyles()({
     margin: 8,
     justifyContent: 'center',
     alignItems: 'center',
-    border: '1px solid var(--color-secondary)',
+    border: `1px solid ${theme.palette.secondary.main}`,
     borderRadius: 4,
-    background: '#fff',
+    background: theme.palette.common.white,
     transition: 'background, color 500ms',
     outline: 'none'
   },
   buttonActive: {
-    color: '#fff',
-    background: 'var(--color-secondary)'
+    color: theme.palette.common.white,
+    background: theme.palette.secondary.main
   },
   buttonDate: {
     width: 124,
@@ -82,22 +78,20 @@ const useStyles = makeStyles()({
     lineHeight: 1.3
   },
   buttonLabel: {
-    fontSize: 20,
     textAlign: 'center'
   },
   buttonLabelSlot: {
     padding: 2,
-    fontSize: 16,
     textAlign: 'center'
   },
   buttonDisabled: {
     cursor: 'blocked',
     pointerEvents: 'none',
-    border: '1px solid #444'
+    border: `1px solid ${theme.palette.action.disabled}`
   },
   buttonStrikethrough: {
     position: 'absolute',
-    background: '#444',
+    background: theme.palette.action.disabled,
     left: 0,
     right: 0,
     height: 2,
@@ -108,7 +102,7 @@ const useStyles = makeStyles()({
     bottom: 'calc(-1 * env(safe-area-inset-bottom))',
     margin: -16,
     marginTop: 8,
-    background: '#fff',
+    background: theme.palette.background.surface,
     padding: 16,
     paddingBottom: 24
   },
@@ -117,7 +111,7 @@ const useStyles = makeStyles()({
       width: '100%'
     }
   }
-});
+}));
 
 /**
  * Get Month day time.
@@ -161,7 +155,7 @@ const RANGES = {
 
 /**
  * @param {Object} props Props.
- * @returns {JSX}
+ * @returns {JSX.Element}
  */
 const FulfillmentSlotSheet = ({
   isOpen,
@@ -260,7 +254,9 @@ const FulfillmentSlotSheet = ({
     allowClose: allowClose,
     children: /*#__PURE__*/_jsxs("div", {
       className: classes.root,
-      children: [/*#__PURE__*/_jsx("span", {
+      children: [/*#__PURE__*/_jsx(Typography, {
+        variant: "h3",
+        component: "span",
         className: classes.title,
         children: i18n.text('locations.your_current_timeslot.dialog.date')
       }), /*#__PURE__*/_jsx("div", {
@@ -271,13 +267,17 @@ const FulfillmentSlotSheet = ({
             [classes.buttonActive]: selectedDate === date
           }),
           onClick: () => setSelectedDate(date),
-          children: /*#__PURE__*/_jsxs("span", {
+          children: /*#__PURE__*/_jsxs(Typography, {
+            variant: "h3",
+            component: "span",
             className: classes.buttonLabel,
             children: [moment(date, 'YYYY-MM-DD').format('dddd'), ' ', getMonthDay(date)]
           })
         }, date))
       }), slotGroups && slotGroups.map(group => /*#__PURE__*/_jsxs(Fragment, {
-        children: [/*#__PURE__*/_jsx("span", {
+        children: [/*#__PURE__*/_jsx(Typography, {
+          variant: "h3",
+          component: "span",
           className: classes.subtitle,
           children: i18n.text(`locations.your_current_timeslot.dialog.${group.name}`)
         }), /*#__PURE__*/_jsx("div", {
@@ -289,7 +289,8 @@ const FulfillmentSlotSheet = ({
               [classes.buttonDisabled]: slot.status !== 'active',
               [classes.buttonActive]: slot.id === selectedSlot
             }),
-            children: [/*#__PURE__*/_jsx("span", {
+            children: [/*#__PURE__*/_jsx(Typography, {
+              component: "span",
               className: classes.buttonLabelSlot,
               children: getRange(slot.from, slot.to)
             }), slot.status !== 'active' ? /*#__PURE__*/_jsx("div", {

package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotProvider.connector.js

@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { getFulfillmentSchedulingEnabled } from '@shopgate/engage/core';
+import { getFulfillmentSchedulingEnabled } from '@shopgate/engage/settings/selectors/merchantSettings';
 import setFulfillmentSlot from '@shopgate/pwa-common-commerce/cart/action-creators/setFulfillmentSlot';
 
 /**

package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotSwitcher.connector.js

@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { getFulfillmentSchedulingEnabled } from '@shopgate/engage/core';
+import { getFulfillmentSchedulingEnabled } from '@shopgate/engage/settings/selectors/merchantSettings';
 import { getActiveFulfillmentSlot, checkActiveFulfillmentSlotBelongsToPreferredLocation } from '@shopgate/engage/cart/cart.selectors';
 import { getIsCartStateConfigurable } from "../../selectors";
 

package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotSwitcher.js

@@ -6,7 +6,7 @@ import FulfillmentSlotSwitcherBar from "./FulfillmentSlotSwitcherBar";
 import connect from "./FulfillmentSlotSwitcher.connector";
 import { forceOpenFulfillmentSlotDialog } from "./FulfillmentSlotProvider";
 import { jsx as _jsx } from "react/jsx-runtime";
-const useStyles = makeStyles()({
+const useStyles = makeStyles()(theme => ({
   card: {
     boxShadow: '0px 4px 2px rgba(0, 0, 0, 0.05)',
     marginBottom: 16,
@@ -16,11 +16,11 @@ const useStyles = makeStyles()({
     ' > div': {
       borderRadius: 5,
       margin: -1,
-      background: '#fff',
-      border: '1px solid #eaeaea'
+      background: theme.palette.background.surface,
+      border: `1px solid ${theme.components.border.light}`
     }
   }
-});
+}));
 
 /**
  * @returns {JSX}

package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotSwitcherBar.js

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
-import { RippleButton, I18n } from '@shopgate/engage/components';
+import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { makeStyles } from '@shopgate/engage/styles';
 import { themeConfig } from '@shopgate/pwa-common/helpers/config';
@@ -11,15 +11,14 @@ const {
 } = themeConfig;
 const useStyles = makeStyles()(theme => ({
   wrapper: {
-    fontSize: '0.875rem',
     color: theme.palette.text.primary,
-    background: 'var(--color-background-accent)'
+    background: theme.palette.background.emphasized
   },
   inner: {
     display: 'flex',
     flexShrink: 0,
     margin: theme.spacing(0, 2),
-    borderBottom: '1px solid #eaeaea',
+    borderBottom: `1px solid ${theme.components.border.light}`,
     alignItems: 'center',
     height: variables.filterbar.height
   },
@@ -32,25 +31,22 @@ const useStyles = makeStyles()(theme => ({
       content: '":"'
     }
   },
-  name: {
-    fontWeight: 500
-  },
   button: {
     marginLeft: 'auto',
     letterSpacing: '0.05em',
     padding: `${theme.spacing(0.375, 0)} !important`,
     ' *': {
-      fontSize: '0.875rem',
+      fontSize: theme.typography.body2.fontSize,
       textTransform: 'initial',
       padding: '0 !important',
       color: theme.palette.text.primary,
-      fontWeight: 500
+      fontWeight: theme.typography.fontWeightMedium
     }
   }
 }));
 
 /**
- * @returns {JSX}
+ * @returns {JSX.Element}
  */
 const FulfillmentSlotSwitcherBar = ({
   fulfillmentSlot,
@@ -69,11 +65,15 @@ const FulfillmentSlotSwitcherBar = ({
       className: cx(classes.inner, {
         [classes.innerStandalone]: standalone
       }),
-      children: [/*#__PURE__*/_jsx("span", {
+      children: [/*#__PURE__*/_jsx(Typography, {
+        variant: "body2",
+        component: "span",
         className: classes.heading,
         children: i18n.text('locations.your_current_timeslot.heading')
-      }), /*#__PURE__*/_jsx("span", {
-        className: classes.name,
+      }), /*#__PURE__*/_jsx(Typography, {
+        variant: "body2",
+        component: "span",
+        fontWeight: "medium",
         children: displayTime
       }), editable && /*#__PURE__*/_jsx(RippleButton, {
         onClick: handleChange,

package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotSwitcherDefault.js

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
-import { RippleButton, I18n } from '@shopgate/engage/components';
+import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { makeStyles } from '@shopgate/engage/styles';
 import { getTimeSlotDisplayText } from "./time";
@@ -9,19 +9,11 @@ const useStyles = makeStyles()(theme => ({
   wrapper: {
     display: 'flex',
     flexDirection: 'column',
-    fontSize: '0.875rem',
     padding: theme.spacing(0, 2),
     flexShrink: 0
   },
-  heading: {
-    color: 'var(--color-text-medium-emphasis)'
-  },
-  name: {
-    fontWeight: 500,
-    color: theme.palette.text.primary
-  },
   button: {
-    fontSize: '0.625rem !important',
+    fontSize: `${theme.typography.caption.fontSize} !important`,
     letterSpacing: '0.05em',
     padding: `${theme.spacing(0.375, 0)} !important`,
     ' *': {
@@ -31,7 +23,7 @@ const useStyles = makeStyles()(theme => ({
 }));
 
 /**
- * @returns {JSX}
+ * @returns {JSX.Element}
  */
 const FulfillmentSlotSwitcherDefault = ({
   handleChange,
@@ -44,12 +36,17 @@ const FulfillmentSlotSwitcherDefault = ({
   const displayTime = useMemo(() => getTimeSlotDisplayText(fulfillmentSlot), [fulfillmentSlot]);
   return /*#__PURE__*/_jsxs("div", {
     className: classes.wrapper,
-    children: [/*#__PURE__*/_jsx("div", {
-      className: classes.heading,
+    children: [/*#__PURE__*/_jsx(Typography, {
+      variant: "body2",
+      component: "div",
+      color: "textSecondary",
       children: i18n.text('locations.your_current_timeslot.heading')
     }), /*#__PURE__*/_jsxs("div", {
-      className: classes.name,
-      children: [/*#__PURE__*/_jsx("span", {
+      children: [/*#__PURE__*/_jsx(Typography, {
+        variant: "body2",
+        component: "span",
+        color: "textPrimary",
+        fontWeight: "medium",
         children: displayTime
       }), /*#__PURE__*/_jsx(RippleButton, {
         onClick: handleChange,

package/locations/components/GlobalLocationSelector/GlobalLocationSelector.js

@@ -4,8 +4,8 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { getCurrentRoute } from '@shopgate/pwa-common/selectors/router';
 import { selectGlobalLocation } from '@shopgate/engage/locations/action-creators';
+import { getIsLocationBasedShopping } from '@shopgate/engage/settings/selectors/merchantSettings';
 import { getPreferredLocation, getIsPending } from "../../selectors";
-import { getIsLocationBasedShopping } from "../../../core/selectors";
 import { FulfillmentSheet } from "../FulfillmentSheet";
 import { STAGE_SELECT_STORE, MULTI_LINE_RESERVE } from "../../constants";
 

package/locations/components/GlobalLocationSwitcher/GlobalLocationSwitcher.connector.js

@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { getIsLocationBasedShopping } from '@shopgate/engage/core';
+import { getIsLocationBasedShopping } from '@shopgate/engage/settings/selectors/merchantSettings';
 import { getPreferredLocation } from '@shopgate/engage/locations/selectors';
 import { selectGlobalLocation } from '@shopgate/engage/locations/action-creators';
 import { getIsCartStateConfigurable } from "../../selectors";

package/locations/components/GlobalLocationSwitcher/GlobalLocationSwitcherBar.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { RippleButton, I18n } from '@shopgate/engage/components';
+import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { makeStyles } from '@shopgate/engage/styles';
 import { themeConfig } from '@shopgate/pwa-common/helpers/config';
@@ -10,15 +10,14 @@ const {
 } = themeConfig;
 const useStyles = makeStyles()(theme => ({
   wrapper: {
-    fontSize: '0.875rem',
     color: theme.palette.text.primary,
-    background: 'var(--color-background-accent)'
+    background: theme.palette.background.emphasized
   },
   inner: {
     display: 'flex',
     flexShrink: 0,
     margin: theme.spacing(0, 2),
-    borderBottom: '1px solid #eaeaea',
+    borderBottom: `1px solid ${theme.components.border.light}`,
     alignItems: 'center',
     height: variables.filterbar.height
   },
@@ -28,19 +27,16 @@ const useStyles = makeStyles()(theme => ({
   heading: {
     paddingRight: theme.spacing(1)
   },
-  name: {
-    fontWeight: 500
-  },
   button: {
     marginLeft: 'auto',
     letterSpacing: '0.05em',
     padding: `${theme.spacing(0.375, 0)} !important`,
     ' *': {
-      fontSize: '0.875rem',
+      fontSize: theme.typography.body2.fontSize,
       textTransform: 'initial',
       padding: '0 !important',
       color: theme.palette.text.primary,
-      fontWeight: 500
+      fontWeight: theme.typography.fontWeightMedium
     }
   }
 }));
@@ -65,11 +61,15 @@ const GlobalLocationSwitcherBar = ({
       }),
       children: [/*#__PURE__*/_jsxs("span", {
         "aria-label": `${i18n.text('locations.your_current_location.heading')}: ${locationName}`,
-        children: [/*#__PURE__*/_jsx("span", {
+        children: [/*#__PURE__*/_jsx(Typography, {
+          variant: "body2",
+          component: "span",
           className: classes.heading,
           children: `${i18n.text('locations.your_current_location.heading')}:`
-        }), /*#__PURE__*/_jsx("span", {
-          className: classes.name,
+        }), /*#__PURE__*/_jsx(Typography, {
+          variant: "body2",
+          component: "span",
+          fontWeight: "medium",
           children: locationName
         })]
       }), /*#__PURE__*/_jsx(RippleButton, {

package/locations/components/GlobalLocationSwitcher/GlobalLocationSwitcherDefault.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { RippleButton, I18n } from '@shopgate/engage/components';
+import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { makeStyles } from '@shopgate/engage/styles';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -8,19 +8,14 @@ const useStyles = makeStyles()(theme => ({
   wrapper: {
     display: 'flex',
     flexDirection: 'column',
-    fontSize: '0.875rem',
     padding: theme.spacing(0, 2),
     flexShrink: 0
   },
-  heading: {
-    color: 'var(--color-text-medium-emphasis)'
-  },
   name: {
-    fontWeight: 500,
     color: theme.palette.text.primary
   },
   button: {
-    fontSize: '0.625rem !important',
+    fontSize: `${theme.typography.caption.fontSize} !important`,
     letterSpacing: '0.05em',
     padding: `${theme.spacing(0.375, 0)} !important`,
     ' *': {
@@ -30,7 +25,7 @@ const useStyles = makeStyles()(theme => ({
 }));
 
 /**
- * @returns {JSX}
+ * @returns {JSX.Element}
  */
 const GlobalLocationSwitcherDefault = ({
   locationName,
@@ -42,12 +37,17 @@ const GlobalLocationSwitcherDefault = ({
   } = useStyles();
   return /*#__PURE__*/_jsxs("div", {
     className: classes.wrapper,
-    children: [/*#__PURE__*/_jsx("div", {
-      className: classes.heading,
+    children: [/*#__PURE__*/_jsx(Typography, {
+      variant: "body2",
+      component: "div",
+      color: "textSecondary",
       children: i18n.text('locations.your_current_location.heading')
     }), /*#__PURE__*/_jsxs("div", {
-      className: classes.name,
-      children: [/*#__PURE__*/_jsx("span", {
+      children: [/*#__PURE__*/_jsx(Typography, {
+        variant: "body2",
+        component: "span",
+        fontWeight: "medium",
+        className: classes.name,
         children: locationName
       }), /*#__PURE__*/_jsx(RippleButton, {
         onClick: handleChange,

package/locations/components/ReservationResponses/ReservationError.js

@@ -1,16 +1,15 @@
 import React from 'react';
+import { Typography } from '@shopgate/engage/components';
 import { makeStyles } from '@shopgate/engage/styles';
 import { i18n } from "../../../core/helpers/i18n";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
   container: {
-    background: theme.palette.background.default,
+    background: theme.palette.background.surface,
     padding: theme.spacing(2, 1.5, 16),
     boxShadow: 'inset rgba(0, 0, 0, .117647) 0 1px 6px, inset rgba(0, 0, 0, .117647) 0 1px 4px'
   },
   heading: {
-    fontSize: '1.125rem',
-    fontWeight: 'bold',
     margin: theme.spacing(1, 0, 2.5)
   },
   body: {
@@ -22,7 +21,7 @@ const useStyles = makeStyles()(theme => ({
 
 /**
  * Renders the reservation error screen.
- * @returns {JSX}
+ * @returns {JSX.Element}
  */
 export function ReservationError() {
   const {
@@ -30,10 +29,14 @@ export function ReservationError() {
   } = useStyles();
   return /*#__PURE__*/_jsxs("div", {
     className: classes.container,
-    children: [/*#__PURE__*/_jsx("h2", {
+    children: [/*#__PURE__*/_jsx(Typography, {
+      variant: "h4",
+      component: "h2",
+      fontWeight: "bold",
       className: classes.heading,
       children: i18n.text('locations.error_title')
-    }), /*#__PURE__*/_jsx("p", {
+    }), /*#__PURE__*/_jsx(Typography, {
+      component: "p",
       className: classes.body,
       children: i18n.text('locations.error_copy')
     })]

package/locations/components/ReservationResponses/ReservationSuccess.js

@@ -1,17 +1,16 @@
 import React, { useContext } from 'react';
+import { Typography } from '@shopgate/engage/components';
 import { makeStyles } from '@shopgate/engage/styles';
 import { i18n } from "../../../core/helpers/i18n";
 import { FulfillmentContext } from "../../locations.context";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
   container: {
-    background: theme.palette.background.default,
+    background: theme.palette.background.surface,
     padding: theme.spacing(2, 1.5, 16),
     boxShadow: 'inset rgba(0, 0, 0, .117647) 0 1px 6px, inset rgba(0, 0, 0, .117647) 0 1px 4px'
   },
   heading: {
-    fontSize: '1.125rem',
-    fontWeight: 'bold',
     margin: theme.spacing(1, 0, 2.5)
   },
   body: {
@@ -21,8 +20,6 @@ const useStyles = makeStyles()(theme => ({
   },
   orderNum: {
     padding: 0,
-    fontSize: '1.1875rem',
-    fontWeight: 'bold',
     margin: theme.spacing(0, 0, 2),
     border: 0
   }
@@ -41,16 +38,24 @@ export function ReservationSuccess() {
   } = useContext(FulfillmentContext);
   return /*#__PURE__*/_jsxs("div", {
     className: classes.container,
-    children: [/*#__PURE__*/_jsx("h2", {
+    children: [/*#__PURE__*/_jsx(Typography, {
+      variant: "h4",
+      component: "h2",
+      fontWeight: "bold",
       className: classes.heading,
       children: i18n.text('locations.success_title')
-    }), /*#__PURE__*/_jsx("p", {
+    }), /*#__PURE__*/_jsx(Typography, {
+      component: "p",
       className: classes.body,
       children: i18n.text('locations.success_copy')
-    }), /*#__PURE__*/_jsx("p", {
+    }), /*#__PURE__*/_jsx(Typography, {
+      component: "p",
       className: classes.body,
       children: i18n.text('locations.success_order_num')
-    }), orderNumbers !== null && /*#__PURE__*/_jsx("p", {
+    }), orderNumbers !== null && /*#__PURE__*/_jsx(Typography, {
+      variant: "h3",
+      component: "p",
+      fontWeight: "bold",
       className: classes.orderNum,
       children: orderNumbers[0]
     })]

package/locations/components/ReserveForm/ReserveForm.js

@@ -1,7 +1,7 @@
 import 'react-phone-number-input/style.css';
 import React, { useState, useContext, useMemo, useRef, useLayoutEffect, useCallback } from 'react';
 import { makeStyles } from '@shopgate/engage/styles';
-import { TextField, RippleButton, RadioGroup, RadioGroupItem, ProgressBar } from '@shopgate/engage/components';
+import { TextField, RippleButton, RadioGroup, RadioGroupItem, ProgressBar, Typography } from '@shopgate/engage/components';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { useFormState } from "../../../core/hooks/useFormState";
 import { FulfillmentContext } from "../../locations.context";
@@ -10,13 +10,11 @@ import { constraints } from "./ReserveForm.constraints";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
   form: {
-    background: theme.palette.background.default,
+    background: theme.palette.background.surface,
     padding: theme.spacing(1.5, 1.5, 2),
     boxShadow: 'inset rgba(0, 0, 0, .117647) 0 1px 6px, inset rgba(0, 0, 0, .117647) 0 1px 4px'
   },
   formHeading: {
-    fontSize: '1.125rem',
-    fontWeight: 'bold',
     margin: theme.spacing(0, 0, 1)
   },
   fieldset: {
@@ -187,7 +185,10 @@ function ReserveFormUnwrapped() {
           className: classes.formField,
           errorText: i18n.text(validationErrors.email)
         })]
-      }), /*#__PURE__*/_jsx("p", {
+      }), /*#__PURE__*/_jsx(Typography, {
+        variant: "h4",
+        component: "p",
+        fontWeight: "bold",
         className: classes.formHeading,
         children: i18n.text('locations.who_will_pickup')
       }), /*#__PURE__*/_jsx("div", {

package/locations/components/ReserveForm/ReserveFormPhone.js

@@ -1,7 +1,6 @@
 import React, { useMemo, useContext, memo, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@shopgate/engage/styles';
-import { themeConfig } from '@shopgate/pwa-common/helpers/config';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { parsePhoneNumber } from 'react-phone-number-input';
 import PhoneInput from 'react-phone-number-input/mobile';
@@ -12,14 +11,12 @@ import es from 'react-phone-number-input/locale/es.json';
 import fr from 'react-phone-number-input/locale/fr.json';
 import pt from 'react-phone-number-input/locale/pt.json';
 import flags from 'react-phone-number-input/flags';
+import { Typography } from '@shopgate/engage/components';
 import TextField from '@shopgate/pwa-ui-shared/TextField';
 import { useCountriesNames } from '@shopgate/engage/i18n';
 import { FulfillmentContext } from "../../locations.context";
 import connect from "./ReserveFormPhone.connector";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const {
-  colors
-} = themeConfig;
 const useStyles = makeStyles()(theme => ({
   formField: {
     width: '100%',
@@ -33,11 +30,11 @@ const useStyles = makeStyles()(theme => ({
     marginBottom: theme.spacing(1),
     ' input.PhoneInputInput': {
       outline: 'none',
-      fontSize: '1rem',
+      fontSize: theme.typography.body1.fontSize,
       lineHeight: '1.1875rem',
       borderRadius: 0,
       paddingBottom: theme.spacing(0.75),
-      borderBottom: `1px solid ${colors.shade12}`,
+      borderBottom: `1px solid ${theme.components.border.dark}`,
       '&:focus': {
         borderBottom: `2px solid ${theme.palette.primary.main}`,
         paddingBottom: theme.spacing(0.75) - 1
@@ -54,9 +51,7 @@ const useStyles = makeStyles()(theme => ({
     position: 'absolute',
     width: '100%',
     bottom: 2,
-    fontSize: '0.75rem',
     lineHeight: 0.875,
-    color: theme.palette.error.main,
     overflow: 'hidden',
     whiteSpace: 'nowrap',
     textOverflow: 'ellipsis'
@@ -177,7 +172,10 @@ const ReserveFormPhoneUnwrapped = /*#__PURE__*/memo(props => {
       placeholder: label,
       countries: countries,
       labels: labels
-    }), !!errorText && /*#__PURE__*/_jsx("div", {
+    }), !!errorText && /*#__PURE__*/_jsx(Typography, {
+      variant: "caption",
+      component: "div",
+      color: "error",
       className: classes.phoneFieldErrorText,
       children: errorText
     })]