@ticketboothapp/booking 1.2.182 → 1.2.184

package/package.json

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

package/src/components/BookingDetails.ts

@@ -1,5 +1,6 @@
 export interface BookingData {
   bookingReference: string;
+  pricingProfileId?: string | null;
   reservationReference?: string | null;
   dateTime?: string | null;
   totalAmount?: number | null;

package/src/components/booking/ChangeBookingDialog.tsx

@@ -428,6 +428,7 @@ export default function ChangeBookingDialog({
                 currency={receiptCurrency}
                 contentRef={contentRef}
                 bookingSourceAttribution={bookingSourceAttribution}
+                availabilityPricingProfileId={booking.pricingProfileId ?? null}
                 onSuccess={() => {
                   onChangeCompleted?.(newBookingPreview);
                   onClose();

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

@@ -183,7 +183,11 @@ export function useStandardBookingAvailability({
   const fetchedRangesRef = useRef<DateRange[]>([]);
   const pendingRangeRef = useRef<DateRange | null>(null);
   const selectedDateHydrationInFlightKeyRef = useRef<string | null>(null);
+  const selectedAvailabilityRef = useRef<Availability | null>(null);
+  const selectedReturnOptionRef = useRef<ReturnOption | null>(null);
   const lastVisibleRangeRef = useRef<DateRange | null>(null);
+  selectedAvailabilityRef.current = selectedAvailability;
+  selectedReturnOptionRef.current = selectedReturnOption;
   const activeOptionsLength = activeOptions.length;
   const pricingProfileResolutionDate = selectedDate || (visibleRange
     ? formatInTimeZone(visibleRange.start, companyTimezone, 'yyyy-MM-dd')
@@ -694,8 +698,6 @@ export function useStandardBookingAvailability({
     if (!selectedAvailability) return;
     if (!availabilityMatchesSelectedDate(selectedAvailability, selectedDate, companyTimezone)) return;
     if (selectedAvailability.isSummary !== true) return;
-    const selectionToHydrate = selectedAvailability;
-
     const hydrationKey = [
       product.productId,
       selectedDate,
@@ -707,7 +709,6 @@ export function useStandardBookingAvailability({
     if (selectedDateHydrationInFlightKeyRef.current === hydrationKey) return;
     selectedDateHydrationInFlightKeyRef.current = hydrationKey;
 
-    let cancelled = false;
     async function hydrateSelectedDateDetails() {
       setIsFetchingMoreAvailabilities(true);
       try {
@@ -725,6 +726,10 @@ export function useStandardBookingAvailability({
             ? { cancellationPolicyProfileId: cancellationPolicyProfileIdForAvailabilities }
             : {}),
         });
+        // Dependency changes (for example, the default return being selected) can rerun this
+        // effect while the request is in flight. Keep that same request authoritative instead
+        // of discarding its result and leaving the UI stuck on "Confirming availability".
+        if (selectedDateHydrationInFlightKeyRef.current !== hydrationKey) return;
         const results = [{
           optionId: product.productId,
           availabilities: result.availabilities.map((availability) => availabilityWithOptionId(availability)),
@@ -732,8 +737,6 @@ export function useStandardBookingAvailability({
           precomputedPricesByOption: result.precomputedPricesByOption,
           pricingConfig: result.pricingConfig,
         }];
-        if (cancelled) return;
-
         const detailedAvailabilities = results.flatMap((fetchResult) => fetchResult.availabilities);
         if (detailedAvailabilities.length === 0) return;
 
@@ -742,12 +745,14 @@ export function useStandardBookingAvailability({
         mergePrecomputedPrices(results);
         mergeFetchedAvailabilities(detailedAvailabilities);
 
+        const selectionToHydrate = selectedAvailabilityRef.current;
         const updatedSelection = findMergedAvailabilityForSelection(detailedAvailabilities, selectionToHydrate);
-        if (updatedSelection && shouldSyncSelectedAvailability(selectionToHydrate, updatedSelection)) {
+        if (selectionToHydrate && updatedSelection && shouldSyncSelectedAvailability(selectionToHydrate, updatedSelection)) {
           setSelectedAvailability(updatedSelection);
-          if (selectedReturnOption && updatedSelection.returnOptions) {
+          const selectedReturnOptionForHydration = selectedReturnOptionRef.current;
+          if (selectedReturnOptionForHydration && updatedSelection.returnOptions) {
             const updatedReturnOption = updatedSelection.returnOptions.find(
-              (option) => option.returnAvailabilityId === selectedReturnOption.returnAvailabilityId,
+              (option) => option.returnAvailabilityId === selectedReturnOptionForHydration.returnAvailabilityId,
             );
             if (updatedReturnOption) setSelectedReturnOption(updatedReturnOption);
           }
@@ -755,21 +760,18 @@ export function useStandardBookingAvailability({
 
         updateCache(detailedAvailabilities, results, undefined, firstPricingConfig);
       } catch (err) {
-        if (!cancelled) {
+        if (selectedDateHydrationInFlightKeyRef.current === hydrationKey) {
           console.error('Error hydrating availability details:', err);
         }
       } finally {
         if (selectedDateHydrationInFlightKeyRef.current === hydrationKey) {
           selectedDateHydrationInFlightKeyRef.current = null;
+          setIsFetchingMoreAvailabilities(false);
         }
-        if (!cancelled) setIsFetchingMoreAvailabilities(false);
       }
     }
 
     hydrateSelectedDateDetails();
-    return () => {
-      cancelled = true;
-    };
   }, [
     activeOptionIdsKey,
     activeOptionsLength,
@@ -784,7 +786,6 @@ export function useStandardBookingAvailability({
     product.productId,
     selectedAvailability,
     selectedDate,
-    selectedReturnOption,
     updateCache,
   ]);