@ticketboothapp/booking 1.2.180 → 1.2.181

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticketboothapp/booking",
-  "version": "1.2.180",
+  "version": "1.2.181",
   "private": false,
   "sideEffects": [
     "**/*.css",

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -18,7 +18,6 @@ import { CURRENCIES, DEFAULT_CURRENCY, type Currency } from './CurrencySwitcher'
 import { useCompanyTimezone } from '../../contexts/CompanyContext';
 import { useBookingApp } from '../../contexts/BookingAppContext';
 import { useBookingHost } from '../../runtime';
-import { filterAvailabilitiesAfterCurrentTime } from '../../lib/booking/booking-cutoffs';
 import type { ChangeBookingFlowProps } from './booking-flow-types';
 import {
   normalizeAddOnSelections,
@@ -26,6 +25,7 @@ import {
 } from './change-booking-flow-helpers';
 import {
   buildChangeBookingMinimumQuantities,
+  filterAdminChangeCalendarAvailabilities,
   isAdminManualOverrideEligibleLine,
   resolveChangeFlowOriginalDate,
   resolveInitialChangeProductOptionId,
@@ -156,6 +156,10 @@ export function AdminChangeBookingFlow({
     isAdmin,
     companyId: env.COMPANY_ID,
   });
+  const changeFlowOriginalDate = useMemo(
+    () => resolveChangeFlowOriginalDate(initialValues?.dateTime, companyTimezone),
+    [initialValues?.dateTime, companyTimezone],
+  );
   const [adminAvailabilityNowMs, setAdminAvailabilityNowMs] = useState(() => Date.now());
 
   useEffect(() => {
@@ -171,8 +175,13 @@ export function AdminChangeBookingFlow({
     (rows: Availability[]) =>
       product.productType === 'PRIVATE_SHUTTLE'
         ? rows
-        : filterAvailabilitiesAfterCurrentTime(rows, adminAvailabilityNow),
-    [adminAvailabilityNow, product.productType],
+        : filterAdminChangeCalendarAvailabilities({
+            availabilities: rows,
+            originalDate: changeFlowOriginalDate,
+            companyTimezone,
+            now: adminAvailabilityNow,
+          }),
+    [adminAvailabilityNow, changeFlowOriginalDate, companyTimezone, product.productType],
   );
   const [selectedAvailability, setSelectedAvailability] = useState<Availability | null>(null);
   const [selectedReturnOption, setSelectedReturnOption] = useState<ReturnOption | null>(null);
@@ -279,10 +288,6 @@ export function AdminChangeBookingFlow({
   const [skipConfirmationCommunications, setSkipConfirmationCommunications] = useState(false);
   /** Admin only: disable all auto communications for this booking (provider dashboard). */
   const [disableAutoCommunications, setDisableAutoCommunications] = useState(false);
-  const changeFlowOriginalDate = useMemo(
-    () => resolveChangeFlowOriginalDate(initialValues?.dateTime, companyTimezone),
-    [initialValues?.dateTime, companyTimezone],
-  );
   const isProviderDashboardChange = Boolean(onChangeBooking);
   const useAdminFeAuthoritativeQuote = isAdmin && isProviderDashboardChange;
   /** Any change from an existing booking (public or provider). */

package/src/components/booking/BookingDialog.tsx

@@ -8,6 +8,7 @@ import { getProduct, type Product } from '../../lib/booking-api';
 import './booking-flow.css';
 import BookingProductGrid from './BookingProductGrid';
 import { BookingFlow } from './BookingFlow';
+import { VIAVIA_TICKET_FINE_PRINT_BY_CATEGORY } from './booking-flow-ui';
 import { PrivateShuttleBookingFlow } from './PrivateShuttleBookingFlow';
 import { BookingFlowPreview } from './BookingFlowPreview';
 import { useIsBookingLaunchLive } from '../../hooks/useIsBookingLaunchLive';
@@ -162,6 +163,7 @@ function BookFlowScreen({
             onComplete();
           }}
           isPartialLaunch={isPartialLaunch}
+          flowUi={{ ticketFinePrintByCategory: VIAVIA_TICKET_FINE_PRINT_BY_CATEGORY }}
         />
       )}
     </div>
@@ -194,6 +196,9 @@ export default function BookingDialog() {
   const isLaunchLive = useIsBookingLaunchLive();
   const isPartialLaunch = !isLaunchLive;
   const currentScreen = stack[stack.length - 1];
+  const currentScreenType = currentScreen.type;
+  const currentBookFlowProductId =
+    currentScreenType === 'book-flow' ? currentScreen.productId : null;
   const [productName, setProductName] = useState<string | null>(null);
   const dialogRef = useRef<HTMLDivElement>(null);
 
@@ -209,18 +214,18 @@ export default function BookingDialog() {
   const contentRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
-    if (currentScreen.type === 'product-grid') {
+    if (currentScreenType === 'product-grid') {
       setProductName(null);
     }
-  }, [currentScreen.type]);
+  }, [currentScreenType]);
 
   // Reset scroll when switching to book-flow so we don't appear partially scrolled
   // (product-grid restores its own scroll when returning from a product)
   useEffect(() => {
-    if (currentScreen.type === 'book-flow' && contentRef.current) {
+    if (currentScreenType === 'book-flow' && contentRef.current) {
       contentRef.current.scrollTop = 0;
     }
-  }, [currentScreen.type, currentScreen.type === 'book-flow' ? currentScreen.productId : null]);
+  }, [currentBookFlowProductId, currentScreenType]);
 
   const overlayRef = useRef<HTMLDivElement>(null);
 

package/src/components/booking/BookingProductGrid.module.css

@@ -49,7 +49,7 @@
 
 .grid {
   display: grid;
-  grid-template-columns: 1fr 1fr;
+  grid-template-columns: 1fr;
   gap: 0.75rem;
 }
 
@@ -65,10 +65,11 @@
   transform: scale(1.05);
 }
 
+/* Mobile: full-width landscape card (single column) */
 .tileImageContainer {
   position: relative;
   width: 100%;
-  height: 280px;
+  height: 220px;
   overflow: hidden;
 }
 
@@ -328,31 +329,42 @@
     display: none;
   }
 
-  .tileImageContainer {
-    height: 280px;
-  }
-
   .tileStartTime {
-    font-size: 2.5rem;
+    font-size: 2rem;
   }
 
   .expandedInner {
     flex-direction: column;
+    min-height: 0;
   }
 
   .expandedImage {
-    flex: 0 0 340px;
-    min-height: 340px;
+    flex: 0 0 260px;
+    min-height: 260px;
   }
 
   .expandedVideo {
-    min-height: 340px;
+    min-height: 260px;
   }
 
   .expandedContent {
     padding: 1rem;
   }
 
+  /* Keep the CTA above the fold: title → book button → description → pills */
+  .expandedTitle {
+    order: -2;
+  }
+
+  .expandedActions {
+    order: -1;
+    margin: 0;
+  }
+
+  .bookButton {
+    width: 100%;
+  }
+
   .expandedTags {
     left: 0.75rem;
   }

package/src/components/booking/BookingProductGrid.tsx

@@ -375,7 +375,7 @@ export default function BookingProductGrid({
   const expandedProduct =
     expandedIndex >= 0 ? products[expandedIndex] : null;
 
-  // Column count for expand-in-place logic (2 mobile, 3 desktop; compact always 2)
+  // Column count for expand-in-place logic (1 mobile, 3 desktop; compact always 2)
   const [cols, setCols] = useState(compact ? 2 : 3);
   useEffect(() => {
     if (compact) {
@@ -383,7 +383,7 @@ export default function BookingProductGrid({
       return;
     }
     const mq = window.matchMedia('(min-width: 768px)');
-    const update = () => setCols(mq.matches ? 3 : 2);
+    const update = () => setCols(mq.matches ? 3 : 1);
     update();
     mq.addEventListener('change', update);
     return () => mq.removeEventListener('change', update);

package/src/components/booking/ChangeBookingDialog.tsx

@@ -8,6 +8,7 @@ import { useBookingHost } from '../../runtime';
 import { formatCurrencyAmount, type Currency } from '../../lib/currency';
 import { CURRENCIES, DEFAULT_CURRENCY } from './CurrencySwitcher';
 import { ChangeBookingFlow } from './ChangeBookingFlow';
+import { VIAVIA_TICKET_FINE_PRINT_BY_CATEGORY } from './booking-flow-ui';
 import type { ChangeFlowSelectionPreview } from './booking-flow-types';
 import { useBookingSourceMetadataFromLocation } from '../../hooks/useBookingSourceMetadataFromLocation';
 import styles from './BookingDialog.module.css';
@@ -131,7 +132,7 @@ export default function ChangeBookingDialog({
     return () => {
       cancelled = true;
     };
-  }, [isOpen, apiProductId, minimalProduct, staticProduct]);
+  }, [isOpen, apiProductId, env.COMPANY_ID, minimalProduct, staticProduct]);
 
   useEffect(() => {
     if (isOpen) {
@@ -448,6 +449,7 @@ export default function ChangeBookingDialog({
                 }}
                 initialValues={initialValues}
                 onChangeFlowSelectionPreview={handleChangeFlowSelectionPreview}
+                flowUi={{ ticketFinePrintByCategory: VIAVIA_TICKET_FINE_PRINT_BY_CATEGORY }}
               />
             </div>
           )}

package/src/components/booking/ChangeBookingFlow.tsx

@@ -329,7 +329,6 @@ export function ChangeBookingFlow({
 
   const {
     initialAddOnQtyByKey,
-    initialAddOnMinQtyByKey,
     initialAddOnMinTotalByAddOnId,
     updateAddOnSelections,
   } = useChangeBookingAddOnFloorController({
@@ -953,6 +952,7 @@ export function ChangeBookingFlow({
             addOnSelections={addOnSelections}
             onAddOnSelectionsChange={updateAddOnSelections}
             minimumTotalByAddOnId={isCustomerSelfServeChange ? initialAddOnMinTotalByAddOnId : undefined}
+            ticketFinePrintByCategory={flowUi?.ticketFinePrintByCategory}
           />
 
           {/* Total and Checkout — shared PriceSummary component */}

package/src/components/booking/ChangeBookingSelectionControlsPanel.tsx

@@ -50,6 +50,7 @@ export interface ChangeBookingSelectionControlsPanelProps {
   suppressUnitPrices?: boolean;
   suppressReturnPerPersonPrices?: boolean;
   suppressAddOnPrices?: boolean;
+  ticketFinePrintByCategory?: Record<string, string>;
 }
 
 export function ChangeBookingSelectionControlsPanel({
@@ -90,6 +91,7 @@ export function ChangeBookingSelectionControlsPanel({
   suppressUnitPrices = false,
   suppressReturnPerPersonPrices = false,
   suppressAddOnPrices = false,
+  ticketFinePrintByCategory,
 }: ChangeBookingSelectionControlsPanelProps) {
   return (
     <>
@@ -156,6 +158,7 @@ export function ChangeBookingSelectionControlsPanel({
           onAddOnSelectionsChange={onAddOnSelectionsChange}
           minimumTotalByAddOnId={minimumTotalByAddOnId}
           suppressAddOnPrices={suppressAddOnPrices}
+          ticketFinePrintByCategory={ticketFinePrintByCategory}
         />
       ) : null}
     </>

package/src/components/booking/ChangeBookingTicketsAndAddOnsPanel.tsx

@@ -40,6 +40,7 @@ export interface ChangeBookingTicketsAndAddOnsPanelProps {
   minimumTotalByAddOnId?: Map<string, number>;
   suppressUnitPrices?: boolean;
   suppressAddOnPrices?: boolean;
+  ticketFinePrintByCategory?: Record<string, string>;
 }
 
 export function ChangeBookingTicketsAndAddOnsPanel({
@@ -69,6 +70,7 @@ export function ChangeBookingTicketsAndAddOnsPanel({
   minimumTotalByAddOnId,
   suppressUnitPrices = false,
   suppressAddOnPrices = false,
+  ticketFinePrintByCategory,
 }: ChangeBookingTicketsAndAddOnsPanelProps) {
   const incompatibleSelections = incompatibleAddOnSelections(
     addOnSelections,
@@ -101,6 +103,7 @@ export function ChangeBookingTicketsAndAddOnsPanel({
         minimumQuantities={minimumQuantities}
         ticketUnitFloorByCategory={applyReceiptPaidFloors ? ticketUnitFloorByCategory : undefined}
         suppressUnitPrices={suppressUnitPrices}
+        ticketFinePrintByCategory={ticketFinePrintByCategory}
       />
 
       {totalQuantity > 0 && addOns.length > 0 ? (

package/src/components/booking/NewBookingFlow.tsx

@@ -952,6 +952,7 @@ export function NewBookingFlow({
             returnVacancies={effectiveSelectedReturnVacancies}
             isSimplifiedPricingView={isSimplifiedPricingView}
             onQuantityChange={handleQuantityChange}
+            ticketFinePrintByCategory={flowUi?.ticketFinePrintByCategory}
             addOns={addOns}
             addOnSelections={addOnSelections}
             onAddOnSelectionsChange={updateAddOnSelections}

package/src/components/booking/PrivateShuttleAddOnsSection.tsx

@@ -153,7 +153,7 @@ export function PrivateShuttleAddOnsSection({
           Food restrictions
         </label>
         <p className="mb-2 text-sm text-stone-500">
-          Shuttle includes croissants, coffee, tea, hot chocolate, and trail snacks.
+          Shuttle includes coffee, tea, hot chocolate, and trail snacks. If you are adding on breakfast or lunch, please let us know if you have any dietary restrictions or allergies.
         </p>
         <textarea
           id="food-restrictions"

package/src/components/booking/StandardBookingSelectionControlsPanel.tsx

@@ -65,6 +65,7 @@ export interface StandardBookingSelectionControlsPanelProps {
   returnVacancies: number | null;
   isSimplifiedPricingView: boolean;
   onQuantityChange: (category: string, delta: number) => void;
+  ticketFinePrintByCategory?: Record<string, string>;
   addOns: AddOn[];
   addOnSelections: AddOnSelection[];
   onAddOnSelectionsChange: AddOnSelectionsChangeHandler;
@@ -107,6 +108,7 @@ export function StandardBookingSelectionControlsPanel({
   returnVacancies,
   isSimplifiedPricingView,
   onQuantityChange,
+  ticketFinePrintByCategory,
   addOns,
   addOnSelections,
   onAddOnSelectionsChange,
@@ -142,9 +144,13 @@ export function StandardBookingSelectionControlsPanel({
       ) : null}
 
       {selectedBookingOptionsHydrating ? (
-        <div className="flex items-center justify-center gap-3 rounded-lg border border-stone-200 bg-white p-4 text-stone-600">
+        <div
+          className="flex items-center justify-center gap-3 py-2 text-stone-600"
+          role="status"
+          aria-live="polite"
+        >
           <div className="booking-loading-spinner" aria-hidden />
-          <div>{t('booking.loadingTimes')}</div>
+          <div>{t('booking.confirmingAvailability')}</div>
         </div>
       ) : null}
 
@@ -218,6 +224,7 @@ export function StandardBookingSelectionControlsPanel({
           onQuantityChange={onQuantityChange}
           minimumQuantities={undefined}
           ticketUnitFloorByCategory={undefined}
+          ticketFinePrintByCategory={ticketFinePrintByCategory}
         />
       ) : null}
 

package/src/components/booking/TicketSelector.module.css

@@ -49,6 +49,14 @@
   color: var(--booking-stone-500, #78716c);
 }
 
+.finePrint {
+  margin-top: 0.25rem;
+  font-size: 0.7rem;
+  line-height: 1.3;
+  color: var(--booking-stone-500, #78716c);
+  max-width: 16rem;
+}
+
 .priceStrikethrough {
   text-decoration: line-through;
   color: var(--booking-stone-400, #a8a29e);

package/src/components/booking/TicketSelector.tsx

@@ -48,6 +48,8 @@ interface TicketSelectorProps {
   ticketUnitFloorByCategory?: Map<string, number>;
   /** Hide unit/strike prices (customer change flow until server-backed pricing is shown). */
   suppressUnitPrices?: boolean;
+  /** Optional small fine print rendered under a ticket row, keyed by category (e.g. INFANT). */
+  ticketFinePrintByCategory?: Record<string, string>;
 }
 
 export function TicketSelector({
@@ -70,6 +72,7 @@ export function TicketSelector({
   minimumQuantities,
   ticketUnitFloorByCategory,
   suppressUnitPrices = false,
+  ticketFinePrintByCategory,
 }: TicketSelectorProps) {
   /** Party size vs tighter of pickup/return vacancies (parent passes min of both legs). */
   const isOverbookedTickets = totalQuantity > selectedVacancies;
@@ -166,6 +169,11 @@ export function TicketSelector({
                     formatCurrencyAmount(effectiveUnitPrice, currency, locale as 'en' | 'fr')
                   )}
                 </p>
+                {ticketFinePrintByCategory?.[rate.category] && (
+                  <p className={styles.finePrint}>
+                    {ticketFinePrintByCategory[rate.category]}
+                  </p>
+                )}
               </div>
               <div className={styles.controls}>
                 <button

package/src/components/booking/admin-change-flow-state-helpers.ts

@@ -1,5 +1,6 @@
 import { formatInTimeZone } from 'date-fns-tz';
 import type { Availability, Product } from '../../lib/booking-api';
+import { isAvailabilityAfterCurrentTime } from '../../lib/booking/booking-cutoffs';
 import {
   effectiveProductOptionIdForChangeFlow,
   normalizeProductOptionIdForChangeFlow,
@@ -45,6 +46,40 @@ export function resolveChangeFlowOriginalDate(
   }
 }
 
+/**
+ * Admin changes may need to edit the return for a tour that is already in progress.
+ * Keep every availability on that booking's service date visible even after its
+ * start time passes, while retaining the normal "future starts only" rule for
+ * every other date.
+ */
+export function filterAdminChangeCalendarAvailabilities({
+  availabilities,
+  originalDate,
+  companyTimezone,
+  now = new Date(),
+}: {
+  availabilities: Availability[];
+  originalDate: string | null;
+  companyTimezone: string;
+  now?: Date;
+}): Availability[] {
+  return availabilities.filter((availability) => {
+    if (originalDate) {
+      try {
+        const availabilityDate = formatInTimeZone(
+          parseAvailabilityDateTime(availability.dateTime),
+          companyTimezone,
+          'yyyy-MM-dd',
+        );
+        if (availabilityDate === originalDate) return true;
+      } catch {
+        /* fall through to the normal time guard */
+      }
+    }
+    return isAvailabilityAfterCurrentTime(availability, now);
+  });
+}
+
 export function buildChangeBookingMinimumQuantities({
   isCustomerSelfServeChange,
   isAdmin,

package/src/components/booking/availability-cache-policy.ts

@@ -0,0 +1,10 @@
+/**
+ * A covered cache range is revalidated only after the cache TTL expires.
+ * Reserve/checkout perform their own fresh validation before committing inventory.
+ */
+export function shouldRevalidateAvailabilityCache(
+  cacheCoversRange: boolean,
+  isStale: boolean,
+): boolean {
+  return cacheCoversRange && isStale;
+}

package/src/components/booking/booking-flow-ui.ts

@@ -69,8 +69,18 @@ export interface BookingFlowUiOptions {
   providerDashboardChangePricingUi?: ProviderDashboardChangePricingUi;
   /** Override the orange section heading above cancellation policy cards (e.g. photo-first shuttle flow). */
   cancellationPolicySectionLabel?: string;
+  /** Small fine print shown under a ticket category row, keyed by category (e.g. { INFANT: "..." }). */
+  ticketFinePrintByCategory?: Record<string, string>;
 }
 
+/**
+ * Via Via default per-category ticket fine print, shown under the ticket row in the
+ * ticket selector. Surfaces that pass their own `flowUi` can override or omit it.
+ */
+export const VIAVIA_TICKET_FINE_PRINT_BY_CATEGORY: Record<string, string> = {
+  INFANT: 'You are required to bring your own safety seat for children under 40lbs (20kg).',
+};
+
 /**
  * Baseline UX for embedded partner-style surfaces (partner portal Book tab, TicketBooth provider dashboard):
  * skip collage + tour description, auto-pick the earliest bookable calendar day and first time slot,

package/src/components/booking/use-private-shuttle-availability.ts

@@ -32,6 +32,7 @@ import {
   privateShuttleAvailabilityDateInZone,
   privateShuttleStartTimeAllowed,
 } from './private-shuttle-availability';
+import { shouldRevalidateAvailabilityCache } from './availability-cache-policy';
 import { getStartOfCurrentDay } from './standard-booking-availability';
 
 interface UsePrivateShuttleAvailabilityParams {
@@ -364,7 +365,10 @@ export function usePrivateShuttleAvailability({
         );
         const isStale = availabilitiesCache?.isStale(cached) ?? false;
         if (cacheCoversRange) {
-          shouldRevalidateCachedRange = true;
+          shouldRevalidateCachedRange = shouldRevalidateAvailabilityCache(
+            cacheCoversRange,
+            isStale,
+          );
           setAvailabilities(cached.availabilities);
           if (cached.pricingConfig) applyCachedPricingConfig(cached.pricingConfig);
           if (cached.precomputedPrices) setPrecomputedPrices(cached.precomputedPrices);

package/src/components/booking/use-standard-booking-availability.ts

@@ -39,6 +39,7 @@ import {
   parseAvailabilityDateTime,
   shouldSyncSelectedAvailability,
 } from './standard-booking-availability';
+import { shouldRevalidateAvailabilityCache } from './availability-cache-policy';
 
 interface UseStandardBookingAvailabilityParams {
   product: Product;
@@ -462,7 +463,10 @@ export function useStandardBookingAvailability({
         );
         const isStale = availabilitiesCache?.isStale(cached) ?? false;
         if (cacheCoversRange) {
-          shouldRevalidateCachedRange = true;
+          shouldRevalidateCachedRange = shouldRevalidateAvailabilityCache(
+            cacheCoversRange,
+            isStale,
+          );
           setAvailabilities(cached.availabilities);
           if (cached.availabilities.length > 0) {
             hasLoadedAvailabilitiesRef.current = true;

package/src/constants/pill-values.ts

@@ -7,7 +7,6 @@ const doubleCheckIconPath = '/pill-value-icons/double-check-icon.svg';
 const hikerIconPath = '/pill-value-icons/hiker-icon.svg';
 const waterIconPath = '/pill-value-icons/water-icon.svg';
 const lunchIconPath = '/pill-value-icons/lunch-icon.svg';
-const croissantIconPath = '/pill-value-icons/croissant-icon.svg';
 const locationPinIconPath = '/pill-value-icons/location-pin-icon.svg';
 const addTimeIconPath = '/pill-value-icons/add-time-icon.svg';
 const coffeeIconPath = '/pill-value-icons/coffee-icon.svg';
@@ -188,13 +187,6 @@ export const createLunchPillValue = (strings = defaultStrings): PillValue => {
     };
 }
 
-export const createCroissantPillValue = (strings = defaultStrings): PillValue => {
-    return {
-        icon: croissantIconPath,
-        label: strings.pillValues.croissant
-    };
-}
-
 export const createHotDrinksPillValue = (strings = defaultStrings): PillValue => {
     return {
         icon: coffeeIconPath,

package/src/constants/products.ts

@@ -1,5 +1,5 @@
 import { ImageData, IMAGES } from './images';
-import { PillValue, createDeparturePillValue, createDurationPillValue, createSunrisePillValue, createTwoLakesInOnePillValue, createHikePillValue, createCanoePillValue, createMoneyPillValue, createAddTimePillValue, createHotDrinksPillValue, createLunchPillValue, createCroissantPillValue, createemeraldLakeEscapeTourLocationsPillValues, createCozyBlanketsPillValue } from './pill-values';
+import { PillValue, createDeparturePillValue, createDurationPillValue, createSunrisePillValue, createTwoLakesInOnePillValue, createHikePillValue, createCanoePillValue, createMoneyPillValue, createAddTimePillValue, createHotDrinksPillValue, createLunchPillValue, createemeraldLakeEscapeTourLocationsPillValues, createCozyBlanketsPillValue } from './pill-values';
 export enum ProductTagStyle {
   MOST_POPULAR = 'most-popular',
   NEW = 'new',
@@ -149,7 +149,7 @@ export const getProducts = (strings: any): Record<string, Product> => ({
     description: strings.productThemePages.privateTours.description,
     path: '/private-shuttle',
     avgPrice: 1699,
-    pillValues: [createDeparturePillValue('private-tour', strings), createDurationPillValue('private-tour', strings), createCroissantPillValue(strings), createHotDrinksPillValue(strings), createMoneyPillValue('private-tour', strings)]
+    pillValues: [createDeparturePillValue('private-tour', strings), createDurationPillValue('private-tour', strings), createHotDrinksPillValue(strings), createMoneyPillValue('private-tour', strings)]
   }
 });
 

package/src/data/product-descriptions/private-tour.en.json

@@ -35,8 +35,7 @@
         "• Trailsnacks 🍫",
         "• Water to refills - bring your water bottle 💧",
         "• Complimentary hot chocolate, coffee & tea ☕️",
-        "• Fresh croissant from a local french-canadian bakery 🥐",
-        "• Lunch options available 🍽️",
+        "• Breakfast and Lunch options available 🍽️",
         "• Phone chargers 🔋 ",
         "• Moraine Lake Access Fee 🏞️",
         "• Banff National Park Pass 🏞️"

package/src/lib/booking/i18n/messages/en.json

@@ -80,6 +80,7 @@
     "selectTimeAndTickets": "Please select a time and at least one ticket",
     "selectPickupLocation": "Please select a pickup location",
     "loadingTimes": "Loading available times...",
+    "confirmingAvailability": "Confirming availability...",
     "noAvailability": "No availability found for the next 30 days. Please check back later.",
     "seeFullTourDescription": "See full tour description",
     "seeFullAddOnDescription": "See full experience details",

package/src/lib/booking/i18n/messages/fr.json

@@ -80,6 +80,7 @@
     "selectTimeAndTickets": "Veuillez sélectionner une heure et au moins un billet",
     "selectPickupLocation": "Veuillez sélectionner un lieu de prise en charge",
     "loadingTimes": "Chargement des heures disponibles...",
+    "confirmingAvailability": "Confirmation des disponibilités...",
     "noAvailability": "Aucune disponibilité trouvée pour les 30 prochains jours. Veuillez réessayer plus tard.",
     "seeFullTourDescription": "Voir la description complète du circuit",
     "seeFullAddOnDescription": "Voir tous les détails de l'expérience",

package/src/lib/booking-api.ts

@@ -23,15 +23,28 @@ import {
   type BookingSourceMetadata,
 } from './booking/source-metadata';
 
-const API_BASE = ENV.API_URL;
+const API_BASE = ENV.API_URL.replace(/\/$/, '');
+const BOOKING_READ_API_BASE = ENV.BOOKING_READ_API_URL.replace(/\/$/, '');
+const BOOKING_GATEWAY_PREFIX = '/api/booking';
 
 /** When set (e.g. booking-portal partner session), reserve/checkout use Bearer instead of Basic. */
 let partnerPortalBookingJwtGetter: () => string | null = () => null;
+let partnerPortalBookingAuthorizationFailureHandler: () => void = () => {};
+
+/** Partner sessions retain their Bearer-authenticated read path. Public reads use the gateway. */
+function bookingReadApiBase(): string {
+  return partnerPortalBookingJwtGetter() ? API_BASE : BOOKING_READ_API_BASE;
+}
 
 export function setPartnerPortalBookingJwtGetter(fn: () => string | null): void {
   partnerPortalBookingJwtGetter = fn;
 }
 
+/** Called when TicketBooth rejects the current partner JWT so the portal can clear stale authority. */
+export function setPartnerPortalBookingAuthorizationFailureHandler(fn: () => void): void {
+  partnerPortalBookingAuthorizationFailureHandler = fn;
+}
+
 interface ApiErrorPayload {
   errorCode?: string;
   errorMessage?: string;
@@ -42,15 +55,85 @@ function isApiErrorPayload(value: unknown): value is ApiErrorPayload {
   return typeof value === 'object' && value !== null;
 }
 
+function notifyPartnerPortalAuthorizationFailure(): void {
+  if (!partnerPortalBookingJwtGetter()) return;
+  try {
+    partnerPortalBookingAuthorizationFailureHandler();
+  } catch {
+    // Authentication cleanup must never mask the original API error.
+  }
+}
+
+function isRejectedAuthenticationPayload(value: unknown): value is ApiErrorPayload {
+  if (!isApiErrorPayload(value) || value.errorCode !== 'AUTHORIZATION_FAILURE') return false;
+  return value.errorMessage?.trim().toLowerCase() !== 'access denied';
+}
+
 async function parseJsonSafely(res: Response): Promise<unknown> {
   try {
-    return await res.json();
+    const payload: unknown = await res.json();
+    if (isRejectedAuthenticationPayload(payload)) {
+      notifyPartnerPortalAuthorizationFailure();
+    }
+    return payload;
   } catch {
     return null;
   }
 }
 
 type BookingClientErrorClass = 'NETWORK' | 'HTTP' | 'APP_ERROR_200';
+const TELEMETRY_DEDUPE_WINDOW_MS = 30_000;
+const telemetryDedupeFallback = new Map<string, number>();
+
+function telemetryDedupeKey(
+  eventName: string,
+  correlationId: string,
+  fields: Record<string, unknown>
+): string | null {
+  if (
+    eventName === 'BOOKING_DIALOG_REQUEST_TIMING' ||
+    eventName === 'BOOKING_DIALOG_REQUEST_RETRYING' ||
+    eventName === 'BOOKING_DIALOG_NETWORK_PROBE_PING'
+  ) return null;
+  const endpoint = typeof fields.endpoint === 'string' ? fields.endpoint : '';
+  if (!endpoint) return null;
+  const signature = [
+    correlationId,
+    eventName,
+    endpoint,
+    fields.errorClass,
+    fields.errorCode,
+    fields.httpStatus,
+    fields.errorName,
+  ].map((value) => String(value ?? '')).join('|');
+  let hash = 2166136261;
+  for (let index = 0; index < signature.length; index += 1) {
+    hash ^= signature.charCodeAt(index);
+    hash = Math.imul(hash, 16777619);
+  }
+  return `tb_booking_telemetry_${(hash >>> 0).toString(16)}`;
+}
+
+function shouldEmitBookingTelemetry(
+  eventName: string,
+  correlationId: string,
+  fields: Record<string, unknown>
+): boolean {
+  const key = telemetryDedupeKey(eventName, correlationId, fields);
+  if (!key) return true;
+  const now = Date.now();
+  try {
+    const previous = Number(sessionStorage.getItem(key));
+    if (Number.isFinite(previous) && now - previous < TELEMETRY_DEDUPE_WINDOW_MS) return false;
+    sessionStorage.setItem(key, String(now));
+    return true;
+  } catch {
+    const previous = telemetryDedupeFallback.get(key);
+    if (previous != null && now - previous < TELEMETRY_DEDUPE_WINDOW_MS) return false;
+    telemetryDedupeFallback.set(key, now);
+    return true;
+  }
+}
 
 /** Thrown by booking-api helpers; includes API error details for UX branching (e.g. capacity conflicts). */
 export type BookingClientError = Error & {
@@ -88,7 +171,7 @@ function logBookingApiNetworkError(endpoint: string, err: unknown): void {
   if (typeof window === 'undefined') return;
   const details = {
     endpoint,
-    apiBase: API_BASE,
+    apiBase: bookingReadApiBase(),
     online: window.navigator.onLine,
     userAgent: window.navigator.userAgent,
     error: err instanceof Error ? err.message : String(err),
@@ -102,16 +185,18 @@ function reportBookingClientTelemetryEvent(
   fields: Record<string, unknown>
 ): void {
   if (typeof window === 'undefined') return;
-  const telemetryEndpoint = `${API_BASE}/1/client-telemetry`;
+  const telemetryEndpoint = `${BOOKING_READ_API_BASE}/1/client-telemetry`;
   const correlationId = getOrCreateBookingCorrelationId();
+  if (!shouldEmitBookingTelemetry(eventName, correlationId, fields)) return;
   const traceparent = buildTraceparent();
   const traceId = traceIdFromTraceparent(traceparent);
   const event = {
     event: eventName,
+    clientBuildId: ENV.BOOKING_CLIENT_BUILD_ID,
     correlationId,
     traceparent,
     ...(traceId ? { traceId } : {}),
-    apiBase: API_BASE,
+    apiBase: BOOKING_READ_API_BASE,
     pageUrl: sanitizeBookingSourceUrl(window.location.href) ?? window.location.origin,
     userAgent: window.navigator.userAgent,
     online: window.navigator.onLine,
@@ -153,6 +238,11 @@ function reportClientFetchError(payload: {
   });
 }
 
+function gatewayResponseMetadata(response: Response): Record<string, string> | undefined {
+  const requestId = response.headers.get('X-Booking-Gateway-Request-Id');
+  return requestId ? { gatewayRequestId: requestId } : undefined;
+}
+
 function isInsufficientCapacityApiError(errorCode?: string, errorMessage?: string): boolean {
   const msg = (errorMessage ?? '').toLowerCase();
   return errorCode === 'VALIDATION_FAILURE' && msg.includes('insufficient capacity');
@@ -355,8 +445,19 @@ function logBookingSourceDebug(
   }
 }
 
-function getAuthHeaders(): Record<string, string> {
+function isBookingGatewayUrl(url: string): boolean {
+  try {
+    return new URL(url, API_BASE).pathname.startsWith(`${BOOKING_GATEWAY_PREFIX}/`);
+  } catch {
+    return false;
+  }
+}
+
+function getAuthHeaders(url?: string): Record<string, string> {
   const headers: Record<string, string> = { 'Content-Type': 'application/json' };
+  if (url && isBookingGatewayUrl(url)) {
+    return withBookingOutboundHeaders(headers);
+  }
   const partnerJwt = partnerPortalBookingJwtGetter();
   if (partnerJwt) {
     headers['Authorization'] = `Bearer ${partnerJwt}`;
@@ -393,7 +494,9 @@ function newBookingAttemptId(): string {
 function getEndpointFromUrl(url: string): string {
   try {
     const parsed = new URL(url, typeof window !== 'undefined' ? window.location.href : API_BASE);
-    return parsed.pathname;
+    return parsed.pathname.startsWith(`${BOOKING_GATEWAY_PREFIX}/`)
+      ? parsed.pathname.slice(BOOKING_GATEWAY_PREFIX.length)
+      : parsed.pathname;
   } catch {
     return '';
   }
@@ -442,7 +545,10 @@ function getBrowserDiagnostics(): Record<string, number | string | boolean> {
 function getAvailabilityQueryShape(url: string): Record<string, string | boolean | string[]> | null {
   try {
     const parsed = new URL(url, typeof window !== 'undefined' ? window.location.href : API_BASE);
-    if (parsed.pathname !== '/1/get-availabilities') return null;
+    const endpoint = parsed.pathname.startsWith(`${BOOKING_GATEWAY_PREFIX}/`)
+      ? parsed.pathname.slice(BOOKING_GATEWAY_PREFIX.length)
+      : parsed.pathname;
+    if (endpoint !== '/1/get-availabilities') return null;
     const params = parsed.searchParams;
     return {
       queryKeys: Array.from(params.keys()).sort(),
@@ -556,6 +662,8 @@ async function collectNetworkFailureProbeResults(
 ): Promise<Array<Record<string, number | string | boolean | null>>> {
   if (typeof window === 'undefined') return [];
   const cacheBust = `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+  const telemetryUrl = `${BOOKING_READ_API_BASE}/1/client-telemetry`;
+  const telemetryIsSameOrigin = new URL(telemetryUrl, window.location.href).origin === window.location.origin;
   return Promise.all([
     runNetworkFailureProbe(
       'same_origin_asset_head',
@@ -563,11 +671,11 @@ async function collectNetworkFailureProbeResults(
       { method: 'HEAD', mode: 'same-origin' }
     ),
     runNetworkFailureProbe(
-      'api_telemetry_cors_post',
-      `${API_BASE}/1/client-telemetry`,
+      telemetryIsSameOrigin ? 'booking_telemetry_same_origin_post' : 'api_telemetry_cors_post',
+      telemetryUrl,
       {
         method: 'POST',
-        mode: 'cors',
+        mode: telemetryIsSameOrigin ? 'same-origin' : 'cors',
         headers: {
           'Content-Type': 'application/json',
           [BOOKING_CORRELATION_HEADER]: correlationId,
@@ -575,10 +683,11 @@ async function collectNetworkFailureProbeResults(
         },
         body: JSON.stringify({
           event: 'BOOKING_DIALOG_NETWORK_PROBE_PING',
+          clientBuildId: ENV.BOOKING_CLIENT_BUILD_ID,
           endpoint,
           correlationId,
           traceparent,
-          apiBase: API_BASE,
+          apiBase: BOOKING_READ_API_BASE,
           pageUrl: sanitizeBookingSourceUrl(window.location.href) ?? window.location.origin,
           userAgent: window.navigator.userAgent,
           online: window.navigator.onLine,
@@ -610,7 +719,7 @@ function bookingRequestTelemetryContext(
     attemptNumber,
     maxRetries: BOOKING_GET_MAX_RETRIES,
     requestUrlPath: endpoint,
-    requestMode: 'cors',
+    requestMode: isBookingGatewayUrl(url) ? 'same-origin' : 'cors',
     requestCache: 'default',
     requestCredentials: 'same-origin',
     requestUrlSearchLength: (() => {
@@ -641,23 +750,22 @@ async function fetchBookingGetWithRetry(
     }
     const requestAttemptId = newBookingAttemptId();
     const headers: Record<string, string> = {
-      ...getAuthHeaders(),
+      ...getAuthHeaders(url),
       [BOOKING_ATTEMPT_HEADER]: requestAttemptId,
     };
     const startedAt = typeof performance !== 'undefined' ? performance.now() : Date.now();
-    if (isBookingCriticalEndpoint(endpoint)) {
-      reportBookingClientTelemetryEvent('BOOKING_DIALOG_REQUEST_STARTED', {
-        ...bookingRequestTelemetryContext(url, endpoint, headers, requestAttemptId, attempt + 1),
-      });
-    }
     try {
       const res = await fetch(url, {
         ...extra,
         method: 'GET',
         headers,
       });
+      if (res.status === 401) {
+        notifyPartnerPortalAuthorizationFailure();
+      }
       const elapsedMs = Math.round((typeof performance !== 'undefined' ? performance.now() : Date.now()) - startedAt);
       if (
+        !res.ok ||
         elapsedMs >= SLOW_REQUEST_THRESHOLD_MS ||
         (isBookingCriticalEndpoint(endpoint) && Math.random() < SUCCESS_TIMING_SAMPLE_RATE)
       ) {
@@ -665,6 +773,9 @@ async function fetchBookingGetWithRetry(
           ...bookingRequestTelemetryContext(url, endpoint, headers, requestAttemptId, attempt + 1, elapsedMs),
           httpStatus: res.status,
           ok: res.ok,
+          sampleRate: !res.ok || elapsedMs >= SLOW_REQUEST_THRESHOLD_MS ? 1 : SUCCESS_TIMING_SAMPLE_RATE,
+          slowThresholdMs: SLOW_REQUEST_THRESHOLD_MS,
+          ...gatewayResponseMetadata(res),
           resourceTiming: latestResourceTiming(url),
         });
       }
@@ -675,6 +786,12 @@ async function fetchBookingGetWithRetry(
         attempt < BOOKING_GET_MAX_RETRIES &&
         (res.status === 502 || res.status === 503 || res.status === 504)
       ) {
+        reportBookingClientTelemetryEvent('BOOKING_DIALOG_REQUEST_RETRYING', {
+          ...bookingRequestTelemetryContext(url, endpoint, headers, requestAttemptId, attempt + 1, elapsedMs),
+          httpStatus: res.status,
+          retryReason: 'retryable_http_status',
+          ...gatewayResponseMetadata(res),
+        });
         continue;
       }
       return res;
@@ -874,9 +991,16 @@ export interface PricingConfig {
   cancellationPolicies?: CancellationPolicyOption[];
 }
 
-export async function fetchProducts(companyId: string): Promise<Product[]> {
+export async function fetchProducts(
+  companyId: string,
+  options?: { productId?: string }
+): Promise<Product[]> {
   const endpoint = '/1/products';
-  const url = `${API_BASE}${endpoint}?companyId=${encodeURIComponent(companyId)}`;
+  const params = new URLSearchParams({ companyId });
+  if (options?.productId?.trim()) {
+    params.set('productId', options.productId.trim());
+  }
+  const url = `${bookingReadApiBase()}${endpoint}?${params}`;
   let res: Response;
   try {
     res = await fetchBookingGetWithRetry(url);
@@ -900,6 +1024,7 @@ export async function fetchProducts(companyId: string): Promise<Product[]> {
       message: debugMessage,
       httpStatus: res.status,
       errorCode: isApiErrorPayload(errPayload) ? errPayload.errorCode : undefined,
+      metadata: gatewayResponseMetadata(res),
     });
     throw createUserError(endpoint, 'HTTP', debugMessage);
   }
@@ -912,6 +1037,7 @@ export async function fetchProducts(companyId: string): Promise<Product[]> {
       errorClass: 'APP_ERROR_200',
       message: appError,
       errorCode: isApiErrorPayload(data) ? data.errorCode : undefined,
+      metadata: gatewayResponseMetadata(res),
     });
     throw createUserError(endpoint, 'APP_ERROR_200', appError);
   }
@@ -921,13 +1047,13 @@ export async function fetchProducts(companyId: string): Promise<Product[]> {
 }
 
 export async function getProduct(productId: string, companyId: string): Promise<Product | null> {
-  const products = await fetchProducts(companyId);
+  const products = await fetchProducts(companyId, { productId });
   return products.find((p) => p.productId === productId) ?? null;
 }
 
 export async function getCompany(companyId: string): Promise<Company> {
   const res = await fetchBookingGetWithRetry(
-    `${API_BASE}/1/companies/${encodeURIComponent(companyId)}`,
+    `${bookingReadApiBase()}/1/companies/${encodeURIComponent(companyId)}`,
   );
   if (!res.ok) {
     const err = await res.json();
@@ -965,7 +1091,7 @@ export async function validatePromoCode(
   if (normalizedProductId) params.set('productId', normalizedProductId);
   if (hasOngoingDiscount === true) params.set('hasOngoingDiscount', 'true');
   if (dateTime?.trim()) params.set('dateTime', dateTime.trim());
-  const res = await fetchBookingGetWithRetry(`${API_BASE}/1/validate-promo?${params}`);
+  const res = await fetchBookingGetWithRetry(`${bookingReadApiBase()}/1/validate-promo?${params}`);
   if (!res.ok) {
     const err = await res.json();
     throw new Error(err.errorMessage || err.error || 'Failed to validate promo code');
@@ -1094,7 +1220,7 @@ export async function getPromoDiscount(
   ) {
     params.set('legacyPromoNewAddOnSubtotal', String(bookingChange.legacyPromoNewAddOnSubtotal));
   }
-  const res = await fetchBookingGetWithRetry(`${API_BASE}/1/get-promo-discount?${params}`);
+  const res = await fetchBookingGetWithRetry(`${bookingReadApiBase()}/1/get-promo-discount?${params}`);
   if (!res.ok) {
     const err = await res.json();
     throw new Error(err.errorMessage || err.error || 'Failed to get promo discount');
@@ -1114,7 +1240,7 @@ export async function getAddOns(
   }
   if (options?.preCheckout !== undefined) params.set('preCheckout', String(options.preCheckout));
   if (options?.dateTime?.trim()) params.set('dateTime', options.dateTime.trim());
-  const res = await fetchBookingGetWithRetry(`${API_BASE}/1/add-ons?${params}`);
+  const res = await fetchBookingGetWithRetry(`${bookingReadApiBase()}/1/add-ons?${params}`);
   if (!res.ok) {
     const err = await res.json();
     throw new Error(err.errorMessage || err.error || 'Failed to get add-ons');
@@ -1779,6 +1905,7 @@ export async function quoteAdminChangeBookingV2(
   request: ChangeBookingQuoteRequest
 ): Promise<ChangeBookingQuoteResponse> {
   const { bookingReference, lastName: _lastName, ...payload } = request;
+  void _lastName;
   const res = await fetch(
     `${API_BASE}/1/admin/bookings/${encodeURIComponent(bookingReference)}/change/quote-v2`,
     {
@@ -2093,7 +2220,7 @@ export async function getAvailabilities(
     params.set('cancellationPolicyProfileId', cancellationPolicyProfileId);
   }
   const endpoint = '/1/get-availabilities';
-  const url = `${API_BASE}${endpoint}?${params}`;
+  const url = `${bookingReadApiBase()}${endpoint}?${params}`;
   let res: Response;
   try {
     res = await fetchBookingGetWithRetry(url);
@@ -2117,6 +2244,7 @@ export async function getAvailabilities(
       message: debugMessage,
       httpStatus: res.status,
       errorCode: isApiErrorPayload(errPayload) ? errPayload.errorCode : undefined,
+      metadata: gatewayResponseMetadata(res),
     });
     throw createUserError(endpoint, 'HTTP', debugMessage);
   }
@@ -2129,6 +2257,7 @@ export async function getAvailabilities(
       errorClass: 'APP_ERROR_200',
       message: appError,
       errorCode: isApiErrorPayload(data) ? data.errorCode : undefined,
+      metadata: gatewayResponseMetadata(res),
     });
     throw createUserError(endpoint, 'APP_ERROR_200', appError);
   }

package/src/lib/env.ts

@@ -24,6 +24,17 @@ const getApiUrl = (): string => {
   return apiUrl;
 };
 
+/**
+ * Read-only booking traffic can use a same-origin gateway while transactional
+ * writes continue to use NEXT_PUBLIC_API_URL.
+ */
+const getBookingReadApiUrl = (): string => {
+  return process.env.NEXT_PUBLIC_BOOKING_READ_API_URL?.trim() || getApiUrl();
+};
+
+const getBookingClientBuildId = (): string =>
+  process.env.NEXT_PUBLIC_BOOKING_CLIENT_BUILD_ID?.trim() || 'source-unknown';
+
 const getGoogleMapsApiKey = (): string => {
   return process.env.NEXT_PUBLIC_GOOGLE_MAPS_API_KEY ?? '';
 };
@@ -92,6 +103,8 @@ export const isLocalhost = (): boolean =>
 
 export const ENV = {
   API_URL: getApiUrl(),
+  BOOKING_READ_API_URL: getBookingReadApiUrl(),
+  BOOKING_CLIENT_BUILD_ID: getBookingClientBuildId(),
   GOOGLE_MAPS_API_KEY: getGoogleMapsApiKey(),
   STRIPE_PUBLISHABLE_KEY: getStripePublishableKey(),
   BASIC_AUTH: getBasicAuth(),

package/src/providers/booking-dialog-provider.tsx

@@ -75,7 +75,7 @@ interface BookingDialogProviderProps {
 
 export function BookingDialogProvider({ children }: BookingDialogProviderProps) {
   const host = useBookingHostOptional();
-  const apiUrl = host?.env.API_URL;
+  const apiUrl = host?.env.BOOKING_READ_API_URL ?? host?.env.API_URL;
 
   const reportSuspiciousBookingProductId = useCallback(
     (original: string, sanitized: string): void => {
@@ -84,6 +84,7 @@ export function BookingDialogProvider({ children }: BookingDialogProviderProps)
       const correlationId = getOrCreateBookingCorrelationId();
       const event = {
         event: 'BOOKING_DIALOG_SUSPICIOUS_PRODUCT_ID',
+        clientBuildId: host?.env.BOOKING_CLIENT_BUILD_ID ?? 'source-unknown',
         endpoint: '/booking-open',
         correlationId,
         originalProductId: original,
@@ -103,7 +104,7 @@ export function BookingDialogProvider({ children }: BookingDialogProviderProps)
         keepalive: true,
       }).catch(() => {});
     },
-    [apiUrl]
+    [apiUrl, host?.env.BOOKING_CLIENT_BUILD_ID]
   );
 
   const [isOpen, setIsOpen] = useState(false);

package/src/runtime/types.ts

@@ -10,6 +10,10 @@ export type BookingSlotComponent = ComponentType<any>;
  */
 export interface BookingRuntimeEnv {
   readonly API_URL: string;
+  /** Optional same-origin base for public booking reads and client telemetry. */
+  readonly BOOKING_READ_API_URL?: string;
+  /** Immutable source/build identifier attached to browser telemetry. */
+  readonly BOOKING_CLIENT_BUILD_ID: string;
   readonly COMPANY_ID: string;
   readonly GOOGLE_MAPS_API_KEY: string;
   readonly STRIPE_PUBLISHABLE_KEY: string;

package/src/strings/en.json

@@ -593,7 +593,6 @@
     "hike": "Perfect for hiking",
     "canoe": "Rent a canoe",
     "lunch": "Lunch at Emerald Lake Lodge",
-    "croissant": "Croissants included",
     "hotDrinks": "Hot drinks",
     "blankets": "Cozy blankets",
     "emeraldLakeEscapeTourLocations": {
@@ -1511,7 +1510,7 @@
           {
             "pagesIncluded": [],
             "question": "Do you provide breakfast during your tours?",
-            "answer": "Only private shuttles include a breakfast croissant from a local bakery per person. Our other tours do not include breakfast, so please be sure to bring your own or purchase a snack at the Moraine Lake Lodge (open from 9 AM - 4 PM)."
+            "answer": "Our private and sunrise shuttles have a breakfast option available for add-on. Our other tours do not include breakfast, so please be sure to bring your own or purchase a snack at the Moraine Lake Lodge (open from 9 AM - 4 PM)."
           },
           {
             "pagesIncluded": [],

package/src/strings/es.json

@@ -392,7 +392,6 @@
     "hike": "Perfecto para senderismo",
     "canoe": "Alquila una canoa",
     "lunch": "Almuerzo en Emerald Lake Lodge",
-    "croissant": "Crusanes incluidos",
     "hotDrinks": "Bebidas calientes",
     "blankets": "Mantas calentitas",
     "emeraldLakeEscapeTourLocations": {
@@ -1309,7 +1308,7 @@
           {
             "pagesIncluded": [],
             "question": "Do you provide breakfast during your tours?",
-            "answer": "Only private shuttles include a breakfast croissant from a local bakery per person. Our other tours do not include breakfast, so please be sure to bring your own or purchase a snack at the Moraine Lake Lodge (open from 9 AM - 4 PM)."
+            "answer": "Our private and sunrise shuttles have a breakfast option available for add-on. Our other tours do not include breakfast, so please be sure to bring your own or purchase a snack at the Moraine Lake Lodge (open from 9 AM - 4 PM)."
           },
           {
             "pagesIncluded": [],

package/src/strings/fr.json

@@ -392,7 +392,6 @@
     "hike": "Idéal pour randonner",
     "canoe": "Location de canoé",
     "lunch": "Déjeuner aux lodges du lac Émeraude",
-    "croissant": "Croissants inclus",
     "hotDrinks": "Boissons chaudes",
     "blankets": "Mantes chaudes",
     "emeraldLakeEscapeTourLocations": {
@@ -1309,7 +1308,7 @@
           {
             "pagesIncluded": [],
             "question": "Do you provide breakfast during your tours?",
-            "answer": "Only private shuttles include a breakfast croissant from a local bakery per person. Our other tours do not include breakfast, so please be sure to bring your own or purchase a snack at the Moraine Lake Lodge (open from 9 AM - 4 PM)."
+            "answer": "Our private and sunrise shuttles have a breakfast option available for add-on. Our other tours do not include breakfast, so please be sure to bring your own or purchase a snack at the Moraine Lake Lodge (open from 9 AM - 4 PM)."
           },
           {
             "pagesIncluded": [],

package/test/change-booking-helpers.test.ts

@@ -22,6 +22,7 @@ import {
   findFirstDateWithBookableAvailability,
   selectedDateHasVisibleAvailability,
 } from '../src/components/booking/availability-date-selection';
+import { shouldRevalidateAvailabilityCache } from '../src/components/booking/availability-cache-policy';
 import {
   buildChangeBookingServerPreview,
   labelAdminAmendmentPriceSummaryLines,
@@ -91,7 +92,10 @@ import {
   buildAdminChangePayNowCheckoutModalData,
   shouldRestoreAdminChangePaymentChoiceAfterCheckoutClose,
 } from '../src/components/booking/admin-change-payment-choice-runner';
-import { shouldLockExistingAddOnQuantities } from '../src/components/booking/admin-change-flow-state-helpers';
+import {
+  filterAdminChangeCalendarAvailabilities,
+  shouldLockExistingAddOnQuantities,
+} from '../src/components/booking/admin-change-flow-state-helpers';
 import { haveAddOnSelectionsChanged } from '../src/components/booking/useChangeBookingSelectionDetails';
 import {
   incompatibleAddOnSelections,
@@ -157,6 +161,12 @@ function test(name: string, fn: () => void | Promise<void>): void {
   }
 }
 
+test('availability cache revalidates only when a covered range is stale', () => {
+  assert.equal(shouldRevalidateAvailabilityCache(true, false), false);
+  assert.equal(shouldRevalidateAvailabilityCache(true, true), true);
+  assert.equal(shouldRevalidateAvailabilityCache(false, true), false);
+});
+
 function calendarAvailability(dateTime: string, vacancies: number): Availability {
   return { dateTime, vacancies, currency: 'CAD' };
 }
@@ -407,6 +417,48 @@ test('admin availability filtering removes only starts that have passed', () =>
   );
 });
 
+test('admin change availability filtering keeps the in-progress booking date selectable', () => {
+  const now = new Date('2026-08-01T13:00:00-06:00');
+  const rows = [
+    calendarAvailability('2026-07-31T09:00:00-06:00', 4),
+    calendarAvailability('2026-08-01T09:00:00-06:00', 4),
+    calendarAvailability('2026-08-01T11:00:00-06:00', 4),
+    calendarAvailability('2026-08-02T09:00:00-06:00', 4),
+  ];
+
+  assert.deepEqual(
+    filterAdminChangeCalendarAvailabilities({
+      availabilities: rows,
+      originalDate: '2026-08-01',
+      companyTimezone: 'America/Edmonton',
+      now,
+    }).map((row) => row.dateTime),
+    [
+      '2026-08-01T09:00:00-06:00',
+      '2026-08-01T11:00:00-06:00',
+      '2026-08-02T09:00:00-06:00',
+    ],
+  );
+});
+
+test('admin change availability filtering keeps the normal time guard without an original date', () => {
+  const now = new Date('2026-08-01T13:00:00-06:00');
+  const rows = [
+    calendarAvailability('2026-08-01T09:00:00-06:00', 4),
+    calendarAvailability('2026-08-01T14:00:00-06:00', 4),
+  ];
+
+  assert.deepEqual(
+    filterAdminChangeCalendarAvailabilities({
+      availabilities: rows,
+      originalDate: null,
+      companyTimezone: 'America/Edmonton',
+      now,
+    }).map((row) => row.dateTime),
+    ['2026-08-01T14:00:00-06:00'],
+  );
+});
+
 test('public availability filtering keeps its stricter advance cutoff', () => {
   const now = new Date('2026-07-21T17:00:00-06:00');
   const rows = [