@rebuy/rebuy-hydrogen 3.0.0-beta.15 → 3.0.0-beta.17

package/dist/index.js

@@ -37,6 +37,8 @@ __export(index_exports, {
   RebuyHydrogenReactContextProvider: () => RebuyHydrogenReactContextProvider,
   RebuyProductAddOns: () => RebuyProductAddOns,
   RebuyProductRecommendations: () => RebuyProductRecommendations,
+  RebuyProductViewed: () => RebuyProductViewed,
+  RebuyRecentlyViewedProducts: () => RebuyRecentlyViewedProducts,
   RebuySmartCart: () => RebuySmartCart,
   RebuyWidget: () => RebuyWidget,
   RebuyWidgetContainer: () => RebuyWidgetContainer,
@@ -1269,7 +1271,7 @@ var useTieredProgressBarStore = (0, import_zustand.create)((set, get) => ({
       if (idsToFetch.length > 0) {
         const productGids = idsToFetch.map((id) => `gid://shopify/Product/${id}`);
         const graphqlQuery = `query getProductsByIds($ids: [ID!]!) { nodes(ids: $ids) { ... on Product { id title handle tags images(first: 1) { edges { node { url altText } } } variants(first: 30) { edges { node { id title sku availableForSale price { amount currencyCode } compareAtPrice { amount currencyCode } selectedOptions { name value } image { url altText } } } } } } }`;
-        const response = await fetch(`https://${_shopifyDomain}/api/2024-07/graphql.json`, {
+        const response = await fetch(`https://${_shopifyDomain}/api/2025-01/graphql.json`, {
           body: JSON.stringify({ query: graphqlQuery, variables: { ids: productGids } }),
           headers: {
             "Content-Type": "application/json",
@@ -3572,7 +3574,7 @@ var RebuyHydrogenReactContextProvider = ({
   publicStoreDomain,
   publicStorefrontId,
   publicStorefrontToken,
-  storefrontApiVersion = "2024-07"
+  storefrontApiVersion = "2025-01"
 }) => {
   const adaptedCallbacks = (0, import_react5.useMemo)(
     () => ({
@@ -3863,7 +3865,14 @@ AnnouncementBar.displayName = "AnnouncementBar";
 // src/smart-cart/components/CartItem/CartItem.tsx
 var import_clsx = __toESM(require("clsx"), 1);
 var import_react8 = require("react");
+var import_react_router4 = require("react-router");
+
+// src/components/RebuyLink/RebuyLink.tsx
 var import_react_router3 = require("react-router");
+var import_jsx_runtime9 = require("react/jsx-runtime");
+var RebuyLink = ({ ariaLabel, children, className, handle, onClick, role = "link" }) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_react_router3.Link, { "aria-label": ariaLabel, className, onClick, rel: "nofollow", role, to: handle, children });
+};
 
 // src/smart-cart/hooks/useCartItemFeatures.ts
 var import_react7 = require("react");
@@ -4283,17 +4292,18 @@ var result2 = { "rebuy-cart-item": "CartItem_rebuy-cart-item", "rebuy-cart-item_
 var CartItem_default = result2;
 
 // src/smart-cart/components/CartItem/CartItem.tsx
-var import_jsx_runtime9 = require("react/jsx-runtime");
-var Spinner = ({ className }) => /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { className: (0, import_clsx.default)(CartItem_default["rebuy-cart-item__spinner"], className) });
+var import_jsx_runtime10 = require("react/jsx-runtime");
+var Spinner = ({ className }) => /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { className: (0, import_clsx.default)(CartItem_default["rebuy-cart-item__spinner"], className) });
 var CartItem = ({ line }) => {
   const { config, isCartBusy, isHydrogenReact, removeItem, updateItem } = useSmartCart();
-  const itemFetcher = (0, import_react_router3.useFetcher)();
+  const itemFetcher = (0, import_react_router4.useFetcher)();
   const [isIncreasing, setIsIncreasing] = (0, import_react8.useState)(false);
   const [isDecreasing, setIsDecreasing] = (0, import_react8.useState)(false);
   const [isRemoving, setIsRemoving] = (0, import_react8.useState)(false);
   const [isAdjustingBMSM, setIsAdjustingBMSM] = (0, import_react8.useState)(false);
   const [isSwitchingSubscription, setIsSwitchingSubscription] = (0, import_react8.useState)(false);
   const [switchingDirection, setSwitchingDirection] = (0, import_react8.useState)(null);
+  const { toggleCart } = useSmartCart();
   const {
     actions: itemActionsLogic,
     bmsm,
@@ -4513,7 +4523,7 @@ var CartItem = ({ line }) => {
     }
   }, [isHydrogenReact, isCartBusy, itemFetcher.state, itemFetcher.data]);
   const selectValue = line.sellingPlanAllocation?.sellingPlan.id ?? "onetime";
-  return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(
     "li",
     {
       "aria-label": meta.ariaLabel,
@@ -4521,21 +4531,34 @@ var CartItem = ({ line }) => {
       "data-line-id": line.id,
       "data-variant-id": line.merchandise.id,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: CartItem_default["rebuy-cart-item__media"], children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("a", { "aria-label": meta.linkLabel, href: meta.itemUrl, children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("img", { alt: meta.imageAltText, height: 120, loading: "lazy", src: meta.imageUrl, width: 120 }) }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: CartItem_default["rebuy-cart-item__info"], children: [
-          /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-            "a",
+        /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: CartItem_default["rebuy-cart-item__media"], children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
+          RebuyLink,
+          {
+            ariaLabel: meta.linkLabel,
+            handle: meta.itemUrl,
+            onClick: () => {
+              toggleCart();
+            },
+            children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("img", { alt: meta.imageAltText, height: 120, loading: "lazy", src: meta.imageUrl, width: 120 })
+          }
+        ) }),
+        /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("div", { className: CartItem_default["rebuy-cart-item__info"], children: [
+          /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
+            RebuyLink,
             {
-              "aria-level": 5,
+              ariaLabel: meta.linkLabel,
               className: CartItem_default["rebuy-cart-item__product-title"],
-              href: meta.itemUrl,
+              handle: meta.itemUrl,
+              onClick: () => {
+                toggleCart();
+              },
               role: "heading",
               children: meta.productTitle
             }
           ),
-          meta.variantTitle && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: CartItem_default["rebuy-cart-item__variant-title"], children: meta.variantTitle }),
-          properties.hasVisibleProperties && /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: CartItem_default["rebuy-cart-item__properties-list"], children: [
-            properties.deliveryFrequency && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+          meta.variantTitle && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: CartItem_default["rebuy-cart-item__variant-title"], children: meta.variantTitle }),
+          properties.hasVisibleProperties && /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("div", { className: CartItem_default["rebuy-cart-item__properties-list"], children: [
+            properties.deliveryFrequency && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
               "div",
               {
                 className: (0, import_clsx.default)(
@@ -4545,7 +4568,7 @@ var CartItem = ({ line }) => {
                 children: properties.deliveryFrequency
               }
             ),
-            properties.visibleProperties.map((prop, index) => /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+            properties.visibleProperties.map((prop, index) => /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
               "div",
               {
                 className: (0, import_clsx.default)(
@@ -4553,16 +4576,16 @@ var CartItem = ({ line }) => {
                   getItemPropertyKeyClass(prop),
                   getItemPropertyValueClass(prop)
                 ),
-                children: prop.key !== "_Discount" ? /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_jsx_runtime9.Fragment, { children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { className: CartItem_default["rebuy-cart-item__property-key"], children: prop.key }),
-                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { className: CartItem_default["rebuy-cart-item__property-separator"], children: ": " }),
-                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { className: CartItem_default["rebuy-cart-item__property-value"], children: prop.value })
-                ] }) : /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { className: CartItem_default["rebuy-cart-item__property-value"], children: prop.value })
+                children: prop.key !== "_Discount" ? /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_jsx_runtime10.Fragment, { children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { className: CartItem_default["rebuy-cart-item__property-key"], children: prop.key }),
+                  /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { className: CartItem_default["rebuy-cart-item__property-separator"], children: ": " }),
+                  /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { className: CartItem_default["rebuy-cart-item__property-value"], children: prop.value })
+                ] }) : /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { className: CartItem_default["rebuy-cart-item__property-value"], children: prop.value })
               },
               `${line.id}-prop-${index}`
             ))
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
             "button",
             {
               "aria-label": `Remove ${meta.productTitle}`,
@@ -4570,11 +4593,11 @@ var CartItem = ({ line }) => {
               disabled: isLoadingCombined,
               onClick: handleRemoveItem,
               type: "button",
-              children: isRemoving ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Spinner, {}) : "\u2715"
+              children: isRemoving ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(Spinner, {}) : "\u2715"
             }
           ),
-          !shouldHideQuantitySelector && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: CartItem_default["rebuy-cart-item__quantity-selector-area"], children: /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: CartItem_default["rebuy-cart-item__quantity-selector"], children: [
-            /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+          !shouldHideQuantitySelector && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: CartItem_default["rebuy-cart-item__quantity-selector-area"], children: /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("div", { className: CartItem_default["rebuy-cart-item__quantity-selector"], children: [
+            /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
               "button",
               {
                 "aria-label": `Decrease quantity of ${meta.productTitle}`,
@@ -4582,17 +4605,17 @@ var CartItem = ({ line }) => {
                 disabled: isLoadingCombined,
                 onClick: handleDecreaseQuantity,
                 type: "button",
-                children: isDecreasing ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Spinner, {}) : "-"
+                children: isDecreasing ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(Spinner, {}) : "-"
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("span", { "aria-live": "polite", className: CartItem_default["rebuy-cart-item__quantity-selector-label"], children: [
-              /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(ScreenReaderText, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { "aria-live": "polite", className: CartItem_default["rebuy-cart-item__quantity-selector-label"], children: [
+              /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(ScreenReaderText, { children: [
                 "Quantity of ",
                 meta.productTitle
               ] }),
               line.quantity
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+            /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
               "button",
               {
                 "aria-label": `Increase quantity of ${meta.productTitle}`,
@@ -4600,12 +4623,12 @@ var CartItem = ({ line }) => {
                 disabled: isLoadingCombined,
                 onClick: handleIncreaseQuantity,
                 type: "button",
-                children: isIncreasing ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Spinner, {}) : "+"
+                children: isIncreasing ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(Spinner, {}) : "+"
               }
             )
           ] }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: CartItem_default["rebuy-cart-item__price-details"], children: pricing.hasDiscount && pricing.compareAtDisplayPrice ? /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_jsx_runtime9.Fragment, { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
+          /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: CartItem_default["rebuy-cart-item__price-details"], children: pricing.hasDiscount && pricing.compareAtDisplayPrice ? /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_jsx_runtime10.Fragment, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(
               "span",
               {
                 "aria-label": "Sale price",
@@ -4614,12 +4637,12 @@ var CartItem = ({ line }) => {
                   CartItem_default["rebuy-cart-item__money--sale"]
                 ),
                 children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(ScreenReaderText, { children: "Sale price" }),
+                  /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(ScreenReaderText, { children: "Sale price" }),
                   pricing.displayPrice
                 ]
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
+            /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(
               "span",
               {
                 "aria-label": "Original price",
@@ -4628,17 +4651,17 @@ var CartItem = ({ line }) => {
                   CartItem_default["rebuy-cart-item__money--compare-at"]
                 ),
                 children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(ScreenReaderText, { children: "Original price" }),
+                  /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(ScreenReaderText, { children: "Original price" }),
                   pricing.compareAtDisplayPrice
                 ]
               }
             )
-          ] }) : /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("span", { "aria-label": "Price", className: CartItem_default["rebuy-cart-item__money"], children: [
-            /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(ScreenReaderText, { children: "Price" }),
+          ] }) : /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { "aria-label": "Price", className: CartItem_default["rebuy-cart-item__money"], children: [
+            /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(ScreenReaderText, { children: "Price" }),
             pricing.displayPrice
           ] }) }),
-          bundle.isBundleParent && bundle.showToggle && /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: CartItem_default["rebuy-cart-item__bundle-section"], children: [
-            bundle.itemCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
+          bundle.isBundleParent && bundle.showToggle && /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("div", { className: CartItem_default["rebuy-cart-item__bundle-section"], children: [
+            bundle.itemCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(
               "button",
               {
                 "aria-controls": `bundle-details-${line.id}`,
@@ -4654,11 +4677,11 @@ var CartItem = ({ line }) => {
                   bundle.itemCount,
                   " item",
                   bundle.itemCount !== 1 ? "s" : "",
-                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { "aria-hidden": "true", className: CartItem_default["rebuy-cart-item__bundle-chev-icon"], children: isBundleExpanded ? "\u25B2" : "\u25BC" })
+                  /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { "aria-hidden": "true", className: CartItem_default["rebuy-cart-item__bundle-chev-icon"], children: isBundleExpanded ? "\u25B2" : "\u25BC" })
                 ]
               }
             ),
-            bundle.itemCount > 0 && isBundleExpanded && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+            bundle.itemCount > 0 && isBundleExpanded && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
               "ul",
               {
                 className: CartItem_default["rebuy-cart-item__bundle-children-list"],
@@ -4672,12 +4695,12 @@ var CartItem = ({ line }) => {
                     optionData,
                     index
                   );
-                  return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
+                  return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(
                     "li",
                     {
                       className: CartItem_default["rebuy-cart-item__bundle-child-item"],
                       children: [
-                        /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: CartItem_default["rebuy-cart-item__bundle-child-media-wrapper"], children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: CartItem_default["rebuy-cart-item__bundle-child-image-wrapper"], children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+                        /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: CartItem_default["rebuy-cart-item__bundle-child-media-wrapper"], children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: CartItem_default["rebuy-cart-item__bundle-child-image-wrapper"], children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
                           "img",
                           {
                             alt: childTitle,
@@ -4686,7 +4709,7 @@ var CartItem = ({ line }) => {
                             src: sizeImage(childImage, "40x40")
                           }
                         ) }) }),
-                        /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: CartItem_default["rebuy-cart-item__bundle-child-details"], children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("h5", { className: CartItem_default["rebuy-cart-item__bundle-child-title"], children: childTitle }) })
+                        /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: CartItem_default["rebuy-cart-item__bundle-child-details"], children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("h5", { className: CartItem_default["rebuy-cart-item__bundle-child-title"], children: childTitle }) })
                       ]
                     },
                     `${line.id}-bundle-child-${index}`
@@ -4697,18 +4720,18 @@ var CartItem = ({ line }) => {
           ] })
         ] }),
         " ",
-        bmsm.isEnabledAndApplicable && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: CartItem_default["rebuy-cart-item__bmsm-section"], children: bmsm.isButtonMode ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: CartItem_default["rebuy-cart-item__bmsm-button-wrapper"], children: bmsm.nextApplicableTiers.map((tier) => /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+        bmsm.isEnabledAndApplicable && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: CartItem_default["rebuy-cart-item__bmsm-section"], children: bmsm.isButtonMode ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: CartItem_default["rebuy-cart-item__bmsm-button-wrapper"], children: bmsm.nextApplicableTiers.map((tier) => /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
           "button",
           {
             "aria-label": `${bmsm.getButtonText(tier)} for ${meta.productTitle}`,
             className: CartItem_default["rebuy-cart-item__bmsm-button"],
             disabled: isLoadingCombined,
             onClick: () => handleAdjustBMSMQuantity(tier.quantity ?? 0),
-            children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { children: bmsm.getButtonText(tier) })
+            children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { children: bmsm.getButtonText(tier) })
           },
           `bmsm-${line.id}-${tier.quantity}`
-        )) }) : /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { className: CartItem_default["rebuy-cart-item__bmsm-dynamic-message"], children: bmsm.dynamicText }) }),
-        sts.isEnabledAndApplicable && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: CartItem_default["rebuy-cart-item__sts-section"], children: !sts.isCurrentlySubscription && sts.availableFrequencies.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+        )) }) : /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { className: CartItem_default["rebuy-cart-item__bmsm-dynamic-message"], children: bmsm.dynamicText }) }),
+        sts.isEnabledAndApplicable && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: CartItem_default["rebuy-cart-item__sts-section"], children: !sts.isCurrentlySubscription && sts.availableFrequencies.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
           "button",
           {
             "aria-label": `Switch ${meta.productTitle} to a Subscription`,
@@ -4716,9 +4739,9 @@ var CartItem = ({ line }) => {
             disabled: isLoadingCombined,
             onClick: handleUpgradeToSubscriptionClick,
             type: "button",
-            children: isSwitchingSubscription && switchingDirection === "upgrading" ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Spinner, {}) : /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { children: sts.getUpgradeButtonLabel() })
+            children: isSwitchingSubscription && switchingDirection === "upgrading" ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(Spinner, {}) : /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { children: sts.getUpgradeButtonLabel() })
           }
-        ) : sts.isCurrentlySubscription || sts.canDowngrade ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_jsx_runtime9.Fragment, { children: isSwitchingSubscription ? /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { className: CartItem_default["rebuy-cart-item__sts-loading-replacement"], children: sts.getLoadingLabel(switchingDirection) }) : /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
+        ) : sts.isCurrentlySubscription || sts.canDowngrade ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_jsx_runtime10.Fragment, { children: isSwitchingSubscription ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { className: CartItem_default["rebuy-cart-item__sts-loading-replacement"], children: sts.getLoadingLabel(switchingDirection) }) : /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(
           "select",
           {
             "aria-label": `Subscription delivery frequency for ${meta.productTitle}`,
@@ -4727,8 +4750,8 @@ var CartItem = ({ line }) => {
             onChange: handleSwitchSubscriptionChange,
             value: selectValue,
             children: [
-              sts.canDowngrade && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("optgroup", { label: sts.getOneTimeGroupLabel(), children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("option", { value: "onetime", children: sts.getOneTimeLabel() }) }),
-              sts.availableFrequencies.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("optgroup", { label: sts.getGroupLabel(), children: sts.availableFrequencies.map((freq) => /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("option", { value: freq.id, children: sts.getOptionLabel(freq.id) }, freq.id)) })
+              sts.canDowngrade && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("optgroup", { label: sts.getOneTimeGroupLabel(), children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("option", { value: "onetime", children: sts.getOneTimeLabel() }) }),
+              sts.availableFrequencies.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("optgroup", { label: sts.getGroupLabel(), children: sts.availableFrequencies.map((freq) => /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("option", { value: freq.id, children: sts.getOptionLabel(freq.id) }, freq.id)) })
             ]
           }
         ) }) : null })
@@ -4742,11 +4765,11 @@ var result3 = { "rebuy-empty-cart-message": "EmptyCart_rebuy-empty-cart-message"
 var EmptyCart_default = result3;
 
 // src/smart-cart/components/EmptyCart/EmptyCart.tsx
-var import_jsx_runtime10 = require("react/jsx-runtime");
+var import_jsx_runtime11 = require("react/jsx-runtime");
 var EmptyCart = () => {
   const { config } = useSmartCart();
   const emptyCartMarkup = config?.empty_cart_markup || "<p>Your cart is empty.</p>";
-  return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: EmptyCart_default["rebuy-empty-cart-message"], dangerouslySetInnerHTML: { __html: emptyCartMarkup } });
+  return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { className: EmptyCart_default["rebuy-empty-cart-message"], dangerouslySetInnerHTML: { __html: emptyCartMarkup } });
 };
 
 // src/smart-cart/components/CartItemList/CartItemList.module.css
@@ -4754,7 +4777,7 @@ var result4 = { "rebuy-cart-item-list__container": "CartItemList_rebuy-cart-item
 var CartItemList_default = result4;
 
 // src/smart-cart/components/CartItemList/CartItemList.tsx
-var import_jsx_runtime11 = require("react/jsx-runtime");
+var import_jsx_runtime12 = require("react/jsx-runtime");
 var CartItemList = ({ componentConfig }) => {
   const { cartData, isLoading: isCartLoading, isProgressBarLineItemMode } = useSmartCart();
   const lines = cartData?.lines?.nodes ?? [];
@@ -4765,13 +4788,13 @@ var CartItemList = ({ componentConfig }) => {
     return true;
   });
   const hasVisibleItems = visibleLines.length > 0;
-  return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
     "div",
     {
       className: CartItemList_default["rebuy-cart-item-list__container"],
       "data-rebuy-component": "cart-items",
       "data-rebuy-component-id": componentConfig.component_id,
-      children: hasVisibleItems ? /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("ul", { className: CartItemList_default["rebuy-cart-item-list"], "data-smartcart-items": "", role: "group", tabIndex: 0, children: visibleLines.map((line) => /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(CartItem, { line }, line.id)) }) : !isCartLoading && /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(EmptyCart, {})
+      children: hasVisibleItems ? /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("ul", { className: CartItemList_default["rebuy-cart-item-list"], "data-smartcart-items": "", role: "group", tabIndex: 0, children: visibleLines.map((line) => /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(CartItem, { line }, line.id)) }) : !isCartLoading && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(EmptyCart, {})
     }
   );
 };
@@ -4779,14 +4802,14 @@ var CartItemList = ({ componentConfig }) => {
 // src/smart-cart/components/CartNoteInput/CartNoteInput.tsx
 var import_clsx2 = __toESM(require("clsx"), 1);
 var import_react9 = __toESM(require("react"), 1);
-var import_react_router4 = require("react-router");
+var import_react_router5 = require("react-router");
 
 // src/smart-cart/components/CartNoteInput/CartNoteInput.module.css
 var result5 = { "rebuy-cart-note-input": "CartNoteInput_rebuy-cart-note-input", "rebuy-cart-note-input__toggle-control": "CartNoteInput_rebuy-cart-note-input__toggle-control", "rebuy-cart-note-input__toggle-checkbox": "CartNoteInput_rebuy-cart-note-input__toggle-checkbox", "rebuy-cart-note-input__toggle-label": "CartNoteInput_rebuy-cart-note-input__toggle-label", "rebuy-cart-note-input__textarea-wrapper": "CartNoteInput_rebuy-cart-note-input__textarea-wrapper", "rebuy-cart-note-input__textarea": "CartNoteInput_rebuy-cart-note-input__textarea", "rebuy-cart-note-input__save-button": "CartNoteInput_rebuy-cart-note-input__save-button", "rebuy-cart-note-input__save-button--visible": "CartNoteInput_rebuy-cart-note-input__save-button--visible", "rebuy-cart-note-input__save-button--saving": "CartNoteInput_rebuy-cart-note-input__save-button--saving", "rebuy-cart-note-input__save-button--saved": "CartNoteInput_rebuy-cart-note-input__save-button--saved", "rebuy-cart-note-input__save-button--error": "CartNoteInput_rebuy-cart-note-input__save-button--error", "rebuy-cart-note-input__meta-info": "CartNoteInput_rebuy-cart-note-input__meta-info", "rebuy-cart-note-input__meta-info--hidden": "CartNoteInput_rebuy-cart-note-input__meta-info--hidden", "rebuy-cart-note-input__remaining-chars-indicator": "CartNoteInput_rebuy-cart-note-input__remaining-chars-indicator", "rebuy-cart-note-input__help-text": "CartNoteInput_rebuy-cart-note-input__help-text", "rebuy-cart-note-input__content-area": "CartNoteInput_rebuy-cart-note-input__content-area" };
 var CartNoteInput_default = result5;
 
 // src/smart-cart/components/CartNoteInput/CartNoteInput.tsx
-var import_jsx_runtime12 = require("react/jsx-runtime");
+var import_jsx_runtime13 = require("react/jsx-runtime");
 var CartNoteInput = import_react9.default.memo(({ componentConfig }) => {
   const {
     cartData,
@@ -4795,7 +4818,7 @@ var CartNoteInput = import_react9.default.memo(({ componentConfig }) => {
     isLoading: isGlobalCartLoading,
     updateCartNote: hrUpdateCartNote
   } = useSmartCart();
-  const noteFetcher = (0, import_react_router4.useFetcher)();
+  const noteFetcher = (0, import_react_router5.useFetcher)();
   const textareaRef = (0, import_react9.useRef)(null);
   const isTextareaFocusedRef = (0, import_react9.useRef)(false);
   const settings = componentConfig.settings || {};
@@ -4947,15 +4970,15 @@ var CartNoteInput = import_react9.default.memo(({ componentConfig }) => {
   const helpTextId = `rebuy-cart-note-help-${componentConfig.component_id}`;
   const remainingCharsId = `rebuy-cart-note-remaining-${componentConfig.component_id}`;
   const describedByIds = [remainingChars !== null && currentNoteValue ? remainingCharsId : null, helpTextId].filter(Boolean).join(" ");
-  return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(
     "div",
     {
       className: CartNoteInput_default["rebuy-cart-note-input"],
       "data-rebuy-component": "notes",
       "data-rebuy-component-id": componentConfig.component_id ?? "notes",
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("label", { className: CartNoteInput_default["rebuy-cart-note-input__toggle-control"], children: [
-          /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("label", { className: CartNoteInput_default["rebuy-cart-note-input__toggle-control"], children: [
+          /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
             "input",
             {
               checked: isTextareaVisible,
@@ -4965,7 +4988,7 @@ var CartNoteInput = import_react9.default.memo(({ componentConfig }) => {
               type: "checkbox"
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
             "span",
             {
               className: CartNoteInput_default["rebuy-cart-note-input__toggle-label"],
@@ -4973,9 +4996,9 @@ var CartNoteInput = import_react9.default.memo(({ componentConfig }) => {
             }
           )
         ] }),
-        isTextareaVisible && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: CartNoteInput_default["rebuy-cart-note-input__content-area"], children: [
-          /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: CartNoteInput_default["rebuy-cart-note-input__textarea-wrapper"], children: [
-            /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+        isTextareaVisible && /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("div", { className: CartNoteInput_default["rebuy-cart-note-input__content-area"], children: [
+          /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("div", { className: CartNoteInput_default["rebuy-cart-note-input__textarea-wrapper"], children: [
+            /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
               "textarea",
               {
                 "aria-describedby": describedByIds || void 0,
@@ -4993,7 +5016,7 @@ var CartNoteInput = import_react9.default.memo(({ componentConfig }) => {
                 value: currentNoteValue
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+            /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
               "button",
               {
                 "aria-label": saveMessage?.text || (isNoteChanged ? "Save note changes" : "Note is up to date"),
@@ -5005,7 +5028,7 @@ var CartNoteInput = import_react9.default.memo(({ componentConfig }) => {
               }
             )
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
+          /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(
             "div",
             {
               className: (0, import_clsx2.default)(
@@ -5013,7 +5036,7 @@ var CartNoteInput = import_react9.default.memo(({ componentConfig }) => {
                 !isNoteChanged && !saveMessage && CartNoteInput_default["rebuy-cart-note-input__meta-info--hidden"]
               ),
               children: [
-                limitChars && currentNoteValue.length > 0 && remainingChars !== null && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+                limitChars && currentNoteValue.length > 0 && remainingChars !== null && /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
                   "small",
                   {
                     "aria-live": "polite",
@@ -5022,7 +5045,7 @@ var CartNoteInput = import_react9.default.memo(({ componentConfig }) => {
                     children: `You have ${remainingChars} characters remaining.`
                   }
                 ),
-                /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("small", { className: CartNoteInput_default["rebuy-cart-note-input__help-text"], id: helpTextId, children: "Press Enter to save, Shift+Enter for new line." })
+                /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("small", { className: CartNoteInput_default["rebuy-cart-note-input__help-text"], id: helpTextId, children: "Press Enter to save, Shift+Enter for new line." })
               ]
             }
           )
@@ -5042,7 +5065,7 @@ var result6 = { "rebuy-cart-subtotal": "CartSubtotal_rebuy-cart-subtotal", "rebu
 var CartSubtotal_default = result6;
 
 // src/smart-cart/components/CartSubtotal/CartSubtotal.tsx
-var import_jsx_runtime13 = require("react/jsx-runtime");
+var import_jsx_runtime14 = require("react/jsx-runtime");
 var getDiscountAllocationTitle = (alloc) => {
   switch (alloc.__typename) {
     case "CartCodeDiscountAllocation":
@@ -5150,37 +5173,37 @@ var CartSubtotalComponent = ({ componentConfig }) => {
   const primaryPrice = formattedFinalTotal;
   const compareAtPrice = hasOrderDiscount ? formattedPreDiscountSubtotal : null;
   const summaryId = `rebuy-discount-summary-details-${componentConfig.component_id}`;
-  return /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(
     "div",
     {
       className: rootClasses,
       "data-rebuy-component": "cart-subtotal",
       "data-rebuy-component-id": componentConfig.component_id,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("div", { className: CartSubtotal_default["rebuy-cart-subtotal__row"], children: [
-          /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: CartSubtotal_default["rebuy-cart-subtotal__label"], children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("span", { children: subtotalLabel }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("div", { className: CartSubtotal_default["rebuy-cart-subtotal__amount-wrapper"], children: [
-            /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(ScreenReaderText, { children: "Cart subtotal" }),
-            compareAtPrice ? /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(import_jsx_runtime13.Fragment, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("span", { className: CartSubtotal_default["rebuy-cart-subtotal__price--final"], children: [
-                /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(ScreenReaderText, { children: "Final price" }),
-                /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("span", { children: primaryPrice })
+        /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)("div", { className: CartSubtotal_default["rebuy-cart-subtotal__row"], children: [
+          /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: CartSubtotal_default["rebuy-cart-subtotal__label"], children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("span", { children: subtotalLabel }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)("div", { className: CartSubtotal_default["rebuy-cart-subtotal__amount-wrapper"], children: [
+            /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(ScreenReaderText, { children: "Cart subtotal" }),
+            compareAtPrice ? /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_jsx_runtime14.Fragment, { children: [
+              /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)("span", { className: CartSubtotal_default["rebuy-cart-subtotal__price--final"], children: [
+                /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(ScreenReaderText, { children: "Final price" }),
+                /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("span", { children: primaryPrice })
               ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("span", { className: CartSubtotal_default["rebuy-cart-subtotal__price--compare-at"], children: [
-                /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(ScreenReaderText, { children: "Original price" }),
-                /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("span", { children: compareAtPrice })
+              /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)("span", { className: CartSubtotal_default["rebuy-cart-subtotal__price--compare-at"], children: [
+                /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(ScreenReaderText, { children: "Original price" }),
+                /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("span", { children: compareAtPrice })
               ] })
-            ] }) : /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("span", { children: primaryPrice })
+            ] }) : /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("span", { children: primaryPrice })
           ] })
         ] }),
-        shouldShowDiscountSummary && /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(
+        shouldShowDiscountSummary && /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(
           "div",
           {
             className: (0, import_clsx3.default)(CartSubtotal_default["rebuy-cart-subtotal__discount-summary"], {
               [CartSubtotal_default["rebuy-cart-subtotal__discount-summary--expanded"]]: isDiscountSummaryExpanded
             }),
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(
+              /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(
                 "button",
                 {
                   "aria-controls": summaryId,
@@ -5188,24 +5211,24 @@ var CartSubtotalComponent = ({ componentConfig }) => {
                   className: CartSubtotal_default["rebuy-cart-subtotal__discount-summary-header"],
                   onClick: toggleDiscountSummary,
                   children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("span", { children: discountSummaryCountLabel }),
-                    /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("span", { "aria-hidden": "true", className: CartSubtotal_default["rebuy-cart-subtotal__discount-summary-icon"], children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("i", { children: "\u25BC" }),
+                    /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("span", { children: discountSummaryCountLabel }),
+                    /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)("span", { "aria-hidden": "true", className: CartSubtotal_default["rebuy-cart-subtotal__discount-summary-icon"], children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("i", { children: "\u25BC" }),
                       " "
                     ] })
                   ]
                 }
               ),
-              /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
+              /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
                 "div",
                 {
                   "aria-hidden": !isDiscountSummaryExpanded,
                   className: CartSubtotal_default["rebuy-cart-subtotal__discount-summary-details"],
                   id: summaryId,
                   role: "region",
-                  children: groupedCartLevelDiscounts.map((discount, index) => /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("div", { className: CartSubtotal_default["rebuy-cart-subtotal__discount-summary-item"], children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("span", { children: discount.title }),
-                    /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("span", { children: discount.amount })
+                  children: groupedCartLevelDiscounts.map((discount, index) => /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)("div", { className: CartSubtotal_default["rebuy-cart-subtotal__discount-summary-item"], children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("span", { children: discount.title }),
+                    /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("span", { children: discount.amount })
                   ] }, index))
                 }
               )
@@ -5228,7 +5251,7 @@ var result7 = { "rebuy-cart-title-bar": "CartTitleBar_rebuy-cart-title-bar" };
 var CartTitleBar_default = result7;
 
 // src/smart-cart/components/CartTitleBar/CartTitleBar.tsx
-var import_jsx_runtime14 = require("react/jsx-runtime");
+var import_jsx_runtime15 = require("react/jsx-runtime");
 var CartTitleBar = import_react11.default.memo(() => {
   const { getComponentConfigByType } = useSmartCart();
   const componentConfig = getComponentConfigByType("title_bar");
@@ -5242,16 +5265,16 @@ var CartTitleBar = import_react11.default.memo(() => {
   const DynamicHeadingTag = headingTag;
   if (title === "" && !screenReaderOnly) return null;
   if (screenReaderOnly) {
-    return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
       DynamicHeadingTag,
       {
         "data-rebuy-component-id": componentConfig?.component_id ?? "title_bar",
         id: "rebuy-cart-title",
-        children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(ScreenReaderText, { children: sanitizedTitle })
+        children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(ScreenReaderText, { children: sanitizedTitle })
       }
     );
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
     DynamicHeadingTag,
     {
       className: CartTitleBar_default["rebuy-cart-title-bar"],
@@ -5266,14 +5289,14 @@ CartTitleBar.displayName = "CartTitleBar";
 
 // src/smart-cart/components/CheckoutArea/CheckoutArea.tsx
 var import_react12 = __toESM(require("react"), 1);
-var import_react_router5 = require("react-router");
+var import_react_router6 = require("react-router");
 
 // src/smart-cart/components/CheckoutArea/CheckoutArea.module.css
 var result8 = { "rebuy-checkout-area": "CheckoutArea_rebuy-checkout-area", "rebuy-checkout-area__terms": "CheckoutArea_rebuy-checkout-area__terms", "rebuy-checkout-area__terms-checkbox": "CheckoutArea_rebuy-checkout-area__terms-checkbox", "rebuy-checkout-area__terms-label": "CheckoutArea_rebuy-checkout-area__terms-label", "rebuy-checkout-area__installments-message": "CheckoutArea_rebuy-checkout-area__installments-message", "rebuy-checkout-area__checkout-button": "CheckoutArea_rebuy-checkout-area__checkout-button", "rebuy-checkout-area__view-cart-button": "CheckoutArea_rebuy-checkout-area__view-cart-button", "rebuy-checkout-area__continue-shopping-button": "CheckoutArea_rebuy-checkout-area__continue-shopping-button", "rebuy-checkout-area__shop-pay-button": "CheckoutArea_rebuy-checkout-area__shop-pay-button" };
 var CheckoutArea_default = result8;
 
 // src/smart-cart/components/CheckoutArea/CheckoutArea.tsx
-var import_jsx_runtime15 = require("react/jsx-runtime");
+var import_jsx_runtime16 = require("react/jsx-runtime");
 var CheckoutArea = import_react12.default.memo(({ componentConfig }) => {
   const {
     cartData,
@@ -5284,7 +5307,7 @@ var CheckoutArea = import_react12.default.memo(({ componentConfig }) => {
     isLoading: isGlobalCartLoading,
     updateCartAttributes: hrUpdateCartAttributes
   } = useSmartCart();
-  const termsFetcher = (0, import_react_router5.useFetcher)();
+  const termsFetcher = (0, import_react_router6.useFetcher)();
   const settings = componentConfig.settings;
   const [termsAccepted, setTermsAccepted] = (0, import_react12.useState)(false);
   const [processingSource, setProcessingSource] = (0, import_react12.useState)(null);
@@ -5481,15 +5504,15 @@ var CheckoutArea = import_react12.default.memo(({ componentConfig }) => {
     []
   );
   if (!settings) return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
     "div",
     {
       className: CheckoutArea_default["rebuy-checkout-area"],
       "data-rebuy-component": "checkout-area",
       "data-rebuy-component-id": componentConfig.component_id,
       children: [
-        hasTermsEnabled && /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)("div", { className: CheckoutArea_default["rebuy-checkout-area__terms"], children: [
-          /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+        hasTermsEnabled && /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("div", { className: CheckoutArea_default["rebuy-checkout-area__terms"], children: [
+          /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
             "input",
             {
               checked: termsAccepted,
@@ -5501,7 +5524,7 @@ var CheckoutArea = import_react12.default.memo(({ componentConfig }) => {
               type: "checkbox"
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
             "label",
             {
               className: CheckoutArea_default["rebuy-checkout-area__terms-label"],
@@ -5510,34 +5533,34 @@ var CheckoutArea = import_react12.default.memo(({ componentConfig }) => {
             }
           )
         ] }),
-        hasCheckoutButton && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+        hasCheckoutButton && /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
           "button",
           {
             className: CheckoutArea_default["rebuy-checkout-area__checkout-button"],
             disabled: isCheckoutDisabled,
             onClick: handleCheckoutClick,
             type: "button",
-            children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { dangerouslySetInnerHTML: { __html: checkoutLabel } })
+            children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { dangerouslySetInnerHTML: { __html: checkoutLabel } })
           }
         ),
-        hasViewCartButton && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+        hasViewCartButton && /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
           "button",
           {
             className: CheckoutArea_default["rebuy-checkout-area__view-cart-button"],
             disabled: isAnyCriticalActionProcessing && processingSource !== "terms",
             onClick: handleViewCartClick,
             type: "button",
-            children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { dangerouslySetInnerHTML: { __html: viewCartLabel } })
+            children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { dangerouslySetInnerHTML: { __html: viewCartLabel } })
           }
         ),
-        hasContinueShoppingButton && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+        hasContinueShoppingButton && /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
           "button",
           {
             className: CheckoutArea_default["rebuy-checkout-area__continue-shopping-button"],
             disabled: isAnyCriticalActionProcessing && processingSource !== "terms",
             onClick: handleContinueShoppingClick,
             type: "button",
-            children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+            children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
               "span",
               {
                 dangerouslySetInnerHTML: {
@@ -5547,7 +5570,7 @@ var CheckoutArea = import_react12.default.memo(({ componentConfig }) => {
             )
           }
         ),
-        hasShopPayButton && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+        hasShopPayButton && /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
           "button",
           {
             "aria-label": "Checkout with Shop Pay",
@@ -5557,7 +5580,7 @@ var CheckoutArea = import_react12.default.memo(({ componentConfig }) => {
             onClick: handleShopPayClick
           }
         ),
-        hasInstallments && installmentsMessage && hasItems && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+        hasInstallments && installmentsMessage && hasItems && /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
           "div",
           {
             className: CheckoutArea_default["rebuy-checkout-area__installments-message"],
@@ -5566,7 +5589,7 @@ var CheckoutArea = import_react12.default.memo(({ componentConfig }) => {
             }
           }
         ),
-        hasPrePurchase && hasItems && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { "data-rebuy-id": settings.pre_purchase.widget_id })
+        hasPrePurchase && hasItems && /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { "data-rebuy-id": settings.pre_purchase.widget_id })
       ]
     }
   );
@@ -5580,9 +5603,9 @@ var import_hydrogen6 = require("@shopify/hydrogen");
 var import_react20 = require("react");
 
 // src/assets/Close.tsx
-var import_jsx_runtime16 = require("react/jsx-runtime");
+var import_jsx_runtime17 = require("react/jsx-runtime");
 var Close = () => {
-  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("svg", { height: "1em", viewBox: "0 0 352 512", width: "1em", children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("path", { d: "M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.19 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.19 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z" }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("svg", { height: "1em", viewBox: "0 0 352 512", width: "1em", children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("path", { d: "M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.19 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.19 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z" }) });
 };
 
 // src/hooks/useBreakpoint.ts
@@ -6091,7 +6114,6 @@ var defaultProductCardSettings = {
 // src/components/ProductCard/ProductCard.tsx
 var import_hydrogen5 = require("@shopify/hydrogen");
 var import_react17 = require("react");
-var import_react_router6 = require("react-router");
 
 // src/components/AddToCartBtn/HydrogenAddToCartBtn.tsx
 var import_hydrogen3 = require("@shopify/hydrogen");
@@ -6101,7 +6123,7 @@ var result9 = { "rebuy-cart-button": "AddToCartBtn_rebuy-cart-button", "rebuy-ca
 var AddToCartBtn_default = result9;
 
 // src/components/AddToCartBtn/HydrogenAddToCartBtn.tsx
-var import_jsx_runtime17 = require("react/jsx-runtime");
+var import_jsx_runtime18 = require("react/jsx-runtime");
 var HydrogenAddToCartBtn = ({
   addToCartBtnText,
   addToCartCallback,
@@ -6123,7 +6145,7 @@ var HydrogenAddToCartBtn = ({
       addToCartCallback();
     }
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: AddToCartBtn_default["rebuy-cart-button__container"], children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: AddToCartBtn_default["rebuy-cart-button__container"], children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
     import_hydrogen3.CartForm,
     {
       action: import_hydrogen3.CartForm.ACTIONS.LinesAdd,
@@ -6131,7 +6153,7 @@ var HydrogenAddToCartBtn = ({
         lines: linesToAdd
       },
       route: "/cart",
-      children: (fetcher) => /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(import_jsx_runtime17.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(
+      children: (fetcher) => /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_jsx_runtime18.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(
         "button",
         {
           className: AddToCartBtn_default["rebuy-cart-button"],
@@ -6140,9 +6162,9 @@ var HydrogenAddToCartBtn = ({
           type: "submit",
           children: [
             addToCartBtnText,
-            moneyData && /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(import_jsx_runtime17.Fragment, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("span", { children: " | " }),
-              /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(import_hydrogen3.Money, { data: moneyData, withoutTrailingZeros: true })
+            moneyData && /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(import_jsx_runtime18.Fragment, { children: [
+              /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("span", { children: " | " }),
+              /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_hydrogen3.Money, { data: moneyData, withoutTrailingZeros: true })
             ] })
           ]
         }
@@ -6153,7 +6175,7 @@ var HydrogenAddToCartBtn = ({
 
 // src/components/AddToCartBtn/HydrogenReactAddToCartBtn.tsx
 var import_hydrogen_react2 = require("@shopify/hydrogen-react");
-var import_jsx_runtime18 = require("react/jsx-runtime");
+var import_jsx_runtime19 = require("react/jsx-runtime");
 var HydrogenReactAddToCartBtn = ({
   addToCartBtnText,
   addToCartCallback,
@@ -6176,17 +6198,17 @@ var HydrogenReactAddToCartBtn = ({
       addToCartCallback();
     }
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)("button", { className: AddToCartBtn_default["rebuy-cart-button"], disabled, onClick: handleAddToCart, type: "button", children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("button", { className: AddToCartBtn_default["rebuy-cart-button"], disabled, onClick: handleAddToCart, type: "button", children: [
     addToCartBtnText,
-    moneyData && /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(import_jsx_runtime18.Fragment, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("span", { children: " | " }),
-      /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_hydrogen_react2.Money, { data: moneyData, withoutTrailingZeros: true })
+    moneyData && /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(import_jsx_runtime19.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("span", { children: " | " }),
+      /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_hydrogen_react2.Money, { data: moneyData, withoutTrailingZeros: true })
     ] })
   ] });
 };
 
 // src/components/AddToCartBtn/AddToCartBtn.tsx
-var import_jsx_runtime19 = require("react/jsx-runtime");
+var import_jsx_runtime20 = require("react/jsx-runtime");
 var AddToCartBtn = ({
   addToCartBtnText,
   addToCartCallback,
@@ -6208,7 +6230,7 @@ var AddToCartBtn = ({
     selectedVariant: variant
   }));
   if (isHydrogenReact) {
-    return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
       HydrogenReactAddToCartBtn,
       {
         addToCartBtnText,
@@ -6221,7 +6243,7 @@ var AddToCartBtn = ({
       }
     );
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
     HydrogenAddToCartBtn,
     {
       addToCartBtnText,
@@ -6244,14 +6266,14 @@ var result10 = { "rebuy-product-price": "ProductPrice_rebuy-product-price", "reb
 var ProductPrice_default = result10;
 
 // src/components/ProductPrice/ProductPrice.tsx
-var import_jsx_runtime20 = require("react/jsx-runtime");
+var import_jsx_runtime21 = require("react/jsx-runtime");
 var RebuyProductPrice = ({ selectedVariant, settingsDiscount }) => {
   if (!selectedVariant) return null;
   const { compareAtPriceV2: compareAtPrice, priceV2: price } = selectedVariant;
   const isDiscounted = (price2, compareAtPrice2) => Number(compareAtPrice2?.amount) > Number(price2?.amount);
   const currentPriceIsOnSale = compareAtPrice && isDiscounted(price, compareAtPrice);
   const CompareAtPrice = ({ data: compareAtPriceData }) => {
-    return compareAtPriceData && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+    return compareAtPriceData && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
       import_hydrogen4.Money,
       {
         as: "span",
@@ -6261,8 +6283,8 @@ var RebuyProductPrice = ({ selectedVariant, settingsDiscount }) => {
       }
     );
   };
-  return price && /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("div", { className: ProductPrice_default["rebuy-product-price"], children: [
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+  return price && /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { className: ProductPrice_default["rebuy-product-price"], children: [
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
       import_hydrogen4.Money,
       {
         as: "span",
@@ -6274,7 +6296,7 @@ var RebuyProductPrice = ({ selectedVariant, settingsDiscount }) => {
         withoutTrailingZeros: true
       }
     ),
-    currentPriceIsOnSale && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(CompareAtPrice, { data: compareAtPrice })
+    currentPriceIsOnSale && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(CompareAtPrice, { data: compareAtPrice })
   ] });
 };
 
@@ -6286,7 +6308,7 @@ var result11 = { "rebuy-quantity__container": "QuantityInput_rebuy-quantity__con
 var QuantityInput_default = result11;
 
 // src/components/QuantityInput/QuantityInput.tsx
-var import_jsx_runtime21 = require("react/jsx-runtime");
+var import_jsx_runtime22 = require("react/jsx-runtime");
 var QuantityInput = ({
   defaultQuantity = 1,
   handleSelectedQuantity,
@@ -6302,7 +6324,7 @@ var QuantityInput = ({
     }
   };
   const quantityOptions = Array.from({ length: maxValue - minValue + 1 }, (_, i) => minValue + i);
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: QuantityInput_default["rebuy-quantity__container"], children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: QuantityInput_default["rebuy-quantity__container"], children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
     "select",
     {
       "aria-label": "Product quantity",
@@ -6310,46 +6332,18 @@ var QuantityInput = ({
       name: "quantity",
       onChange: handleChange,
       value: quantity,
-      children: quantityOptions.map((value) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("option", { value, children: value }, `quantity-${value}`))
+      children: quantityOptions.map((value) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("option", { value, children: value }, `quantity-${value}`))
     }
   ) });
 };
 
-// src/components/Title/Title.tsx
-var import_clsx5 = __toESM(require("clsx"), 1);
-
-// src/components/Title/Title.module.css
-var result12 = { "rebuy-title": "Title_rebuy-title" };
-var Title_default = result12;
-
-// src/components/Title/Title.tsx
-var import_jsx_runtime22 = require("react/jsx-runtime");
-var Title = ({ className, level, style, text }) => {
-  const combinedClassName = (0, import_clsx5.default)(Title_default["rebuy-title"], className);
-  switch (level) {
-    case "h1":
-      return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("h1", { className: combinedClassName, style, children: text });
-    default:
-    case "h2":
-      return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("h2", { className: combinedClassName, style, children: text });
-    case "h3":
-      return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("h3", { className: combinedClassName, style, children: text });
-    case "h4":
-      return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("h4", { className: combinedClassName, style, children: text });
-    case "h5":
-      return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("h5", { className: combinedClassName, style, children: text });
-    case "h6":
-      return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("h6", { className: combinedClassName, style, children: text });
-  }
-};
-
 // src/components/VariantSelect/VariantSelect.tsx
-var import_clsx6 = __toESM(require("clsx"), 1);
+var import_clsx5 = __toESM(require("clsx"), 1);
 var import_react16 = require("react");
 
 // src/components/VariantSelect/VariantSelect.module.css
-var result13 = { "rebuy-variant__container": "VariantSelect_rebuy-variant__container", "rebuy-variant__select": "VariantSelect_rebuy-variant__select", "rebuy-variant__select-option": "VariantSelect_rebuy-variant__select-option", "rebuy-variant__buttons": "VariantSelect_rebuy-variant__buttons", "rebuy-variant__button": "VariantSelect_rebuy-variant__button", "rebuy-variant__button--selected": "VariantSelect_rebuy-variant__button--selected" };
-var VariantSelect_default = result13;
+var result12 = { "rebuy-variant__container": "VariantSelect_rebuy-variant__container", "rebuy-variant__select": "VariantSelect_rebuy-variant__select", "rebuy-variant__select-option": "VariantSelect_rebuy-variant__select-option", "rebuy-variant__buttons": "VariantSelect_rebuy-variant__buttons", "rebuy-variant__button": "VariantSelect_rebuy-variant__button", "rebuy-variant__button--selected": "VariantSelect_rebuy-variant__button--selected" };
+var VariantSelect_default = result12;
 
 // src/components/VariantSelect/VariantSelect.tsx
 var import_jsx_runtime23 = require("react/jsx-runtime");
@@ -6388,7 +6382,7 @@ var VariantSelect = ({ handleSelectedVariant, product, selectedId, style = "sele
     "button",
     {
       "aria-pressed": id === selectedVariantId,
-      className: (0, import_clsx6.default)(
+      className: (0, import_clsx5.default)(
         VariantSelect_default["rebuy-variant__button"],
         id === selectedVariantId && VariantSelect_default["rebuy-variant__button--selected"]
       ),
@@ -6400,15 +6394,44 @@ var VariantSelect = ({ handleSelectedVariant, product, selectedId, style = "sele
   )) }) });
 };
 
+// src/components/Title/Title.tsx
+var import_clsx6 = __toESM(require("clsx"), 1);
+
+// src/components/Title/Title.module.css
+var result13 = { "rebuy-title": "Title_rebuy-title" };
+var Title_default = result13;
+
+// src/components/Title/Title.tsx
+var import_jsx_runtime24 = require("react/jsx-runtime");
+var Title = ({ className, level, style, text }) => {
+  const combinedClassName = (0, import_clsx6.default)(Title_default["rebuy-title"], className);
+  switch (level) {
+    case "h1":
+      return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("h1", { className: combinedClassName, style, children: text });
+    default:
+    case "h2":
+      return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("h2", { className: combinedClassName, style, children: text });
+    case "h3":
+      return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("h3", { className: combinedClassName, style, children: text });
+    case "h4":
+      return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("h4", { className: combinedClassName, style, children: text });
+    case "h5":
+      return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("h5", { className: combinedClassName, style, children: text });
+    case "h6":
+      return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("h6", { className: combinedClassName, style, children: text });
+  }
+};
+
 // src/components/ProductCard/ProductCard.module.css
 var result14 = { "rebuy-product-card__container": "ProductCard_rebuy-product-card__container", "rebuy-product-card": "ProductCard_rebuy-product-card", "rebuy-product-card__content": "ProductCard_rebuy-product-card__content", "rebuy-product-card__header": "ProductCard_rebuy-product-card__header", "rebuy-product-card__info": "ProductCard_rebuy-product-card__info", "rebuy-product-card__actions": "ProductCard_rebuy-product-card__actions", "rebuy-product-card__media-link": "ProductCard_rebuy-product-card__media-link", "rebuy-product-card__image": "ProductCard_rebuy-product-card__image", "rebuy-product-card__title": "ProductCard_rebuy-product-card__title", "rebuy-product-card__title-link": "ProductCard_rebuy-product-card__title-link", "rebuy-product-card__actions-variant-select": "ProductCard_rebuy-product-card__actions-variant-select", "rebuy-product-card__variant-select": "ProductCard_rebuy-product-card__variant-select", "rebuy-product-card__actions-quantity": "ProductCard_rebuy-product-card__actions-quantity", "rebuy-product-card__actions-button": "ProductCard_rebuy-product-card__actions-button", "rebuy-product-card__vendor": "ProductCard_rebuy-product-card__vendor", "rebuy-product-card__variant-title": "ProductCard_rebuy-product-card__variant-title", "rebuy-product-card__review": "ProductCard_rebuy-product-card__review", "rebuy-product-card__star-rating": "ProductCard_rebuy-product-card__star-rating", "rebuy-product-card__star-rating-value": "ProductCard_rebuy-product-card__star-rating-value", "rebuy-product-card__star-rating-background": "ProductCard_rebuy-product-card__star-rating-background", "rebuy-product-card__star-rating-foreground": "ProductCard_rebuy-product-card__star-rating-foreground", "rebuy-product-card__review-count": "ProductCard_rebuy-product-card__review-count", "rebuy-product-card__review-count-parenthesis": "ProductCard_rebuy-product-card__review-count-parenthesis", "rebuy-product-card__review-count-number": "ProductCard_rebuy-product-card__review-count-number", "rebuy-product-card__review-count-label": "ProductCard_rebuy-product-card__review-count-label", "rebuy-product-card__description": "ProductCard_rebuy-product-card__description" };
 var ProductCard_default = result14;
 
 // src/components/ProductCard/ProductCard.tsx
-var import_jsx_runtime24 = require("react/jsx-runtime");
+var import_jsx_runtime25 = require("react/jsx-runtime");
 var ProductCard = ({
   addToCartBtnText,
   addToCartCallback,
+  isCrossSell,
   isHydrogenReact,
   isInPopup,
   onPopupDismiss,
@@ -6420,6 +6443,7 @@ var ProductCard = ({
   const [selectedVariant, setSelectedVariant] = (0, import_react17.useState)(product.variants.nodes[0]);
   const [selectedQuantity, setSelectedQuantity] = (0, import_react17.useState)(settings?.quantityInput?.default_quantity || 1);
   const [interactionStatus, setInteractionStatus] = (0, import_react17.useState)("ready");
+  const { toggleCart } = useSmartCart();
   const displayImage = selectedVariant.image || product.featuredImage;
   const handleSelectedVariant = (0, import_react17.useCallback)((product2, variant_id) => {
     const updatedVariant = product2.variants.nodes.find((variant) => variant.id === variant_id);
@@ -6431,6 +6455,9 @@ var ProductCard = ({
     setSelectedQuantity(quantity);
   }, []);
   const handleLinkClick = (0, import_react17.useCallback)(() => {
+    if (isCrossSell) {
+      toggleCart();
+    }
     if (isInPopup && onPopupDismiss) {
       onPopupDismiss();
     }
@@ -6487,40 +6514,92 @@ var ProductCard = ({
   const productReviewsRating = product.reviews?.star_rating;
   const showProductDescription = settings?.productOptions?.show_product_description === "show" && product.description !== "" && product.description !== null;
   const showQuantityInput = settings?.quantityInput?.enabled && settings?.quantityInput?.max_value !== null && settings?.quantityInput?.min_value !== null;
-  return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: ProductCard_default["rebuy-product-card__container"], children: [
-    /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: ProductCard_default["rebuy-product-card"], "data-layout": cardLayout, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-        import_react_router6.Link,
-        {
-          "aria-label": `View ${product.title}`,
-          className: ProductCard_default["rebuy-product-card__media-link"],
-          onClick: handleLinkClick,
-          rel: "nofollow",
-          to: `/products/${product.handle}`,
-          children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-            import_hydrogen5.Image,
+  return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: ProductCard_default["rebuy-product-card__container"], children: [
+    /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: ProductCard_default["rebuy-product-card"], "data-layout": cardLayout, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+          RebuyLink,
+          {
+            ariaLabel: `View ${product.title}`,
+            className: ProductCard_default["rebuy-product-card__media-link"],
+            handle: `/products/${product.handle}`,
+            onClick: handleLinkClick,
+            children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+              import_hydrogen5.Image,
+              {
+                alt: displayImage?.altText ?? `Picture of ${product.title}`,
+                className: ProductCard_default["rebuy-product-card__image"],
+                data: displayImage,
+                sizes: "(max-width: 320px) 280px, (max-width: 768px) 720px, 1440px"
+              }
+            )
+          }
+        ),
+        settings?.layoutStyle === "grid" && /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: ProductCard_default["rebuy-product-card__content"], children: [
+          /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: ProductCard_default["rebuy-product-card__header"], children: [
+            product.vendor && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("p", { className: ProductCard_default["rebuy-product-card__vendor"], children: product.vendor }),
+            /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+              RebuyLink,
+              {
+                ariaLabel: `View ${product.title}`,
+                className: ProductCard_default["rebuy-product-card__title-link"],
+                handle: `/products/${product.handle}`,
+                onClick: handleLinkClick,
+                children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+                  Title,
+                  {
+                    className: ProductCard_default["rebuy-product-card__title"],
+                    level: productCardTitleLevel,
+                    text: product.title
+                  }
+                )
+              }
+            ),
+            showVariantTitle && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: ProductCard_default["rebuy-product-card__variant-title"], children: selectedVariant.title })
+          ] }),
+          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+            RebuyProductPrice,
             {
-              alt: displayImage?.altText ?? `Picture of ${product.title}`,
-              className: ProductCard_default["rebuy-product-card__image"],
-              data: displayImage,
-              sizes: "(max-width: 320px) 280px, (max-width: 768px) 720px, 1440px"
+              selectedVariant,
+              settingsDiscount: settings?.settingsDiscount
             }
-          )
-        }
-      ) }),
-      /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: ProductCard_default["rebuy-product-card__info"], children: [
-        /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: ProductCard_default["rebuy-product-card__content"], children: [
-          /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: ProductCard_default["rebuy-product-card__header"], children: [
-            product.vendor && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("p", { className: ProductCard_default["rebuy-product-card__vendor"], children: product.vendor }),
-            /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-              import_react_router6.Link,
+          ),
+          showReviews && /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { "aria-label": "product star rating", className: ProductCard_default["rebuy-product-card__review"], children: [
+            /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("span", { className: ProductCard_default["rebuy-product-card__star-rating"], children: [
+              productReviewsRating && /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("span", { className: ProductCard_default["rebuy-product-card__star-rating-value"], children: [
+                productReviewsRating,
+                " stars out of 5 stars"
+              ] }),
+              /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("span", { className: ProductCard_default["rebuy-product-card__star-rating-background"] }),
+              /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+                "span",
+                {
+                  className: ProductCard_default["rebuy-product-card__star-rating-foreground"],
+                  style: productReviewsRating ? { width: productReviewsRating / 5 * 100 + "%" } : {}
+                }
+              )
+            ] }),
+            product.reviews?.review_count && /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("span", { className: ProductCard_default["rebuy-product-card__review-count"], children: [
+              "(",
+              product.reviews.review_count,
+              ")"
+            ] })
+          ] }),
+          showProductDescription && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: ProductCard_default["rebuy-product-card__description"], children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("p", { children: product.description }) })
+        ] })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: ProductCard_default["rebuy-product-card__info"], children: [
+        settings?.layoutStyle !== "grid" && /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: ProductCard_default["rebuy-product-card__content"], children: [
+          /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: ProductCard_default["rebuy-product-card__header"], children: [
+            product.vendor && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("p", { className: ProductCard_default["rebuy-product-card__vendor"], children: product.vendor }),
+            /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+              RebuyLink,
               {
-                "aria-label": `View ${product.title}`,
+                ariaLabel: `View ${product.title}`,
                 className: ProductCard_default["rebuy-product-card__title-link"],
+                handle: `/products/${product.handle}`,
                 onClick: handleLinkClick,
-                rel: "nofollow",
-                to: `/products/${product.handle}`,
-                children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+                children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
                   Title,
                   {
                     className: ProductCard_default["rebuy-product-card__title"],
@@ -6530,23 +6609,23 @@ var ProductCard = ({
                 )
               }
             ),
-            showVariantTitle && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: ProductCard_default["rebuy-product-card__variant-title"], children: selectedVariant.title })
+            showVariantTitle && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: ProductCard_default["rebuy-product-card__variant-title"], children: selectedVariant.title })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
             RebuyProductPrice,
             {
               selectedVariant,
               settingsDiscount: settings?.settingsDiscount
             }
           ),
-          showReviews && /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { "aria-label": "product star rating", className: ProductCard_default["rebuy-product-card__review"], children: [
-            /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("span", { className: ProductCard_default["rebuy-product-card__star-rating"], children: [
-              productReviewsRating && /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("span", { className: ProductCard_default["rebuy-product-card__star-rating-value"], children: [
+          showReviews && /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { "aria-label": "product star rating", className: ProductCard_default["rebuy-product-card__review"], children: [
+            /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("span", { className: ProductCard_default["rebuy-product-card__star-rating"], children: [
+              productReviewsRating && /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("span", { className: ProductCard_default["rebuy-product-card__star-rating-value"], children: [
                 productReviewsRating,
                 " stars out of 5 stars"
               ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("span", { className: ProductCard_default["rebuy-product-card__star-rating-background"] }),
-              /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+              /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("span", { className: ProductCard_default["rebuy-product-card__star-rating-background"] }),
+              /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
                 "span",
                 {
                   className: ProductCard_default["rebuy-product-card__star-rating-foreground"],
@@ -6554,21 +6633,21 @@ var ProductCard = ({
                 }
               )
             ] }),
-            product.reviews?.review_count && /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("span", { className: ProductCard_default["rebuy-product-card__review-count"], children: [
+            product.reviews?.review_count && /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("span", { className: ProductCard_default["rebuy-product-card__review-count"], children: [
               "(",
               product.reviews.review_count,
               ")"
             ] })
           ] }),
-          showProductDescription && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: ProductCard_default["rebuy-product-card__description"], children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("p", { children: product.description }) })
+          showProductDescription && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: ProductCard_default["rebuy-product-card__description"], children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("p", { children: product.description }) })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: ProductCard_default["rebuy-product-card__actions"], children: [
-          showVariantSelect && cardLayout !== "line" && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: ProductCard_default["rebuy-product-card__actions"], children: [
+          showVariantSelect && cardLayout !== "line" && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
             "div",
             {
               className: ProductCard_default["rebuy-product-card__actions-variant-select"],
               "data-layout": cardLayout,
-              children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+              children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
                 VariantSelect,
                 {
                   handleSelectedVariant,
@@ -6579,7 +6658,7 @@ var ProductCard = ({
               )
             }
           ),
-          showQuantityInput && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: ProductCard_default["rebuy-product-card__actions-quantity"], children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+          showQuantityInput && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: ProductCard_default["rebuy-product-card__actions-quantity"], children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
             QuantityInput,
             {
               defaultQuantity: settings?.quantityInput?.default_quantity,
@@ -6588,7 +6667,7 @@ var ProductCard = ({
               minValue: settings?.quantityInput?.min_value
             }
           ) }),
-          /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: ProductCard_default["rebuy-product-card__actions-button"], children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: ProductCard_default["rebuy-product-card__actions-button"], children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
             AddToCartBtn,
             {
               addToCartBtnText: atcButtonLabel,
@@ -6603,7 +6682,7 @@ var ProductCard = ({
         ] })
       ] })
     ] }),
-    showVariantSelect && cardLayout === "line" && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: ProductCard_default["rebuy-product-card__variant-select"], "data-layout": cardLayout, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+    showVariantSelect && cardLayout === "line" && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: ProductCard_default["rebuy-product-card__variant-select"], "data-layout": cardLayout, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
       VariantSelect,
       {
         handleSelectedVariant,
@@ -6623,12 +6702,15 @@ var result15 = { "rebuy-carousel": "ProductCarousel_rebuy-carousel", "rebuy-caro
 var ProductCarousel_default = result15;
 
 // src/components/ProductCarousel/ProductCarousel.tsx
-var import_jsx_runtime25 = require("react/jsx-runtime");
+var import_jsx_runtime26 = require("react/jsx-runtime");
 var ProductCarousel = ({
   addToCartBtnText,
   addToCartCallback,
   columns,
+  isCrossSell,
   isHydrogenReact,
+  isInPopup,
+  onPopupDismiss,
   productCardTitleLevel,
   products,
   settings,
@@ -6669,18 +6751,21 @@ var ProductCarousel = ({
   for (let i = 0; i < repeatedProducts.length; i += columns) {
     slides.push(repeatedProducts.slice(i, i + columns));
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: ProductCarousel_default["rebuy-carousel"], children: [
-    /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)("div", { className: ProductCarousel_default["rebuy-carousel"], children: [
+    /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
       "div",
       {
         className: ProductCarousel_default["rebuy-carousel__container"],
         style: { transform: `translateX(-${currentSlide * 100}%)` },
-        children: slides.map((slideProducts, index) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: ProductCarousel_default["rebuy-carousel__slide"], children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: ProductCarousel_default["rebuy-carousel__grid"], "data-columns": columns, children: slideProducts.map((product, productIndex) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+        children: slides.map((slideProducts, index) => /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: ProductCarousel_default["rebuy-carousel__slide"], children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: ProductCarousel_default["rebuy-carousel__grid"], "data-columns": columns, children: slideProducts.map((product, productIndex) => /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
           ProductCard,
           {
             addToCartBtnText,
             addToCartCallback,
+            isCrossSell,
             isHydrogenReact,
+            isInPopup,
+            onPopupDismiss,
             product,
             productCardTitleLevel,
             settings,
@@ -6690,11 +6775,11 @@ var ProductCarousel = ({
         )) }) }, index))
       }
     ),
-    totalSlides > 1 && /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: ProductCarousel_default["rebuy-carousel__controls"], children: [
-      /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("button", { className: ProductCarousel_default["rebuy-carousel__prev"], onClick: prevSlide, type: "button", children: "\u2190" }),
-      /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("button", { className: ProductCarousel_default["rebuy-carousel__next"], onClick: nextSlide, type: "button", children: "\u2192" })
+    totalSlides > 1 && /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)("div", { className: ProductCarousel_default["rebuy-carousel__controls"], children: [
+      /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("button", { className: ProductCarousel_default["rebuy-carousel__prev"], onClick: prevSlide, type: "button", children: "\u2190" }),
+      /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("button", { className: ProductCarousel_default["rebuy-carousel__next"], onClick: nextSlide, type: "button", children: "\u2192" })
     ] }),
-    showPagination && totalSlides > 1 && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: ProductCarousel_default["rebuy-carousel__pagination"], children: Array.from({ length: totalSlides }).map((_, index) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+    showPagination && totalSlides > 1 && /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: ProductCarousel_default["rebuy-carousel__pagination"], children: Array.from({ length: totalSlides }).map((_, index) => /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
       "button",
       {
         className: ProductCarousel_default["rebuy-carousel__dot"],
@@ -6716,7 +6801,7 @@ var result16 = { "rebuy-timer__container": "Timer_rebuy-timer__container", "rebu
 var Timer_default = result16;
 
 // src/components/Timer/Timer.tsx
-var import_jsx_runtime26 = require("react/jsx-runtime");
+var import_jsx_runtime27 = require("react/jsx-runtime");
 var Timer = ({ action, durationMinutes, durationSeconds, isPopup = false, onDismiss, title }) => {
   const initialTotalSeconds = (durationMinutes || 0) * 60 + (durationSeconds || 0);
   const [totalSeconds, setTotalSeconds] = (0, import_react19.useState)(initialTotalSeconds);
@@ -6759,16 +6844,16 @@ var Timer = ({ action, durationMinutes, durationSeconds, isPopup = false, onDism
     return () => clearInterval(interval);
   }, [timerActive, handleTimerEnd]);
   const isUrgent = totalSeconds < 10;
-  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: Timer_default["rebuy-timer__container"], children: /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)("p", { className: Timer_default["rebuy-timer__text"], children: [
-    /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("span", { className: Timer_default["rebuy-timer__title"], children: title }),
-    /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: Timer_default["rebuy-timer__container"], children: /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("p", { className: Timer_default["rebuy-timer__text"], children: [
+    /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("span", { className: Timer_default["rebuy-timer__title"], children: title }),
+    /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(
       "span",
       {
         className: (0, import_clsx7.default)(Timer_default["rebuy-timer__display"], isUrgent && Timer_default["rebuy-timer__display--urgent"]),
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("span", { className: Timer_default["rebuy-timer__minutes"], children: formattedMinutes }),
-          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("span", { className: Timer_default["rebuy-timer__separator"], children: ":" }),
-          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("span", { className: Timer_default["rebuy-timer__seconds"], children: formattedSeconds })
+          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("span", { className: Timer_default["rebuy-timer__minutes"], children: formattedMinutes }),
+          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("span", { className: Timer_default["rebuy-timer__separator"], children: ":" }),
+          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("span", { className: Timer_default["rebuy-timer__seconds"], children: formattedSeconds })
         ]
       }
     )
@@ -6818,12 +6903,13 @@ var result17 = { "rebuy-widget__container": "RebuyWidget_rebuy-widget__container
 var RebuyWidget_default = result17;
 
 // src/widgets/RebuyWidget/WidgetContent.tsx
-var import_jsx_runtime27 = require("react/jsx-runtime");
+var import_jsx_runtime28 = require("react/jsx-runtime");
 var WidgetContent = ({
   addToCartCallback,
   customTitle,
   customTitleLevel,
   customTitleStyle,
+  isCrossSell,
   isHydrogenReact,
   isInPopup,
   onDismiss,
@@ -6874,13 +6960,16 @@ var WidgetContent = ({
       return null;
     }
     if (isCarousel) {
-      return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
         ProductCarousel,
         {
           addToCartBtnText: settings?.language.add_to_cart,
           addToCartCallback,
           columns,
+          isCrossSell,
           isHydrogenReact,
+          isInPopup,
+          onPopupDismiss: onDismiss,
           productCardTitleLevel,
           products,
           settings: productCardSettings,
@@ -6889,11 +6978,12 @@ var WidgetContent = ({
         }
       );
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: RebuyWidget_default["rebuy-widget__product-grid"], "data-columns": columns, role: "list", tabIndex: 0, children: products.map((product) => /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: RebuyWidget_default["rebuy-widget__product-grid"], "data-columns": columns, role: "list", tabIndex: 0, children: products.map((product) => /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
       ProductCard,
       {
         addToCartBtnText: settings?.language.add_to_cart,
         addToCartCallback,
+        isCrossSell,
         isHydrogenReact,
         isInPopup,
         onPopupDismiss: onDismiss,
@@ -6904,8 +6994,8 @@ var WidgetContent = ({
       }
     ) }, product.id)) });
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { className: RebuyWidget_default["rebuy-widget__inner-content"], children: [
-    hasTimer && /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)("div", { className: RebuyWidget_default["rebuy-widget__inner-content"], children: [
+    hasTimer && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
       Timer,
       {
         action: settings?.timer.action,
@@ -6916,7 +7006,7 @@ var WidgetContent = ({
         title: settings?.language.timer_title
       }
     ),
-    hasSuperTitle && /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+    hasSuperTitle && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
       Title,
       {
         level: getTitleLevel(customTitleLevel),
@@ -6924,7 +7014,7 @@ var WidgetContent = ({
         text: settings.language.super_title
       }
     ),
-    hasPrimaryTitle && /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+    hasPrimaryTitle && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
       Title,
       {
         level: getTitleLevel(customTitleLevel, hasSuperTitle ? true : false),
@@ -6932,19 +7022,20 @@ var WidgetContent = ({
         text: primaryTitle
       }
     ),
-    hasDescription && /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("p", { className: RebuyWidget_default["rebuy-widget__description"], children: settings.language.description }),
+    hasDescription && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("p", { className: RebuyWidget_default["rebuy-widget__description"], children: settings.language.description }),
     renderProducts()
   ] });
 };
 
 // src/widgets/RebuyWidget/RebuyWidget.tsx
-var import_jsx_runtime28 = require("react/jsx-runtime");
+var import_jsx_runtime29 = require("react/jsx-runtime");
 var RebuyWidget = (props) => {
   const {
     addToCartCallback,
     customTitle,
     customTitleLevel = "h2",
     customTitleStyle,
+    isCrossSell,
     isHydrogenReact,
     popupTriggerId,
     product,
@@ -7167,17 +7258,17 @@ var RebuyWidget = (props) => {
   if (settings && !loadingSettings && shouldHideWidget) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(import_jsx_runtime28.Fragment, { children: (settings || products?.length > 0) && !loadingSettings && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: RebuyWidget_default["rebuy-widget__container"], id: `rebuy-widget-${widgetId}`, children: settings?.display_type === "popup" && (settings.popup_trigger !== "add_to_cart" || settings.popup_trigger === "add_to_cart" && popupTriggerId) ? /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { children: showPopup && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: RebuyWidget_default["rebuy-widget__popup-overlay"], children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: RebuyWidget_default["rebuy-widget__popup-content"], ref: popupRef, children: /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)("div", { className: RebuyWidget_default["rebuy-widget__content"], children: [
-    /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(import_jsx_runtime29.Fragment, { children: (settings || products?.length > 0) && !loadingSettings && /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: RebuyWidget_default["rebuy-widget__container"], id: `rebuy-widget-${widgetId}`, children: settings?.display_type === "popup" && (settings.popup_trigger !== "add_to_cart" || settings.popup_trigger === "add_to_cart" && popupTriggerId) ? /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { children: showPopup && /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: RebuyWidget_default["rebuy-widget__popup-overlay"], children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: RebuyWidget_default["rebuy-widget__popup-content"], ref: popupRef, children: /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: RebuyWidget_default["rebuy-widget__content"], children: [
+    /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
       "button",
       {
         "aria-label": "close modal",
         className: RebuyWidget_default["rebuy-widget__modal-close"],
         onClick: closePopup,
-        children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Close, {})
+        children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Close, {})
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
       WidgetContent,
       {
         addToCartCallback: () => {
@@ -7196,13 +7287,14 @@ var RebuyWidget = (props) => {
         settings
       }
     )
-  ] }) }) }) }) : /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: RebuyWidget_default["rebuy-widget__content"], children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
+  ] }) }) }) }) : /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: RebuyWidget_default["rebuy-widget__content"], children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
     WidgetContent,
     {
       addToCartCallback,
       customTitle,
       customTitleLevel,
       customTitleStyle,
+      isCrossSell,
       isHydrogenReact,
       isInPopup: settings?.display_type === "popup",
       products,
@@ -7212,14 +7304,14 @@ var RebuyWidget = (props) => {
 };
 
 // src/smart-cart/components/CrossSell/CrossSell.tsx
-var import_jsx_runtime29 = require("react/jsx-runtime");
+var import_jsx_runtime30 = require("react/jsx-runtime");
 var CrossSell = ({ componentConfig }) => {
   const widgetId = componentConfig.settings.widget_id;
   if (!widgetId) {
     console.warn("[CrossSell] Widget ID is missing from component configuration");
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { "data-rebuy-component": "cross-sell-widget", "data-rebuy-component-id": widgetId, children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(RebuyWidget, { widgetId }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { "data-rebuy-component": "cross-sell-widget", "data-rebuy-component-id": widgetId, children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(RebuyWidget, { isCrossSell: true, widgetId }) });
 };
 
 // src/smart-cart/components/CustomCode/CustomCodeBlock.tsx
@@ -7296,7 +7388,7 @@ var executeScriptsInContainer = (container, debugKey, debugContext) => {
 };
 
 // src/smart-cart/components/CustomCode/CustomCodeBlock.tsx
-var import_jsx_runtime30 = require("react/jsx-runtime");
+var import_jsx_runtime31 = require("react/jsx-runtime");
 var CustomCodeBlock = import_react21.default.memo(({ componentConfig }) => {
   const containerRef = (0, import_react21.useRef)(null);
   const executedCodeRef = (0, import_react21.useRef)(null);
@@ -7323,7 +7415,7 @@ var CustomCodeBlock = import_react21.default.memo(({ componentConfig }) => {
   if (!htmlCode) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
     "div",
     {
       dangerouslySetInnerHTML: { __html: htmlCode },
@@ -7425,7 +7517,7 @@ var result18 = { "rebuy-discount-code-input": "DiscountCodeInput_rebuy-discount-
 var DiscountCodeInput_default = result18;
 
 // src/smart-cart/components/DiscountCodeInput/DiscountCodeInput.tsx
-var import_jsx_runtime31 = require("react/jsx-runtime");
+var import_jsx_runtime32 = require("react/jsx-runtime");
 var DiscountCodeInputComponent = ({ componentConfig }) => {
   const {
     applyDiscountCodes: hrApplyDiscountCodes,
@@ -7594,22 +7686,22 @@ var DiscountCodeInputComponent = ({ componentConfig }) => {
     cartData
   ]);
   if (!hasItems) return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(
     "div",
     {
       className: DiscountCodeInput_default["rebuy-discount-code-input"],
       "data-rebuy-component": "discount-input",
       "data-rebuy-component-id": componentConfig.component_id,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)("form", { className: DiscountCodeInput_default["rebuy-discount-code-input__form"], onSubmit: handleApply, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("form", { className: DiscountCodeInput_default["rebuy-discount-code-input__form"], onSubmit: handleApply, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(
             "div",
             {
               className: (0, import_clsx8.default)(DiscountCodeInput_default["rebuy-discount-code-input__input-wrapper"], {
                 [DiscountCodeInput_default["rebuy-discount-code-input__input-wrapper--show-label"]]: !!inputValue || isInputFocused
               }),
               children: [
-                /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+                /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
                   "input",
                   {
                     "aria-label": lang.inputLabel,
@@ -7630,7 +7722,7 @@ var DiscountCodeInputComponent = ({ componentConfig }) => {
                     value: inputValue
                   }
                 ),
-                /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+                /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
                   "label",
                   {
                     className: DiscountCodeInput_default["rebuy-discount-code-input__input-label"],
@@ -7641,7 +7733,7 @@ var DiscountCodeInputComponent = ({ componentConfig }) => {
               ]
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
             "button",
             {
               className: DiscountCodeInput_default["rebuy-discount-code-input__apply-button"],
@@ -7651,11 +7743,11 @@ var DiscountCodeInputComponent = ({ componentConfig }) => {
             }
           )
         ] }),
-        discountManagerError && /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: DiscountCodeInput_default["rebuy-discount-code-input__error-message"], children: discountManagerError }),
-        shouldShowTags && /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: DiscountCodeInput_default["rebuy-discount-code-input__tags-list"], children: appliedCodes.map((code) => /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)("div", { className: DiscountCodeInput_default["rebuy-discount-code-input__tag"], children: [
-          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("span", { className: DiscountCodeInput_default["rebuy-discount-code-input__tag-icon"], children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("svg", { fill: "currentColor", height: "14", viewBox: "0 0 24 24", width: "14", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("path", { d: "M21.41 11.58l-9-9C12.05 2.22 11.55 2 11 2H4c-1.1 0-2 .9-2 2v7c0 .55.22 1.05.59 1.42l9 9c.36.36.86.58 1.41.58.55 0 1.05-.22 1.41-.59l7-7c.37-.36.59-.86.59-1.41 0-.55-.23-1.06-.59-1.42zM5.5 7C4.67 7 4 6.33 4 5.5S4.67 4 5.5 4 7 4.67 7 5.5 6.33 7 5.5 7z" }) }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("span", { className: DiscountCodeInput_default["rebuy-discount-code-input__tag-text"], children: code }),
-          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+        discountManagerError && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: DiscountCodeInput_default["rebuy-discount-code-input__error-message"], children: discountManagerError }),
+        shouldShowTags && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: DiscountCodeInput_default["rebuy-discount-code-input__tags-list"], children: appliedCodes.map((code) => /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: DiscountCodeInput_default["rebuy-discount-code-input__tag"], children: [
+          /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("span", { className: DiscountCodeInput_default["rebuy-discount-code-input__tag-icon"], children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("svg", { fill: "currentColor", height: "14", viewBox: "0 0 24 24", width: "14", children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("path", { d: "M21.41 11.58l-9-9C12.05 2.22 11.55 2 11 2H4c-1.1 0-2 .9-2 2v7c0 .55.22 1.05.59 1.42l9 9c.36.36.86.58 1.41.58.55 0 1.05-.22 1.41-.59l7-7c.37-.36.59-.86.59-1.41 0-.55-.23-1.06-.59-1.42zM5.5 7C4.67 7 4 6.33 4 5.5S4.67 4 5.5 4 7 4.67 7 5.5 6.33 7 5.5 7z" }) }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("span", { className: DiscountCodeInput_default["rebuy-discount-code-input__tag-text"], children: code }),
+          /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
             "button",
             {
               "aria-label": `Remove discount code ${code}`,
@@ -7682,7 +7774,7 @@ var result19 = { "rebuy-login-button": "LoginButton_rebuy-login-button" };
 var LoginButton_default = result19;
 
 // src/smart-cart/components/LoginButton/LoginButton.tsx
-var import_jsx_runtime32 = require("react/jsx-runtime");
+var import_jsx_runtime33 = require("react/jsx-runtime");
 var LoginButton = import_react24.default.memo(() => {
   const { cartData, getComponentConfigByType } = useSmartCart();
   const componentConfig = getComponentConfigByType("login");
@@ -7696,13 +7788,14 @@ var LoginButton = import_react24.default.memo(() => {
   }
   const loginLabel = componentConfig?.settings?.language?.title ?? "Login";
   const loginUrl = componentConfig?.settings?.url ?? "/account/login";
-  return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
-    "a",
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+    RebuyLink,
     {
+      ariaLabel: loginLabel,
       className: LoginButton_default["rebuy-login-button"],
       "data-rebuy-component": "login",
       "data-rebuy-component-id": componentConfig.component_id ?? "login",
-      href: loginUrl,
+      handle: loginUrl,
       children: loginLabel
     }
   );
@@ -7919,7 +8012,7 @@ var useSmartCartApps = () => {
 };
 
 // src/smart-cart/components/SmartCartApp/SmartCartApp.tsx
-var import_jsx_runtime33 = require("react/jsx-runtime");
+var import_jsx_runtime34 = require("react/jsx-runtime");
 var SmartCartApp = import_react26.default.memo(({ componentConfig }) => {
   const containerRef = (0, import_react26.useRef)(null);
   const executedScriptRef = (0, import_react26.useRef)(null);
@@ -7951,7 +8044,7 @@ var SmartCartApp = import_react26.default.memo(({ componentConfig }) => {
     }
   }, [scriptContent, appId, componentId]);
   if (appsLoading) {
-    return /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)("div", { "data-rebuy-component-id": componentId, children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { "data-rebuy-component-id": componentId, children: [
       "Loading App (",
       appId ?? "N/A",
       ")..."
@@ -7959,7 +8052,7 @@ var SmartCartApp = import_react26.default.memo(({ componentConfig }) => {
   }
   if (appsHookError) {
     console.error(`[SmartCartApp - ${componentId}] Hook error prevented app rendering: ${appsHookError}`);
-    return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)("div", { "data-rebuy-component-id": componentId, children: "Error loading app data." });
+    return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { "data-rebuy-component-id": componentId, children: "Error loading app data." });
   }
   if (appId === null) {
     console.warn(`[SmartCartApp - ${componentId}] Missing App ID (settings.app_id) in configuration.`);
@@ -7972,7 +8065,7 @@ var SmartCartApp = import_react26.default.memo(({ componentConfig }) => {
     );
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
     "div",
     {
       dangerouslySetInnerHTML: { __html: scriptContent },
@@ -7999,7 +8092,7 @@ var result20 = { "rebuy-tiered-progress-bar": "TieredProgressBar_rebuy-tiered-pr
 var TieredProgressBar_default = result20;
 
 // src/smart-cart/components/TieredProgressBar/TPBGiftItem.tsx
-var import_jsx_runtime34 = require("react/jsx-runtime");
+var import_jsx_runtime35 = require("react/jsx-runtime");
 var TieredProgressBarGiftItem = ({
   isGloballySyncing,
   onAddOrReAdd,
@@ -8025,14 +8118,14 @@ var TieredProgressBarGiftItem = ({
   const imageAlt = image?.altText ?? title;
   const isDisabled = isGloballySyncing || !!error;
   const itemLevelError = error;
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(
     "div",
     {
       className: (0, import_clsx9.default)(TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item"], {
         [TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item--syncing"]]: isGloballySyncing
       }),
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-image-wrapper"], children: imageSrc ? /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-image-wrapper"], children: imageSrc ? /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
           "img",
           {
             alt: imageAlt,
@@ -8040,24 +8133,24 @@ var TieredProgressBarGiftItem = ({
             loading: "lazy",
             src: imageSrc
           }
-        ) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+        ) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
           "div",
           {
             "aria-label": "Gift product image placeholder",
             className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-image"]
           }
         ) }),
-        /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-details"], children: [
-          /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("h4", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-title"], id: `tpb-gift-${tierId}-title`, children: title }),
-          displayStatus === "added" /* ADDED */ && displayVariantTitle && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-variant-title"], children: displayVariantTitle }),
-          /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-actions-wrapper"], children: [
-            isGloballySyncing && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("button", { className: (0, import_clsx9.default)(TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-button"]), disabled: true, children: "Updating..." }),
-            itemLevelError && !isGloballySyncing && /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__error-message"], children: [
+        /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-details"], children: [
+          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("h4", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-title"], id: `tpb-gift-${tierId}-title`, children: title }),
+          displayStatus === "added" /* ADDED */ && displayVariantTitle && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-variant-title"], children: displayVariantTitle }),
+          /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-actions-wrapper"], children: [
+            isGloballySyncing && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("button", { className: (0, import_clsx9.default)(TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-button"]), disabled: true, children: "Updating..." }),
+            itemLevelError && !isGloballySyncing && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__error-message"], children: [
               "Error: ",
               itemLevelError
             ] }),
-            !isGloballySyncing && !itemLevelError && /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(import_jsx_runtime34.Fragment, { children: [
-              displayStatus === "added" /* ADDED */ && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+            !isGloballySyncing && !itemLevelError && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(import_jsx_runtime35.Fragment, { children: [
+              displayStatus === "added" /* ADDED */ && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
                 "button",
                 {
                   "aria-label": `Remove ${title} gift`,
@@ -8070,7 +8163,7 @@ var TieredProgressBarGiftItem = ({
                   children: "Remove"
                 }
               ),
-              displayStatus === "needs_selection" /* NEEDS_SELECTION */ && /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(
+              displayStatus === "needs_selection" /* NEEDS_SELECTION */ && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(
                 "select",
                 {
                   "aria-label": `Select option for ${title}`,
@@ -8079,10 +8172,10 @@ var TieredProgressBarGiftItem = ({
                   onChange: handleVariantChange,
                   value: "",
                   children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("option", { disabled: true, value: "", children: "Select Option" }),
+                    /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("option", { disabled: true, value: "", children: "Select Option" }),
                     availableChoices.map((variant) => {
                       const variantLabel = getFreeVariantTitle(variant) || variant.title;
-                      return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("option", { value: variant.id, children: [
+                      return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("option", { value: variant.id, children: [
                         variantLabel,
                         " (",
                         formatMoney(variant.price.amount),
@@ -8092,7 +8185,7 @@ var TieredProgressBarGiftItem = ({
                   ]
                 }
               ),
-              canReAdd && displayStatus === "declined" /* DECLINED */ && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+              canReAdd && displayStatus === "declined" /* DECLINED */ && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
                 "button",
                 {
                   "aria-label": `Re-add ${title} gift`,
@@ -8105,7 +8198,7 @@ var TieredProgressBarGiftItem = ({
                   children: "Re-Add Gift"
                 }
               ),
-              displayStatus === "unavailable" /* UNAVAILABLE */ && !canReAdd && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-status-text"], children: "Unavailable" })
+              displayStatus === "unavailable" /* UNAVAILABLE */ && !canReAdd && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-item-status-text"], children: "Unavailable" })
             ] })
           ] })
         ] })
@@ -8191,7 +8284,7 @@ var codeBlock = {
 };
 
 // src/smart-cart/components/TieredProgressBar/TieredProgressBar.tsx
-var import_jsx_runtime35 = require("react/jsx-runtime");
+var import_jsx_runtime36 = require("react/jsx-runtime");
 var TieredProgressBar = import_react27.default.memo(() => {
   const { hydrogenReactCartActions, isCartBusy, isHydrogenReact } = useSmartCart();
   const tpbUserActionFetcher = (0, import_react_router8.useFetcher)();
@@ -8370,9 +8463,9 @@ var TieredProgressBar = import_react27.default.memo(() => {
   const progressBarId = `tpb-main-${activeBarConfig.id}`;
   const feedbackId = `tpb-feedback-text-${activeBarConfig.id}`;
   const giftAreaTitleId = `tpb-giftarea-title-${activeBarConfig.id}`;
-  return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar"], "data-rebuy-component": "tiered-progress-bar", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__main-progress-area"], id: progressBarId, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__tier-markers-list"], children: activeBarConfig.tiers.map((tier) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar"], "data-rebuy-component": "tiered-progress-bar", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__main-progress-area"], id: progressBarId, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__tier-markers-list"], children: activeBarConfig.tiers.map((tier) => {
         const isReached = checkTierReachedCallback(tier);
         const tierLabel = getTierLabel(tier, fetchedProductMap);
         const iconRenderData = getTierIconComponent(tier, isReached, fetchedProductMap);
@@ -8387,7 +8480,7 @@ var TieredProgressBar = import_react27.default.memo(() => {
         if (import_react27.default.isValidElement(iconRenderData)) iconElement = iconRenderData;
         else if (iconRenderData.type === "image") {
           const imageObject = iconRenderData;
-          iconElement = /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+          iconElement = /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
             "img",
             {
               alt: imageObject.alt,
@@ -8396,7 +8489,7 @@ var TieredProgressBar = import_react27.default.memo(() => {
             }
           );
         } else iconElement = null;
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(
+        return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
           "div",
           {
             className: (0, import_clsx10.default)(TieredProgressBar_default["rebuy-tiered-progress-bar__tier-step"], {
@@ -8404,7 +8497,7 @@ var TieredProgressBar = import_react27.default.memo(() => {
             }),
             title: `${tierLabel} (${isReached ? "Reached" : "Pending"} at ${formatMoney(getTierMinimum(tier))})`,
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+              /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
                 "div",
                 {
                   className: TieredProgressBar_default["rebuy-tiered-progress-bar__tier-icon-wrapper"],
@@ -8412,13 +8505,13 @@ var TieredProgressBar = import_react27.default.memo(() => {
                   children: iconElement
                 }
               ),
-              /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__tier-label"], children: tierLabel })
+              /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__tier-label"], children: tierLabel })
             ]
           },
           tier.id
         );
       }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__track"], children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__track"], children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
         "div",
         {
           "aria-label": "Reward progress",
@@ -8432,25 +8525,25 @@ var TieredProgressBar = import_react27.default.memo(() => {
         }
       ) })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { "aria-live": "polite", className: TieredProgressBar_default["rebuy-tiered-progress-bar__feedback-message"], id: feedbackId, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { "aria-live": "polite", className: TieredProgressBar_default["rebuy-tiered-progress-bar__feedback-message"], id: feedbackId, children: [
       (isContextLoading || productFetchStatus === "loading") && !feedbackText ? "Loading rewards..." : feedbackText,
-      productFetchError && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__error-message"], children: [
+      productFetchError && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__error-message"], children: [
         "Could not load reward info.",
         rebuyDebugLog.isKeyActive("smart-cart-tpb" /* SC_TPB */) && ` Details: ${productFetchError}`
       ] }),
-      cartSyncError && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__error-message"], children: [
+      cartSyncError && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__error-message"], children: [
         "Could not update rewards.",
         rebuyDebugLog.isKeyActive("smart-cart-tpb" /* SC_TPB */) && ` Details: ${cartSyncError}`
       ] }),
-      userActionError && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__error-message"], children: [
+      userActionError && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__error-message"], children: [
         "Error: ",
         userActionError.message
       ] })
     ] }),
-    renderGiftArea && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-area"], children: [
-      renderGiftAreaTitle && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("h3", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-area-title"], id: giftAreaTitleId, children: giftAreaTitle }),
+    renderGiftArea && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-area"], children: [
+      renderGiftAreaTitle && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("h3", { className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-area-title"], id: giftAreaTitleId, children: giftAreaTitle }),
       shouldDisableGiftActions && // If actions are disabled (likely loading something)
-      productsToRenderInGiftArea.length === 0 && !productFetchError && !cartSyncError && !userActionError && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+      productsToRenderInGiftArea.length === 0 && !productFetchError && !cartSyncError && !userActionError && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
         "div",
         {
           style: {
@@ -8460,12 +8553,12 @@ var TieredProgressBar = import_react27.default.memo(() => {
           children: "Loading gifts..."
         }
       ),
-      productsToRenderInGiftArea.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+      productsToRenderInGiftArea.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
         "div",
         {
           "aria-labelledby": renderGiftAreaTitle ? giftAreaTitleId : void 0,
           className: TieredProgressBar_default["rebuy-tiered-progress-bar__gift-items-list"],
-          children: productsToRenderInGiftArea.map((productState) => /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+          children: productsToRenderInGiftArea.map((productState) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
             TieredProgressBarGiftItem,
             {
               isGloballySyncing: shouldDisableGiftActions,
@@ -8479,7 +8572,7 @@ var TieredProgressBar = import_react27.default.memo(() => {
         }
       )
     ] }),
-    rebuyDebugLog.isKeyActive("smart-cart-tpb" /* SC_TPB */) && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+    rebuyDebugLog.isKeyActive("smart-cart-tpb" /* SC_TPB */) && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
       "button",
       {
         onClick: () => setShowDebugPanel(!showDebugPanel),
@@ -8491,7 +8584,7 @@ var TieredProgressBar = import_react27.default.memo(() => {
         children: showDebugPanel ? "Hide Debug Panel" : "Show Debug Panel"
       }
     ),
-    rebuyDebugLog.isKeyActive("smart-cart-tpb" /* SC_TPB */) && showDebugPanel && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(
+    rebuyDebugLog.isKeyActive("smart-cart-tpb" /* SC_TPB */) && showDebugPanel && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
       "div",
       {
         style: {
@@ -8502,38 +8595,38 @@ var TieredProgressBar = import_react27.default.memo(() => {
           width: "100%"
         },
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { style: infoText, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("strong", { children: "Progress Bar Debug Info" }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { style: codeBlock, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { style: infoText, children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("strong", { children: "Progress Bar Debug Info" }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { style: codeBlock, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { children: [
               "Subtotal: ",
               formatMoney(currentSubtotal)
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { children: [
               "Visual Progress: ",
               visualPercentageComplete.toFixed(0),
               "%"
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { children: [
               "Actual Progress: ",
               realPercentageComplete.toFixed(0),
               "%"
             ] }),
-            amountToNextTier > 0 && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { children: [
+            amountToNextTier > 0 && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { children: [
               "To Next Tier: ",
               formatMoney(amountToNextTier)
             ] }),
-            currentTier && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { children: [
+            currentTier && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { children: [
               "Current Tier: ",
               getTierLabel(currentTier)
             ] }),
-            cartSyncError && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { style: { color: "#f66" }, children: [
+            cartSyncError && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { style: { color: "#f66" }, children: [
               "Error: ",
               cartSyncError
             ] })
           ] }),
-          giftsForDisplay.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { style: { marginTop: "8px" }, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { style: infoText, children: "Gift Status:" }),
-            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { style: codeBlock, children: giftsForDisplay.map((gift, idx) => /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { style: { marginBottom: "4px" }, children: [
+          giftsForDisplay.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { style: { marginTop: "8px" }, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { style: infoText, children: "Gift Status:" }),
+            /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { style: codeBlock, children: giftsForDisplay.map((gift, idx) => /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { style: { marginBottom: "4px" }, children: [
               "Tier ",
               gift.tierId,
               ": ",
@@ -8549,7 +8642,7 @@ var TieredProgressBar = import_react27.default.memo(() => {
 TieredProgressBar.displayName = "TieredProgressBar";
 
 // src/smart-cart/components/componentRegistry.tsx
-var import_jsx_runtime36 = require("react/jsx-runtime");
+var import_jsx_runtime37 = require("react/jsx-runtime");
 var componentRegistry = {
   // Use 'any' for props initially, refine later
   announcement_bar: AnnouncementBar,
@@ -8568,7 +8661,7 @@ var componentRegistry = {
 };
 
 // src/smart-cart/components/_Layouts/AnchorSlot.tsx
-var import_jsx_runtime37 = require("react/jsx-runtime");
+var import_jsx_runtime38 = require("react/jsx-runtime");
 var AnchorSlot = ({ anchor, components, excludeTypes, includeTypes }) => {
   const componentsForSlot = (0, import_react28.useMemo)(() => {
     return components.filter((comp) => {
@@ -8586,13 +8679,13 @@ var AnchorSlot = ({ anchor, components, excludeTypes, includeTypes }) => {
     });
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(import_jsx_runtime37.Fragment, { children: componentsForSlot.map((componentConfig) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(import_jsx_runtime38.Fragment, { children: componentsForSlot.map((componentConfig) => {
     const Component = componentRegistry[componentConfig.type];
     if (!Component) {
       console.warn(`[SmartCartReact] No component registered for type: "${componentConfig.type}"`);
       return null;
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Component, { componentConfig }, componentConfig.component_id);
+    return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Component, { componentConfig }, componentConfig.component_id);
   }) });
 };
 
@@ -8624,15 +8717,15 @@ var result21 = { "rebuy-smart-cart-layout__anchor-goal-box": "LayoutStyles_rebuy
 var LayoutStyles_default = result21;
 
 // src/smart-cart/components/_Layouts/DoubleColumnLayout.tsx
-var import_jsx_runtime38 = require("react/jsx-runtime");
+var import_jsx_runtime39 = require("react/jsx-runtime");
 var DoubleColumnLayout = ({ components, itemCount, layout }) => {
   const scrollAreaRef = (0, import_react30.useRef)(null);
   const isScrolled = useIsScrolled(scrollAreaRef);
   const layoutClass = layout === "double-right" ? LayoutStyles_default["rebuy-smart-cart-layout__flyout-inner--double-right"] : LayoutStyles_default["rebuy-smart-cart-layout__flyout-inner--double"];
-  return /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: (0, import_clsx11.default)(LayoutStyles_default["rebuy-smart-cart-layout__flyout-inner"], layoutClass), children: [
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: LayoutStyles_default["rebuy-smart-cart-layout__column--primary"], children: [
-      /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: LayoutStyles_default["rebuy-smart-cart-layout__anchor-goal-box"], "data-rebuy-cart-anchor": "goalBox", children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(AnchorSlot, { anchor: "goalBox", components }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: (0, import_clsx11.default)(LayoutStyles_default["rebuy-smart-cart-layout__flyout-inner"], layoutClass), children: [
+    /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: LayoutStyles_default["rebuy-smart-cart-layout__column--primary"], children: [
+      /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: LayoutStyles_default["rebuy-smart-cart-layout__anchor-goal-box"], "data-rebuy-cart-anchor": "goalBox", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(AnchorSlot, { anchor: "goalBox", components }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
         "div",
         {
           className: (0, import_clsx11.default)(
@@ -8641,26 +8734,26 @@ var DoubleColumnLayout = ({ components, itemCount, layout }) => {
           ),
           "data-rebuy-cart-scroll-area": true,
           ref: scrollAreaRef,
-          children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: LayoutStyles_default["rebuy-smart-cart-layout__anchor-body"], "data-rebuy-cart-anchor": "body", children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(AnchorSlot, { anchor: "body", components }) })
+          children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: LayoutStyles_default["rebuy-smart-cart-layout__anchor-body"], "data-rebuy-cart-anchor": "body", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(AnchorSlot, { anchor: "body", components }) })
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
         "div",
         {
           className: (0, import_clsx11.default)(LayoutStyles_default["rebuy-smart-cart-layout__anchor-footer"], {
             [LayoutStyles_default["rebuy-smart-cart-layout__anchor-footer--hidden"]]: itemCount === 0
           }),
           "data-rebuy-cart-anchor": "footer",
-          children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(AnchorSlot, { anchor: "footer", components })
+          children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(AnchorSlot, { anchor: "footer", components })
         }
       )
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: LayoutStyles_default["rebuy-smart-cart-layout__column--secondary"], children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: LayoutStyles_default["rebuy-smart-cart-layout__column--secondary"], children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
       "div",
       {
         className: LayoutStyles_default["rebuy-smart-cart-layout__anchor-cross-sells"],
         "data-rebuy-cart-anchor": "crossSells",
-        children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(AnchorSlot, { anchor: "crossSells", components })
+        children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(AnchorSlot, { anchor: "crossSells", components })
       }
     ) })
   ] });
@@ -8669,13 +8762,13 @@ var DoubleColumnLayout = ({ components, itemCount, layout }) => {
 // src/smart-cart/components/_Layouts/SingleColumnLayout.tsx
 var import_clsx12 = __toESM(require("clsx"), 1);
 var import_react31 = require("react");
-var import_jsx_runtime39 = require("react/jsx-runtime");
+var import_jsx_runtime40 = require("react/jsx-runtime");
 var SingleColumnLayout = ({ components, itemCount }) => {
   const scrollAreaRef = (0, import_react31.useRef)(null);
   const isScrolled = useIsScrolled(scrollAreaRef);
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(import_jsx_runtime39.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: LayoutStyles_default["rebuy-smart-cart-layout__anchor-goal-box"], "data-rebuy-cart-anchor": "goalBox", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(AnchorSlot, { anchor: "goalBox", components }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(import_jsx_runtime40.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("div", { className: LayoutStyles_default["rebuy-smart-cart-layout__anchor-goal-box"], "data-rebuy-cart-anchor": "goalBox", children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(AnchorSlot, { anchor: "goalBox", components }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
       "div",
       {
         className: (0, import_clsx12.default)(
@@ -8684,17 +8777,17 @@ var SingleColumnLayout = ({ components, itemCount }) => {
         ),
         "data-rebuy-cart-scroll-area": true,
         ref: scrollAreaRef,
-        children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: LayoutStyles_default["rebuy-smart-cart-layout__anchor-body"], "data-rebuy-cart-anchor": "body", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(AnchorSlot, { anchor: "body", components }) })
+        children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("div", { className: LayoutStyles_default["rebuy-smart-cart-layout__anchor-body"], "data-rebuy-cart-anchor": "body", children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(AnchorSlot, { anchor: "body", components }) })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
       "div",
       {
         className: (0, import_clsx12.default)(LayoutStyles_default["rebuy-smart-cart-layout__anchor-footer"], {
           [LayoutStyles_default["rebuy-smart-cart-layout__anchor-footer--hidden"]]: itemCount === 0
         }),
         "data-rebuy-cart-anchor": "footer",
-        children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(AnchorSlot, { anchor: "footer", components })
+        children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(AnchorSlot, { anchor: "footer", components })
       }
     )
   ] });
@@ -8705,12 +8798,37 @@ var result22 = { "rebuy-smart-cart": "SmartCartContainer_rebuy-smart-cart", "reb
 var SmartCartContainer_default = result22;
 
 // src/smart-cart/components/SmartCartContainer/SmartCartContainer.tsx
-var import_jsx_runtime40 = require("react/jsx-runtime");
+var import_jsx_runtime41 = require("react/jsx-runtime");
 var SmartCartContainer = ({ containerId }) => {
-  const { checkout, config, getItemCount, hideCart, isVisible } = useSmartCart();
+  const { config, getItemCount, hideCart, isVisible } = useSmartCart();
+  const containerRef = (0, import_react32.useRef)(null);
+  const previousFocusRef = (0, import_react32.useRef)(null);
   const components = (0, import_react32.useMemo)(() => config && Array.isArray(config.components) ? config.components : [], [config]);
-  const handleCheckout = () => checkout();
-  const handleClose = () => hideCart();
+  const handleClose = (0, import_react32.useCallback)(() => {
+    hideCart();
+    if (previousFocusRef.current) {
+      previousFocusRef.current.focus();
+    }
+  }, [hideCart]);
+  (0, import_react32.useEffect)(() => {
+    if (isVisible) {
+      previousFocusRef.current = document.activeElement;
+      const closeButton = containerRef.current?.querySelector("#rebuy-cart-close");
+      if (closeButton instanceof HTMLElement) {
+        closeButton.focus();
+      }
+    }
+  }, [isVisible]);
+  (0, import_react32.useEffect)(() => {
+    if (isVisible) {
+      document.body.classList.add("rebuy-smart-cart-open");
+    } else {
+      document.body.classList.remove("rebuy-smart-cart-open");
+    }
+    return () => {
+      document.body.classList.remove("rebuy-smart-cart-open");
+    };
+  }, [isVisible]);
   const backgroundClassName = (0, import_clsx13.default)(SmartCartContainer_default["rebuy-smart-cart__overlay-background"], {
     [SmartCartContainer_default["rebuy-smart-cart__overlay-background--visible"]]: isVisible
   });
@@ -8723,40 +8841,41 @@ var SmartCartContainer = ({ containerId }) => {
     }
   );
   const renderLayoutContent = () => {
-    if (!config) return /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("div", { style: { padding: "20px", textAlign: "center" }, children: "Loading configuration..." });
+    if (!config) return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { style: { padding: "20px", textAlign: "center" }, children: "Loading configuration..." });
     switch (config.layout) {
       case "double":
       case "double-right":
-        return /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(DoubleColumnLayout, { components, itemCount: getItemCount(), layout: config.layout });
+        return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(DoubleColumnLayout, { components, itemCount: getItemCount(), layout: config.layout });
       default:
-        return /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(SingleColumnLayout, { components, itemCount: getItemCount() });
+        return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(SingleColumnLayout, { components, itemCount: getItemCount() });
     }
   };
   const defaultTitleId = "rebuy-smart-cart-default-title";
   const titleBarComponent = components.find((c) => c.type === "title_bar");
   const ariaLabelledBy = titleBarComponent ? `rebuy-title-${titleBarComponent.component_id}` : defaultTitleId;
-  return /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(import_react32.default.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("div", { "aria-hidden": !isVisible, className: backgroundClassName, onClick: handleClose }),
-    /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_react32.default.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: backgroundClassName, onClick: handleClose }),
+    /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(
       "div",
       {
-        "aria-hidden": !isVisible,
         "aria-labelledby": ariaLabelledBy,
         "aria-modal": "true",
         className: flyoutContainerClasses,
         "data-rebuy-cart-layout": config?.layout || "single",
         id: containerId || "rebuy-cart-react",
+        ref: containerRef,
         role: "dialog",
+        tabIndex: -1,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)("header", { className: SmartCartContainer_default["rebuy-smart-cart__header"], "data-rebuy-cart-anchor": "header", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)("div", { className: SmartCartContainer_default["rebuy-smart-cart__header-top-bar"], "data-rebuy-cart-header-top-bar": "", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)("div", { className: SmartCartContainer_default["rebuy-smart-cart__header-content"], "data-rebuy-cart-header-top-inner": "", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(AnchorSlot, { anchor: "header", components, includeTypes: ["title_bar", "login"] }),
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("header", { className: SmartCartContainer_default["rebuy-smart-cart__header"], "data-rebuy-cart-anchor": "header", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: SmartCartContainer_default["rebuy-smart-cart__header-top-bar"], "data-rebuy-cart-header-top-bar": "", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: SmartCartContainer_default["rebuy-smart-cart__header-content"], "data-rebuy-cart-header-top-inner": "", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(AnchorSlot, { anchor: "header", components, includeTypes: ["title_bar", "login"] }),
                 !components.some(
                   (c) => c.type === "title_bar" && !c.settings?.screen_reader_only
-                ) && /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("h2", { id: defaultTitleId, children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(ScreenReaderText, { children: "Your Cart" }) })
+                ) && /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("h2", { id: defaultTitleId, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ScreenReaderText, { children: "Your Cart" }) })
               ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(
+              /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(
                 "button",
                 {
                   "aria-label": "Close Cart",
@@ -8766,15 +8885,15 @@ var SmartCartContainer = ({ containerId }) => {
                   type: "button",
                   children: [
                     "\u2715",
-                    /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(ScreenReaderText, { children: "Close Cart" })
+                    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ScreenReaderText, { children: "Close Cart" })
                   ]
                 }
               )
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(AnchorSlot, { anchor: "header", components, excludeTypes: ["title_bar", "login"] })
+            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(AnchorSlot, { anchor: "header", components, excludeTypes: ["title_bar", "login"] })
           ] }),
           renderLayoutContent(),
-          /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("div", { "aria-live": "polite", className: "rebuy-sr-only", id: "rebuy-cart-live-region" })
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { "aria-live": "polite", className: "rebuy-sr-only", id: "rebuy-cart-live-region" })
         ]
       }
     )
@@ -8782,9 +8901,9 @@ var SmartCartContainer = ({ containerId }) => {
 };
 
 // src/smart-cart/RebuySmartCart.tsx
-var import_jsx_runtime41 = require("react/jsx-runtime");
+var import_jsx_runtime42 = require("react/jsx-runtime");
 var RebuySmartCart = () => {
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(SmartCartContainer, {});
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(SmartCartContainer, {});
 };
 
 // src/widgetContainer/RebuyWidgetContainer.tsx
@@ -8793,19 +8912,8 @@ var Utilities5 = __toESM(require("@rebuy/rebuy/utilities"), 1);
 var import_hydrogen7 = require("@shopify/hydrogen");
 var import_react33 = __toESM(require("react"), 1);
 var RebuyWidgetContainerBase = ({ children, ...props }) => {
-  const {
-    apiKey: apiKeyFromProps,
-    collection,
-    collectionId,
-    dataSource,
-    limit,
-    options,
-    product,
-    productId,
-    variant,
-    variantId
-  } = props;
-  const { apiKey: apiKeyFromContext, loadingStatus: configLoadingStatus, rebuyConfig } = useRebuyConfig();
+  const { collection, collectionId, dataSource, limit, options, product, productId, variant, variantId } = props;
+  const { apiKey, loadingStatus: configLoadingStatus, rebuyConfig } = useRebuyConfig();
   const rebuyContext = (0, import_react33.useContext)(RebuyContext);
   const [rebuyApiClient, setRebuyApiClient] = (0, import_react33.useState)(null);
   const [initialized, setInitialized] = (0, import_react33.useState)(false);
@@ -8814,10 +8922,9 @@ var RebuyWidgetContainerBase = ({ children, ...props }) => {
   const shopifyCollectionId = collection?.id ?? collectionId ?? null;
   const [products, setProducts] = (0, import_react33.useState)([]);
   const [metadata, setMetadata] = (0, import_react33.useState)();
-  const finalApiKey = apiKeyFromProps || apiKeyFromContext;
   (0, import_react33.useEffect)(() => {
-    if (!rebuyApiClient && finalApiKey && configLoadingStatus === "success") {
-      const client = new import_rebuy3.RebuyClient(finalApiKey);
+    if (!rebuyApiClient && apiKey && configLoadingStatus === "success") {
+      const client = new import_rebuy3.RebuyClient(apiKey);
       const currentEndpoint = dataSource || "/api/v1/products/recommended";
       if (rebuyContext?.contextParameters) {
         const filteredParams = filterContextForWidgetEndpoints(rebuyContext.contextParameters, currentEndpoint);
@@ -8829,7 +8936,7 @@ var RebuyWidgetContainerBase = ({ children, ...props }) => {
       setRebuyApiClient(client);
       setInitialized(true);
     }
-  }, [finalApiKey, rebuyApiClient, configLoadingStatus, options, rebuyContext, dataSource]);
+  }, [apiKey, rebuyApiClient, configLoadingStatus, options, rebuyContext, dataSource]);
   (0, import_react33.useEffect)(() => {
     if (rebuyApiClient && rebuyContext?.contextParameters) {
       const currentEndpoint = dataSource || "/api/v1/products/recommended";
@@ -8896,8 +9003,9 @@ var RebuyWidgetContainerBase = ({ children, ...props }) => {
   );
   const childProps = {
     ...props,
-    apiKey: finalApiKey,
+    apiKey,
     cacheKey: rebuyConfig?.shop?.cache_key,
+    isHydrogenReact: rebuyContext?.contextParameters?.isHydrogenReact,
     key: product?.id,
     metadata,
     products
@@ -8914,7 +9022,7 @@ var result23 = { "container": "RebuyCompleteTheLook_container", "productGrid": "
 var RebuyCompleteTheLook_default = result23;
 
 // src/widgets/RebuyCompleteTheLook/RebuyCompleteTheLook.tsx
-var import_jsx_runtime42 = require("react/jsx-runtime");
+var import_jsx_runtime43 = require("react/jsx-runtime");
 var RebuyCompleteTheLook = (props) => {
   const {
     addToCartBtnText = "Add to cart",
@@ -8928,9 +9036,9 @@ var RebuyCompleteTheLook = (props) => {
     rebuyDebugLog.log("widget-complete-the-look" /* WIDGET_COMPLETE_THE_LOOK */, "RebuyCompleteTheLook: No products found");
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("section", { className: RebuyCompleteTheLook_default.container, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Title, { level: getTitleLevel(customTitleLevel), style: customTitleStyle, text: customTitle }),
-    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("ul", { className: RebuyCompleteTheLook_default.productGrid, children: products.map((product) => /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("li", { className: RebuyCompleteTheLook_default.productItem, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("section", { className: RebuyCompleteTheLook_default.container, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Title, { level: getTitleLevel(customTitleLevel), style: customTitleStyle, text: customTitle }),
+    /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("ul", { className: RebuyCompleteTheLook_default.productGrid, children: products.map((product) => /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("li", { className: RebuyCompleteTheLook_default.productItem, children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
       ProductCard,
       {
         addToCartBtnText,
@@ -8948,11 +9056,34 @@ var import_react35 = require("react");
 
 // src/utils/convertToRebuyProduct.tsx
 var convertToRebuyProduct = (isHydrogenReact, product) => {
-  const mainProductVariants = isHydrogenReact ? product?.variants?.nodes?.map((variant) => {
-    return {
-      ...variant
-    };
-  }) || [] : product?.adjacentVariants.map((variant) => {
+  const mainProductVariants = isHydrogenReact ? product?.variants?.nodes?.map((variant) => ({
+    availableForSale: variant.availableForSale,
+    compareAtPriceV2: {
+      amount: variant.compareAtPrice?.amount || "",
+      currencyCode: variant.compareAtPrice?.currencyCode || "USD"
+    },
+    id: variant.id,
+    image: variant.image ? {
+      altText: variant.image.altText || null,
+      height: variant.image.height || 100,
+      id: variant.image.id || "",
+      url: variant.image.url || "",
+      width: variant.image.width || 100
+    } : void 0,
+    priceV2: {
+      amount: variant.price.amount,
+      currencyCode: variant.price.currencyCode
+    },
+    product: {
+      handle: product.handle,
+      id: product.id,
+      title: product.title,
+      vendor: product.vendor
+    },
+    selectedOptions: variant.selectedOptions,
+    sku: variant.sku || "",
+    title: variant.title
+  })) || [] : product?.adjacentVariants.map((variant) => {
     return {
       availableForSale: variant.availableForSale,
       compareAtPriceV2: {
@@ -9016,26 +9147,28 @@ var convertToRebuyProduct = (isHydrogenReact, product) => {
     selected: true,
     selectedOptions: product?.selectedVariant?.selectedOptions?.reduce((acc, option) => {
       return { ...acc, [option.name]: option.value };
+    }, {}) || product?.variants?.nodes[0]?.selectedOptions?.reduce((acc, option) => {
+      return { ...acc, [option.name]: option.value };
     }, {}) || {},
     selectedSellingPlan: {},
     selectedSellingPlanAllocation: {},
     selectedVariant: {
-      availableForSale: product?.selectedVariant?.availableForSale || false,
+      availableForSale: product?.selectedVariant?.availableForSale || product?.variants?.nodes[0]?.availableForSale || false,
       compareAtPriceV2: {
-        amount: product?.selectedVariant?.compareAtPrice?.amount || "",
-        currencyCode: product?.selectedVariant?.compareAtPrice?.currencyCode || "USD"
+        amount: product?.selectedVariant?.compareAtPrice?.amount || product?.variants?.nodes[0]?.compareAtPrice?.amount || "",
+        currencyCode: product?.selectedVariant?.compareAtPrice?.currencyCode || product?.variants?.nodes[0]?.compareAtPrice?.currencyCode || "USD"
       },
       id: product?.selectedVariant?.id || "",
       image: {
-        altText: product?.selectedVariant?.image?.altText || "",
-        height: product?.selectedVariant?.image?.height || 100,
-        id: product?.selectedVariant?.image?.id || "",
-        url: product?.selectedVariant?.image?.url || "",
-        width: product?.selectedVariant?.image?.width || 100
+        altText: product?.selectedVariant?.image?.altText || product?.variants?.nodes[0]?.image?.altText || "",
+        height: product?.selectedVariant?.image?.height || product?.variants?.nodes[0]?.image?.height || 100,
+        id: product?.selectedVariant?.image?.id || product?.variants?.nodes[0]?.image?.id || "",
+        url: product?.selectedVariant?.image?.url || product?.variants?.nodes[0]?.image?.url || "",
+        width: product?.selectedVariant?.image?.width || product?.variants?.nodes[0]?.image?.width || 100
       },
       priceV2: {
-        amount: product?.selectedVariant?.price.amount || "",
-        currencyCode: product?.selectedVariant?.price.currencyCode || "USD"
+        amount: product?.selectedVariant?.price.amount || product?.variants?.nodes[0]?.price.amount || "",
+        currencyCode: product?.selectedVariant?.price.currencyCode || product?.variants?.nodes[0]?.price.currencyCode || "USD"
       },
       product: {
         handle: product?.handle || "",
@@ -9043,9 +9176,9 @@ var convertToRebuyProduct = (isHydrogenReact, product) => {
         title: product?.title || "",
         vendor: product?.vendor || ""
       },
-      selectedOptions: product?.selectedVariant?.selectedOptions || [],
-      sku: product?.selectedVariant?.sku || "",
-      title: product?.selectedVariant?.title || ""
+      selectedOptions: product?.selectedVariant?.selectedOptions || product?.variants?.nodes[0]?.selectedOptions || [],
+      sku: product?.selectedVariant?.sku || product?.variants?.nodes[0]?.sku || "",
+      title: product?.selectedVariant?.title || product?.variants?.nodes[0]?.title || ""
     },
     sellingPlanGroups: [],
     seo: {
@@ -9172,19 +9305,18 @@ var convertToRebuyProduct = (isHydrogenReact, product) => {
 // src/widgets/RebuyDynamicBundleProducts/BundleImages.tsx
 var import_hydrogen8 = require("@shopify/hydrogen");
 var import_react34 = require("react");
-var import_react_router9 = require("react-router");
 
 // src/widgets/RebuyDynamicBundleProducts/RebuyDynamicBundleProducts.module.css
 var result24 = { "container": "RebuyDynamicBundleProducts_container", "addCartBtnContainer": "RebuyDynamicBundleProducts_addCartBtnContainer", "bundleContainer": "RebuyDynamicBundleProducts_bundleContainer", "select": "RebuyDynamicBundleProducts_select", "bundleItemRowContainer": "RebuyDynamicBundleProducts_bundleItemRowContainer", "unselected": "RebuyDynamicBundleProducts_unselected", "bundleItemRow": "RebuyDynamicBundleProducts_bundleItemRow", "bundleItemInput": "RebuyDynamicBundleProducts_bundleItemInput", "bundleItemLabel": "RebuyDynamicBundleProducts_bundleItemLabel", "bundleImages": "RebuyDynamicBundleProducts_bundleImages", "bundleImage": "RebuyDynamicBundleProducts_bundleImage", "bundleImageDelimiter": "RebuyDynamicBundleProducts_bundleImageDelimiter", "compareAtPrice": "RebuyDynamicBundleProducts_compareAtPrice" };
 var RebuyDynamicBundleProducts_default = result24;
 
 // src/widgets/RebuyDynamicBundleProducts/BundleImages.tsx
-var import_jsx_runtime43 = require("react/jsx-runtime");
+var import_jsx_runtime44 = require("react/jsx-runtime");
 var BundleImages = ({ products }) => {
   const selected = products.filter((product) => product.selected);
-  return /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("ul", { className: RebuyDynamicBundleProducts_default.bundleImages, children: products.map((product, index) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("ul", { className: RebuyDynamicBundleProducts_default.bundleImages, children: products.map((product, index) => {
     const image = product.selectedVariant?.image;
-    const productImage = image ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
+    const productImage = image ? /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
       import_hydrogen8.Image,
       {
         alt: image.altText || `Picture of ${product.title}`,
@@ -9199,24 +9331,79 @@ var BundleImages = ({ products }) => {
       product.title
     );
     const showDelimiter = selected[0]?.id !== product.id;
-    return /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(import_react34.Fragment, { children: product.selected && /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(import_jsx_runtime43.Fragment, { children: [
-      showDelimiter && /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("li", { className: RebuyDynamicBundleProducts_default.bundleImageDelimiter, children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("span", { children: "+" }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("li", { className: "flex items-center", children: product.default ? (
+    return /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(import_react34.Fragment, { children: product.selected && /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(import_jsx_runtime44.Fragment, { children: [
+      showDelimiter && /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("li", { className: RebuyDynamicBundleProducts_default.bundleImageDelimiter, children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("span", { children: "+" }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("li", { className: "flex items-center", children: product.default ? (
         // Already on product page
         productImage
       ) : (
         // Link to product
-        /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(import_react_router9.Link, { title: product.title, to: `/products/${product.handle}`, children: productImage })
+        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
+          RebuyLink,
+          {
+            ariaLabel: `View ${product.title}`,
+            handle: `/products/${product.handle}`,
+            children: productImage
+          }
+        )
       ) })
     ] }) }, product.id + "-BundleImages-" + index);
   }) });
 };
 
+// src/widgets/RebuyDynamicBundleProducts/BundlePrice.tsx
+var import_hydrogen9 = require("@shopify/hydrogen");
+var import_jsx_runtime45 = require("react/jsx-runtime");
+var BundlePrice = ({ products }) => {
+  const isDisabled = products.filter((product) => product.selected).length < 1;
+  const totalBundlePrice = () => {
+    let total = 0;
+    let currencyCode = "USD";
+    for (const product of products) {
+      if (product.selected && product.selectedVariant) {
+        const { priceV2: price2 } = product.selectedVariant;
+        total += Number(price2?.amount);
+        currencyCode = price2?.currencyCode || "USD";
+      }
+    }
+    return {
+      amount: String(total),
+      currencyCode
+    };
+  };
+  const totalBundleCompareAtPrice = () => {
+    let compareAtTotal = 0;
+    let currencyCode = "USD";
+    for (const product of products) {
+      if (product.selected && product.selectedVariant) {
+        const { compareAtPriceV2: compareAtPrice2, priceV2: price2 } = product.selectedVariant;
+        currencyCode = price2?.currencyCode || "USD";
+        compareAtTotal += Number((compareAtPrice2 || price2)?.amount);
+      }
+    }
+    return {
+      amount: String(compareAtTotal),
+      currencyCode
+    };
+  };
+  const isDiscounted = (price2, compareAtPrice2) => Number(compareAtPrice2?.amount) > Number(price2?.amount);
+  const price = totalBundlePrice();
+  const compareAtPrice = totalBundleCompareAtPrice();
+  const CompareAtPrice = ({ data: compareAtPrice2 }) => {
+    return compareAtPrice2 && /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(import_hydrogen9.Money, { as: "span", className: RebuyDynamicBundleProducts_default.compareAtPrice, data: compareAtPrice2, withoutTrailingZeros: true });
+  };
+  return products.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("div", { className: "flex items-center flex-col", children: !isDisabled && /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("p", { className: "flex items-center gap-2 mb-2", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("span", { children: "Total Price:" }),
+    /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(import_hydrogen9.Money, { as: "span", data: price, withoutTrailingZeros: true }),
+    isDiscounted(price, compareAtPrice) && /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(CompareAtPrice, { data: compareAtPrice })
+  ] }) });
+};
+
 // src/widgets/RebuyDynamicBundleProducts/BundleSelection.tsx
 var import_clsx14 = __toESM(require("clsx"), 1);
 
 // src/widgets/RebuyDynamicBundleProducts/Select.tsx
-var import_jsx_runtime44 = require("react/jsx-runtime");
+var import_jsx_runtime46 = require("react/jsx-runtime");
 var Select = ({ onSelectVariant, product }) => {
   const getOptionsLabel = (product2) => {
     const options = product2.variants.nodes[0].selectedOptions;
@@ -9225,30 +9412,30 @@ var Select = ({ onSelectVariant, product }) => {
     const useValues = optionsFromKeys.every((key) => ["name", "value"].includes(key));
     return (useValues ? optionsFromValues : optionsFromKeys).join(" / ");
   };
-  return product && /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
+  return product && /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
     "select",
     {
       "aria-label": "select variant",
       className: RebuyDynamicBundleProducts_default.select,
       onChange: (e) => onSelectVariant(product, e.target.value),
       value: product.selectedVariant.id,
-      children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("optgroup", { label: getOptionsLabel(product), children: product.variants.nodes.map(({ id, title }) => /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("option", { value: id, children: title }, id + "-BundleVariant")) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("optgroup", { label: getOptionsLabel(product), children: product.variants.nodes.map(({ id, title }) => /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("option", { value: id, children: title }, id + "-BundleVariant")) })
     }
   );
 };
 
 // src/widgets/RebuyDynamicBundleProducts/BundleSelection.tsx
-var import_jsx_runtime45 = require("react/jsx-runtime");
+var import_jsx_runtime47 = require("react/jsx-runtime");
 var BundleSelection = ({ onSelectVariant, onToggleBundleItem, products }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("ul", { children: products.map((product, index) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("ul", { children: products.map((product, index) => {
     const { availableForSale } = product.selectedVariant;
     const isOutOfStock = !availableForSale;
-    return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
       "li",
       {
         className: (0, import_clsx14.default)(RebuyDynamicBundleProducts_default.bundleItemRowContainer, !product.selected && RebuyDynamicBundleProducts_default.unselected),
-        children: /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("div", { className: RebuyDynamicBundleProducts_default.bundleItemRow, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
+        children: /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("div", { className: RebuyDynamicBundleProducts_default.bundleItemRow, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
             "input",
             {
               checked: product.selected && availableForSale,
@@ -9260,14 +9447,14 @@ var BundleSelection = ({ onSelectVariant, onToggleBundleItem, products }) => {
               value: product.id
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("div", { className: RebuyDynamicBundleProducts_default.bundleItemInput, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("label", { className: RebuyDynamicBundleProducts_default.bundleItemLabel, htmlFor: `${product.id}-toggle`, children: [
-              isOutOfStock && /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("b", { children: "SOLD OUT" }),
-              product.default && /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("b", { children: "This item:" }),
+          /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("div", { className: RebuyDynamicBundleProducts_default.bundleItemInput, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("label", { className: RebuyDynamicBundleProducts_default.bundleItemLabel, htmlFor: `${product.id}-toggle`, children: [
+              isOutOfStock && /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("b", { children: "SOLD OUT" }),
+              product.default && /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("b", { children: "This item:" }),
               product.title,
-              /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(RebuyProductPrice, { selectedVariant: product.selectedVariant })
+              /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(RebuyProductPrice, { selectedVariant: product.selectedVariant })
             ] }),
-            product.variants.nodes.length > 1 && /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Select, { onSelectVariant, product })
+            product.variants.nodes.length > 1 && /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Select, { onSelectVariant, product })
           ] })
         ] })
       },
@@ -9276,56 +9463,8 @@ var BundleSelection = ({ onSelectVariant, onToggleBundleItem, products }) => {
   }) });
 };
 
-// src/widgets/RebuyDynamicBundleProducts/BundlePrice.tsx
-var import_hydrogen9 = require("@shopify/hydrogen");
-var import_jsx_runtime46 = require("react/jsx-runtime");
-var BundlePrice = ({ products }) => {
-  const isDisabled = products.filter((product) => product.selected).length < 1;
-  const totalBundlePrice = () => {
-    let total = 0;
-    let currencyCode = "USD";
-    for (const product of products) {
-      if (product.selected && product.selectedVariant) {
-        const { priceV2: price2 } = product.selectedVariant;
-        total += Number(price2?.amount);
-        currencyCode = price2?.currencyCode || "USD";
-      }
-    }
-    return {
-      amount: String(total),
-      currencyCode
-    };
-  };
-  const totalBundleCompareAtPrice = () => {
-    let compareAtTotal = 0;
-    let currencyCode = "USD";
-    for (const product of products) {
-      if (product.selected && product.selectedVariant) {
-        const { compareAtPriceV2: compareAtPrice2, priceV2: price2 } = product.selectedVariant;
-        currencyCode = price2?.currencyCode || "USD";
-        compareAtTotal += Number((compareAtPrice2 || price2)?.amount);
-      }
-    }
-    return {
-      amount: String(compareAtTotal),
-      currencyCode
-    };
-  };
-  const isDiscounted = (price2, compareAtPrice2) => Number(compareAtPrice2?.amount) > Number(price2?.amount);
-  const price = totalBundlePrice();
-  const compareAtPrice = totalBundleCompareAtPrice();
-  const CompareAtPrice = ({ data: compareAtPrice2 }) => {
-    return compareAtPrice2 && /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(import_hydrogen9.Money, { as: "span", className: RebuyDynamicBundleProducts_default.compareAtPrice, data: compareAtPrice2, withoutTrailingZeros: true });
-  };
-  return products.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("div", { className: "flex items-center flex-col", children: !isDisabled && /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)("p", { className: "flex items-center gap-2 mb-2", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("span", { children: "Total Price:" }),
-    /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(import_hydrogen9.Money, { as: "span", data: price, withoutTrailingZeros: true }),
-    isDiscounted(price, compareAtPrice) && /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(CompareAtPrice, { data: compareAtPrice })
-  ] }) });
-};
-
 // src/widgets/RebuyDynamicBundleProducts/RebuyDynamicBundleProducts.tsx
-var import_jsx_runtime47 = require("react/jsx-runtime");
+var import_jsx_runtime48 = require("react/jsx-runtime");
 var RebuyDynamicBundleProducts = (props) => {
   const {
     addToCartBtnText = "Add to cart",
@@ -9371,12 +9510,12 @@ var RebuyDynamicBundleProducts = (props) => {
     rebuyDebugLog.log("widget-dynamic-bundle-products" /* WIDGET_DYNAMIC_BUNDLE_PRODUCTS */, "RebuyDynamicBundleProducts: No products found");
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("section", { className: RebuyDynamicBundleProducts_default.container, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Title, { level: getTitleLevel(customTitleLevel), style: customTitleStyle, text: customTitle }),
-    /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)("div", { className: RebuyDynamicBundleProducts_default.bundleContainer, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(BundleImages, { products: bundleProducts }),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(BundlePrice, { products: bundleProducts }),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("div", { className: RebuyDynamicBundleProducts_default.addCartBtnContainer, children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)("section", { className: RebuyDynamicBundleProducts_default.container, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Title, { level: getTitleLevel(customTitleLevel), style: customTitleStyle, text: customTitle }),
+    /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)("div", { className: RebuyDynamicBundleProducts_default.bundleContainer, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(BundleImages, { products: bundleProducts }),
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(BundlePrice, { products: bundleProducts }),
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)("div", { className: RebuyDynamicBundleProducts_default.addCartBtnContainer, children: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
         AddToCartBtn,
         {
           addToCartBtnText,
@@ -9388,7 +9527,7 @@ var RebuyDynamicBundleProducts = (props) => {
           })
         }
       ) }),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
         BundleSelection,
         {
           onSelectVariant,
@@ -9406,14 +9545,13 @@ var import_react36 = require("react");
 
 // src/widgets/RebuyProductAddOns/RebuyProductAddOnCard.tsx
 var import_hydrogen10 = require("@shopify/hydrogen");
-var import_react_router10 = require("react-router");
 
 // src/widgets/RebuyProductAddOns/RebuyProductAddOns.module.css
 var result25 = { "container": "RebuyProductAddOns_container", "productAddOnsList": "RebuyProductAddOns_productAddOnsList", "addOnCard": "RebuyProductAddOns_addOnCard", "addOnCardContent": "RebuyProductAddOns_addOnCardContent", "addOnCardInput": "RebuyProductAddOns_addOnCardInput", "addOnCardContentImage": "RebuyProductAddOns_addOnCardContentImage", "addOnCardOutOfStock": "RebuyProductAddOns_addOnCardOutOfStock", "addOnCardTextContent": "RebuyProductAddOns_addOnCardTextContent", "addOnCardLearnMore": "RebuyProductAddOns_addOnCardLearnMore", "addCartBtnContainer": "RebuyProductAddOns_addCartBtnContainer", "productAddOnsFooter": "RebuyProductAddOns_productAddOnsFooter", "moneyContainer": "RebuyProductAddOns_moneyContainer" };
 var RebuyProductAddOns_default = result25;
 
 // src/widgets/RebuyProductAddOns/RebuyProductAddOnCard.tsx
-var import_jsx_runtime48 = require("react/jsx-runtime");
+var import_jsx_runtime49 = require("react/jsx-runtime");
 var RebuyProductAddOnCard = ({
   handleChange,
   learnMoreText,
@@ -9422,8 +9560,8 @@ var RebuyProductAddOnCard = ({
   titleLevel
 }) => {
   const { availableForSale, image } = product.selectedVariant || {};
-  return /* @__PURE__ */ (0, import_jsx_runtime48.jsx)("label", { className: RebuyProductAddOns_default.addOnCard, htmlFor: product.id, children: /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)("div", { className: RebuyProductAddOns_default.addOnCardContent, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime49.jsx)("label", { className: RebuyProductAddOns_default.addOnCard, htmlFor: product.id, children: /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)("div", { className: RebuyProductAddOns_default.addOnCardContent, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
       "input",
       {
         checked: Boolean(product.selected),
@@ -9436,7 +9574,7 @@ var RebuyProductAddOnCard = ({
         value: ""
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime48.jsx)("div", { className: RebuyProductAddOns_default.addOnCardContentImage, children: image && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime49.jsx)("div", { className: RebuyProductAddOns_default.addOnCardContentImage, children: image && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
       import_hydrogen10.Image,
       {
         alt: image.altText || `Picture of ${product.title}`,
@@ -9445,17 +9583,25 @@ var RebuyProductAddOnCard = ({
         width: 300
       }
     ) }),
-    /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)("div", { className: RebuyProductAddOns_default.addOnCardTextContent, children: [
-      !availableForSale && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)("p", { className: RebuyProductAddOns_default.addOnCardOutOfStock, children: outOfStockText }),
-      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Title, { level: titleLevel, text: product.title }),
-      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(RebuyProductPrice, { selectedVariant: product.selectedVariant }),
-      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(import_react_router10.Link, { className: RebuyProductAddOns_default.addOnCardLearnMore, to: `/products/${product.handle}`, children: learnMoreText })
+    /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)("div", { className: RebuyProductAddOns_default.addOnCardTextContent, children: [
+      !availableForSale && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)("p", { className: RebuyProductAddOns_default.addOnCardOutOfStock, children: outOfStockText }),
+      /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Title, { level: titleLevel, text: product.title }),
+      /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(RebuyProductPrice, { selectedVariant: product.selectedVariant }),
+      /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        RebuyLink,
+        {
+          ariaLabel: `View ${product.title}`,
+          className: RebuyProductAddOns_default.addOnCardLearnMore,
+          handle: `/products/${product.handle}`,
+          children: learnMoreText
+        }
+      )
     ] })
   ] }) });
 };
 
 // src/widgets/RebuyProductAddOns/RebuyProductAddOns.tsx
-var import_jsx_runtime49 = require("react/jsx-runtime");
+var import_jsx_runtime50 = require("react/jsx-runtime");
 var RebuyProductAddOns = (props) => {
   const {
     addToCartCallback,
@@ -9475,6 +9621,7 @@ var RebuyProductAddOns = (props) => {
   const [addedItems, setAddedItems] = (0, import_react36.useState)(products);
   const [subtotalWithProduct, setSubtotalWithProduct] = (0, import_react36.useState)();
   const [subtotalWithOutProduct, setSubtotalWithOutProduct] = (0, import_react36.useState)();
+  const convertedProduct = convertToRebuyProduct(isHydrogenReact || false, product);
   (0, import_react36.useEffect)(() => {
     let initialTotal = 0;
     let currencyCode = "USD";
@@ -9493,14 +9640,14 @@ var RebuyProductAddOns = (props) => {
     setSubtotalWithOutProduct({
       amount: String(
         initialTotal - Number(
-          isHydrogenReact ? product?.selectedVariant?.price.amount : product?.selectedOrFirstAvailableVariant?.price.amount
+          isHydrogenReact ? convertedProduct?.selectedVariant?.priceV2?.amount : product?.selectedOrFirstAvailableVariant?.price.amount
         )
       ),
       currencyCode
     });
     setAddedItems(products);
     if (includeMainProduct) {
-      setAddedItems([convertToRebuyProduct(isHydrogenReact || false, product), ...products]);
+      setAddedItems([convertedProduct, ...products]);
     } else {
       setAddedItems(products);
     }
@@ -9540,7 +9687,7 @@ var RebuyProductAddOns = (props) => {
     setSubtotalWithOutProduct({
       amount: String(
         total - Number(
-          isHydrogenReact ? product?.selectedVariant?.price.amount : product?.selectedOrFirstAvailableVariant?.price.amount
+          isHydrogenReact ? convertedProduct?.selectedVariant?.priceV2?.amount : product?.selectedOrFirstAvailableVariant?.price.amount
         )
       ),
       currencyCode
@@ -9550,9 +9697,9 @@ var RebuyProductAddOns = (props) => {
     rebuyDebugLog.log("widget-product-add-ons" /* WIDGET_PRODUCT_ADD_ONS */, "RebuyProductAddOns: No products found");
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)("div", { className: RebuyProductAddOns_default.container, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Title, { level: getTitleLevel(customTitleLevel), style: customTitleStyle, text: customTitle }),
-    /* @__PURE__ */ (0, import_jsx_runtime49.jsx)("ul", { className: RebuyProductAddOns_default.productAddOnsList, children: products.map((product2) => /* @__PURE__ */ (0, import_jsx_runtime49.jsx)("li", { children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)("div", { className: RebuyProductAddOns_default.container, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Title, { level: getTitleLevel(customTitleLevel), style: customTitleStyle, text: customTitle }),
+    /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("ul", { className: RebuyProductAddOns_default.productAddOnsList, children: products.map((product2) => /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("li", { children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
       RebuyProductAddOnCard,
       {
         handleChange,
@@ -9562,16 +9709,16 @@ var RebuyProductAddOns = (props) => {
         titleLevel: getTitleLevel(customTitleLevel, true)
       }
     ) }, product2.id)) }),
-    /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)("div", { className: RebuyProductAddOns_default.productAddOnsFooter, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)("div", { className: RebuyProductAddOns_default.moneyContainer, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)("div", { className: RebuyProductAddOns_default.productAddOnsFooter, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)("div", { className: RebuyProductAddOns_default.moneyContainer, children: [
         subtotalText,
-        subtotalWithOutProduct && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(import_hydrogen_react3.Money, { data: subtotalWithOutProduct, withoutTrailingZeros: true })
+        subtotalWithOutProduct && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(import_hydrogen_react3.Money, { data: subtotalWithOutProduct, withoutTrailingZeros: true })
       ] }),
-      includeMainProduct && /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)("div", { className: RebuyProductAddOns_default.moneyContainer, children: [
+      includeMainProduct && /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)("div", { className: RebuyProductAddOns_default.moneyContainer, children: [
         withProductText,
-        subtotalWithProduct && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(import_hydrogen_react3.Money, { data: subtotalWithProduct, withoutTrailingZeros: true })
+        subtotalWithProduct && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(import_hydrogen_react3.Money, { data: subtotalWithProduct, withoutTrailingZeros: true })
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime49.jsx)("div", { className: RebuyProductAddOns_default.addCartBtnContainer, children: includeMainProduct ? /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("div", { className: RebuyProductAddOns_default.addCartBtnContainer, children: includeMainProduct ? /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
         AddToCartBtn,
         {
           addToCartBtnText,
@@ -9581,7 +9728,7 @@ var RebuyProductAddOns = (props) => {
           moneyData: subtotalWithProduct,
           selectedVariants: addedItems.map((item) => item.selectedVariant)
         }
-      ) : /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+      ) : /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
         AddToCartBtn,
         {
           addToCartBtnText,
@@ -9597,11 +9744,11 @@ var RebuyProductAddOns = (props) => {
 };
 
 // src/widgets/RebuyProductRecommendations/RebuyProductRecommendations.module.css
-var result26 = { "container": "RebuyProductRecommendations_container", "productGrid": "RebuyProductRecommendations_productGrid", "productItem": "RebuyProductRecommendations_productItem" };
+var result26 = { "container": "RebuyProductRecommendations_container", "productGrid": "RebuyProductRecommendations_productGrid" };
 var RebuyProductRecommendations_default = result26;
 
 // src/widgets/RebuyProductRecommendations/RebuyProductRecommendations.tsx
-var import_jsx_runtime50 = require("react/jsx-runtime");
+var import_jsx_runtime51 = require("react/jsx-runtime");
 var RebuyProductRecommendations = (props) => {
   const {
     addToCartBtnText = "Add to cart",
@@ -9615,9 +9762,9 @@ var RebuyProductRecommendations = (props) => {
     rebuyDebugLog.log("widget-product-recommendations" /* WIDGET_PRODUCT_RECOMMENDATIONS */, "RebuyProductRecommendations: No products found");
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)("section", { className: RebuyProductRecommendations_default.container, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Title, { level: getTitleLevel(customTitleLevel), style: customTitleStyle, text: customTitle }),
-    /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("ul", { className: RebuyProductRecommendations_default.productGrid, children: products.map((product) => /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("li", { className: RebuyProductRecommendations_default.productItem, children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)("section", { className: RebuyProductRecommendations_default.container, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Title, { level: getTitleLevel(customTitleLevel), style: customTitleStyle, text: customTitle }),
+    /* @__PURE__ */ (0, import_jsx_runtime51.jsx)("ul", { className: RebuyProductRecommendations_default.productGrid, children: products.map((product) => /* @__PURE__ */ (0, import_jsx_runtime51.jsx)("li", { children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
       ProductCard,
       {
         addToCartBtnText,
@@ -9630,6 +9777,190 @@ var RebuyProductRecommendations = (props) => {
   ] });
 };
 
+// src/widgets/RebuyProductViewed/RebuyProductViewed.tsx
+var import_rebuy4 = require("@rebuy/rebuy");
+var Utilities6 = __toESM(require("@rebuy/rebuy/utilities"), 1);
+var import_react37 = require("react");
+
+// src/zustandStores/productViewed.ts
+var import_zustand2 = require("zustand");
+var useProductViewedStore = (0, import_zustand2.create)((set) => ({
+  customerId: null,
+  setCustomerId: (customerId) => set({ customerId }),
+  setUuid: (uuid) => set({ uuid }),
+  uuid: null
+}));
+
+// src/widgets/RebuyProductViewed/RebuyProductViewed.tsx
+var RebuyProductViewed = ({ ...props }) => {
+  const { apiKey: apiKeyFromContext } = useRebuyConfig();
+  const { customerId, product, productHandle, productId } = props;
+  const [event, setEvent] = (0, import_react37.useState)(null);
+  const [Rebuy, setRebuy] = (0, import_react37.useState)(null);
+  const shopifyProductId = product?.id ?? productId ?? null;
+  const [initialized, setInitialized] = (0, import_react37.useState)(false);
+  const { setCustomerId, setUuid } = useProductViewedStore();
+  const request = (0, import_react37.useMemo)(() => {
+    const request2 = {
+      parameters: {}
+    };
+    if (shopifyProductId) {
+      const productNumericId = Utilities6.getIdFromGraphUrl(shopifyProductId, "Product");
+      if (productNumericId !== null) {
+        request2.parameters.shopify_product_id = productNumericId.toString();
+      }
+    } else if (productHandle) {
+      request2.parameters.shopify_product_handle = productHandle;
+    }
+    return request2;
+  }, [productHandle, shopifyProductId]);
+  (0, import_react37.useEffect)(() => {
+    const recordView = async () => {
+      if (!Rebuy) {
+        return;
+      }
+      try {
+        const response = await Rebuy.trackProductViewed(request.parameters);
+        setEvent(response.data);
+        if (response.data === "Received" && request.parameters.uuid) {
+          setUuid(request.parameters.uuid);
+          if (customerId && customerId !== "") {
+            setCustomerId(customerId);
+          }
+        }
+      } catch (error) {
+        console.error("Error tracking product view:", error);
+      }
+    };
+    if (!initialized && apiKeyFromContext) {
+      const client = new import_rebuy4.RebuyClient(apiKeyFromContext);
+      setRebuy(client);
+      setInitialized(true);
+      return;
+    }
+    recordView();
+  }, [request.parameters, initialized, apiKeyFromContext, Rebuy]);
+  if (Object.keys(request.parameters).length === 0) {
+    console.warn("No parameters!");
+    return;
+  }
+  return null;
+};
+
+// src/widgets/RebuyRecentlyViewedProducts/RebuyRecentlyViewedProducts.tsx
+var import_rebuy5 = require("@rebuy/rebuy");
+var import_hydrogen11 = require("@shopify/hydrogen");
+var import_react38 = require("react");
+
+// src/widgets/RebuyRecentlyViewedProducts/RebuyRecentlyViewedProducts.module.css
+var result27 = { "rebuy-recently-viewed-products-container": "RebuyRecentlyViewedProducts_rebuy-recently-viewed-products-container", "product-grid": "RebuyRecentlyViewedProducts_product-grid" };
+var RebuyRecentlyViewedProducts_default = result27;
+
+// src/widgets/RebuyRecentlyViewedProducts/RebuyRecentlyViewedProducts.tsx
+var import_jsx_runtime52 = require("react/jsx-runtime");
+var RebuyRecentlyViewedProducts = (props) => {
+  const {
+    addToCartBtnText = "Add to cart",
+    addToCartCallback,
+    customTitle = `Your recently viewed products`,
+    customTitleLevel = "h2",
+    customTitleStyle,
+    limit,
+    options,
+    productId
+  } = props;
+  const { customerId, uuid } = useProductViewedStore();
+  const { apiKey, loadingStatus: configLoadingStatus, rebuyConfig } = useRebuyConfig();
+  const rebuyContext = (0, import_react38.useContext)(RebuyContext);
+  const [rebuyApiClient, setRebuyApiClient] = (0, import_react38.useState)(null);
+  const [initialized, setInitialized] = (0, import_react38.useState)(false);
+  const [products, setProducts] = (0, import_react38.useState)([]);
+  const [metadata, setMetadata] = (0, import_react38.useState)();
+  const rebuyConfigKey = rebuyConfig?.shop?.cache_key;
+  const endpoint = customerId && customerId !== "" ? `/api/v1/products/viewed?key=${rebuyConfigKey}&customer_id=${customerId}` : `/api/v1/products/viewed?key=${rebuyConfigKey}&uuid=${uuid}`;
+  (0, import_react38.useEffect)(() => {
+    if (!rebuyApiClient && apiKey && configLoadingStatus === "success") {
+      const client = new import_rebuy5.RebuyClient(apiKey);
+      if (rebuyContext?.contextParameters) {
+        const filteredParams = filterContextForWidgetEndpoints(rebuyContext.contextParameters, endpoint);
+        client.setContextParameters(filteredParams);
+      }
+      if (options) {
+        client.setDefaultParameters(options);
+      }
+      setRebuyApiClient(client);
+      setInitialized(true);
+    }
+  }, [apiKey, rebuyApiClient, configLoadingStatus, options, rebuyContext, uuid, endpoint]);
+  (0, import_react38.useEffect)(() => {
+    if (rebuyApiClient && rebuyContext?.contextParameters) {
+      const filteredParams = filterContextForWidgetEndpoints(rebuyContext.contextParameters, endpoint);
+      rebuyApiClient.setContextParameters(filteredParams);
+    }
+  }, [rebuyApiClient, rebuyContext, uuid, endpoint]);
+  const request = (0, import_react38.useMemo)(() => {
+    const req = {
+      endpoint,
+      params: {}
+      // Keeping this object generic to allow for custom endpoints
+    };
+    if (limit) {
+      req.params.limit = limit;
+    }
+    return req;
+  }, [limit, uuid, endpoint]);
+  (0, import_react38.useEffect)(() => {
+    let isMounted = true;
+    if (!rebuyApiClient || !initialized || configLoadingStatus !== "success") return;
+    const fetchData = async () => {
+      try {
+        const { data, metadata: metadata2 } = await rebuyApiClient.getStorefrontData(
+          request.endpoint,
+          request.params
+        );
+        if (isMounted) {
+          setProducts(
+            Array.isArray(data) ? data.filter((p) => p.id !== productId).map((p) => ({
+              ...p,
+              variants: {
+                nodes: p.variants ? (0, import_hydrogen11.flattenConnection)(p.variants) : []
+              }
+            })) : []
+          );
+          setMetadata(metadata2);
+        }
+      } catch (error) {
+        console.error("[RebuyWidgetContainer] Error fetching widget data:", error);
+        if (isMounted) {
+          setProducts([]);
+          setMetadata(void 0);
+        }
+      }
+    };
+    fetchData();
+    return () => {
+      isMounted = false;
+    };
+  }, [rebuyApiClient, initialized, request, configLoadingStatus, productId]);
+  if (products.length === 0) {
+    rebuyDebugLog.log("widget-recently-viewed-products" /* WIDGET_RECENTLY_VIEWED_PRODUCTS */, "RebuyRecentlyViewedProducts: No products found");
+    return null;
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)("div", { className: RebuyRecentlyViewedProducts_default["rebuy-recently-viewed-products-container"], children: [
+    /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Title, { level: getTitleLevel(customTitleLevel), style: customTitleStyle, text: customTitle }),
+    /* @__PURE__ */ (0, import_jsx_runtime52.jsx)("ul", { className: RebuyRecentlyViewedProducts_default["product-grid"], children: products?.map((product) => /* @__PURE__ */ (0, import_jsx_runtime52.jsx)("li", { children: /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+      ProductCard,
+      {
+        addToCartBtnText,
+        addToCartCallback,
+        product,
+        productCardTitleLevel: getTitleLevel("h2")
+      },
+      product.id
+    ) }, product.id)) })
+  ] });
+};
+
 // src/constants/api.ts
 var REBUY_THEME_STYLES_BASE_URL = "https://rebuyengine.com/api/v1/theme-styles";