diff --git a/examples/b2b/README.md b/examples/b2b/README.md
index e69de29bb2..47b9bf392b 100644
--- a/examples/b2b/README.md
+++ b/examples/b2b/README.md
@@ -0,0 +1,44 @@
+# Hydrogen example: B2B
+
+> Note:
+>
+> This example is currently Unstable
+
+This is an example implementation of a B2B storefront using Hydrogen. It includes the following high level changes.
+
+1. Retrieving company location data from a logged in customer using the [Customer Account API](https://shopify.dev/docs/api/customer/2024-04/queries/customer)
+2. Displaying a list of company locations and setting a `companyLocationId` in session
+3. Using a storefront `customerAccessToken` and `companyLocationId` to update cart and get B2B specific rules and pricing
+4. Using a storefront `customerAccessToken` and `companyLocationId` to [contextualize queries](https://shopify.dev/docs/api/storefront#directives) using the `buyer` argument
+
+Only queries on the product display page, `app/routes/products.$handle.tsx`, were contextualized in this example. For a production storefront, all queries for product data should be contextualized.
+
+## Install
+
+Setup a new project with this example:
+
+```bash
+npm create @shopify/hydrogen@latest -- --template b2b
+```
+
+## Requirements
+
+- Your store is on a [Shopify Plus plan](https://help.shopify.com/manual/intro-to-shopify/pricing-plans/plans-features/shopify-plus-plan).
+- Your store is using [new customer accounts](https://help.shopify.com/en/manual/customers/customer-accounts/new-customer-accounts).
+- You have access to a customer which has permission to order for a [B2B company](https://help.shopify.com/en/manual/b2b).
+
+## Key files
+
+This folder contains the minimal set of files needed to showcase the implementation.
+Not all queries where contextualized for B2B. `app/routes/products.$handle.tsx` provides
+reference on how to contextualize storefront queries.Files that aren’t included by default 
+with Hydrogen and that you’ll need to create are labeled with 🆕.
+
+| File                                                 | Description                                                                                    |
+| ---------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
+| [`app/root.tsx`](app/root.tsx)                             | Includes a customer query to determine if the the logged in session is for a B2B buyer. Set `companyLocationId` in session if there is only one location available to buy for    |
+| 🆕 [`app/graphql/CustomerLocationsQuery.ts`](app/graphql/CustomerLocationsQuery.ts)  | Customer query to fetch company locations        |
+| 🆕 [`app/components/LocationSelector.tsx`](app/components/LocationSelector.tsx) | Component to choose a Company location to buy for. Rendered if there is no `companyLocationId` set in session    |
+| [`app/routes/products.$handle.tsx`](app/routes/products.$handle.tsx)      | Added buyer context to the product and product varient queries. Includes logic and components to display quantity rules and quantity price breaks |
+| 🆕 [`app/components/PriceBreaks.tsx`](app/components/PriceBreaks.tsx)  | Component rendered on the product page to highlight quantity price breaks        |
+| 🆕 [`app/components/QuantityRules.tsx`](app/components/QuantityRules.tsx)  | Component rendered on the product page to highlight quantity rules        |
diff --git a/examples/b2b/app/components/Header.tsx b/examples/b2b/app/components/Header.tsx
index f06ddcee23..003e3e8d00 100644
--- a/examples/b2b/app/components/Header.tsx
+++ b/examples/b2b/app/components/Header.tsx
@@ -4,6 +4,10 @@ import {useState, Suspense} from 'react';
 import type {HeaderQuery} from 'storefrontapi.generated';
 import type {LayoutProps} from './Layout';
 import {useRootLoaderData} from '~/root';
+import type {
+  CompanyLocation,
+  CompanyLocationConnection,
+} from '@shopify/hydrogen-react/customer-account-api-types';
 
 /***********************************************/
 /**********  EXAMPLE UPDATE STARTS  ************/
@@ -156,13 +160,13 @@ function CartToggle({cart}: Pick<HeaderProps, 'cart'>) {
 /**********  EXAMPLE UPDATE STARTS  ************/
 function LocationDropdown({company}: Pick<HeaderProps, 'company'>) {
   const locations = company?.locations?.edges
-    ? company.locations.edges.map((location) => {
+    ? company.locations.edges.map((location: CompanyLocationConnection) => {
         return {...location.node};
       })
     : [];
 
   const [selectedLocation, setSelectedLocation] = useState(
-    company.locations.edges[0].node.id ?? undefined,
+    company?.locations?.edges?.[0]?.node?.id ?? undefined,
   );
 
   const setLocation = async (event: React.ChangeEvent<HTMLSelectElement>) => {
@@ -170,7 +174,7 @@ function LocationDropdown({company}: Pick<HeaderProps, 'company'>) {
     setSelectedLocation(locationId);
   };
 
-  if (locations.length === 1) return null;
+  if (locations.length === 1 || !company) return null;
 
   return (
     <CartForm route="/cart" action={CartForm.ACTIONS.BuyerIdentityUpdate}>
@@ -187,7 +191,7 @@ function LocationDropdown({company}: Pick<HeaderProps, 'company'>) {
             value={selectedLocation}
             style={{marginRight: '4px'}}
           >
-            {locations.map((location) => {
+            {locations.map((location: CompanyLocation) => {
               return (
                 <option
                   defaultValue={selectedLocation}
diff --git a/examples/b2b/app/components/LocationSelector.tsx b/examples/b2b/app/components/LocationSelector.tsx
index 83519b38e8..1bfede466b 100644
--- a/examples/b2b/app/components/LocationSelector.tsx
+++ b/examples/b2b/app/components/LocationSelector.tsx
@@ -2,12 +2,13 @@ import {CartForm} from '@shopify/hydrogen';
 import type {
   Company,
   CompanyLocation,
+  CompanyLocationConnection,
 } from '@shopify/hydrogen-react/customer-account-api-types';
 
 export function LocationSelector({company}: {company: Company}) {
   const locations = company?.locations?.edges
-    ? company.locations.edges.map((loc) => {
-        return {...loc.node};
+    ? company.locations.edges.map((location: CompanyLocationConnection) => {
+        return {...location.node};
       })
     : [];
 
@@ -42,7 +43,7 @@ export function LocationSelector({company}: {company: Company}) {
       <CartForm route="/cart" action={CartForm.ACTIONS.BuyerIdentityUpdate}>
         <fieldset>
           <legend>Choose a location:</legend>
-          {locations.map((location) => {
+          {locations.map((location: CompanyLocation) => {
             return (
               <div key={location.id}>
                 <LocationItem location={location} />
diff --git a/examples/b2b/app/root.tsx b/examples/b2b/app/root.tsx
index 96b8457140..4dff7f83e0 100644
--- a/examples/b2b/app/root.tsx
+++ b/examples/b2b/app/root.tsx
@@ -70,11 +70,15 @@ export const useRootLoaderData = () => {
   return root?.data as SerializeFrom<typeof loader>;
 };
 
-export async function loader({request, context}: LoaderFunctionArgs) {
-  const {storefront, customerAccount, cart, session} = context;
+export async function loader({context}: LoaderFunctionArgs) {
+  const {storefront, customerAccount, cart} = context;
   const publicStoreDomain = context.env.PUBLIC_STORE_DOMAIN;
 
+  /***********************************************/
+  /**********  EXAMPLE UPDATE STARTS  ************/
   const isLoggedIn = await customerAccount.isLoggedIn();
+  /**********   EXAMPLE UPDATE END   ************/
+  /***********************************************/
   const cartPromise = cart.get();
 
   // defer the footer query (below the fold)
@@ -93,13 +97,20 @@ export async function loader({request, context}: LoaderFunctionArgs) {
     },
   });
 
+  /***********************************************/
+  /**********  EXAMPLE UPDATE STARTS  ************/
   // B2B buyer context
-  let companyLocationId = (await customerAccount.UNSTABLE_getBuyer())
-    ?.companyLocationId;
+  let companyLocationId;
+  let company: Company;
 
-  const customer = await customerAccount.query(CUSTOMER_LOCATIONS_QUERY);
-  const company: Company =
-    customer?.data?.customer?.companyContacts?.edges?.[0]?.node?.company;
+  if (isLoggedIn) {
+    companyLocationId = (await customerAccount.UNSTABLE_getBuyer())
+      ?.companyLocationId;
+
+    const customer = await customerAccount.query(CUSTOMER_LOCATIONS_QUERY);
+    company =
+      customer?.data?.customer?.companyContacts?.edges?.[0]?.node?.company;
+  }
 
   if (!companyLocationId && company?.locations?.edges?.length === 1) {
     companyLocationId = company.locations.edges[0].node.id;
@@ -107,21 +118,25 @@ export async function loader({request, context}: LoaderFunctionArgs) {
     customerAccount.UNSTABLE_setBuyer({
       companyLocationId,
     });
-
-    //updateBuyerIdentity
   }
 
   const showLocationSelector = Boolean(company && !companyLocationId);
+  /**********   EXAMPLE UPDATE END   ************/
+  /***********************************************/
 
   return defer(
     {
       cart: cartPromise,
       footer: footerPromise,
       header: await headerPromise,
+      /***********************************************/
+      /**********  EXAMPLE UPDATE STARTS  ************/
       isLoggedIn,
       publicStoreDomain,
       company,
       showLocationSelector,
+      /**********   EXAMPLE UPDATE END   ************/
+      /***********************************************/
     },
     {
       headers: {
@@ -144,16 +159,21 @@ export default function App() {
         <Links />
       </head>
       <body>
-        {data.showLocationSelector ? (
-          <main>
-            <LocationSelector company={data.company} />
-          </main>
-        ) : (
-          <Layout {...data}>
-            <Outlet />
-          </Layout>
-        )}
-
+        {
+          /***********************************************/
+          /**********  EXAMPLE UPDATE STARTS  ************/
+          data.showLocationSelector ? (
+            <main>
+              <LocationSelector company={data.company} />
+            </main>
+          ) : (
+            <Layout {...data}>
+              <Outlet />
+            </Layout>
+          )
+          /**********   EXAMPLE UPDATE END   ************/
+          /***********************************************/
+        }
         <ScrollRestoration nonce={nonce} />
         <Scripts nonce={nonce} />
         <LiveReload nonce={nonce} />
diff --git a/examples/b2b/app/routes/_index.tsx b/examples/b2b/app/routes/_index.tsx
deleted file mode 100644
index d4c1376799..0000000000
--- a/examples/b2b/app/routes/_index.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-import {defer, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
-import {Await, useLoaderData, Link, type MetaFunction} from '@remix-run/react';
-import {Suspense} from 'react';
-import {Image, Money} from '@shopify/hydrogen';
-import type {
-  FeaturedCollectionFragment,
-  RecommendedProductsQuery,
-} from 'storefrontapi.generated';
-
-export const meta: MetaFunction = () => {
-  return [{title: 'Hydrogen | Home'}];
-};
-
-export async function loader({context}: LoaderFunctionArgs) {
-  const {storefront} = context;
-  const {collections} = await storefront.query(FEATURED_COLLECTION_QUERY);
-  const featuredCollection = collections?.nodes?.[0];
-  const recommendedProducts = storefront.query(RECOMMENDED_PRODUCTS_QUERY);
-
-  return defer({featuredCollection, recommendedProducts});
-}
-
-export default function Homepage() {
-  const data = useLoaderData<typeof loader>();
-  return (
-    <div className="home">
-      <FeaturedCollection collection={data.featuredCollection} />
-      <RecommendedProducts products={data.recommendedProducts} />
-    </div>
-  );
-}
-
-function FeaturedCollection({
-  collection,
-}: {
-  collection: FeaturedCollectionFragment;
-}) {
-  if (!collection) return null;
-  const image = collection?.image;
-  return (
-    <Link
-      className="featured-collection"
-      to={`/collections/${collection.handle}`}
-    >
-      {image && (
-        <div className="featured-collection-image">
-          <Image data={image} sizes="100vw" />
-        </div>
-      )}
-      <h1>{collection.title}</h1>
-    </Link>
-  );
-}
-
-function RecommendedProducts({
-  products,
-}: {
-  products: Promise<RecommendedProductsQuery>;
-}) {
-  return (
-    <div className="recommended-products">
-      <h2>Recommended Products</h2>
-      <Suspense fallback={<div>Loading...</div>}>
-        <Await resolve={products}>
-          {({products}) => (
-            <div className="recommended-products-grid">
-              {products.nodes.map((product) => (
-                <Link
-                  key={product.id}
-                  className="recommended-product"
-                  to={`/products/${product.handle}`}
-                >
-                  <Image
-                    data={product.images.nodes[0]}
-                    aspectRatio="1/1"
-                    sizes="(min-width: 45em) 20vw, 50vw"
-                  />
-                  <h4>{product.title}</h4>
-                  <small>
-                    <Money data={product.priceRange.minVariantPrice} />
-                  </small>
-                </Link>
-              ))}
-            </div>
-          )}
-        </Await>
-      </Suspense>
-      <br />
-    </div>
-  );
-}
-
-const FEATURED_COLLECTION_QUERY = `#graphql
-  fragment FeaturedCollection on Collection {
-    id
-    title
-    image {
-      id
-      url
-      altText
-      width
-      height
-    }
-    handle
-  }
-  query FeaturedCollection($country: CountryCode, $language: LanguageCode)
-    @inContext(country: $country, language: $language) {
-    collections(first: 1, sortKey: UPDATED_AT, reverse: true) {
-      nodes {
-        ...FeaturedCollection
-      }
-    }
-  }
-` as const;
-
-const RECOMMENDED_PRODUCTS_QUERY = `#graphql
-  fragment RecommendedProduct on Product {
-    id
-    title
-    handle
-    priceRange {
-      minVariantPrice {
-        amount
-        currencyCode
-      }
-    }
-    images(first: 1) {
-      nodes {
-        id
-        url
-        altText
-        width
-        height
-      }
-    }
-  }
-  query RecommendedProducts ($country: CountryCode, $language: LanguageCode, $buyer: BuyerInput)
-    @inContext(country: $country, language: $language, buyer: $buyer) {
-    products(first: 4, sortKey: UPDATED_AT, reverse: true) {
-      nodes {
-        ...RecommendedProduct
-      }
-    }
-  }
-` as const;
diff --git a/examples/b2b/app/routes/api.predictive-search.tsx b/examples/b2b/app/routes/api.predictive-search.tsx
deleted file mode 100644
index 6f85c4ab6b..0000000000
--- a/examples/b2b/app/routes/api.predictive-search.tsx
+++ /dev/null
@@ -1,321 +0,0 @@
-import {json, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
-import type {
-  NormalizedPredictiveSearch,
-  NormalizedPredictiveSearchResults,
-} from '~/components/Search';
-import {NO_PREDICTIVE_SEARCH_RESULTS} from '~/components/Search';
-import {applyTrackingParams} from '~/lib/search';
-
-import type {
-  PredictiveArticleFragment,
-  PredictiveCollectionFragment,
-  PredictivePageFragment,
-  PredictiveProductFragment,
-  PredictiveQueryFragment,
-  PredictiveSearchQuery,
-} from 'storefrontapi.generated';
-
-type PredictiveSearchTypes =
-  | 'ARTICLE'
-  | 'COLLECTION'
-  | 'PAGE'
-  | 'PRODUCT'
-  | 'QUERY';
-
-const DEFAULT_SEARCH_TYPES: PredictiveSearchTypes[] = [
-  'ARTICLE',
-  'COLLECTION',
-  'PAGE',
-  'PRODUCT',
-  'QUERY',
-];
-
-/**
- * Fetches the search results from the predictive search API
- * requested by the SearchForm component
- */
-export async function action({request, params, context}: LoaderFunctionArgs) {
-  if (request.method !== 'POST') {
-    throw new Error('Invalid request method');
-  }
-
-  const search = await fetchPredictiveSearchResults({
-    params,
-    request,
-    context,
-  });
-
-  return json(search);
-}
-
-async function fetchPredictiveSearchResults({
-  params,
-  request,
-  context,
-}: Pick<LoaderFunctionArgs, 'params' | 'context' | 'request'>) {
-  const url = new URL(request.url);
-  const searchParams = new URLSearchParams(url.search);
-  let body;
-  try {
-    body = await request.formData();
-  } catch (error) {}
-  const searchTerm = String(body?.get('q') || searchParams.get('q') || '');
-  const limit = Number(body?.get('limit') || searchParams.get('limit') || 10);
-  const rawTypes = String(
-    body?.get('type') || searchParams.get('type') || 'ANY',
-  );
-  const searchTypes =
-    rawTypes === 'ANY'
-      ? DEFAULT_SEARCH_TYPES
-      : rawTypes
-          .split(',')
-          .map((t) => t.toUpperCase() as PredictiveSearchTypes)
-          .filter((t) => DEFAULT_SEARCH_TYPES.includes(t));
-
-  if (!searchTerm) {
-    return {
-      searchResults: {results: null, totalResults: 0},
-      searchTerm,
-      searchTypes,
-    };
-  }
-
-  const data = await context.storefront.query(PREDICTIVE_SEARCH_QUERY, {
-    variables: {
-      limit,
-      limitScope: 'EACH',
-      searchTerm,
-      types: searchTypes,
-    },
-  });
-
-  if (!data) {
-    throw new Error('No data returned from Shopify API');
-  }
-
-  const searchResults = normalizePredictiveSearchResults(
-    data.predictiveSearch,
-    params.locale,
-  );
-
-  return {searchResults, searchTerm, searchTypes};
-}
-
-/**
- * Normalize results and apply tracking qurery parameters to each result url
- */
-export function normalizePredictiveSearchResults(
-  predictiveSearch: PredictiveSearchQuery['predictiveSearch'],
-  locale: LoaderFunctionArgs['params']['locale'],
-): NormalizedPredictiveSearch {
-  let totalResults = 0;
-  if (!predictiveSearch) {
-    return {
-      results: NO_PREDICTIVE_SEARCH_RESULTS,
-      totalResults,
-    };
-  }
-
-  const localePrefix = locale ? `/${locale}` : '';
-  const results: NormalizedPredictiveSearchResults = [];
-
-  if (predictiveSearch.queries.length) {
-    results.push({
-      type: 'queries',
-      items: predictiveSearch.queries.map((query: PredictiveQueryFragment) => {
-        const trackingParams = applyTrackingParams(
-          query,
-          `q=${encodeURIComponent(query.text)}`,
-        );
-
-        totalResults++;
-        return {
-          __typename: query.__typename,
-          handle: '',
-          id: query.text,
-          image: undefined,
-          title: query.text,
-          styledTitle: query.styledText,
-          url: `${localePrefix}/search${trackingParams}`,
-        };
-      }),
-    });
-  }
-
-  if (predictiveSearch.products.length) {
-    results.push({
-      type: 'products',
-      items: predictiveSearch.products.map(
-        (product: PredictiveProductFragment) => {
-          totalResults++;
-          const trackingParams = applyTrackingParams(product);
-          return {
-            __typename: product.__typename,
-            handle: product.handle,
-            id: product.id,
-            image: product.variants?.nodes?.[0]?.image,
-            title: product.title,
-            url: `${localePrefix}/products/${product.handle}${trackingParams}`,
-            price: product.variants.nodes[0].price,
-          };
-        },
-      ),
-    });
-  }
-
-  if (predictiveSearch.collections.length) {
-    results.push({
-      type: 'collections',
-      items: predictiveSearch.collections.map(
-        (collection: PredictiveCollectionFragment) => {
-          totalResults++;
-          const trackingParams = applyTrackingParams(collection);
-          return {
-            __typename: collection.__typename,
-            handle: collection.handle,
-            id: collection.id,
-            image: collection.image,
-            title: collection.title,
-            url: `${localePrefix}/collections/${collection.handle}${trackingParams}`,
-          };
-        },
-      ),
-    });
-  }
-
-  if (predictiveSearch.pages.length) {
-    results.push({
-      type: 'pages',
-      items: predictiveSearch.pages.map((page: PredictivePageFragment) => {
-        totalResults++;
-        const trackingParams = applyTrackingParams(page);
-        return {
-          __typename: page.__typename,
-          handle: page.handle,
-          id: page.id,
-          image: undefined,
-          title: page.title,
-          url: `${localePrefix}/pages/${page.handle}${trackingParams}`,
-        };
-      }),
-    });
-  }
-
-  if (predictiveSearch.articles.length) {
-    results.push({
-      type: 'articles',
-      items: predictiveSearch.articles.map(
-        (article: PredictiveArticleFragment) => {
-          totalResults++;
-          const trackingParams = applyTrackingParams(article);
-          return {
-            __typename: article.__typename,
-            handle: article.handle,
-            id: article.id,
-            image: article.image,
-            title: article.title,
-            url: `${localePrefix}/blog/${article.handle}${trackingParams}`,
-          };
-        },
-      ),
-    });
-  }
-
-  return {results, totalResults};
-}
-
-const PREDICTIVE_SEARCH_QUERY = `#graphql
-  fragment PredictiveArticle on Article {
-    __typename
-    id
-    title
-    handle
-    image {
-      url
-      altText
-      width
-      height
-    }
-    trackingParameters
-  }
-  fragment PredictiveCollection on Collection {
-    __typename
-    id
-    title
-    handle
-    image {
-      url
-      altText
-      width
-      height
-    }
-    trackingParameters
-  }
-  fragment PredictivePage on Page {
-    __typename
-    id
-    title
-    handle
-    trackingParameters
-  }
-  fragment PredictiveProduct on Product {
-    __typename
-    id
-    title
-    handle
-    trackingParameters
-    variants(first: 1) {
-      nodes {
-        id
-        image {
-          url
-          altText
-          width
-          height
-        }
-        price {
-          amount
-          currencyCode
-        }
-      }
-    }
-  }
-  fragment PredictiveQuery on SearchQuerySuggestion {
-    __typename
-    text
-    styledText
-    trackingParameters
-  }
-  query predictiveSearch(
-    $country: CountryCode
-    $language: LanguageCode
-    $buyer: BuyerInput
-    $limit: Int!
-    $limitScope: PredictiveSearchLimitScope!
-    $searchTerm: String!
-    $types: [PredictiveSearchType!]
-  ) @inContext(country: $country, language: $language, buyer: $buyer) {
-    predictiveSearch(
-      limit: $limit,
-      limitScope: $limitScope,
-      query: $searchTerm,
-      types: $types,
-    ) {
-      articles {
-        ...PredictiveArticle
-      }
-      collections {
-        ...PredictiveCollection
-      }
-      pages {
-        ...PredictivePage
-      }
-      products {
-        ...PredictiveProduct
-      }
-      queries {
-        ...PredictiveQuery
-      }
-    }
-  }
-` as const;
diff --git a/examples/b2b/app/routes/cart.tsx b/examples/b2b/app/routes/cart.tsx
index eefca6abe2..a49a31317c 100644
--- a/examples/b2b/app/routes/cart.tsx
+++ b/examples/b2b/app/routes/cart.tsx
@@ -5,7 +5,7 @@ import {CartForm} from '@shopify/hydrogen';
 import {json, type ActionFunctionArgs} from '@shopify/remix-oxygen';
 import {CartMain} from '~/components/Cart';
 import {useRootLoaderData} from '~/root';
-import type {CartBuyerIdentityInput} from '@shopify/hydrogen-react/storefront-api-types';
+import type {CartBuyerIdentityInput} from '@shopify/hydrogen/storefront-api-types';
 
 export const meta: MetaFunction = () => {
   return [{title: `Hydrogen | Cart`}];
@@ -21,7 +21,8 @@ export async function action({request, context}: ActionFunctionArgs) {
   /***********************************************/
   /**********  EXAMPLE UPDATE STARTS  ************/
 
-  const companyLocationId = inputs.companyLocationId as string; // fix this type properly
+  const companyLocationId =
+    inputs.companyLocationId as CartBuyerIdentityInput['companyLocationId'];
 
   if (companyLocationId) {
     context.customerAccount.UNSTABLE_setBuyer({companyLocationId});
diff --git a/examples/b2b/app/routes/collections.$handle.tsx b/examples/b2b/app/routes/collections.$handle.tsx
deleted file mode 100644
index bc1c46ac02..0000000000
--- a/examples/b2b/app/routes/collections.$handle.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import {json, redirect, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
-import {useLoaderData, Link, type MetaFunction} from '@remix-run/react';
-import {
-  Pagination,
-  getPaginationVariables,
-  Image,
-  Money,
-} from '@shopify/hydrogen';
-import type {ProductItemFragment} from 'storefrontapi.generated';
-import {useVariantUrl} from '~/lib/variants';
-
-export const meta: MetaFunction<typeof loader> = ({data}) => {
-  return [{title: `Hydrogen | ${data?.collection.title ?? ''} Collection`}];
-};
-
-export async function loader({request, params, context}: LoaderFunctionArgs) {
-  const {handle} = params;
-  const {storefront} = context;
-  const paginationVariables = getPaginationVariables(request, {
-    pageBy: 8,
-  });
-
-  if (!handle) {
-    return redirect('/collections');
-  }
-
-  const {collection} = await storefront.query(COLLECTION_QUERY, {
-    variables: {handle, ...paginationVariables},
-  });
-
-  if (!collection) {
-    throw new Response(`Collection ${handle} not found`, {
-      status: 404,
-    });
-  }
-  return json({collection});
-}
-
-export default function Collection() {
-  const {collection} = useLoaderData<typeof loader>();
-
-  return (
-    <div className="collection">
-      <h1>{collection.title}</h1>
-      <p className="collection-description">{collection.description}</p>
-      <Pagination connection={collection.products}>
-        {({nodes, isLoading, PreviousLink, NextLink}) => (
-          <>
-            <PreviousLink>
-              {isLoading ? 'Loading...' : <span>↑ Load previous</span>}
-            </PreviousLink>
-            <ProductsGrid products={nodes} />
-            <br />
-            <NextLink>
-              {isLoading ? 'Loading...' : <span>Load more ↓</span>}
-            </NextLink>
-          </>
-        )}
-      </Pagination>
-    </div>
-  );
-}
-
-function ProductsGrid({products}: {products: ProductItemFragment[]}) {
-  return (
-    <div className="products-grid">
-      {products.map((product, index) => {
-        return (
-          <ProductItem
-            key={product.id}
-            product={product}
-            loading={index < 8 ? 'eager' : undefined}
-          />
-        );
-      })}
-    </div>
-  );
-}
-
-function ProductItem({
-  product,
-  loading,
-}: {
-  product: ProductItemFragment;
-  loading?: 'eager' | 'lazy';
-}) {
-  const variant = product.variants.nodes[0];
-  const variantUrl = useVariantUrl(product.handle, variant.selectedOptions);
-  return (
-    <Link
-      className="product-item"
-      key={product.id}
-      prefetch="intent"
-      to={variantUrl}
-    >
-      {product.featuredImage && (
-        <Image
-          alt={product.featuredImage.altText || product.title}
-          aspectRatio="1/1"
-          data={product.featuredImage}
-          loading={loading}
-          sizes="(min-width: 45em) 400px, 100vw"
-        />
-      )}
-      <h4>{product.title}</h4>
-      <small>
-        <Money data={product.priceRange.minVariantPrice} />
-      </small>
-    </Link>
-  );
-}
-
-const PRODUCT_ITEM_FRAGMENT = `#graphql
-  fragment MoneyProductItem on MoneyV2 {
-    amount
-    currencyCode
-  }
-  fragment ProductItem on Product {
-    id
-    handle
-    title
-    featuredImage {
-      id
-      altText
-      url
-      width
-      height
-    }
-    priceRange {
-      minVariantPrice {
-        ...MoneyProductItem
-      }
-      maxVariantPrice {
-        ...MoneyProductItem
-      }
-    }
-    variants(first: 1) {
-      nodes {
-        selectedOptions {
-          name
-          value
-        }
-      }
-    }
-  }
-` as const;
-
-// NOTE: https://shopify.dev/docs/api/storefront/2022-04/objects/collection
-const COLLECTION_QUERY = `#graphql
-  ${PRODUCT_ITEM_FRAGMENT}
-  query Collection(
-    $handle: String!
-    $country: CountryCode
-    $buyer: BuyerInput
-    $language: LanguageCode
-    $first: Int
-    $last: Int
-    $startCursor: String
-    $endCursor: String
-  ) @inContext(country: $country, language: $language, buyer: $buyer) {
-    collection(handle: $handle) {
-      id
-      handle
-      title
-      description
-      products(
-        first: $first,
-        last: $last,
-        before: $startCursor,
-        after: $endCursor
-      ) {
-        nodes {
-          ...ProductItem
-        }
-        pageInfo {
-          hasPreviousPage
-          hasNextPage
-          endCursor
-          startCursor
-        }
-      }
-    }
-  }
-` as const;
diff --git a/examples/b2b/app/routes/products.$handle.tsx b/examples/b2b/app/routes/products.$handle.tsx
index 7e3101a86a..dc415e08c8 100644
--- a/examples/b2b/app/routes/products.$handle.tsx
+++ b/examples/b2b/app/routes/products.$handle.tsx
@@ -180,25 +180,37 @@ function ProductMain({
               product={product}
               selectedVariant={selectedVariant}
               variants={data.product?.variants.nodes || []}
+              /***********************************************/
+              /**********  EXAMPLE UPDATE STARTS  ************/
               quantity={selectedVariant?.quantityRule?.increment || 1}
+              /**********   EXAMPLE UPDATE END   ************/
+              /***********************************************/
             />
           )}
         </Await>
       </Suspense>
       <br />
-      {hasQuantityRules(selectedVariant?.quantityRule) ? (
-        <QuantityRules
-          maximum={selectedVariant.quantityRule.maximum}
-          minimum={selectedVariant.quantityRule.minimum}
-          increment={selectedVariant.quantityRule.increment}
-        />
-      ) : null}
+      {
+        /***********************************************/
+        /**********  EXAMPLE UPDATE STARTS  ************/
+        hasQuantityRules(selectedVariant?.quantityRule) ? (
+          <QuantityRules
+            maximum={selectedVariant.quantityRule.maximum}
+            minimum={selectedVariant.quantityRule.minimum}
+            increment={selectedVariant.quantityRule.increment}
+          />
+        ) : null
+      }
       <br />
-      {selectedVariant?.quantityPriceBreaks?.nodes?.length > 0 ? (
-        <PriceBreaks
-          priceBreaks={selectedVariant?.quantityPriceBreaks?.nodes}
-        />
-      ) : null}
+      {
+        selectedVariant?.quantityPriceBreaks?.nodes?.length > 0 ? (
+          <PriceBreaks
+            priceBreaks={selectedVariant?.quantityPriceBreaks?.nodes}
+          />
+        ) : null
+        /**********   EXAMPLE UPDATE END   ************/
+        /***********************************************/
+      }
       <br />
       <p>
         <strong>Description</strong>
@@ -235,6 +247,8 @@ function ProductPrice({
   );
 }
 
+/***********************************************/
+/**********  EXAMPLE UPDATE STARTS  ************/
 function ProductForm({
   product,
   selectedVariant,
@@ -246,6 +260,8 @@ function ProductForm({
   variants: Array<ProductVariantFragment>;
   quantity: number;
 }) {
+  /**********   EXAMPLE UPDATE END   ************/
+  /***********************************************/
   return (
     <div className="product-form">
       <VariantSelector
@@ -266,7 +282,11 @@ function ProductForm({
             ? [
                 {
                   merchandiseId: selectedVariant.id,
+                  /***********************************************/
+                  /**********  EXAMPLE UPDATE STARTS  ************/
                   quantity,
+                  /**********   EXAMPLE UPDATE END   ************/
+                  /***********************************************/
                 },
               ]
             : []
@@ -342,6 +362,8 @@ function AddToCartButton({
   );
 }
 
+/***********************************************/
+/**********  EXAMPLE UPDATE STARTS  ************/
 const PRODUCT_VARIANT_FRAGMENT = `#graphql
   fragment ProductVariant on ProductVariant {
     availableForSale
@@ -392,6 +414,8 @@ const PRODUCT_VARIANT_FRAGMENT = `#graphql
     }
   }
 ` as const;
+/**********   EXAMPLE UPDATE END   ************/
+/***********************************************/
 
 const PRODUCT_FRAGMENT = `#graphql
   fragment Product on Product {
@@ -421,6 +445,8 @@ const PRODUCT_FRAGMENT = `#graphql
   ${PRODUCT_VARIANT_FRAGMENT}
 ` as const;
 
+/***********************************************/
+/**********  EXAMPLE UPDATE STARTS  ************/
 const PRODUCT_QUERY = `#graphql
   query Product(
     $country: CountryCode
@@ -435,6 +461,8 @@ const PRODUCT_QUERY = `#graphql
   }
   ${PRODUCT_FRAGMENT}
 ` as const;
+/**********   EXAMPLE UPDATE END   ************/
+/***********************************************/
 
 const PRODUCT_VARIANTS_FRAGMENT = `#graphql
   fragment ProductVariants on Product {
@@ -447,6 +475,8 @@ const PRODUCT_VARIANTS_FRAGMENT = `#graphql
   ${PRODUCT_VARIANT_FRAGMENT}
 ` as const;
 
+/***********************************************/
+/**********  EXAMPLE UPDATE STARTS  ************/
 const VARIANTS_QUERY = `#graphql
   ${PRODUCT_VARIANTS_FRAGMENT}
   query ProductVariants(
@@ -460,3 +490,5 @@ const VARIANTS_QUERY = `#graphql
     }
   }
 ` as const;
+/**********   EXAMPLE UPDATE END   ************/
+/***********************************************/
diff --git a/examples/b2b/app/routes/search.tsx b/examples/b2b/app/routes/search.tsx
deleted file mode 100644
index 0db681cbe8..0000000000
--- a/examples/b2b/app/routes/search.tsx
+++ /dev/null
@@ -1,175 +0,0 @@
-import {defer, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
-import {useLoaderData, type MetaFunction} from '@remix-run/react';
-import {getPaginationVariables} from '@shopify/hydrogen';
-
-import {SearchForm, SearchResults, NoSearchResults} from '~/components/Search';
-
-export const meta: MetaFunction = () => {
-  return [{title: `Hydrogen | Search`}];
-};
-
-export async function loader({request, context}: LoaderFunctionArgs) {
-  const url = new URL(request.url);
-  const searchParams = new URLSearchParams(url.search);
-  const variables = getPaginationVariables(request, {pageBy: 8});
-  const searchTerm = String(searchParams.get('q') || '');
-
-  if (!searchTerm) {
-    return {
-      searchResults: {results: null, totalResults: 0},
-      searchTerm,
-    };
-  }
-
-  const {errors, ...data} = await context.storefront.query(SEARCH_QUERY, {
-    variables: {
-      query: searchTerm,
-      ...variables,
-    },
-  });
-
-  if (!data) {
-    throw new Error('No search data returned from Shopify API');
-  }
-
-  const totalResults = Object.values(data).reduce((total, value) => {
-    return total + value.nodes.length;
-  }, 0);
-
-  const searchResults = {
-    results: data,
-    totalResults,
-  };
-
-  return defer({
-    searchTerm,
-    searchResults,
-  });
-}
-
-export default function SearchPage() {
-  const {searchTerm, searchResults} = useLoaderData<typeof loader>();
-
-  return (
-    <div className="search">
-      <h1>Search</h1>
-      <SearchForm searchTerm={searchTerm} />
-      {!searchTerm || !searchResults.totalResults ? (
-        <NoSearchResults />
-      ) : (
-        <SearchResults
-          results={searchResults.results}
-          searchTerm={searchTerm}
-        />
-      )}
-    </div>
-  );
-}
-
-const SEARCH_QUERY = `#graphql
-  fragment SearchProduct on Product {
-    __typename
-    handle
-    id
-    publishedAt
-    title
-    trackingParameters
-    vendor
-    variants(first: 1) {
-      nodes {
-        id
-        image {
-          url
-          altText
-          width
-          height
-        }
-        price {
-          amount
-          currencyCode
-        }
-        compareAtPrice {
-          amount
-          currencyCode
-        }
-        selectedOptions {
-          name
-          value
-        }
-        product {
-          handle
-          title
-        }
-      }
-    }
-  }
-  fragment SearchPage on Page {
-     __typename
-     handle
-    id
-    title
-    trackingParameters
-  }
-  fragment SearchArticle on Article {
-    __typename
-    handle
-    id
-    title
-    trackingParameters
-  }
-  query search(
-    $country: CountryCode
-    $buyer: BuyerInput
-    $endCursor: String
-    $first: Int
-    $language: LanguageCode
-    $last: Int
-    $query: String!
-    $startCursor: String
-  ) @inContext(country: $country, language: $language, buyer: $buyer) {
-    products: search(
-      query: $query,
-      unavailableProducts: HIDE,
-      types: [PRODUCT],
-      first: $first,
-      sortKey: RELEVANCE,
-      last: $last,
-      before: $startCursor,
-      after: $endCursor
-    ) {
-      nodes {
-        ...on Product {
-          ...SearchProduct
-        }
-      }
-      pageInfo {
-        hasNextPage
-        hasPreviousPage
-        startCursor
-        endCursor
-      }
-    }
-    pages: search(
-      query: $query,
-      types: [PAGE],
-      first: 10
-    ) {
-      nodes {
-        ...on Page {
-          ...SearchPage
-        }
-      }
-    }
-    articles: search(
-      query: $query,
-      types: [ARTICLE],
-      first: 10
-    ) {
-      nodes {
-        ...on Article {
-          ...SearchArticle
-        }
-      }
-    }
-  }
-` as const;
diff --git a/examples/b2b/app/styles/app.css b/examples/b2b/app/styles/app.css
index 46d9df66f9..ceeb42c9d0 100644
--- a/examples/b2b/app/styles/app.css
+++ b/examples/b2b/app/styles/app.css
@@ -467,7 +467,8 @@ aside li {
   display: inline-block;
 }
 
-
+/***********************************************/
+/**********  EXAMPLE UPDATE STARTS  ************/
 /*
 * --------------------------------------------------
 * Quantity Rules and price breaks
@@ -489,4 +490,6 @@ aside li {
   padding: 8px;
   border: 0.5px darkgrey solid;
   font-weight: 400;
-}
\ No newline at end of file
+}
+/**********   EXAMPLE UPDATE END   ************/
+/***********************************************/
\ No newline at end of file
diff --git a/examples/b2b/server.ts b/examples/b2b/server.ts
index a6edb88145..2ae929d103 100644
--- a/examples/b2b/server.ts
+++ b/examples/b2b/server.ts
@@ -51,7 +51,7 @@ export default {
         customerApiVersion: 'unstable',
         /***********************************************/
         /**********  EXAMPLE UPDATE STARTS  ************/
-        b2b: true,
+        unstableB2b: true,
         /**********   EXAMPLE UPDATE END   ************/
         /***********************************************/
       });
@@ -71,8 +71,8 @@ export default {
         storefrontApiVersion: 'unstable',
         /***********************************************/
         /**********  EXAMPLE UPDATE STARTS  ************/
-        b2b: true,
-        customerAccount,
+        unstableB2b: true,
+        unstableCustomerAccount: customerAccount,
         /**********   EXAMPLE UPDATE END   ************/
         /***********************************************/
       });
diff --git a/package-lock.json b/package-lock.json
index 1be6cd9225..c3432d4d26 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -81,7 +81,9 @@
     "examples/analytics": {
       "name": "example-analytics"
     },
-    "examples/b2b": {},
+    "examples/b2b": {
+      "name": "example-b2b"
+    },
     "examples/classic-remix": {
       "name": "example-classic-remix"
     },
diff --git a/packages/hydrogen-react/src/customer-account-api-types.d.ts b/packages/hydrogen-react/src/customer-account-api-types.d.ts
index 801ed7ae83..adf107c010 100644
--- a/packages/hydrogen-react/src/customer-account-api-types.d.ts
+++ b/packages/hydrogen-react/src/customer-account-api-types.d.ts
@@ -1876,8 +1876,6 @@ export type CountryCode =
   | 'UG'
   /** U.S. Outlying Islands. */
   | 'UM'
-  /** Unknown country code. */
-  | 'UNKNOWN__'
   /** United States. */
   | 'US'
   /** Uruguay. */
@@ -1947,28 +1945,11 @@ export type CropRegion =
   | 'CENTER'
   /** Keep the left of the image. */
   | 'LEFT'
-  /** Crop the exact region of the image specified by the crop_left, crop_top, crop_width and crop_height parameters. */
-  | 'REGION'
   /** Keep the right of the image. */
   | 'RIGHT'
   /** Keep the top of the image. */
   | 'TOP';
 
-/**
- * The input fields for defining an arbitrary cropping region.
- *
- */
-export type CropRegionInput = {
-  /** Height of the region of the image to extract when using the region crop mode. */
-  height: Scalars['Int']['input'];
-  /** Left position of the region of the image to extract when using the region crop mode. */
-  left: Scalars['Int']['input'];
-  /** Top position of the region of the image to extract when using the region crop mode. */
-  top: Scalars['Int']['input'];
-  /** Width of the region of the image to extract when using the region crop mode. */
-  width: Scalars['Int']['input'];
-};
-
 /**
  * The three-letter currency codes that represent the world currencies used in stores. These include standard ISO 4217 codes, legacy codes,
  * and non-standard codes.
@@ -2298,16 +2279,8 @@ export type CurrencyCode =
   /** Zambian Kwacha (ZMW). */
   | 'ZMW';
 
-/** The gift card payment details related to a transaction. */
-export type CustomGiftCardPaymentDetails = {
-  __typename?: 'CustomGiftCardPaymentDetails';
-  /** The transaction identifier of the gift card used. */
-  last4?: Maybe<Scalars['String']['output']>;
-};
-
 /** Represents the personal information of a customer. */
 export type Customer = HasMetafields &
-  HasStoreCreditAccounts &
   Node & {
     __typename?: 'Customer';
     /** The addresses associated with the customer. */
@@ -2361,8 +2334,6 @@ export type Customer = HasMetafields &
     phoneNumber?: Maybe<CustomerPhoneNumber>;
     /** A Return identified by ID. */
     return?: Maybe<Return>;
-    /** Returns a list of store credit accounts that belong to the owner resource. */
-    storeCreditAccounts: StoreCreditAccountConnection;
     /** A Subscription Contract resource identified by ID. */
     subscriptionContract?: Maybe<SubscriptionContract>;
     /** The Subscription Contracts associated with the customer. */
@@ -2444,15 +2415,6 @@ export type CustomerReturnArgs = {
   id: Scalars['ID']['input'];
 };
 
-/** Represents the personal information of a customer. */
-export type CustomerStoreCreditAccountsArgs = {
-  after?: InputMaybe<Scalars['String']['input']>;
-  before?: InputMaybe<Scalars['String']['input']>;
-  first?: InputMaybe<Scalars['Int']['input']>;
-  last?: InputMaybe<Scalars['Int']['input']>;
-  query?: InputMaybe<Scalars['String']['input']>;
-};
-
 /** Represents the personal information of a customer. */
 export type CustomerSubscriptionContractArgs = {
   id: Scalars['ID']['input'];
@@ -3128,33 +3090,10 @@ export type Domain = Node & {
   id: Scalars['ID']['output'];
   /** The host of the primary domain that this domain redirects to (for example, `example.com`). */
   redirectHost?: Maybe<Scalars['String']['output']>;
-  /** The type of the domain. */
-  type: DomainType;
   /** The URL of the domain (for example, `example.com`). */
   url: Scalars['URL']['output'];
 };
 
-/** The type of domain. */
-export type DomainType =
-  /** A personalised Shopify-provided domain. */
-  | 'BRANDED_SHOPIFY_DOMAIN'
-  /** The permanent domain of the customer accounts. */
-  | 'CUSTOMER_ACCOUNT_PERMANENT_DOMAIN'
-  /** The permanent domain of the custom storefront. */
-  | 'CUSTOM_STOREFRONT_PERMANENT_DOMAIN'
-  /** A domain that is not connected to Shopify. */
-  | 'EXTERNAL_DOMAIN'
-  /** A domain purchased through a Google domain subscription. */
-  | 'GOOGLE_DOMAIN'
-  /** A domain purchased through Open SRS. */
-  | 'OPEN_SRS_DOMAIN'
-  /** The permanent domain of the shop. */
-  | 'PERMANENT_DOMAIN'
-  /** A Shopify-provided domain. */
-  | 'SHOPIFY_PROVIDED_DOMAIN'
-  /** A third-party domain. */
-  | 'THIRD_PARTY_DOMAIN';
-
 /** A draft order for the customer. Any fields related to money are in the presentment currency. */
 export type DraftOrder = Node & {
   __typename?: 'DraftOrder';
@@ -3225,10 +3164,6 @@ export type DraftOrder = Node & {
   taxExempt: Scalars['Boolean']['output'];
   /** Whether the line item prices include taxes. */
   taxesIncluded: Scalars['Boolean']['output'];
-  /** The total amount of additional fees for the draft order. A null response means it wasn't calculated. */
-  totalAdditionalFees?: Maybe<MoneyV2>;
-  /** The total amount of duties for the draft order. A null response means it wasn't calculated. */
-  totalDuties?: Maybe<MoneyV2>;
   /** The total price of line items for this draft order. */
   totalLineItemsPrice: MoneyV2;
   /**
@@ -4000,21 +3935,6 @@ export type HasMetafieldsIdentifier = {
   namespace: Scalars['String']['input'];
 };
 
-/** Represents information about the store credit accounts associated to the specified owner. */
-export type HasStoreCreditAccounts = {
-  /** Returns a list of store credit accounts that belong to the owner resource. */
-  storeCreditAccounts: StoreCreditAccountConnection;
-};
-
-/** Represents information about the store credit accounts associated to the specified owner. */
-export type HasStoreCreditAccountsStoreCreditAccountsArgs = {
-  after?: InputMaybe<Scalars['String']['input']>;
-  before?: InputMaybe<Scalars['String']['input']>;
-  first?: InputMaybe<Scalars['Int']['input']>;
-  last?: InputMaybe<Scalars['Int']['input']>;
-  query?: InputMaybe<Scalars['String']['input']>;
-};
-
 /** Represents an image resource. */
 export type Image = {
   __typename?: 'Image';
@@ -4037,15 +3957,6 @@ export type Image = {
    * @deprecated Use `url` instead.
    */
   src: Scalars['URL']['output'];
-  /**
-   * The ThumbHash of the image.
-   *
-   * Useful to display placeholder images while the original image is loading.
-   *
-   * See https://evanw.github.io/thumbhash/ for details on how to use it.
-   *
-   */
-  thumbhash?: Maybe<Scalars['String']['output']>;
   /**
    * The location of the transformed image as a URL.
    *
@@ -4086,8 +3997,6 @@ export type ImageUrlArgs = {
 
 /** List of supported image content types. */
 export type ImageContentType =
-  /** A BMP image. */
-  | 'BMP'
   /** A JPG image. */
   | 'JPG'
   /** A PNG image. */
@@ -4111,8 +4020,6 @@ export type ImageTransformInput = {
    *
    */
   crop?: InputMaybe<CropRegion>;
-  /** Defines an arbitrary cropping region. */
-  cropRegion?: InputMaybe<CropRegionInput>;
   /**
    * Image height in pixels between 1 and 5760.
    *
@@ -5024,74 +4931,12 @@ export type Node = {
   id: Scalars['ID']['output'];
 };
 
-/**
- * A line item that contains units which are not eligible for return.
- *
- */
-export type NonReturnableLineItem = {
-  __typename?: 'NonReturnableLineItem';
-  /** The line item associated with the non-returnable units. */
-  lineItem: LineItem;
-  /** The number of units that aren't eligible for return. */
-  quantity: Scalars['Int']['output'];
-  /** The detailed information about the non-returnable quantities, categorized by reason. */
-  quantityDetails: Array<NonReturnableQuantityDetail>;
-};
-
-/**
- * An auto-generated type for paginating through multiple NonReturnableLineItems.
- *
- */
-export type NonReturnableLineItemConnection = {
-  __typename?: 'NonReturnableLineItemConnection';
-  /** A list of edges. */
-  edges: Array<NonReturnableLineItemEdge>;
-  /** A list of the nodes contained in NonReturnableLineItemEdge. */
-  nodes: Array<NonReturnableLineItem>;
-  /** Information to aid in pagination. */
-  pageInfo: PageInfo;
-};
-
-/**
- * An auto-generated type which holds one NonReturnableLineItem and a cursor during pagination.
- *
- */
-export type NonReturnableLineItemEdge = {
-  __typename?: 'NonReturnableLineItemEdge';
-  /** A cursor for use in pagination. */
-  cursor: Scalars['String']['output'];
-  /** The item at the end of NonReturnableLineItemEdge. */
-  node: NonReturnableLineItem;
-};
-
-/** The total quantity that is not available for return for a specific reason. */
-export type NonReturnableQuantityDetail = {
-  __typename?: 'NonReturnableQuantityDetail';
-  /** The number of units that aren't eligible for return. */
-  quantity: Scalars['Int']['output'];
-  /** The reason why this quantity isn't eligible for return. */
-  reasonCode: NonReturnableReason;
-};
-
-/** The reason explaining why this quantity cannot be returned. */
-export type NonReturnableReason =
-  /** A return isn't accepted for this item quantity. */
-  | 'FINAL_SALE'
-  /** The item quantity has already been returned. */
-  | 'RETURNED'
-  /** The return window for the item has expired. */
-  | 'RETURN_WINDOW_EXPIRED'
-  /** The item quantity has not been fulfilled by the merchant. */
-  | 'UNFULFILLED';
-
 /** A customer’s completed request to purchase one or more products from a shop. */
 export type Order = HasMetafields &
   Node & {
     __typename?: 'Order';
     /** A list of sales agreements associated with the order. */
     agreements: SalesAgreementConnection;
-    /** Whether the order has automatic deferred payment collection. */
-    automaticDeferredPaymentCollection: Scalars['Boolean']['output'];
     /**
      * The mailing address provided by the customer. Not all orders have a mailing address.
      *
@@ -5149,8 +4994,6 @@ export type Order = HasMetafields &
     email?: Maybe<Scalars['String']['output']>;
     /** The email address of the customer. */
     emailAddress?: Maybe<CustomerEmailAddress>;
-    /** A refund estimate for the order based on a set of line items. */
-    estimatedRefund?: Maybe<OrderEstimatedRefund>;
     /** The financial status of the order. */
     financialStatus?: Maybe<OrderFinancialStatus>;
     /** The fulfillment status of the order. */
@@ -5206,8 +5049,6 @@ export type Order = HasMetafields &
     phone?: Maybe<Scalars['String']['output']>;
     /** The pickup information for the order. */
     pickupInformation?: Maybe<OrderPickupInformation>;
-    /** The pickup point information for the order. */
-    pickupPointInformation?: Maybe<OrderPickupPointInformation>;
     /** The purchase order number of the order. */
     poNumber?: Maybe<Scalars['String']['output']>;
     /**
@@ -5225,8 +5066,6 @@ export type Order = HasMetafields &
     reorderPath?: Maybe<Scalars['String']['output']>;
     /** Whether the order requires shipping. */
     requiresShipping: Scalars['Boolean']['output'];
-    /** The return information for the order. */
-    returnInformation: OrderReturnInformation;
     /** The list of returns for the order with pagination. */
     returns: ReturnConnection;
     /**
@@ -5295,11 +5134,6 @@ export type OrderDiscountApplicationsArgs = {
   reverse?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
-/** A customer’s completed request to purchase one or more products from a shop. */
-export type OrderEstimatedRefundArgs = {
-  requestedLineItems: Array<RefundEstimateLineItemInput>;
-};
-
 /** A customer’s completed request to purchase one or more products from a shop. */
 export type OrderFulfillmentsArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
@@ -5592,46 +5426,10 @@ export type OrderEditSummaryChange = Node & {
   lineItem: LineItem;
 };
 
-/** The projected refund amount for a collection of line items, taxes, and shipping fees. */
-export type OrderEstimatedRefund = {
-  __typename?: 'OrderEstimatedRefund';
-  /** The total monetary value expected to be refunded, expressed in shop and presentment currencies. */
-  amountSet: MoneyBag;
-  /** The total of all discounted prices of the line items expected to be refunded. */
-  discountedSubtotalSet: MoneyBag;
-  /** A list of line items expected to be refunded, along with restock instructions. */
-  refundLineItems: RefundLineItemConnection;
-  /** The restocking fee generated by the return process. */
-  returnRestockingFee: ReturnRestockingFee;
-  /** The shipping fee generated by the return process. */
-  returnShippingFee: ReturnShippingFee;
-  /** The shipping costs expected to be refunded from the order. */
-  shipping: ShippingRefund;
-  /** The total of all amounts of the line items expected to be refunded in shop and presentment currencies. */
-  subtotalSet: MoneyBag;
-  /** A list of suggested order transactions. */
-  suggestedTransactions: Array<SuggestedOrderTransaction>;
-  /** The total cart discount amount that was applied to all line items in this expected refund. */
-  totalCartDiscountAmountSet: MoneyBag;
-  /** The total of the taxes expected to be refunded from the order in shop and presentment currencies. */
-  totalTaxSet: MoneyBag;
-};
-
-/** The projected refund amount for a collection of line items, taxes, and shipping fees. */
-export type OrderEstimatedRefundRefundLineItemsArgs = {
-  after?: InputMaybe<Scalars['String']['input']>;
-  before?: InputMaybe<Scalars['String']['input']>;
-  first?: InputMaybe<Scalars['Int']['input']>;
-  last?: InputMaybe<Scalars['Int']['input']>;
-  reverse?: InputMaybe<Scalars['Boolean']['input']>;
-};
-
 /** Represents the order's current financial status. */
 export type OrderFinancialStatus =
   /** Displayed as **Authorized**. */
   | 'AUTHORIZED'
-  /** Displayed as **Expired**. */
-  | 'EXPIRED'
   /** Displayed as **Paid**. */
   | 'PAID'
   /** Displayed as **Partially paid**. */
@@ -5717,18 +5515,6 @@ export type OrderLineItemsSummary = {
   totalQuantityOfTipLineItems: Scalars['Int']['output'];
 };
 
-/**
- * The summary of reasons why the order is ineligible for return.
- *
- */
-export type OrderNonReturnableSummary = {
-  __typename?: 'OrderNonReturnableSummary';
-  /** The specific reasons why the order is ineligible for return. */
-  nonReturnableReasons: Array<NonReturnableReason>;
-  /** A message displayed to the customer summarizing why the order is ineligible for return. */
-  summaryMessage?: Maybe<Scalars['String']['output']>;
-};
-
 /** The summary of payment status information for the order. */
 export type OrderPaymentInformation = {
   __typename?: 'OrderPaymentInformation';
@@ -5779,70 +5565,11 @@ export type OrderPickupInformation = {
   updatedAt?: Maybe<Scalars['DateTime']['output']>;
 };
 
-/**
- * The pickup point information associated with an order.
- *
- */
-export type OrderPickupPointInformation = {
-  __typename?: 'OrderPickupPointInformation';
-  /** The pickup point address for the order. */
-  address: PickupAddress;
-  /** Logo of the carrier for this pickup point. */
-  carrierLogoUrl: Scalars['URL']['output'];
-  /** Name of the carrier for this pickup point. */
-  carrierName: Scalars['String']['output'];
-  /** Pickup point name. */
-  name: Scalars['String']['output'];
-};
-
 /** Return type for `orderRequestReturn` mutation. */
 export type OrderRequestReturnPayload = {
   __typename?: 'OrderRequestReturnPayload';
   /** The return request that has been made. */
   return?: Maybe<Return>;
-  /** The list of errors that occurred from executing the mutation. */
-  userErrors: Array<ReturnUserError>;
-};
-
-/** The return information for a specific order. */
-export type OrderReturnInformation = {
-  __typename?: 'OrderReturnInformation';
-  /** Whether the order has one or more restocking fees associated with its returnable line items. */
-  hasRestockingFee: Scalars['Boolean']['output'];
-  /** Whether the order has one or more return promises associated with any of its line items. */
-  hasReturnPromise: Scalars['Boolean']['output'];
-  /** Whether the order has one or more return shipping fees associated with its returnable line items. */
-  hasReturnShippingFee: Scalars['Boolean']['output'];
-  /** The line items that are not eligible for return. */
-  nonReturnableLineItems: NonReturnableLineItemConnection;
-  /** A summary of the reasons why an item in an order isn't returnable. */
-  nonReturnableSummary?: Maybe<OrderNonReturnableSummary>;
-  /** The aggregated subtotal of all fees applied on the order (includes return shipping and restocking. */
-  returnFees: Array<ReturnRestockingFee | ReturnShippingFee>;
-  /** The note for the buyer about the return shipping method. This field is translated. */
-  returnShippingMethodNote?: Maybe<Scalars['String']['output']>;
-  /** A set of return shipping methods associated with the order's returnable line items. */
-  returnShippingMethods: Array<ReturnShippingMethod>;
-  /** The line items that can be returned. */
-  returnableLineItems: ReturnableLineItemConnection;
-};
-
-/** The return information for a specific order. */
-export type OrderReturnInformationNonReturnableLineItemsArgs = {
-  after?: InputMaybe<Scalars['String']['input']>;
-  before?: InputMaybe<Scalars['String']['input']>;
-  first?: InputMaybe<Scalars['Int']['input']>;
-  last?: InputMaybe<Scalars['Int']['input']>;
-  reverse?: InputMaybe<Scalars['Boolean']['input']>;
-};
-
-/** The return information for a specific order. */
-export type OrderReturnInformationReturnableLineItemsArgs = {
-  after?: InputMaybe<Scalars['String']['input']>;
-  before?: InputMaybe<Scalars['String']['input']>;
-  first?: InputMaybe<Scalars['Int']['input']>;
-  last?: InputMaybe<Scalars['Int']['input']>;
-  reverse?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
 /** The group including the shipping lines of the order. */
@@ -5980,9 +5707,7 @@ export type OrderTransactionType =
   /** A money order transaction. */
   | 'MONEY_ORDER'
   /** A Shopify installments transaction. */
-  | 'SHOPIFY_INSTALLMENTS'
-  /** A store credit transaction. */
-  | 'STORE_CREDIT';
+  | 'SHOPIFY_INSTALLMENTS';
 
 /**
  * Returns information about pagination in a connection, in accordance with the
@@ -6003,7 +5728,7 @@ export type PageInfo = {
 };
 
 /** Payment details related to a transaction. */
-export type PaymentDetails = CardPaymentDetails | CustomGiftCardPaymentDetails;
+export type PaymentDetails = CardPaymentDetails;
 
 /** The payment icon to display for the transaction. */
 export type PaymentIcon = {
@@ -6033,15 +5758,6 @@ export type PaymentIconImage = Node & {
    * @deprecated Use `url` instead.
    */
   src: Scalars['URL']['output'];
-  /**
-   * The ThumbHash of the image.
-   *
-   * Useful to display placeholder images while the original image is loading.
-   *
-   * See https://evanw.github.io/thumbhash/ for details on how to use it.
-   *
-   */
-  thumbhash?: Maybe<Scalars['String']['output']>;
   /**
    * The location of the transformed image as a URL.
    *
@@ -6330,7 +6046,6 @@ export type PermittedOperation =
 
 /** Represents the personal information of a customer. */
 export type PersonalAccount = HasMetafields &
-  HasStoreCreditAccounts &
   Node & {
     __typename?: 'PersonalAccount';
     /**
@@ -6410,8 +6125,6 @@ export type PersonalAccount = HasMetafields &
     phone?: Maybe<Scalars['String']['output']>;
     /** A Return identified by ID. */
     return?: Maybe<Return>;
-    /** Returns a list of store credit accounts that belong to the owner resource. */
-    storeCreditAccounts: StoreCreditAccountConnection;
     /** A Subscription Contract resource identified by ID. */
     subscriptionContract?: Maybe<SubscriptionContract>;
     /** The Subscription Contracts associated with the customer. */
@@ -6503,15 +6216,6 @@ export type PersonalAccountReturnArgs = {
   id: Scalars['ID']['input'];
 };
 
-/** Represents the personal information of a customer. */
-export type PersonalAccountStoreCreditAccountsArgs = {
-  after?: InputMaybe<Scalars['String']['input']>;
-  before?: InputMaybe<Scalars['String']['input']>;
-  first?: InputMaybe<Scalars['Int']['input']>;
-  last?: InputMaybe<Scalars['Int']['input']>;
-  query?: InputMaybe<Scalars['String']['input']>;
-};
-
 /** Represents the personal information of a customer. */
 export type PersonalAccountSubscriptionContractArgs = {
   id: Scalars['ID']['input'];
@@ -6618,8 +6322,6 @@ export type ProductSale = Node &
 /** The data that about an order that is visible to anyone with the order ID. */
 export type PublicOrder = Node & {
   __typename?: 'PublicOrder';
-  /** Whether the order has automatic deferred payment collection. */
-  automaticDeferredPaymentCollection: Scalars['Boolean']['output'];
   /**
    * The date and time when the order was canceled.
    * Returns `null` if the order wasn't canceled.
@@ -6668,8 +6370,6 @@ export type PublicOrder = Node & {
   paymentInformation?: Maybe<OrderPaymentInformation>;
   /** The pickup information for the order. */
   pickupInformation?: Maybe<OrderPickupInformation>;
-  /** The pickup point information for the order. */
-  pickupPointInformation?: Maybe<OrderPickupPointInformation>;
   /** The purchase order number of the order. */
   poNumber?: Maybe<Scalars['String']['output']>;
   /**
@@ -6685,8 +6385,6 @@ export type PublicOrder = Node & {
   reorderPath?: Maybe<Scalars['String']['output']>;
   /** Whether the order requires shipping. */
   requiresShipping: Scalars['Boolean']['output'];
-  /** The return information for the order. */
-  returnInformation: OrderReturnInformation;
   /** The list of returns for the order with pagination. */
   returns: ReturnConnection;
   /** The list of shipping line groups for the order. */
@@ -6900,53 +6598,6 @@ export type RefundAgreementSalesArgs = {
   reverse?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
-/** The input fields for a requested line item. */
-export type RefundEstimateLineItemInput = {
-  /** The ID of the line item to be returned. */
-  lineItemId: Scalars['ID']['input'];
-  /** The quantity of the item to be returned. */
-  quantity: Scalars['Int']['input'];
-};
-
-/** A line item that is included in a refund. */
-export type RefundLineItem = Node & {
-  __typename?: 'RefundLineItem';
-  /** A globally-unique ID. */
-  id: Scalars['ID']['output'];
-  /** The line item that was associated with the refund. */
-  lineItem: LineItem;
-  /** The quantity of the item that was refunded. */
-  quantity?: Maybe<Scalars['Int']['output']>;
-  /** The subtotal amount that was refunded, in both shop and presentment currencies. */
-  subtotalSet: MoneyBag;
-};
-
-/**
- * An auto-generated type for paginating through multiple RefundLineItems.
- *
- */
-export type RefundLineItemConnection = {
-  __typename?: 'RefundLineItemConnection';
-  /** A list of edges. */
-  edges: Array<RefundLineItemEdge>;
-  /** A list of the nodes contained in RefundLineItemEdge. */
-  nodes: Array<RefundLineItem>;
-  /** Information to aid in pagination. */
-  pageInfo: PageInfo;
-};
-
-/**
- * An auto-generated type which holds one RefundLineItem and a cursor during pagination.
- *
- */
-export type RefundLineItemEdge = {
-  __typename?: 'RefundLineItemEdge';
-  /** A cursor for use in pagination. */
-  cursor: Scalars['String']['output'];
-  /** The item at the end of RefundLineItemEdge. */
-  node: RefundLineItem;
-};
-
 /**
  * The information about the line items container for items that have not been refunded or removed.
  *
@@ -7112,8 +6763,6 @@ export type Return = Node & {
   closedAt?: Maybe<Scalars['DateTime']['output']>;
   /** The date when the return was created. */
   createdAt?: Maybe<Scalars['DateTime']['output']>;
-  /** The additional details about the declined return. */
-  decline?: Maybe<ReturnDecline>;
   /** A globally-unique ID. */
   id: Scalars['ID']['output'];
   /** The name assigned to the return. */
@@ -7187,27 +6836,6 @@ export type ReturnConnection = {
   pageInfo: PageInfo;
 };
 
-/** The extra information about why a merchant declined the customer's return request. */
-export type ReturnDecline = {
-  __typename?: 'ReturnDecline';
-  /**
-   * The notification message that was sent to the customer about their declined return.
-   *
-   */
-  note?: Maybe<Scalars['String']['output']>;
-  /** The reason for the decline. */
-  reason: ReturnDeclineReason;
-};
-
-/** The specific reason for the merchant declining a customer's return request. */
-export type ReturnDeclineReason =
-  /** The return request was declined because it contains items from a final sale. */
-  | 'FINAL_SALE'
-  /** The return request was declined due to another reason. */
-  | 'OTHER'
-  /** The return request was declined because the return period has ended. */
-  | 'RETURN_PERIOD_ENDED';
-
 /**
  * An auto-generated type which holds one Return and a cursor during pagination.
  *
@@ -7220,67 +6848,6 @@ export type ReturnEdge = {
   node: Return;
 };
 
-/** Possible error codes that can be returned by `ReturnUserError`. */
-export type ReturnErrorCode =
-  /** The requested resource already exists. */
-  | 'ALREADY_EXISTS'
-  /** The input value is blank. */
-  | 'BLANK'
-  /** A requested resource could not be created. */
-  | 'CREATION_FAILED'
-  /** The input value should be equal to the value allowed. */
-  | 'EQUAL_TO'
-  /** A required feature is not enabled. */
-  | 'FEATURE_NOT_ENABLED'
-  /** The input value should be greater than the minimum allowed value. */
-  | 'GREATER_THAN'
-  /** The input value should be greater than or equal to the minimum value allowed. */
-  | 'GREATER_THAN_OR_EQUAL_TO'
-  /** The input value isn't included in the list. */
-  | 'INCLUSION'
-  /** Unexpected internal error happened. */
-  | 'INTERNAL_ERROR'
-  /** The input value is invalid. */
-  | 'INVALID'
-  /** A resource was not in the correct state for the operation to succeed. */
-  | 'INVALID_STATE'
-  /** The input value should be less than the maximum value allowed. */
-  | 'LESS_THAN'
-  /** The input value should be less than or equal to the maximum value allowed. */
-  | 'LESS_THAN_OR_EQUAL_TO'
-  /** A requested notification could not be sent. */
-  | 'NOTIFICATION_FAILED'
-  /** A request is not authorized. */
-  | 'NOT_AUTHORIZED'
-  /** The input value is not a number. */
-  | 'NOT_A_NUMBER'
-  /** A requested item is not editable. */
-  | 'NOT_EDITABLE'
-  /** A requested item could not be found. */
-  | 'NOT_FOUND'
-  /** The input value needs to be blank. */
-  | 'PRESENT'
-  /** The input value is already taken. */
-  | 'TAKEN'
-  /** The input value is too big. */
-  | 'TOO_BIG'
-  /** The input value is too long. */
-  | 'TOO_LONG'
-  /** Too many arguments provided. */
-  | 'TOO_MANY_ARGUMENTS'
-  /** The input value is too short. */
-  | 'TOO_SHORT'
-  /** The input value is the wrong length. */
-  | 'WRONG_LENGTH';
-
-/** Fee generated by the return process. */
-export type ReturnFee = {
-  /** The total monetary value of the fee in shop and presentment currencies. */
-  amountSet: MoneyBag;
-  /** Human-readable name of the fee. */
-  title: Scalars['String']['output'];
-};
-
 /** A line item that is being returned. */
 export type ReturnLineItem = Node & {
   __typename?: 'ReturnLineItem';
@@ -7343,31 +6910,6 @@ export type ReturnReason =
   /** The customer received the wrong item. */
   | 'WRONG_ITEM';
 
-/** The restocking fee incurred during the return process. */
-export type ReturnRestockingFee = ReturnFee & {
-  __typename?: 'ReturnRestockingFee';
-  /** The total monetary value of the fee in shop and presentment currencies. */
-  amountSet: MoneyBag;
-  /** Human-readable name of the fee. */
-  title: Scalars['String']['output'];
-};
-
-/** The shipping fee incurred during the return process. */
-export type ReturnShippingFee = ReturnFee & {
-  __typename?: 'ReturnShippingFee';
-  /** The total monetary value of the fee in shop and presentment currencies. */
-  amountSet: MoneyBag;
-  /** Human-readable name of the fee. */
-  title: Scalars['String']['output'];
-};
-
-/** The return shipping method. */
-export type ReturnShippingMethod =
-  /** The customer provides the shipping label. */
-  | 'CUSTOMER_PROVIDED_LABEL'
-  /** The merchant provides the shipping label. */
-  | 'MERCHANT_PROVIDED_LABEL';
-
 /** The set of valid sort keys for the Return query. */
 export type ReturnSortKeys =
   /** Sort by the `created_at` value. */
@@ -7403,55 +6945,6 @@ export type ReturnSupportedReason = {
   title: Scalars['String']['output'];
 };
 
-/** The errors that occur during the execution of a return mutation. */
-export type ReturnUserError = DisplayableError & {
-  __typename?: 'ReturnUserError';
-  /** The error code. */
-  code?: Maybe<ReturnErrorCode>;
-  /** The path to the input field that caused the error. */
-  field?: Maybe<Array<Scalars['String']['output']>>;
-  /** The error message. */
-  message: Scalars['String']['output'];
-};
-
-/**
- * A line item that contains some units eligible for return.
- *
- */
-export type ReturnableLineItem = {
-  __typename?: 'ReturnableLineItem';
-  /** The related line item. */
-  lineItem: LineItem;
-  /** The quantity of units that can be returned. */
-  quantity: Scalars['Int']['output'];
-};
-
-/**
- * An auto-generated type for paginating through multiple ReturnableLineItems.
- *
- */
-export type ReturnableLineItemConnection = {
-  __typename?: 'ReturnableLineItemConnection';
-  /** A list of edges. */
-  edges: Array<ReturnableLineItemEdge>;
-  /** A list of the nodes contained in ReturnableLineItemEdge. */
-  nodes: Array<ReturnableLineItem>;
-  /** Information to aid in pagination. */
-  pageInfo: PageInfo;
-};
-
-/**
- * An auto-generated type which holds one ReturnableLineItem and a cursor during pagination.
- *
- */
-export type ReturnableLineItemEdge = {
-  __typename?: 'ReturnableLineItemEdge';
-  /** A cursor for use in pagination. */
-  cursor: Scalars['String']['output'];
-  /** The item at the end of ReturnableLineItemEdge. */
-  node: ReturnableLineItem;
-};
-
 /**
  * A reverse delivery represents a package being sent back by a buyer to a merchant post-fulfillment.
  * This could occur when a buyer requests a return and the merchant provides a shipping label.
@@ -7822,18 +7315,6 @@ export type ShippingRate = {
   title: Scalars['String']['output'];
 };
 
-/**
- * The shipping costs that are paid back with the refund.
- *
- */
-export type ShippingRefund = {
-  __typename?: 'ShippingRefund';
-  /** The maximum amount of shipping fees that can be refunded currently, in both shop and presentment currencies. */
-  maximumRefundableSet: MoneyBag;
-  /** The monetary value of the tax allocated to the shipping fees that are to be refunded, in both shop and presentment currencies. */
-  taxSet: MoneyBag;
-};
-
 /** A collection of the general information about the shop. */
 export type Shop = HasMetafields &
   Node & {
@@ -8450,8 +7931,6 @@ export type SubscriptionContractsSortKeys =
    *
    */
   | 'RELEVANCE'
-  /** Sort by the `status` value. */
-  | 'STATUS'
   /** Sort by the `updated_at` value. */
   | 'UPDATED_AT';
 
@@ -8795,32 +8274,6 @@ export type SubscriptionShippingOption = {
   title: Scalars['String']['output'];
 };
 
-/**
- * A suggested order transaction. Suggested transactions are usually used in the context of refunds
- * and exchanges.
- *
- */
-export type SuggestedOrderTransaction = {
-  __typename?: 'SuggestedOrderTransaction';
-  /** The brand of the card used or the card type. */
-  cardBrand?: Maybe<Scalars['String']['output']>;
-  /** The human-readable payment gateway name suggested to process the transaction. */
-  formattedGateway?: Maybe<Scalars['String']['output']>;
-  /** The suggested payment gateway used to process the transaction. */
-  gateway?: Maybe<Scalars['String']['output']>;
-  /** The last four digits of the card used. */
-  last4?: Maybe<Scalars['String']['output']>;
-  /** The available amount to refund on the gateway in shop and presentment currencies. Only available within SuggestedRefund. */
-  maximumRefundableSet?: Maybe<MoneyBag>;
-  /**
-   * Whether the payment provider supports refunds.
-   * If true, then the provider supports refunds.
-   * If false, then the provider doesn't support refunds.
-   *
-   */
-  refundedUsingGateway: Scalars['Boolean']['output'];
-};
-
 /** The available tax exemptions for a customer. */
 export type TaxExemption =
   /** This customer is exempt from GST taxes for holding a valid exemption. The business customer should provide their GST number and account for the GST. */
@@ -10222,8 +9675,6 @@ export type UserErrorsPaymentInstrumentUserErrorsCode =
   | 'PHONE_NUMBER_NOT_VALID'
   /** The field is required. */
   | 'REQUIRED'
-  /** Saved payment methods is not enabled on this shop. */
-  | 'SAVED_PAYMENT_METHODS_NOT_ENABLED'
   /** This test card cannot be used for real transactions. */
   | 'TEST_MODE_LIVE_CARD'
   /** Address field is too long. */
diff --git a/packages/hydrogen-react/src/storefront-api-types.d.ts b/packages/hydrogen-react/src/storefront-api-types.d.ts
index d95b0c6050..2202ce834a 100644
--- a/packages/hydrogen-react/src/storefront-api-types.d.ts
+++ b/packages/hydrogen-react/src/storefront-api-types.d.ts
@@ -31,7 +31,6 @@ export type Scalars = {
   DateTime: {input: string; output: string};
   Decimal: {input: string; output: string};
   HTML: {input: string; output: string};
-  ISO8601DateTime: {input: unknown; output: unknown};
   JSON: {input: unknown; output: unknown};
   URL: {input: string; output: string};
   UnsignedInt64: {input: string; output: string};
@@ -525,14 +524,10 @@ export type CardBrand =
   | 'DINERS_CLUB'
   /** Discover. */
   | 'DISCOVER'
-  /** Elo. */
-  | 'ELO'
   /** JCB. */
   | 'JCB'
   /** Mastercard. */
   | 'MASTERCARD'
-  /** UnionPay. */
-  | 'UNIONPAY'
   /** Visa. */
   | 'VISA';
 
@@ -617,7 +612,6 @@ export type CartDeliveryGroupsArgs = {
   first?: InputMaybe<Scalars['Int']['input']>;
   last?: InputMaybe<Scalars['Int']['input']>;
   reverse?: InputMaybe<Scalars['Boolean']['input']>;
-  withCarrierRates?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
 /**
@@ -945,18 +939,6 @@ export type CartDeliveryOption = {
   estimatedCost: MoneyV2;
   /** The unique identifier of the delivery option. */
   handle: Scalars['String']['output'];
-  /**
-   * The maximum date and time by which the delivery is expected to be completed. You must enable
-   *       [processing time](https://help.shopify.com/manual/shipping/setting-up-and-managing-your-shipping/set-up-delivery-dates) or enroll in [Shopify Logistics](https://www.shopify.com/fulfillment)
-   *       to have access to this field.
-   */
-  maxEstimatedDeliveryDate?: Maybe<Scalars['ISO8601DateTime']['output']>;
-  /**
-   * The minimum date and time by which the delivery is expected to be completed. You must enable
-   *       [processing time](https://help.shopify.com/manual/shipping/setting-up-and-managing-your-shipping/set-up-delivery-dates) or enroll in [Shopify Logistics](https://www.shopify.com/fulfillment)
-   *       to have access to this field.
-   */
-  minEstimatedDeliveryDate?: Maybe<Scalars['ISO8601DateTime']['output']>;
   /** The title of the delivery option. */
   title?: Maybe<Scalars['String']['output']>;
 };
@@ -2385,157 +2367,6 @@ export type ComponentizableCartLineAttributeArgs = {
   key: Scalars['String']['input'];
 };
 
-/** Interaction of the current visitor consent with the configured consent policies of the shop. */
-export type ConsentManagement = {
-  __typename?: 'ConsentManagement';
-  /** The privacy banner that should be displayed to the visitor, if any, plus the list of country/regions configured in the cookie banner visibility. */
-  banner?: Maybe<ConsentManagementBanner>;
-  /** Given the provided visitor consent, the resulting ConsentManagementCookies that need to be setin the browser for the Consent Managament Platform to work and respect visitor consent. */
-  cookies: ConsentManagementCookies;
-  /** List of ISO3166 2-character country codes where the sale of data is enabled. */
-  saleOfDataRegions: Array<Scalars['String']['output']>;
-};
-
-/** Interaction of the current visitor consent with the configured consent policies of the shop. */
-export type ConsentManagementCookiesArgs = {
-  visitorConsent: VisitorConsent;
-};
-
-/** A shop's privacy banner settings. */
-export type ConsentManagementBanner = {
-  __typename?: 'ConsentManagementBanner';
-  /** Text for the accept button. */
-  buttonAcceptText: Scalars['String']['output'];
-  /** Text for the decline button. */
-  buttonDeclineText: Scalars['String']['output'];
-  /** Text for the preference button. */
-  buttonPrefsOpenText: Scalars['String']['output'];
-  /** Indicates if the banner is visible. */
-  enabled: Scalars['Boolean']['output'];
-  /** Text for the policy link. */
-  policyLinkText: Scalars['String']['output'];
-  /** URL for the policy link. */
-  policyLinkUrl: Scalars['String']['output'];
-  /** Position of the banner. */
-  position: ConsentManagementBannerPosition;
-  /** Fields for the banner preferences popup. */
-  preferences: ConsentManagementBannerPreferences;
-  /** List of ISO3166 2-character country codes where the banner should be visible. */
-  regionVisibility: Array<Scalars['String']['output']>;
-  /** Body text on the banner. */
-  text: Scalars['String']['output'];
-  /** Theme related fields of the banner. */
-  theme: ConsentManagementBannerTheme;
-  /** Title of the banner. */
-  title?: Maybe<Scalars['String']['output']>;
-};
-
-/**
- * Bullet points that provide clarity on the actions and consequences of cookie acceptance.
- *
- */
-export type ConsentManagementBannerBulletPoints = {
-  __typename?: 'ConsentManagementBannerBulletPoints';
-  /** Whether bullet points are enabled. */
-  enabled?: Maybe<Scalars['Boolean']['output']>;
-  /** Text of the first bullet point. */
-  firstText?: Maybe<Scalars['String']['output']>;
-  /** Text of the second bullet point. */
-  secondText?: Maybe<Scalars['String']['output']>;
-  /** Text of the third bullet point. */
-  thirdText?: Maybe<Scalars['String']['output']>;
-  /** Title of the bullet points. */
-  title?: Maybe<Scalars['String']['output']>;
-};
-
-/** The possible positions of a privacy banner. */
-export type ConsentManagementBannerPosition =
-  /** Banner is centered at the bottom of the page. */
-  | 'bottom_center'
-  /** Banner spans the full width of the page at the bottom. */
-  | 'bottom_full_width'
-  /** Banner is aligned to the bottom left of the page. */
-  | 'bottom_left'
-  /** Banner is aligned to the bottom right of the page. */
-  | 'bottom_right'
-  /** Banner is centered on the page. */
-  | 'center';
-
-/** Settings related to the banner preferences. */
-export type ConsentManagementBannerPreferences = {
-  __typename?: 'ConsentManagementBannerPreferences';
-  /** Data related to the bullet points of consent. */
-  bulletPoints?: Maybe<ConsentManagementBannerBulletPoints>;
-  /** Accept button text. */
-  buttonAcceptText: Scalars['String']['output'];
-  /** Decline button text. */
-  buttonDeclineText: Scalars['String']['output'];
-  /** Save button text. */
-  buttonSaveText: Scalars['String']['output'];
-  /** Introduction text. */
-  introText: Scalars['String']['output'];
-  /** Introduction title. */
-  introTitle: Scalars['String']['output'];
-  /** Purpose descriptions. */
-  purposes: ConsentManagementBannerPurposes;
-  /** Title for the banner preferences. */
-  title?: Maybe<Scalars['String']['output']>;
-};
-
-/** Descriptions associated with each purpose. */
-export type ConsentManagementBannerPurposes = {
-  __typename?: 'ConsentManagementBannerPurposes';
-  /** Long description for the essential purpose. */
-  essentialDesc: Scalars['String']['output'];
-  /** Short description for the essential purpose. */
-  essentialName: Scalars['String']['output'];
-  /** Long description for the marketing purpose. */
-  marketingDesc: Scalars['String']['output'];
-  /** Short description for the marketing purpose. */
-  marketingName: Scalars['String']['output'];
-  /** Long description for the performance purpose. */
-  performanceDesc: Scalars['String']['output'];
-  /** Short description for the performance purpose. */
-  performanceName: Scalars['String']['output'];
-  /** Long description for the preferences purpose. */
-  preferencesDesc: Scalars['String']['output'];
-  /** Short description for the preferences purpose. */
-  preferencesName: Scalars['String']['output'];
-};
-
-/** Represents the theme settings for the privacy banner. */
-export type ConsentManagementBannerTheme = {
-  __typename?: 'ConsentManagementBannerTheme';
-  /** Background color. */
-  backgroundColor: Scalars['String']['output'];
-  /** Button background color. */
-  buttonBackgroundColor: Scalars['String']['output'];
-  /** Button font color. */
-  buttonFontColor: Scalars['String']['output'];
-  /** Font color. */
-  fontColor: Scalars['String']['output'];
-  /** The chosen theme. */
-  theme: ConsentManagementBannerThemeEnum;
-};
-
-/** Possible themes for a privacy banner. */
-export type ConsentManagementBannerThemeEnum =
-  /** Customized theme provided by the user. */
-  | 'custom'
-  /** Dark theme for the banner. */
-  | 'dark'
-  /** Light theme for the banner. */
-  | 'light';
-
-/** Computed cookies needed by the Consent Management Platform to respect and query visitor consent. */
-export type ConsentManagementCookies = {
-  __typename?: 'ConsentManagementCookies';
-  /** The _cmp_a cookie, already URI encoded and serialized. */
-  answersCookie: Scalars['String']['output'];
-  /** The _tracking_consent cookie, already URI encoded and serialized. */
-  trackingConsentCookie: Scalars['String']['output'];
-};
-
 /** A country. */
 export type Country = {
   __typename?: 'Country';
@@ -3099,28 +2930,11 @@ export type CropRegion =
   | 'CENTER'
   /** Keep the left of the image. */
   | 'LEFT'
-  /** Crop the exact region of the image specified by the crop_left, crop_top, crop_width and crop_height parameters. */
-  | 'REGION'
   /** Keep the right of the image. */
   | 'RIGHT'
   /** Keep the top of the image. */
   | 'TOP';
 
-/**
- * The input fields for defining an arbitrary cropping region.
- *
- */
-export type CropRegionInput = {
-  /** Height of the region of the image to extract when using the region crop mode. */
-  height: Scalars['Int']['input'];
-  /** Left position of the region of the image to extract when using the region crop mode. */
-  left: Scalars['Int']['input'];
-  /** Top position of the region of the image to extract when using the region crop mode. */
-  top: Scalars['Int']['input'];
-  /** Width of the region of the image to extract when using the region crop mode. */
-  width: Scalars['Int']['input'];
-};
-
 /** A currency. */
 export type Currency = {
   __typename?: 'Currency';
@@ -3912,14 +3726,10 @@ export type DeliveryMethodType =
 
 /** Digital wallet, such as Apple Pay, which can be used for accelerated checkouts. */
 export type DigitalWallet =
-  /** Amazon Pay. */
-  | 'AMAZON_PAY'
   /** Android Pay. */
   | 'ANDROID_PAY'
   /** Apple Pay. */
   | 'APPLE_PAY'
-  /** Facebook Pay. */
-  | 'FACEBOOK_PAY'
   /** Google Pay. */
   | 'GOOGLE_PAY'
   /** Shopify Pay. */
@@ -4236,57 +4046,6 @@ export type FulfillmentTrackingInfo = {
   url?: Maybe<Scalars['URL']['output']>;
 };
 
-/** Represents a gate configuration. */
-export type GateConfiguration = HasMetafields &
-  Node & {
-    __typename?: 'GateConfiguration';
-    /**
-     * An ID that an owner can use to identify the gate configuration.
-     * @deprecated `appId` is deprecated and `handle` should be used for identifying a gate.
-     */
-    appId?: Maybe<Scalars['String']['output']>;
-    /** The date and time when the gate configuration was created. */
-    createdAt: Scalars['DateTime']['output'];
-    /** A non-unique string used to group gate configurations. */
-    handle?: Maybe<Scalars['String']['output']>;
-    /** The ID of the gate configuration. */
-    id: Scalars['ID']['output'];
-    /** Returns a metafield found by namespace and key. */
-    metafield?: Maybe<Metafield>;
-    /** The metafields associated with the resource matching the supplied list of namespaces and keys. */
-    metafields: Array<Maybe<Metafield>>;
-    /** The name of the gate configuration. */
-    name?: Maybe<Scalars['String']['output']>;
-    /** The date and time when the gate configuration was updated. */
-    updatedAt: Scalars['DateTime']['output'];
-  };
-
-/** Represents a gate configuration. */
-export type GateConfigurationMetafieldArgs = {
-  key: Scalars['String']['input'];
-  namespace?: InputMaybe<Scalars['String']['input']>;
-};
-
-/** Represents a gate configuration. */
-export type GateConfigurationMetafieldsArgs = {
-  identifiers: Array<HasMetafieldsIdentifier>;
-};
-
-/** Represents a connection from a subject to a gate configuration. */
-export type GateSubject = Node & {
-  __typename?: 'GateSubject';
-  /** True when the subject gate is active, false otherwise. */
-  active: Scalars['Boolean']['output'];
-  /** The bound gate configuration. */
-  configuration: GateConfiguration;
-  /** The date and time when the gate subject was created. */
-  createdAt: Scalars['DateTime']['output'];
-  /** The ID of the gate subject. */
-  id: Scalars['ID']['output'];
-  /** The date and time when the gate subject was updated. */
-  updatedAt: Scalars['DateTime']['output'];
-};
-
 /** The generic file resource lets you manage files in a merchant’s store. Generic files include any file that doesn’t fit into a designated type such as image or video. Example: PDF, JSON. */
 export type GenericFile = Node & {
   __typename?: 'GenericFile';
@@ -4312,17 +4071,6 @@ export type GeoCoordinateInput = {
   longitude: Scalars['Float']['input'];
 };
 
-/** Represents information about gates bound to a subject. */
-export type HasGates = {
-  /** Returns a list of GateSubjects bound to the subject. */
-  gates: Array<GateSubject>;
-};
-
-/** Represents information about gates bound to a subject. */
-export type HasGatesGatesArgs = {
-  includeInactive?: InputMaybe<Scalars['Boolean']['input']>;
-};
-
 /** Represents information about the metafields associated to the specified resource. */
 export type HasMetafields = {
   /** Returns a metafield found by namespace and key. */
@@ -4372,15 +4120,6 @@ export type Image = {
    * @deprecated Use `url` instead.
    */
   src: Scalars['URL']['output'];
-  /**
-   * The ThumbHash of the image.
-   *
-   * Useful to display placeholder images while the original image is loading.
-   *
-   * See https://evanw.github.io/thumbhash/ for details on how to use it.
-   *
-   */
-  thumbhash?: Maybe<Scalars['String']['output']>;
   /**
    * The location of the transformed image as a URL.
    *
@@ -4435,8 +4174,6 @@ export type ImageConnection = {
 
 /** List of supported image content types. */
 export type ImageContentType =
-  /** A BMP image. */
-  | 'BMP'
   /** A JPG image. */
   | 'JPG'
   /** A PNG image. */
@@ -4475,8 +4212,6 @@ export type ImageTransformInput = {
    *
    */
   crop?: InputMaybe<CropRegion>;
-  /** Defines an arbitrary cropping region. */
-  cropRegion?: InputMaybe<CropRegionInput>;
   /**
    * Image height in pixels between 1 and 5760.
    *
@@ -5391,7 +5126,6 @@ export type MetafieldParentResource =
   | Company
   | CompanyLocation
   | Customer
-  | GateConfiguration
   | Location
   | Market
   | Order
@@ -5827,10 +5561,6 @@ export type Mutation = {
   customerResetByUrl?: Maybe<CustomerResetByUrlPayload>;
   /** Updates an existing customer. */
   customerUpdate?: Maybe<CustomerUpdatePayload>;
-  /** Create a new Shop Pay payment request session. */
-  shopPayPaymentRequestSessionCreate?: Maybe<ShopPayPaymentRequestSessionCreatePayload>;
-  /** Submits a Shop Pay payment request session. */
-  shopPayPaymentRequestSessionSubmit?: Maybe<ShopPayPaymentRequestSessionSubmitPayload>;
 };
 
 /** The schema’s entry-point for mutations. This acts as the public, top-level API from which all mutation queries must start. */
@@ -5853,7 +5583,7 @@ export type MutationCartCreateArgs = {
 /** The schema’s entry-point for mutations. This acts as the public, top-level API from which all mutation queries must start. */
 export type MutationCartDiscountCodesUpdateArgs = {
   cartId: Scalars['ID']['input'];
-  discountCodes: Array<Scalars['String']['input']>;
+  discountCodes?: InputMaybe<Array<Scalars['String']['input']>>;
 };
 
 /** The schema’s entry-point for mutations. This acts as the public, top-level API from which all mutation queries must start. */
@@ -6098,19 +5828,6 @@ export type MutationCustomerUpdateArgs = {
   customerAccessToken: Scalars['String']['input'];
 };
 
-/** The schema’s entry-point for mutations. This acts as the public, top-level API from which all mutation queries must start. */
-export type MutationShopPayPaymentRequestSessionCreateArgs = {
-  paymentRequest: ShopPayPaymentRequestInput;
-  sourceIdentifier: Scalars['String']['input'];
-};
-
-/** The schema’s entry-point for mutations. This acts as the public, top-level API from which all mutation queries must start. */
-export type MutationShopPayPaymentRequestSessionSubmitArgs = {
-  idempotencyKey: Scalars['String']['input'];
-  paymentRequest: ShopPayPaymentRequestInput;
-  token: Scalars['String']['input'];
-};
-
 /**
  * An object with an ID field to support global identification, in accordance with the
  * [Relay specification](https://relay.dev/graphql/objectidentification.htm#sec-Node-Interface).
@@ -6147,8 +5864,6 @@ export type Order = HasMetafields &
     currentTotalDuties?: Maybe<MoneyV2>;
     /** The total amount of the order, including duties, taxes and discounts, minus amounts for line items that have been removed. */
     currentTotalPrice: MoneyV2;
-    /** The total cost of shipping, excluding shipping lines that have been refunded or removed. Taxes aren't included unless the order is a taxes-included order. */
-    currentTotalShippingPrice: MoneyV2;
     /** The total of all taxes applied to the order, excluding taxes for returned line items. */
     currentTotalTax: MoneyV2;
     /** A list of the custom attributes added to the order. */
@@ -6325,8 +6040,6 @@ export type OrderEdge = {
 export type OrderFinancialStatus =
   /** Displayed as **Authorized**. */
   | 'AUTHORIZED'
-  /** Displayed as **Expired**. */
-  | 'EXPIRED'
   /** Displayed as **Paid**. */
   | 'PAID'
   /** Displayed as **Partially paid**. */
@@ -6665,8 +6378,7 @@ export type PricingValue = MoneyV2 | PricingPercentageValue;
  * customization of another product or an extended warranty).
  *
  */
-export type Product = HasGates &
-  HasMetafields &
+export type Product = HasMetafields &
   Node &
   OnlineStorePublishable &
   Trackable & {
@@ -6690,8 +6402,6 @@ export type Product = HasGates &
      *
      */
     featuredImage?: Maybe<Image>;
-    /** Returns a list of GateSubjects bound to the subject. */
-    gates: Array<GateSubject>;
     /**
      * A human-friendly unique string for the Product automatically generated from its title.
      * They are used by the Liquid templating language to refer to objects.
@@ -6785,17 +6495,6 @@ export type ProductDescriptionArgs = {
   truncateAt?: InputMaybe<Scalars['Int']['input']>;
 };
 
-/**
- * A product represents an individual item for sale in a Shopify store. Products are often physical, but they don't have to be.
- * For example, a digital download (such as a movie, music or ebook file) also
- * qualifies as a product, as do services (such as equipment rental, work for hire,
- * customization of another product or an extended warranty).
- *
- */
-export type ProductGatesArgs = {
-  includeInactive?: InputMaybe<Scalars['Boolean']['input']>;
-};
-
 /**
  * A product represents an individual item for sale in a Shopify store. Products are often physical, but they don't have to be.
  * For example, a digital download (such as a movie, music or ebook file) also
@@ -7355,8 +7054,6 @@ export type QueryRoot = {
   collectionByHandle?: Maybe<Collection>;
   /** List of the shop’s collections. */
   collections: CollectionConnection;
-  /** Interaction of the current visitor consent with the configured consent policies of the shop. */
-  consentManagement: ConsentManagement;
   /**
    * The customer associated with the given access token. Tokens are obtained by using the
    * [`customerAccessTokenCreate` mutation](https://shopify.dev/docs/api/storefront/latest/mutations/customerAccessTokenCreate).
@@ -7395,8 +7092,6 @@ export type QueryRoot = {
     | CompanyLocation
     | ComponentizableCartLine
     | ExternalVideo
-    | GateConfiguration
-    | GateSubject
     | GenericFile
     | Location
     | MailingAddress
@@ -7436,8 +7131,6 @@ export type QueryRoot = {
       | CompanyLocation
       | ComponentizableCartLine
       | ExternalVideo
-      | GateConfiguration
-      | GateSubject
       | GenericFile
       | Location
       | MailingAddress
@@ -8162,374 +7855,6 @@ export type ShopMetafieldsArgs = {
   identifiers: Array<HasMetafieldsIdentifier>;
 };
 
-/** Represents a Shop Pay payment request. */
-export type ShopPayPaymentRequest = {
-  __typename?: 'ShopPayPaymentRequest';
-  /** The delivery methods for the payment request. */
-  deliveryMethods: Array<ShopPayPaymentRequestDeliveryMethod>;
-  /** The discount codes for the payment request. */
-  discountCodes: Array<Scalars['String']['output']>;
-  /** The discounts for the payment request order. */
-  discounts?: Maybe<Array<ShopPayPaymentRequestDiscount>>;
-  /** The line items for the payment request. */
-  lineItems: Array<ShopPayPaymentRequestLineItem>;
-  /** The locale for the payment request. */
-  locale: Scalars['String']['output'];
-  /** The presentment currency for the payment request. */
-  presentmentCurrency: CurrencyCode;
-  /** The delivery method type for the payment request. */
-  selectedDeliveryMethodType: ShopPayPaymentRequestDeliveryMethodType;
-  /** The shipping address for the payment request. */
-  shippingAddress?: Maybe<ShopPayPaymentRequestContactField>;
-  /** The shipping lines for the payment request. */
-  shippingLines: Array<ShopPayPaymentRequestShippingLine>;
-  /** The subtotal amount for the payment request. */
-  subtotal: MoneyV2;
-  /** The total amount for the payment request. */
-  total: MoneyV2;
-  /** The total shipping price for the payment request. */
-  totalShippingPrice?: Maybe<ShopPayPaymentRequestTotalShippingPrice>;
-  /** The total tax for the payment request. */
-  totalTax?: Maybe<MoneyV2>;
-};
-
-/** Represents a contact field for a Shop Pay payment request. */
-export type ShopPayPaymentRequestContactField = {
-  __typename?: 'ShopPayPaymentRequestContactField';
-  /** The first address line of the contact field. */
-  address1: Scalars['String']['output'];
-  /** The second address line of the contact field. */
-  address2?: Maybe<Scalars['String']['output']>;
-  /** The city of the contact field. */
-  city: Scalars['String']['output'];
-  /** The company name of the contact field. */
-  companyName?: Maybe<Scalars['String']['output']>;
-  /** The country of the contact field. */
-  countryCode: Scalars['String']['output'];
-  /** The email of the contact field. */
-  email?: Maybe<Scalars['String']['output']>;
-  /** The first name of the contact field. */
-  firstName: Scalars['String']['output'];
-  /** The first name of the contact field. */
-  lastName: Scalars['String']['output'];
-  /** The phone number of the contact field. */
-  phone?: Maybe<Scalars['String']['output']>;
-  /** The postal code of the contact field. */
-  postalCode?: Maybe<Scalars['String']['output']>;
-  /** The province of the contact field. */
-  provinceCode?: Maybe<Scalars['String']['output']>;
-};
-
-/** The input fields to create a contact field for a Shop Pay payment request. */
-export type ShopPayPaymentRequestContactFieldInput = {
-  /** The first address line of the contact field. */
-  address1?: InputMaybe<Scalars['String']['input']>;
-  /** The second address line of the contact field. */
-  address2?: InputMaybe<Scalars['String']['input']>;
-  /** The city of the contact field. */
-  city?: InputMaybe<Scalars['String']['input']>;
-  /** The company name of the contact field. */
-  companyName?: InputMaybe<Scalars['String']['input']>;
-  /** The country of the contact field. */
-  countryCode?: InputMaybe<Scalars['String']['input']>;
-  /** The email of the contact field. */
-  email?: InputMaybe<Scalars['String']['input']>;
-  /** The first name of the contact field. */
-  firstName?: InputMaybe<Scalars['String']['input']>;
-  /** The first name of the contact field. */
-  lastName?: InputMaybe<Scalars['String']['input']>;
-  /** The phone number of the contact field. */
-  phone?: InputMaybe<Scalars['String']['input']>;
-  /** The postal code of the contact field. */
-  postalCode?: InputMaybe<Scalars['String']['input']>;
-  /** The province of the contact field. */
-  provinceCode?: InputMaybe<Scalars['String']['input']>;
-};
-
-/** Represents a delivery method for a Shop Pay payment request. */
-export type ShopPayPaymentRequestDeliveryMethod = {
-  __typename?: 'ShopPayPaymentRequestDeliveryMethod';
-  /** The amount for the delivery method. */
-  amount: MoneyV2;
-  /** The code of the delivery method. */
-  code: Scalars['String']['output'];
-  /** The detail about when the delivery may be expected. */
-  deliveryExpectationLabel?: Maybe<Scalars['String']['output']>;
-  /** The detail of the delivery method. */
-  detail?: Maybe<Scalars['String']['output']>;
-  /** The label of the delivery method. */
-  label: Scalars['String']['output'];
-  /** The maximum delivery date for the delivery method. */
-  maxDeliveryDate?: Maybe<Scalars['ISO8601DateTime']['output']>;
-  /** The minimum delivery date for the delivery method. */
-  minDeliveryDate?: Maybe<Scalars['ISO8601DateTime']['output']>;
-};
-
-/** The input fields to create a delivery method for a Shop Pay payment request. */
-export type ShopPayPaymentRequestDeliveryMethodInput = {
-  /** The amount for the delivery method. */
-  amount?: InputMaybe<MoneyInput>;
-  /** The code of the delivery method. */
-  code?: InputMaybe<Scalars['String']['input']>;
-  /** The detail about when the delivery may be expected. */
-  deliveryExpectationLabel?: InputMaybe<Scalars['String']['input']>;
-  /** The detail of the delivery method. */
-  detail?: InputMaybe<Scalars['String']['input']>;
-  /** The label of the delivery method. */
-  label?: InputMaybe<Scalars['String']['input']>;
-  /** The maximum delivery date for the delivery method. */
-  maxDeliveryDate?: InputMaybe<Scalars['ISO8601DateTime']['input']>;
-  /** The minimum delivery date for the delivery method. */
-  minDeliveryDate?: InputMaybe<Scalars['ISO8601DateTime']['input']>;
-};
-
-/** Represents the delivery method type for a Shop Pay payment request. */
-export type ShopPayPaymentRequestDeliveryMethodType =
-  /** The delivery method type is pickup. */
-  | 'PICKUP'
-  /** The delivery method type is shipping. */
-  | 'SHIPPING';
-
-/** Represents a discount for a Shop Pay payment request. */
-export type ShopPayPaymentRequestDiscount = {
-  __typename?: 'ShopPayPaymentRequestDiscount';
-  /** The amount of the discount. */
-  amount: MoneyV2;
-  /** The label of the discount. */
-  label: Scalars['String']['output'];
-};
-
-/** The input fields to create a discount for a Shop Pay payment request. */
-export type ShopPayPaymentRequestDiscountInput = {
-  /** The amount of the discount. */
-  amount?: InputMaybe<MoneyInput>;
-  /** The label of the discount. */
-  label?: InputMaybe<Scalars['String']['input']>;
-};
-
-/** Represents an image for a Shop Pay payment request line item. */
-export type ShopPayPaymentRequestImage = {
-  __typename?: 'ShopPayPaymentRequestImage';
-  /** The alt text of the image. */
-  alt?: Maybe<Scalars['String']['output']>;
-  /** The source URL of the image. */
-  url: Scalars['String']['output'];
-};
-
-/** The input fields to create an image for a Shop Pay payment request. */
-export type ShopPayPaymentRequestImageInput = {
-  /** The alt text of the image. */
-  alt?: InputMaybe<Scalars['String']['input']>;
-  /** The source URL of the image. */
-  url: Scalars['String']['input'];
-};
-
-/** The input fields represent a Shop Pay payment request. */
-export type ShopPayPaymentRequestInput = {
-  /**
-   * The delivery methods for the payment request.
-   *
-   * The input must not contain more than `250` values.
-   */
-  deliveryMethods?: InputMaybe<Array<ShopPayPaymentRequestDeliveryMethodInput>>;
-  /**
-   * The discount codes for the payment request.
-   *
-   * The input must not contain more than `250` values.
-   */
-  discountCodes?: InputMaybe<Array<Scalars['String']['input']>>;
-  /**
-   * The discounts for the payment request order.
-   *
-   * The input must not contain more than `250` values.
-   */
-  discounts?: InputMaybe<Array<ShopPayPaymentRequestDiscountInput>>;
-  /**
-   * The line items for the payment request.
-   *
-   * The input must not contain more than `250` values.
-   */
-  lineItems?: InputMaybe<Array<ShopPayPaymentRequestLineItemInput>>;
-  /** The locale for the payment request. */
-  locale: Scalars['String']['input'];
-  /** The encrypted payment method for the payment request. */
-  paymentMethod?: InputMaybe<Scalars['String']['input']>;
-  /** The presentment currency for the payment request. */
-  presentmentCurrency: CurrencyCode;
-  /** The delivery method type for the payment request. */
-  selectedDeliveryMethodType?: InputMaybe<ShopPayPaymentRequestDeliveryMethodType>;
-  /** The shipping address for the payment request. */
-  shippingAddress?: InputMaybe<ShopPayPaymentRequestContactFieldInput>;
-  /**
-   * The shipping lines for the payment request.
-   *
-   * The input must not contain more than `250` values.
-   */
-  shippingLines?: InputMaybe<Array<ShopPayPaymentRequestShippingLineInput>>;
-  /** The subtotal amount for the payment request. */
-  subtotal: MoneyInput;
-  /** The total amount for the payment request. */
-  total: MoneyInput;
-  /** The total shipping price for the payment request. */
-  totalShippingPrice?: InputMaybe<ShopPayPaymentRequestTotalShippingPriceInput>;
-  /** The total tax for the payment request. */
-  totalTax?: InputMaybe<MoneyInput>;
-};
-
-/** Represents a line item for a Shop Pay payment request. */
-export type ShopPayPaymentRequestLineItem = {
-  __typename?: 'ShopPayPaymentRequestLineItem';
-  /**
-   * The amount for the line item.
-   * @deprecated This field is deprecated. Use final_line_price instead.
-   */
-  amount: MoneyV2;
-  /** The final item price for the line item. */
-  finalItemPrice: MoneyV2;
-  /** The final line price for the line item. */
-  finalLinePrice: MoneyV2;
-  /** The image of the line item. */
-  image?: Maybe<ShopPayPaymentRequestImage>;
-  /** The item discounts for the line item. */
-  itemDiscounts?: Maybe<Array<ShopPayPaymentRequestDiscount>>;
-  /** The label of the line item. */
-  label: Scalars['String']['output'];
-  /** The line discounts for the line item. */
-  lineDiscounts?: Maybe<Array<ShopPayPaymentRequestDiscount>>;
-  /** The original item price for the line item. */
-  originalItemPrice?: Maybe<MoneyV2>;
-  /** The original line price for the line item. */
-  originalLinePrice?: Maybe<MoneyV2>;
-  /** The quantity of the line item. */
-  quantity: Scalars['Int']['output'];
-  /** Whether the line item requires shipping. */
-  requiresShipping?: Maybe<Scalars['Boolean']['output']>;
-  /** The SKU of the line item. */
-  sku?: Maybe<Scalars['String']['output']>;
-};
-
-/** The input fields to create a line item for a Shop Pay payment request. */
-export type ShopPayPaymentRequestLineItemInput = {
-  /** The final item price for the line item. */
-  finalItemPrice?: InputMaybe<MoneyInput>;
-  /** The final line price for the line item. */
-  finalLinePrice?: InputMaybe<MoneyInput>;
-  /** The image of the line item. */
-  image?: InputMaybe<ShopPayPaymentRequestImageInput>;
-  /**
-   * The item discounts for the line item.
-   *
-   * The input must not contain more than `250` values.
-   */
-  itemDiscounts?: InputMaybe<Array<ShopPayPaymentRequestDiscountInput>>;
-  /** The label of the line item. */
-  label?: InputMaybe<Scalars['String']['input']>;
-  /**
-   * The line discounts for the line item.
-   *
-   * The input must not contain more than `250` values.
-   */
-  lineDiscounts?: InputMaybe<Array<ShopPayPaymentRequestDiscountInput>>;
-  /** The original item price for the line item. */
-  originalItemPrice?: InputMaybe<MoneyInput>;
-  /** The original line price for the line item. */
-  originalLinePrice?: InputMaybe<MoneyInput>;
-  /** The quantity of the line item. */
-  quantity: Scalars['Int']['input'];
-  /** Whether the line item requires shipping. */
-  requiresShipping?: InputMaybe<Scalars['Boolean']['input']>;
-  /** The SKU of the line item. */
-  sku?: InputMaybe<Scalars['String']['input']>;
-};
-
-/** Represents a receipt for a Shop Pay payment request. */
-export type ShopPayPaymentRequestReceipt = {
-  __typename?: 'ShopPayPaymentRequestReceipt';
-  /** The payment request object. */
-  paymentRequest: ShopPayPaymentRequest;
-  /** The processing status. */
-  processingStatusType: Scalars['String']['output'];
-  /** The token of the receipt. */
-  token: Scalars['String']['output'];
-};
-
-/** Represents a Shop Pay payment request session. */
-export type ShopPayPaymentRequestSession = {
-  __typename?: 'ShopPayPaymentRequestSession';
-  /** The checkout URL of the Shop Pay payment request session. */
-  checkoutUrl: Scalars['URL']['output'];
-  /** The payment request associated with the Shop Pay payment request session. */
-  paymentRequest: ShopPayPaymentRequest;
-  /** The source identifier of the Shop Pay payment request session. */
-  sourceIdentifier: Scalars['String']['output'];
-  /** The token of the Shop Pay payment request session. */
-  token: Scalars['String']['output'];
-};
-
-/** Return type for `shopPayPaymentRequestSessionCreate` mutation. */
-export type ShopPayPaymentRequestSessionCreatePayload = {
-  __typename?: 'ShopPayPaymentRequestSessionCreatePayload';
-  /** The new Shop Pay payment request session object. */
-  shopPayPaymentRequestSession?: Maybe<ShopPayPaymentRequestSession>;
-  /** Error codes for failed Shop Pay payment request session mutations. */
-  userErrors: Array<UserErrorsShopPayPaymentRequestSessionUserErrors>;
-};
-
-/** Return type for `shopPayPaymentRequestSessionSubmit` mutation. */
-export type ShopPayPaymentRequestSessionSubmitPayload = {
-  __typename?: 'ShopPayPaymentRequestSessionSubmitPayload';
-  /** The checkout on which the payment was applied. */
-  paymentRequestReceipt?: Maybe<ShopPayPaymentRequestReceipt>;
-  /** Error codes for failed Shop Pay payment request session mutations. */
-  userErrors: Array<UserErrorsShopPayPaymentRequestSessionUserErrors>;
-};
-
-/** Represents a shipping line for a Shop Pay payment request. */
-export type ShopPayPaymentRequestShippingLine = {
-  __typename?: 'ShopPayPaymentRequestShippingLine';
-  /** The amount for the shipping line. */
-  amount: MoneyV2;
-  /** The code of the shipping line. */
-  code: Scalars['String']['output'];
-  /** The label of the shipping line. */
-  label: Scalars['String']['output'];
-};
-
-/** The input fields to create a shipping line for a Shop Pay payment request. */
-export type ShopPayPaymentRequestShippingLineInput = {
-  /** The amount for the shipping line. */
-  amount?: InputMaybe<MoneyInput>;
-  /** The code of the shipping line. */
-  code?: InputMaybe<Scalars['String']['input']>;
-  /** The label of the shipping line. */
-  label?: InputMaybe<Scalars['String']['input']>;
-};
-
-/** Represents a shipping total for a Shop Pay payment request. */
-export type ShopPayPaymentRequestTotalShippingPrice = {
-  __typename?: 'ShopPayPaymentRequestTotalShippingPrice';
-  /** The discounts for the shipping total. */
-  discounts: Array<ShopPayPaymentRequestDiscount>;
-  /** The final total for the shipping total. */
-  finalTotal: MoneyV2;
-  /** The original total for the shipping total. */
-  originalTotal?: Maybe<MoneyV2>;
-};
-
-/** The input fields to create a shipping total for a Shop Pay payment request. */
-export type ShopPayPaymentRequestTotalShippingPriceInput = {
-  /**
-   * The discounts for the shipping total.
-   *
-   * The input must not contain more than `250` values.
-   */
-  discounts?: InputMaybe<Array<ShopPayPaymentRequestDiscountInput>>;
-  /** The final total for the shipping total. */
-  finalTotal?: InputMaybe<MoneyInput>;
-  /** The original total for the shipping total. */
-  originalTotal?: InputMaybe<MoneyInput>;
-};
-
 /**
  * The input fields for submitting Shop Pay payment method information for checkout.
  *
@@ -8769,8 +8094,6 @@ export type SubmitSuccess = {
   __typename?: 'SubmitSuccess';
   /** The ID of the cart completion attempt that will be used for polling for the result. */
   attemptId: Scalars['String']['output'];
-  /** The url to which the buyer should be redirected after the cart is successfully submitted. */
-  redirectUrl: Scalars['URL']['output'];
 };
 
 /** Cart submit for checkout completion is throttled. */
@@ -8980,27 +8303,6 @@ export type UserError = DisplayableError & {
   message: Scalars['String']['output'];
 };
 
-/** Represents an error that happens during execution of a customer mutation. */
-export type UserErrorsShopPayPaymentRequestSessionUserErrors =
-  DisplayableError & {
-    __typename?: 'UserErrorsShopPayPaymentRequestSessionUserErrors';
-    /** The error code. */
-    code?: Maybe<UserErrorsShopPayPaymentRequestSessionUserErrorsCode>;
-    /** The path to the input field that caused the error. */
-    field?: Maybe<Array<Scalars['String']['output']>>;
-    /** The error message. */
-    message: Scalars['String']['output'];
-  };
-
-/** Possible error codes that can be returned by `ShopPayPaymentRequestSessionUserErrors`. */
-export type UserErrorsShopPayPaymentRequestSessionUserErrorsCode =
-  /** Idempotency key has already been used. */
-  | 'IDEMPOTENCY_KEY_ALREADY_USED'
-  /** Payment request input is invalid. */
-  | 'PAYMENT_REQUEST_INVALID_INPUT'
-  /** Payment request not found. */
-  | 'PAYMENT_REQUEST_NOT_FOUND';
-
 /** The input fields for a filter used to view a subset of products in a collection matching a specific variant option. */
 export type VariantOptionFilter = {
   /** The name of the variant option to filter on. */
@@ -9042,18 +8344,6 @@ export type VideoSource = {
   width: Scalars['Int']['output'];
 };
 
-/** The new consent to data processing purposes provided by a visitor of the shop. true meansaccepting the purposes, false declining them, and null means that the visitor didn't express a preference. */
-export type VisitorConsent = {
-  /** The visitor accepts or rejects the analytics data processing purpose. */
-  analytics?: InputMaybe<Scalars['Boolean']['input']>;
-  /** The visitor accepts or rejects the first and third party marketing data processing purposes. */
-  marketing?: InputMaybe<Scalars['Boolean']['input']>;
-  /** The visitor accepts or rejects the preferences data processing purpose. */
-  preferences?: InputMaybe<Scalars['Boolean']['input']>;
-  /** The visitor accepts or rejects the sale or sharing of their data with third parties. */
-  saleOfData?: InputMaybe<Scalars['Boolean']['input']>;
-};
-
 /** Units of measurement for weight. */
 export type WeightUnit =
   /** Metric system unit of mass. */
diff --git a/packages/hydrogen/src/cart/cart-test-helper.ts b/packages/hydrogen/src/cart/cart-test-helper.ts
index 76c7b5d41e..41956eaf1a 100644
--- a/packages/hydrogen/src/cart/cart-test-helper.ts
+++ b/packages/hydrogen/src/cart/cart-test-helper.ts
@@ -2,7 +2,10 @@ import {CachingStrategy} from '../cache/strategies';
 import type {ExecutionArgs} from 'graphql';
 import {Storefront} from '../storefront';
 import {CacheNone} from '../cache/strategies';
+import {CustomerAccount} from '../customer/types';
 
+export const BUYER_ACCESS_TOKEN = 'sha123';
+export const BUYER_LOCATION_ID = 'gid://shopify/CompanyLocation/1';
 export const CART_ID = 'gid://shopify/Cart/c1-123';
 export const NEW_CART_ID = 'c1-new-cart-id';
 export const CHECKOUT_URL =
@@ -72,3 +75,17 @@ export function mockCreateStorefrontClient() {
     CacheNone: CacheNone,
   } as Storefront;
 }
+
+export function mockGetBuyer() {
+  return Promise.resolve({
+    customerAccessToken: BUYER_ACCESS_TOKEN,
+    companyLocationId: BUYER_LOCATION_ID,
+  });
+}
+
+export function mockCreateCustomerAccountClient() {
+  return {
+    UNSTABLE_getBuyer: mockGetBuyer,
+    isLoggedIn: () => Promise.resolve(true),
+  } as CustomerAccount;
+}
diff --git a/packages/hydrogen/src/cart/createCartHandler.test.ts b/packages/hydrogen/src/cart/createCartHandler.test.ts
index 56755d018e..04346411d6 100644
--- a/packages/hydrogen/src/cart/createCartHandler.test.ts
+++ b/packages/hydrogen/src/cart/createCartHandler.test.ts
@@ -4,7 +4,11 @@ import {
   HydrogenCartCustom,
   createCartHandler,
 } from './createCartHandler';
-import {mockCreateStorefrontClient, mockHeaders} from './cart-test-helper';
+import {
+  mockCreateCustomerAccountClient,
+  mockCreateStorefrontClient,
+  mockHeaders,
+} from './cart-test-helper';
 
 type MockCarthandler = {
   cartId?: string;
@@ -17,6 +21,7 @@ function getCartHandler(options: MockCarthandler = {}) {
   const {cartId, ...rest} = options;
   return createCartHandler({
     storefront: mockCreateStorefrontClient(),
+    customerAccount: mockCreateCustomerAccountClient(),
     getCartId: () =>
       options.cartId ? `gid://shopify/Cart/${options.cartId}` : undefined,
     setCartId: () => new Headers(),
diff --git a/packages/hydrogen/src/constants.ts b/packages/hydrogen/src/constants.ts
index f034384b10..e1b4af592f 100644
--- a/packages/hydrogen/src/constants.ts
+++ b/packages/hydrogen/src/constants.ts
@@ -11,6 +11,7 @@ export const SDK_VERSION_HEADER = 'X-SDK-Version';
 // For Customer Account API
 export const DEFAULT_CUSTOMER_API_VERSION = '2024-04';
 export const USER_AGENT = `Shopify Hydrogen ${LIB_VERSION}`;
+// This is a static api client id: https://shopify.dev/docs/api/customer#useaccesstoken-propertydetail-audience
 export const CUSTOMER_API_CLIENT_ID = '30243aa5-17c1-465a-8493-944bcc4e88aa';
 export const CUSTOMER_ACCOUNT_SESSION_KEY = 'customerAccount';
 export const BUYER_SESSION_KEY = 'buyer';
diff --git a/packages/hydrogen/src/customer/auth.helpers.test.ts b/packages/hydrogen/src/customer/auth.helpers.test.ts
index 460db56e4b..bfce68697a 100644
--- a/packages/hydrogen/src/customer/auth.helpers.test.ts
+++ b/packages/hydrogen/src/customer/auth.helpers.test.ts
@@ -1,6 +1,6 @@
 import {describe, it, expect, vi, beforeEach, afterEach} from 'vitest';
 import type {HydrogenSession} from '../hydrogen';
-import {CUSTOMER_ACCOUNT_SESSION_KEY} from './constants';
+import {CUSTOMER_ACCOUNT_SESSION_KEY} from '../constants';
 import {checkExpires, clearSession, refreshToken} from './auth.helpers';
 
 vi.mock('./BadRequest', () => {
@@ -36,6 +36,8 @@ function createFetchResponse<T>(data: T, options: {ok: boolean}) {
 
 let session: HydrogenSession;
 
+const exchangeForStorefrontCustomerAccessToken = vi.fn();
+
 describe('auth.helpers', () => {
   describe('refreshToken', () => {
     beforeEach(() => {
@@ -58,6 +60,7 @@ describe('auth.helpers', () => {
           customerAccountId: 'customerAccountId',
           customerAccountUrl: 'customerAccountUrl',
           httpsOrigin: 'https://localhost',
+          exchangeForStorefrontCustomerAccessToken,
         });
       }
 
@@ -77,6 +80,7 @@ describe('auth.helpers', () => {
           customerAccountId: 'customerAccountId',
           customerAccountUrl: 'customerAccountUrl',
           httpsOrigin: 'https://localhost',
+          exchangeForStorefrontCustomerAccessToken,
         });
       }
 
@@ -106,6 +110,7 @@ describe('auth.helpers', () => {
           customerAccountId: 'customerAccountId',
           customerAccountUrl: 'customerAccountUrl',
           httpsOrigin: 'https://localhost',
+          exchangeForStorefrontCustomerAccessToken,
         });
       }
 
@@ -136,6 +141,7 @@ describe('auth.helpers', () => {
         customerAccountId: 'customerAccountId',
         customerAccountUrl: 'customerAccountUrl',
         httpsOrigin: 'https://localhost',
+        exchangeForStorefrontCustomerAccessToken,
       });
 
       expect(session.set).toHaveBeenNthCalledWith(
@@ -194,6 +200,7 @@ describe('auth.helpers', () => {
           customerAccountId: 'customerAccountId',
           customerAccountUrl: 'customerAccountUrl',
           httpsOrigin: 'https://localhost',
+          exchangeForStorefrontCustomerAccessToken,
         });
       }
 
@@ -224,6 +231,7 @@ describe('auth.helpers', () => {
         customerAccountId: 'customerAccountId',
         customerAccountUrl: 'customerAccountUrl',
         httpsOrigin: 'https://localhost',
+        exchangeForStorefrontCustomerAccessToken,
       });
 
       expect(session.set).toHaveBeenNthCalledWith(
@@ -265,6 +273,7 @@ describe('auth.helpers', () => {
         customerAccountId: 'customerAccountId',
         customerAccountUrl: 'customerAccountUrl',
         httpsOrigin: 'https://localhost',
+        exchangeForStorefrontCustomerAccessToken,
       });
 
       expect(session.set).not.toHaveBeenNthCalledWith(1, 'customerAccount', {
diff --git a/packages/hydrogen/src/customer/customer.test.ts b/packages/hydrogen/src/customer/customer.test.ts
index fffe2919df..6605d1c647 100644
--- a/packages/hydrogen/src/customer/customer.test.ts
+++ b/packages/hydrogen/src/customer/customer.test.ts
@@ -1,7 +1,7 @@
 import {describe, it, expect, vi, beforeEach, afterEach} from 'vitest';
 import type {HydrogenSession, HydrogenSessionData} from '../hydrogen';
 import {createCustomerAccountClient} from './customer';
-import {CUSTOMER_ACCOUNT_SESSION_KEY} from './constants';
+import {BUYER_SESSION_KEY, CUSTOMER_ACCOUNT_SESSION_KEY} from '../constants';
 import crypto from 'node:crypto';
 
 if (!globalThis.crypto) {
@@ -55,11 +55,18 @@ const mockCustomerAccountSession: HydrogenSessionData['customerAccount'] = {
   nonce: 'nonce',
 };
 
+const mockBuyerSession = {
+  customerAccessToken: 'sha123',
+  companyLocationId: '1',
+};
+
 describe('customer', () => {
   beforeEach(() => {
     session = {
       commit: vi.fn(() => new Promise((resolve) => resolve('cookie'))),
-      get: vi.fn(() => mockCustomerAccountSession) as HydrogenSession['get'],
+      get: vi.fn(() => {
+        return {...mockCustomerAccountSession, ...mockBuyerSession};
+      }) as HydrogenSession['get'],
       set: vi.fn(),
       unset: vi.fn(),
     };
@@ -519,7 +526,6 @@ describe('customer', () => {
           expiresAt: expect.any(String),
           idToken: 'e30=.eyJub25jZSI6ICJub25jZSJ9.signature',
           refreshToken: 'refresh_token',
-          redirectPath: undefined,
         }),
       );
     });
@@ -570,7 +576,50 @@ describe('customer', () => {
           expiresAt: expect.any(String),
           idToken: 'e30=.eyJub25jZSI6ICJub25jZSJ9.signature',
           refreshToken: 'refresh_token',
-          redirectPath: undefined,
+        }),
+      );
+    });
+
+    it('exchanges for a storefront customer access token for b2b', async () => {
+      const redirectPath = '/account/orders';
+      session = {
+        commit: vi.fn(() => new Promise((resolve) => resolve('cookie'))),
+        get: vi.fn(() => {
+          return {...mockCustomerAccountSession, redirectPath};
+        }) as HydrogenSession['get'],
+        set: vi.fn(),
+        unset: vi.fn(),
+      };
+
+      const customer = createCustomerAccountClient({
+        session,
+        customerAccountId: 'customerAccountId',
+        customerAccountUrl: 'https://customer-api',
+        request: new Request('https://localhost?state=state&code=code'),
+        b2b: true,
+        waitUntil: vi.fn(),
+      });
+
+      fetch.mockResolvedValue(
+        createFetchResponse(
+          {
+            access_token: 'access_token',
+            expires_in: '',
+            id_token: `${btoa('{}')}.${btoa('{"nonce": "nonce"}')}.signature`,
+            refresh_token: 'refresh_token',
+          },
+          {ok: true},
+        ),
+      );
+
+      const response = await customer.authorize();
+
+      expect(response.status).toBe(302);
+
+      expect(fetch).toHaveBeenCalledWith(
+        expect.stringContaining('https://customer-api/account/customer/api'),
+        expect.objectContaining({
+          body: expect.stringContaining('storefrontCustomerAccessTokenCreate'),
         }),
       );
     });
@@ -835,4 +884,55 @@ describe('customer', () => {
       }
     });
   });
+
+  describe('setBuyer()', async () => {
+    it('set buyer in session', async () => {
+      const customer = createCustomerAccountClient({
+        session,
+        customerAccountId: 'customerAccountId',
+        customerAccountUrl: 'https://customer-api',
+        request: new Request('https://localhost'),
+        waitUntil: vi.fn(),
+      });
+
+      customer.UNSTABLE_setBuyer(mockBuyerSession);
+
+      expect(session.set).toHaveBeenCalledWith(
+        BUYER_SESSION_KEY,
+        expect.objectContaining(mockBuyerSession),
+      );
+    });
+  });
+
+  describe('setBuyer and getBuyer()', async () => {
+    it('returns a buyer when logged in', async () => {
+      const customer = createCustomerAccountClient({
+        session,
+        customerAccountId: 'customerAccountId',
+        customerAccountUrl: 'https://customer-api',
+        request: new Request('https://localhost'),
+        waitUntil: vi.fn(),
+      });
+
+      const buyer = await customer.UNSTABLE_getBuyer();
+
+      expect(buyer).toEqual(expect.objectContaining(mockBuyerSession));
+    });
+
+    it('returns undefined when not logged in', async () => {
+      const customer = createCustomerAccountClient({
+        session,
+        customerAccountId: 'customerAccountId',
+        customerAccountUrl: 'https://customer-api',
+        request: new Request('https://localhost'),
+        waitUntil: vi.fn(),
+      });
+
+      (session.get as any).mockReturnValueOnce(undefined);
+
+      const buyer = await customer.UNSTABLE_getBuyer();
+
+      expect(buyer).toBeUndefined();
+    });
+  });
 });
diff --git a/packages/hydrogen/src/customer/customer.ts b/packages/hydrogen/src/customer/customer.ts
index 4fe99f2b01..65b3b09517 100644
--- a/packages/hydrogen/src/customer/customer.ts
+++ b/packages/hydrogen/src/customer/customer.ts
@@ -75,7 +75,7 @@ export function createCustomerAccountClient({
   authUrl,
   customAuthStatusHandler,
   logErrors = true,
-  b2b = false,
+  unstableB2b = false,
 }: CustomerAccountOptions): CustomerAccount {
   if (customerApiVersion !== DEFAULT_CUSTOMER_API_VERSION) {
     console.warn(
@@ -302,7 +302,7 @@ export function createCustomerAccountClient({
   }
 
   async function exchangeForStorefrontCustomerAccessToken() {
-    if (!b2b) {
+    if (!unstableB2b) {
       return;
     }
 
diff --git a/packages/hydrogen/src/customer/types.ts b/packages/hydrogen/src/customer/types.ts
index c7b4ccf4bf..5ebad85c1b 100644
--- a/packages/hydrogen/src/customer/types.ts
+++ b/packages/hydrogen/src/customer/types.ts
@@ -145,7 +145,7 @@ export type CustomerAccountOptions = {
   /** Whether it should print GraphQL errors automatically. Defaults to true */
   logErrors?: boolean | ((error?: Error) => boolean);
   /** UNSTABLE feature, this will eventually goes away. If true then we will exchange customerAccessToken for storefrontCustomerAccessToken. */
-  b2b?: boolean;
+  unstableB2b?: boolean;
 };
 
 /** Below are types meant for documentation only. Ensure it stay in sync with the type above. */
diff --git a/packages/hydrogen/src/storefront.test.ts b/packages/hydrogen/src/storefront.test.ts
index 95e993197b..99a3ccdf08 100644
--- a/packages/hydrogen/src/storefront.test.ts
+++ b/packages/hydrogen/src/storefront.test.ts
@@ -6,6 +6,11 @@ import {
   SHOPIFY_STOREFRONT_S_HEADER,
   SHOPIFY_STOREFRONT_Y_HEADER,
 } from '@shopify/hydrogen-react';
+import {
+  BUYER_ACCESS_TOKEN,
+  BUYER_LOCATION_ID,
+  mockCreateCustomerAccountClient,
+} from './cart/cart-test-helper';
 
 vi.mock('./cache/fetch.ts', async () => {
   const original = await vi.importActual<typeof import('./cache/fetch.ts')>(
@@ -136,6 +141,28 @@ describe('createStorefrontClient', () => {
     });
   });
 
+  it('adds buyer variables for b2b', async () => {
+    const {storefront} = createStorefrontClient({
+      storeDomain,
+      storefrontId,
+      storefrontHeaders,
+      publicStorefrontToken,
+      i18n: {language: 'EN', country: 'US'},
+      customerAccount: mockCreateCustomerAccountClient(),
+      b2b: true,
+    });
+
+    await expect(
+      storefront.query('query Name($something: String, $buyer: BuyerInput) {}'),
+    ).resolves.not.toThrow();
+
+    expect(vi.mocked(fetchWithServerCache).mock.lastCall?.[1]).toMatchObject({
+      body: expect.stringMatching(
+        `"variables":{"buyer":{"customerAccessToken":"${BUYER_ACCESS_TOKEN}","companyLocationId":"${BUYER_LOCATION_ID}"}}`,
+      ),
+    });
+  });
+
   describe('response errors', () => {
     it('throws when the response is not ok', async () => {
       const {storefront} = createStorefrontClient({
diff --git a/packages/hydrogen/src/storefront.ts b/packages/hydrogen/src/storefront.ts
index bd92e91a51..01e8c88702 100644
--- a/packages/hydrogen/src/storefront.ts
+++ b/packages/hydrogen/src/storefront.ts
@@ -175,9 +175,9 @@ type HydrogenClientProps<TI18n> = {
   /** Whether it should print GraphQL errors automatically. Defaults to true */
   logErrors?: boolean | ((error?: Error) => boolean);
   /** /** UNSTABLE feature. When using Customer Account API with B2B, provided customerAccount client here for all the query to automatically get buyer Context. */
-  customerAccount?: CustomerAccount;
+  unstableCustomerAccount?: CustomerAccount;
   /** UNSTABLE feature. If true then we will exchange query a buyer context will automatically be provided. */
-  b2b?: boolean;
+  unstableB2b?: boolean;
 };
 
 export type CreateStorefrontClientOptions<TI18n extends I18nBase> =
@@ -223,8 +223,8 @@ export function createStorefrontClient<TI18n extends I18nBase>(
     i18n,
     storefrontId,
     logErrors = true,
-    customerAccount,
-    b2b = false,
+    unstableCustomerAccount,
+    unstableB2b = false,
     ...clientOptions
   } = options;
   const H2_PREFIX_WARN = '[h2:warn:createStorefrontClient] ';
@@ -311,8 +311,8 @@ export function createStorefrontClient<TI18n extends I18nBase>(
       }
     }
 
-    if (b2b && customerAccount) {
-      const buyer = await customerAccount.UNSTABLE_getBuyer();
+    if (unstableB2b && unstableCustomerAccount) {
+      const buyer = await unstableCustomerAccount.UNSTABLE_getBuyer();
 
       queryVariables.buyer = buyer;
     }