@shopgate/engage 7.32.0-beta.7 → 7.32.0-beta.8

package/core/initialization/index.js

@@ -6,7 +6,11 @@ import fetchClientInformation from '@shopgate/pwa-common/actions/client/fetchCli
 import { appConfig } from '@shopgate/engage';
 import { appInitialization, configuration } from '@shopgate/engage/core/collections';
 import { CONFIGURATION_COLLECTION_KEY_BASE_URL } from '@shopgate/engage/core/constants';
-import { loadCustomStyles, loadThemeCss } from '@shopgate/engage/styles';
+import { loadCustomStyles, loadThemeCss, loadFontCss } from '@shopgate/engage/styles';
+import { getTypographyFontCssUrls } from '@shopgate/engage/settings/selectors/appSettings';
+// Imported via its module path rather than the admin-preview helpers barrel, which ThemeProvider
+// and loadThemeCss already import - this module reaches into the settings action creators.
+import { awaitInitialFrontendSettings } from '@shopgate/engage/admin-preview/initialization/awaitInitialFrontendSettings';
 import { fetchSettings } from "./fetchSettings";
 
 /**
@@ -61,15 +65,30 @@ export const initialize = async (locales, reducers, subscribers) => {
   configuration.set(CONFIGURATION_COLLECTION_KEY_BASE_URL, getAppBaseUrl());
   store.dispatch(appWillInit(`${window.location.pathname}${window.location.search}`));
   try {
-    // The order of the style loaders does not affect the cascade: loadThemeCss pins its link to
-    // the theme css insertion point in the html template, while loadCustomStyles appends its link
-    // to the end of the head.
-    const promises = [fetchSettings(store), loadCustomStyles(), loadThemeCss()];
+    // The order of the style loaders does not affect the cascade: loadThemeCss and loadFontCss pin
+    // their links to their insertion points in the html template, while loadCustomStyles appends
+    // its link to the end of the head.
+    //
+    // The font css urls come from the app settings, so that loader is chained onto fetchSettings
+    // rather than started alongside it. Chaining keeps the other two running in parallel with the
+    // settings request instead of serializing everything behind it.
+    const promises = [fetchSettings(store).then(() => loadFontCss(getTypographyFontCssUrls(store.getState()))), loadCustomStyles(), loadThemeCss()];
     await Promise.all(promises);
   } catch (e) {
     // Nothing to see here.
   }
 
+  // Resolves at once outside the admin preview. Inside it, this holds app start until the admin
+  // sent its first settings payload, so the preview renders styled instead of painting the theme
+  // defaults first. Runs after fetchSettings, since the reducer merges and the preview has to be
+  // the later write.
+  await awaitInitialFrontendSettings(store);
+
+  // That payload can replace the configured font files, which were loaded above from whatever the
+  // jsonp settings carried, so they are synced again before anything renders. Outside the preview
+  // the urls are unchanged, and loadFontCss leaves the existing tags alone and resolves at once.
+  await loadFontCss(getTypographyFontCssUrls(store.getState()));
+
   // Execute all registered handlers from the AppInitialization collection
   await appInitialization.initialize({
     dispatch: store.dispatch,

package/core/router/conductor.d.ts

@@ -0,0 +1,9 @@
+import { Router } from '@virtuous/conductor';
+
+/**
+ * `@virtuous/conductor` ships types for the `Router` class but not for the singleton instance it
+ * exports at runtime. Declared here so that TypeScript consumers can use it.
+ */
+declare module '@virtuous/conductor' {
+  export const router: Router;
+}

package/core/router/helpers.d.ts

@@ -1,30 +1,43 @@
+export interface NavigationState {
+    target?: string;
+    [key: string]: unknown;
+}
+export interface NavigationParams {
+    pathname: string;
+    state?: NavigationState;
+    silent?: boolean;
+}
+export interface PopParams {
+    steps?: number;
+    state?: NavigationState;
+}
+export declare const NAVIGATION_PUSH = "navigation.push";
+export declare const NAVIGATION_POP = "navigation.pop";
+export declare const NAVIGATION_REPLACE = "navigation.replace";
+export declare const NAVIGATION_RESET = "navigation.reset";
 /**
  * Performs the PUSH navigation action.
- * @param {Object} params The history params.
+ * @param params The history params.
  */
-export function push(params: Object): void;
+export declare function push(params: NavigationParams): void;
 /**
  * Performs the POP navigation action.
+ * @param params The history params. Pass `steps` to pop more than one route.
  */
-export function pop(): void;
+export declare function pop(params?: PopParams): void;
 /**
  * Performs the REPLACE navigation action.
- * @param {Object} params The history params.
+ * @param params The history params.
  */
-export function replace(params: Object): void;
+export declare function replace(params: NavigationParams): void;
 /**
  * Performs the RESET navigation action.
- * @param {Object} params The history params.
  */
-export function reset(): void;
+export declare function reset(): void;
 /**
- * Performs the UPDATE navigation action.
- * @param {Object} state The meta state to add to a existing route.
- * @param {string} [routeId] The ID of the route to update.
+ * Adds meta state to an existing route.
+ * @param state The meta state to merge into the route.
+ * @param routeId The ID of the route to update. Defaults to the current route.
  */
-export function update(state: Object, routeId?: string): void;
-export const NAVIGATION_PUSH: "navigation.push";
-export const NAVIGATION_POP: "navigation.pop";
-export const NAVIGATION_REPLACE: "navigation.replace";
-export const NAVIGATION_RESET: "navigation.reset";
+export declare function update(state: NavigationState, routeId?: string): void;
 //# sourceMappingURL=helpers.d.ts.map

package/core/router/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../core/router/helpers.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH,6BAFW,MAAM,QAIhB;AAED;;GAEG;AACH,4BAEC;AAED;;;GAGG;AACH,gCAFW,MAAM,QAIhB;AAED;;;GAGG;AACH,8BAEC;AAED;;;;GAIG;AACH,8BAHW,MAAM,YACN,MAAM,QAIhB;AA3CD,8BAA+B,iBAAiB,CAAC;AACjD,6BAA8B,gBAAgB,CAAC;AAC/C,iCAAkC,oBAAoB,CAAC;AACvD,+BAAgC,kBAAkB,CAAC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../core/router/helpers.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,eAAO,MAAM,eAAe,oBAAoB,CAAC;AACjD,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAC/C,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AACvD,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AAEnD;;;GAGG;AACH,wBAAgB,IAAI,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAEnD;AAED;;;GAGG;AACH,wBAAgB,GAAG,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,IAAI,CAE5C;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAEtD;AAED;;GAEG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAE5B;AAED;;;;GAIG;AACH,wBAAgB,MAAM,CACpB,KAAK,EAAE,eAAe,EACtB,OAAO,GAAE,MAAoC,GAC5C,IAAI,CAEN"}

package/core/router/helpers.js

@@ -7,7 +7,7 @@ export const NAVIGATION_RESET = 'navigation.reset';
 
 /**
  * Performs the PUSH navigation action.
- * @param {Object} params The history params.
+ * @param params The history params.
  */
 export function push(params) {
   UIEvents.emit(NAVIGATION_PUSH, params);
@@ -15,14 +15,15 @@ export function push(params) {
 
 /**
  * Performs the POP navigation action.
+ * @param params The history params. Pass `steps` to pop more than one route.
  */
-export function pop() {
-  UIEvents.emit(NAVIGATION_POP);
+export function pop(params) {
+  UIEvents.emit(NAVIGATION_POP, params);
 }
 
 /**
  * Performs the REPLACE navigation action.
- * @param {Object} params The history params.
+ * @param params The history params.
  */
 export function replace(params) {
   UIEvents.emit(NAVIGATION_REPLACE, params);
@@ -30,16 +31,15 @@ export function replace(params) {
 
 /**
  * Performs the RESET navigation action.
- * @param {Object} params The history params.
  */
 export function reset() {
   UIEvents.emit(NAVIGATION_RESET);
 }
 
 /**
- * Performs the UPDATE navigation action.
- * @param {Object} state The meta state to add to a existing route.
- * @param {string} [routeId] The ID of the route to update.
+ * Adds meta state to an existing route.
+ * @param state The meta state to merge into the route.
+ * @param routeId The ID of the route to update. Defaults to the current route.
  */
 export function update(state, routeId = router.getCurrentRoute().id) {
   router.update(routeId, state);

package/development/components/DevelopmentSettings/DevelopmentSettings.js

@@ -1,7 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useSelector, useDispatch } from 'react-redux';
-import { SheetDrawer, RippleButton } from '@shopgate/engage/components';
+import { SheetDrawer } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { makeStyles } from '@shopgate/engage/styles';
 import { getEnabledCMSVersion } from '@shopgate/engage/settings/selectors/merchantSettings';
 import { getEnableCms2ForAllShoppers } from '@shopgate/engage/settings/selectors/shopSettings';
@@ -49,9 +50,8 @@ const DevelopmentSettings = ({
     onClose: onClose,
     children: /*#__PURE__*/_jsx("div", {
       className: classes.container,
-      children: /*#__PURE__*/_jsx(RippleButton, {
+      children: /*#__PURE__*/_jsx(Button, {
         className: classes.button,
-        type: "simple",
         onClick: () => {
           onClose();
           setTimeout(() => {

package/favorites/components/FavoriteButtonWide/FavoriteButtonWide.js

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { RippleButton } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { makeStyles } from '@shopgate/engage/styles';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { toggleFavoriteWithListChooser } from '@shopgate/pwa-common-commerce/favorites/actions/toggleFavorites';
@@ -29,20 +29,10 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = dispatch => ({
   toggle: productId => dispatch(toggleFavoriteWithListChooser(productId))
 });
-const useStyles = makeStyles()(theme => ({
+const useStyles = makeStyles()(() => ({
   root: {
-    '&&': {
-      margin: '0 0px 16px 16px',
-      backgroundColor: theme.palette.background.surface,
-      border: `1px solid ${theme.palette.primary.main}`,
-      borderRadius: 5,
-      fontSize: theme.typography.body2.fontSize,
-      textTransform: 'none',
-      padding: 0
-    }
-  },
-  ripple: {
-    padding: '8px 16px'
+    margin: '0 0 16px 16px',
+    textTransform: 'none'
   }
 }));
 
@@ -70,10 +60,10 @@ const FavoriteButtonWide = ({
   if (!appConfig.hasFavorites) {
     return null;
   }
-  return /*#__PURE__*/_jsx(RippleButton, {
+  return /*#__PURE__*/_jsx(Button, {
+    variant: "outlined",
+    color: "primary",
     className: classes.root,
-    rippleClassName: classes.ripple,
-    type: "primary",
     onClick: () => toggle(productId),
     children: i18n.text(label)
   });

package/favorites/components/List/List.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"List.d.ts","sourceRoot":"","sources":["../../../../favorites/components/List/List.jsx"],"names":[],"mappings":";;;;;;;;;;;QAwEY,GAAG,CAAC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBArED,YAAY"}
+{"version":3,"file":"List.d.ts","sourceRoot":"","sources":["../../../../favorites/components/List/List.jsx"],"names":[],"mappings":";;;;;;;;;;;QAuEY,GAAG,CAAC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBApED,YAAY"}

package/favorites/components/List/List.js

@@ -15,7 +15,6 @@ const useStyles = makeStyles()(theme => ({
     margin: '8px 8px 10px'
   },
   rootNoFavoritesLists: {
-    background: theme.palette.background.surface,
     flexGrow: 1,
     paddingBottom: theme.spacing(1),
     paddingLeft: '16px',

package/favorites/components/List/ListContent.js

@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import { makeStyles } from '@shopgate/engage/styles';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { ProductListTypeProvider, ProductProvider } from '@shopgate/engage/product/providers';
-import { RippleButton } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { getUseGetFavoriteIdsPipeline } from '@shopgate/engage/favorites';
 import ListItemWrapper from "./ListItemWrapper";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -19,8 +19,7 @@ const useStyles = makeStyles()({
   },
   loadMoreButton: {
     width: 'calc(100% - 32px)',
-    margin: '16px 16px 0 16px',
-    borderRadius: 5
+    margin: '16px 16px 0 16px'
   }
 });
 
@@ -86,8 +85,8 @@ const ListContent = ({
         removeItem: removeItem,
         index: index
       }, product.id))]
-    }), showLoadMoreButton && /*#__PURE__*/_jsx(RippleButton, {
-      type: "primary",
+    }), showLoadMoreButton && /*#__PURE__*/_jsx(Button, {
+      color: "secondary",
       className: classes.loadMoreButton,
       onClick: onLoadMore,
       children: i18n.text('favorites.load_more_button')

package/favorites/components/Lists/Lists.js

@@ -1,7 +1,8 @@
 import React, { useState, useCallback, useRef } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { RippleButton, SurroundPortals } from '@shopgate/engage/components';
+import { SurroundPortals } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { hasNewServices, i18n } from '@shopgate/engage/core/helpers';
 import { getFavoritesLists, isInitialLoading, getHasMultipleFavoritesListsSupport } from '@shopgate/pwa-common-commerce/favorites/selectors';
 import addFavoritesList from '@shopgate/pwa-common-commerce/favorites/actions/addFavoritesList';
@@ -64,7 +65,6 @@ const useStyles = makeStyles()({
   addButton: {
     width: 'calc(100% - 32px)',
     margin: 16,
-    borderRadius: 5,
     [responsiveMediaQuery('>=md', {
       webOnly: true
     })]: {
@@ -283,11 +283,10 @@ const FavoriteLists = ({
       onClose: handleMethodClose
     }), /*#__PURE__*/_jsx(SurroundPortals, {
       portalName: FAVORITES_LIST_ADD_BUTTON,
-      children: hasMultipleFavoritesListsSupport ? /*#__PURE__*/_jsx(RippleButton, {
-        type: "primary",
+      children: hasMultipleFavoritesListsSupport ? /*#__PURE__*/_jsx(Button, {
+        color: "secondary",
         className: classes.addButton,
         onClick: openAddModal,
-        disabled: false,
         children: i18n.text('favorites.add_list')
       }) : null
     })]

package/filter/components/FilterPageContent/components/ApplyButton/index.js

@@ -1,18 +1,17 @@
 import React, { memo } from 'react';
 import PropTypes from 'prop-types';
-import { I18n, Button, SurroundPortals } from '@shopgate/engage/components';
+import { I18n, SurroundPortals } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { makeStyles } from '@shopgate/engage/styles';
 import { PORTAL_FILTER_APPLY_BUTTON } from '@shopgate/engage/filter/constants';
 import { withWidgetSettings } from '@shopgate/engage/core';
 import { jsx as _jsx } from "react/jsx-runtime";
-const useStyles = makeStyles()({
+const useStyles = makeStyles()(theme => ({
   wrapper: {
-    display: 'flex'
-  },
-  button: {
-    padding: '0 !important'
+    display: 'flex',
+    marginRight: theme.spacing(2)
   }
-});
+}));
 
 /**
  * The filter apply button component.
@@ -44,9 +43,8 @@ const FilterApplyButton = ({
     children: /*#__PURE__*/_jsx("div", {
       className: classes.wrapper,
       children: /*#__PURE__*/_jsx(Button, {
-        className: classes.button,
-        flat: true,
-        type: "primary",
+        variant: "link",
+        color: "secondary",
         onClick: onClick,
         disabled: disabled,
         testId: "applyFilterButton",

package/filter/components/FilterPageContent/components/ResetButton/index.js

@@ -1,16 +1,18 @@
 import React, { memo } from 'react';
 import PropTypes from 'prop-types';
-import { I18n, Button, SurroundPortals } from '@shopgate/engage/components';
+import { I18n, SurroundPortals } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { makeStyles } from '@shopgate/engage/styles';
 import { PORTAL_FILTER_RESET_BUTTON } from '@shopgate/engage/filter/constants';
 import { jsx as _jsx } from "react/jsx-runtime";
-const useStyles = makeStyles()({
+const useStyles = makeStyles()(theme => ({
   buttonContainer: {
-    marginTop: 4,
+    marginTop: theme.spacing(0.5),
+    marginRight: theme.spacing(2),
     marginBottom: 40,
     textAlign: 'right'
   }
-});
+}));
 
 /**
  * The filter reset button component.
@@ -35,8 +37,8 @@ const FilterResetButton = ({
     children: /*#__PURE__*/_jsx("div", {
       className: classes.buttonContainer,
       children: /*#__PURE__*/_jsx(Button, {
-        flat: true,
-        type: "primary",
+        variant: "link",
+        color: "secondary",
         onClick: onClick,
         disabled: disabled,
         testId: "clearAllButton",

package/locations/components/ChangeLocationButton/ChangeLocationButton.js

@@ -1,20 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { RippleButton, I18n, SurroundPortals } from '@shopgate/engage/components';
+import { I18n, SurroundPortals } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { makeStyles } from '@shopgate/engage/styles';
 import { PRODUCT_FULFILLMENT_CHANGE_LOCATION } from "../../constants/Portals";
 import { jsx as _jsx } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
   button: {
-    fontSize: `${theme.typography.caption.fontSize} !important`,
-    letterSpacing: '0.05em',
-    padding: `${theme.spacing(0.375, 0)} !important`,
-    ' *': {
-      padding: '0 !important'
-    }
-  },
-  ripple: {
-    padding: 0
+    fontSize: theme.typography.caption.fontSize,
+    padding: 0,
+    letterSpacing: '0.05em'
   }
 }));
 
@@ -38,13 +33,14 @@ export const ChangeLocationButtonUnwrapped = ({
       onClick,
       disabled
     },
-    children: /*#__PURE__*/_jsx(RippleButton, {
+    children: /*#__PURE__*/_jsx(Button, {
+      variant: "link",
+      color: "primary",
+      size: "small",
+      dense: true,
       onClick: onClick,
       className: classes.button,
       disabled: disabled,
-      rippleClassName: classes.ripple,
-      type: "secondary",
-      flat: true,
       children: /*#__PURE__*/_jsx(I18n.Text, {
         string: "locations.change_location"
       })

package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotDialog.js

@@ -5,7 +5,8 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { makeStyles } from '@shopgate/engage/styles';
 import groupBy from 'lodash/groupBy';
-import { SheetDrawer, Button, Typography } from '@shopgate/engage/components';
+import { SheetDrawer, Typography } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { getActiveFulfillmentSlot } from '@shopgate/engage/cart/cart.selectors';
 import { makeGetFulfillmentSlotsForLocation, getPreferredLocation } from "../../selectors";
@@ -105,11 +106,6 @@ const useStyles = makeStyles()(theme => ({
     background: theme.palette.background.surface,
     padding: 16,
     paddingBottom: 24
-  },
-  buttonSchedule: {
-    '&&': {
-      width: '100%'
-    }
   }
 }));
 
@@ -301,8 +297,8 @@ const FulfillmentSlotSheet = ({
       }, group.name)), /*#__PURE__*/_jsx("div", {
         className: classes.buttonScheduleContainer,
         children: /*#__PURE__*/_jsx(Button, {
-          className: classes.buttonSchedule,
-          type: "secondary",
+          color: "primary",
+          fullWidth: true,
           onClick: handleChange,
           disabled: !selectedDate || !selectedSlot,
           children: i18n.text('locations.your_current_timeslot.dialog.schedule')

package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotSwitcher.js

@@ -14,7 +14,7 @@ const useStyles = makeStyles()(theme => ({
       borderBottom: 0
     },
     ' > div': {
-      borderRadius: 5,
+      borderRadius: theme.shape.borderRadius,
       margin: -1,
       background: theme.palette.background.surface,
       border: `1px solid ${theme.components.border.light}`

package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotSwitcherBar.js

@@ -1,6 +1,7 @@
 import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
-import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
+import { I18n, Typography } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { makeStyles } from '@shopgate/engage/styles';
 import { getTimeSlotDisplayText } from "./time";
@@ -29,15 +30,8 @@ const useStyles = makeStyles()(theme => ({
   },
   button: {
     marginLeft: 'auto',
-    letterSpacing: '0.05em',
-    padding: `${theme.spacing(0.375, 0)} !important`,
-    ' *': {
-      fontSize: theme.typography.body2.fontSize,
-      textTransform: 'initial',
-      padding: '0 !important',
-      color: theme.palette.text.primary,
-      fontWeight: theme.typography.fontWeightMedium
-    }
+    textTransform: 'none',
+    padding: theme.spacing(0.375, 0)
   }
 }));
 
@@ -71,11 +65,12 @@ const FulfillmentSlotSwitcherBar = ({
         component: "span",
         fontWeight: "medium",
         children: displayTime
-      }), editable && /*#__PURE__*/_jsx(RippleButton, {
+      }), editable && /*#__PURE__*/_jsx(Button, {
+        variant: "text",
+        color: "inherit",
+        size: "small",
         onClick: handleChange,
-        type: "secondary",
         className: classes.button,
-        flat: true,
         children: /*#__PURE__*/_jsx(I18n.Text, {
           string: "locations.your_current_location.change"
         })

package/locations/components/FulfillmentSlotSwitcher/FulfillmentSlotSwitcherDefault.js

@@ -1,6 +1,7 @@
 import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
-import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
+import { I18n, Typography } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { makeStyles } from '@shopgate/engage/styles';
 import { getTimeSlotDisplayText } from "./time";
@@ -13,12 +14,10 @@ const useStyles = makeStyles()(theme => ({
     flexShrink: 0
   },
   button: {
-    fontSize: `${theme.typography.caption.fontSize} !important`,
-    letterSpacing: '0.05em',
-    padding: `${theme.spacing(0.375, 0)} !important`,
-    ' *': {
-      padding: '0 !important'
-    }
+    // Inline affordance that follows the location name, so it carries no button chrome and
+    // stays sentence case - matching the switcher bars that render the same action.
+    padding: theme.spacing(0.375, 0),
+    textTransform: 'none'
   }
 }));
 
@@ -48,12 +47,13 @@ const FulfillmentSlotSwitcherDefault = ({
         color: "textPrimary",
         fontWeight: "medium",
         children: displayTime
-      }), /*#__PURE__*/_jsx(RippleButton, {
+      }), /*#__PURE__*/_jsx(Button, {
+        variant: "text",
+        color: "primary",
+        size: "small",
         onClick: handleChange,
-        type: "secondary",
         className: classes.button,
         disabled: !editable,
-        flat: true,
         children: /*#__PURE__*/_jsx(I18n.Text, {
           string: "locations.your_current_location.change"
         })

package/locations/components/GlobalLocationSwitcher/GlobalLocationSwitcherBar.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
+import { I18n, Typography } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { makeStyles } from '@shopgate/engage/styles';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -24,16 +25,8 @@ const useStyles = makeStyles()(theme => ({
     paddingRight: theme.spacing(1)
   },
   button: {
-    marginLeft: 'auto',
-    letterSpacing: '0.05em',
-    padding: `${theme.spacing(0.375, 0)} !important`,
-    ' *': {
-      fontSize: theme.typography.body2.fontSize,
-      textTransform: 'initial',
-      padding: '0 !important',
-      color: theme.palette.text.primary,
-      fontWeight: theme.typography.fontWeightMedium
-    }
+    marginLeft: theme.spacing(2),
+    textTransform: 'none'
   }
 }));
 
@@ -68,12 +61,13 @@ const GlobalLocationSwitcherBar = ({
           fontWeight: "medium",
           children: locationName
         })]
-      }), /*#__PURE__*/_jsx(RippleButton, {
+      }), /*#__PURE__*/_jsx(Button, {
+        variant: "link",
+        size: "small",
+        dense: true,
         onClick: handleChange,
-        type: "secondary",
         className: classes.button,
         "aria-haspopup": true,
-        flat: true,
         children: /*#__PURE__*/_jsx(I18n.Text, {
           string: "locations.your_current_location.change"
         })

package/locations/components/GlobalLocationSwitcher/GlobalLocationSwitcherDefault.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { RippleButton, I18n, Typography } from '@shopgate/engage/components';
+import { I18n, Typography } from '@shopgate/engage/components';
+import { Button } from '@shopgate/engage/components/v2';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { makeStyles } from '@shopgate/engage/styles';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -15,12 +16,8 @@ const useStyles = makeStyles()(theme => ({
     color: theme.palette.text.primary
   },
   button: {
-    fontSize: `${theme.typography.caption.fontSize} !important`,
-    letterSpacing: '0.05em',
-    padding: `${theme.spacing(0.375, 0)} !important`,
-    ' *': {
-      padding: '0 !important'
-    }
+    textTransform: 'none',
+    marginLeft: theme.spacing(1)
   }
 }));
 
@@ -49,12 +46,14 @@ const GlobalLocationSwitcherDefault = ({
         fontWeight: "medium",
         className: classes.name,
         children: locationName
-      }), /*#__PURE__*/_jsx(RippleButton, {
+      }), /*#__PURE__*/_jsx(Button, {
+        variant: "link",
+        color: "primary",
+        size: "small",
+        dense: true,
         onClick: handleChange,
-        type: "secondary",
         className: classes.button,
         disabled: !editable,
-        flat: true,
         children: /*#__PURE__*/_jsx(I18n.Text, {
           string: "locations.your_current_location.change"
         })