@faststore/core 4.5.0-dev.4 → 4.5.0-dev.6

package/src/pages/[slug]/p.tsx

@@ -135,6 +135,22 @@ function buildHreflangLinks(
   return links
 }
 
+// With client-side offer enabled, `useOffer` only refreshes price aggregates —
+// it does not rebuild the per-seller array the buy button reads. Keep that array
+// from SSG, but inject the fresh Pricing Fallback token into the best offer so the
+// value sent to the cart respects the token's short validity window.
+const withFreshPriceToken = (
+  serverOffers: ServerProductQueryQuery['product']['offers'],
+  offer: ReturnType<typeof useOffer>
+) => ({
+  ...offer.offers,
+  offers: serverOffers.offers.map((offerItem, index) =>
+    index === 0
+      ? { ...offerItem, priceToken: offer.priceToken ?? offerItem.priceToken }
+      : offerItem
+  ),
+})
+
 function Page({
   data: server,
   sections,
@@ -198,7 +214,11 @@ function Page({
     ? (() => {
         const offer = useOffer({ skuId: product.sku })
         return {
-          client: { product: { offers: offer.offers } },
+          client: {
+            product: {
+              offers: withFreshPriceToken(product.offers, offer),
+            },
+          },
           isValidating: offer.isValidating,
         }
       })()
@@ -388,6 +408,7 @@ const query = gql(`
           priceValidUntil
           priceCurrency
           itemCondition
+          priceToken
           seller {
             identifier
           }

package/src/pages/pvt/account/404.tsx

@@ -147,9 +147,9 @@ const getServerSidePropsBase: GetServerSideProps<
 
   return {
     props: {
-      page,
+      page: page ?? ({ sections: [], settings: {} } as PageContentType),
       globalSections: globalSectionsResult,
-      accountName: account.data.accountProfile.name,
+      accountName: account.data?.accountProfile?.name ?? '',
     },
   }
 }

package/src/sdk/account/useReorder.ts

@@ -78,8 +78,9 @@ export const useReorder = () => {
           seller: {
             identifier: item.seller,
           },
-          price: item.price ?? 0,
-          listPrice: item.price ?? 0,
+          price: item.price,
+          listPrice: item.price,
+          priceToken: null,
           itemOffered: {
             sku: item.id ?? '',
             image: item.imageUrl
@@ -111,7 +112,7 @@ export const useReorder = () => {
         orderPayload.orderNumber = currentCart.id
       }
 
-      const { validateCart: validated } = await request<
+      const result = await request<
         ValidateCartMutationMutation,
         ValidateCartMutationMutationVariables
       >(ValidateCartMutation, {
@@ -121,6 +122,8 @@ export const useReorder = () => {
         },
       })
 
+      const validated = result?.validateCart ?? null
+
       if (!validated) {
         throw new ReorderError('Failed to add items to cart')
       }
@@ -132,7 +135,7 @@ export const useReorder = () => {
           id: getItemId(item),
         })),
         messages: validated.messages,
-        shouldSplitItem: validated.order.shouldSplitItem,
+        shouldSplitItem: validated.order.shouldSplitItem ?? undefined,
       }
 
       cartStore.set(updatedCart)

package/src/sdk/cart/index.ts

@@ -18,8 +18,9 @@ import { createValidationStore, useStore } from '../useStore'
 
 export interface CartItem
   extends SDKCartItem,
-    Omit<CartItemFragment, 'isGift'> {
+    Omit<CartItemFragment, 'isGift' | 'priceToken'> {
   isGift?: boolean | null
+  priceToken?: string | null
 }
 
 export interface Cart extends SDKCart<CartItem> {
@@ -58,6 +59,7 @@ export const ValidateCartMutation = gql(`
     listPrice
     listPriceWithTaxes
     isGift
+    priceToken
     itemOffered {
       ...CartProductItem
     }
@@ -128,12 +130,14 @@ const validateCart = async (cart: Cart): Promise<Cart | null> => {
             seller,
             quantity,
             itemOffered,
+            priceToken,
           }): IStoreOffer => {
             return {
               price,
               listPrice,
               seller,
               quantity,
+              priceToken,
               itemOffered: {
                 sku: itemOffered.sku,
                 image: itemOffered.image,

package/src/sdk/offer/index.ts

@@ -5,7 +5,7 @@ import { fetcher } from './fetcher'
 import { bestOfferFirst } from './sort'
 export { getUrl as getOfferUrl } from './fetcher'
 
-const ERROR_DATA = { offers: {}, isValidating: false }
+const ERROR_DATA = { offers: {}, priceToken: null, isValidating: false }
 
 export function useOffer(args: { skuId: string }) {
   const { data, error, isValidating } = useSWR(args.skuId, fetcher)
@@ -41,5 +41,10 @@ export function useOffer(args: { skuId: string }) {
 
   const offers = aggregateOffer(sellers)
 
-  return { offers, isValidating }
+  // Fresh Pricing Fallback signed price token from the best seller. Fetched
+  // directly from Intelligent Search on the client, so it bypasses the SSG/CDN
+  // caches and respects the token's short (~30min) validity window.
+  const priceToken = sellers[0]?.PriceToken ?? null
+
+  return { offers, priceToken, isValidating }
 }

package/src/server/cms/fetchMyAccountPageContent.ts

@@ -16,22 +16,23 @@ export async function fetchMyAccountPageContent(
   context: FetchMyAccountPageContentContext,
   pagePath: string
 ) {
-  const pageContent = await contentService
-    .getSingleContent<PageContentType>({
-      contentType,
-      previewData: context.previewData,
-      locale: context.locale,
-    })
-    .catch((err) => {
-      console.warn('[MyAccount CMS fallback]', {
+  const pageContent =
+    (await contentService
+      .getSingleContent<PageContentType>({
         contentType,
+        previewData: context.previewData,
         locale: context.locale,
-        fallbackReason: err instanceof Error ? err.message : String(err),
-        page: pagePath,
       })
+      .catch((err) => {
+        console.warn('[MyAccount CMS fallback]', {
+          contentType,
+          locale: context.locale,
+          fallbackReason: err instanceof Error ? err.message : String(err),
+          page: pagePath,
+        })
 
-      return { sections: [], settings: {} } as PageContentType
-    })
+        return { sections: [], settings: {} } as PageContentType
+      })) ?? ({ sections: [], settings: {} } as PageContentType)
 
   const sections = withDefaultMyAccountSections(
     contentType,