@qite/tide-components 1.0.7 → 1.0.8

package/build/build-cjs/index.js

@@ -458,6 +458,7 @@ var SRP$f = {
 	TRAVEL_GROUP: "مجموعة المسافرين",
 	EXCURSION: "رحلة",
 	LOADING_EXCURSIONS: "جارٍ تحميل الرحلات...",
+	LOADING_ACTIVITIES: "جارٍ تحميل الأنشطة...",
 	LOADING_FLIGHTS: "جارٍ تحميل الرحلات الجوية...",
 	LOADING_ACCOMMODATIONS: "جارٍ تحميل الإقامات...",
 	LOADING_ITINERARY: "جارٍ تحميل خط سير الرحلة...",
@@ -902,6 +903,7 @@ var SRP$e = {
 	TRAVEL_GROUP: "Rejseselskab",
 	EXCURSION: "Udflugt",
 	LOADING_EXCURSIONS: "Indlæser udflugter...",
+	LOADING_ACTIVITIES: "Indlæser aktiviteter...",
 	LOADING_FLIGHTS: "Indlæser fly...",
 	LOADING_ACCOMMODATIONS: "Indlæser indkvarteringer...",
 	LOADING_ITINERARY: "Indlæser rejseplan...",
@@ -1346,6 +1348,7 @@ var SRP$d = {
 	TRAVEL_GROUP: "Reisegruppe",
 	EXCURSION: "Ausflug",
 	LOADING_EXCURSIONS: "Lade Ausflüge...",
+	LOADING_ACTIVITIES: "Lade Aktivitäten...",
 	LOADING_FLIGHTS: "Lade Flüge...",
 	LOADING_ACCOMMODATIONS: "Lade Unterkünfte...",
 	LOADING_ITINERARY: "Lade Reiseverlauf...",
@@ -1794,6 +1797,7 @@ var SRP$c = {
 	TRAVEL_GROUP: "Travel group",
 	EXCURSION: "Excursion",
 	LOADING_EXCURSIONS: "Loading excursions...",
+	LOADING_ACTIVITIES: "Loading activities...",
 	LOADING_FLIGHTS: "Loading flights...",
 	LOADING_ACCOMMODATIONS: "Loading accommodations...",
 	LOADING_ITINERARY: "Loading itinerary...",
@@ -2238,6 +2242,7 @@ var SRP$b = {
 	TRAVEL_GROUP: "Grupo de viaje",
 	EXCURSION: "Excursión",
 	LOADING_EXCURSIONS: "Cargando excursiones...",
+	LOADING_ACTIVITIES: "Cargando actividades...",
 	LOADING_FLIGHTS: "Cargando vuelos...",
 	LOADING_ACCOMMODATIONS: "Cargando alojamientos...",
 	LOADING_ITINERARY: "Cargando itinerario...",
@@ -2686,6 +2691,7 @@ var SRP$a = {
 	TRAVEL_GROUP: "Groupe de voyageurs",
 	EXCURSION: "Excursion",
 	LOADING_EXCURSIONS: "Chargement des excursions...",
+	LOADING_ACTIVITIES: "Chargement des activités...",
 	LOADING_FLIGHTS: "Chargement des vols...",
 	LOADING_ACCOMMODATIONS: "Chargement des hébergements...",
 	LOADING_ITINERARY: "Chargement de l’itinéraire...",
@@ -3130,6 +3136,7 @@ var SRP$9 = {
 	TRAVEL_GROUP: "Groupe de voyageurs",
 	EXCURSION: "Excursion",
 	LOADING_EXCURSIONS: "Chargement des excursions...",
+	LOADING_ACTIVITIES: "Chargement des activités...",
 	LOADING_FLIGHTS: "Chargement des vols...",
 	LOADING_ACCOMMODATIONS: "Chargement des hébergements...",
 	LOADING_ITINERARY: "Chargement de l’itinéraire...",
@@ -3574,6 +3581,7 @@ var SRP$8 = {
 	TRAVEL_GROUP: "Ferðahópur",
 	EXCURSION: "Útflutningur",
 	LOADING_EXCURSIONS: "Hleðst inn í útflutninga...",
+	LOADING_ACTIVITIES: "Hleð inn afþreyingu...",
 	LOADING_FLIGHTS: "Hleðst inn í flug...",
 	LOADING_ACCOMMODATIONS: "Hleðst inn í gistingar...",
 	LOADING_ITINERARY: "Hleðst inn í ferðaráætlun...",
@@ -4018,6 +4026,7 @@ var SRP$7 = {
 	TRAVEL_GROUP: "Gruppo di viaggio",
 	EXCURSION: "Escursione",
 	LOADING_EXCURSIONS: "Caricamento delle escursioni...",
+	LOADING_ACTIVITIES: "Caricamento delle attività...",
 	LOADING_FLIGHTS: "Caricamento dei voli...",
 	LOADING_ACCOMMODATIONS: "Caricamento degli alloggi...",
 	LOADING_ITINERARY: "Caricamento dell'itinerario...",
@@ -4466,6 +4475,7 @@ var SRP$6 = {
 	TRAVEL_GROUP: "Reisgezelschap",
 	EXCURSION: "Excursie",
 	LOADING_EXCURSIONS: "Excursies laden...",
+	LOADING_ACTIVITIES: "Activiteiten laden...",
 	LOADING_FLIGHTS: "Vluchten laden...",
 	LOADING_ACCOMMODATIONS: "Accommodaties laden...",
 	LOADING_ITINERARY: "Reisplan laden...",
@@ -4910,6 +4920,7 @@ var SRP$5 = {
 	TRAVEL_GROUP: "Reisgezelschap",
 	EXCURSION: "Excursie",
 	LOADING_EXCURSIONS: "Excursies laden...",
+	LOADING_ACTIVITIES: "Activiteiten laden...",
 	LOADING_FLIGHTS: "Vluchten laden...",
 	LOADING_ACCOMMODATIONS: "Accommodaties laden...",
 	LOADING_ITINERARY: "Reisplan laden...",
@@ -5354,6 +5365,7 @@ var SRP$4 = {
 	TRAVEL_GROUP: "Reisefølge",
 	EXCURSION: "Utflukt",
 	LOADING_EXCURSIONS: "Laster utflukter...",
+	LOADING_ACTIVITIES: "Laster aktiviteter...",
 	LOADING_FLIGHTS: "Laster flyvninger...",
 	LOADING_ACCOMMODATIONS: "Laster overnattinger...",
 	LOADING_ITINERARY: "Laster reiserute...",
@@ -5798,6 +5810,7 @@ var SRP$3 = {
 	TRAVEL_GROUP: "Grupa podróżnych",
 	EXCURSION: "Wycieczka",
 	LOADING_EXCURSIONS: "Ładowanie wycieczek...",
+	LOADING_ACTIVITIES: "Ładowanie atrakcji...",
 	LOADING_FLIGHTS: "Ładowanie lotów...",
 	LOADING_ACCOMMODATIONS: "Ładowanie zakwaterowań...",
 	LOADING_ITINERARY: "Ładowanie planu podróży...",
@@ -6242,6 +6255,7 @@ var SRP$2 = {
 	TRAVEL_GROUP: "Grupo de viajantes",
 	EXCURSION: "Excursão",
 	LOADING_EXCURSIONS: "A carregar excursões...",
+	LOADING_ACTIVITIES: "A carregar atividades...",
 	LOADING_FLIGHTS: "A carregar voos...",
 	LOADING_ACCOMMODATIONS: "A carregar alojamentos...",
 	LOADING_ITINERARY: "A carregar itinerário...",
@@ -6686,6 +6700,7 @@ var SRP$1 = {
 	TRAVEL_GROUP: "Resesällskap",
 	EXCURSION: "Utflykt",
 	LOADING_EXCURSIONS: "Laddar utflykter...",
+	LOADING_ACTIVITIES: "Laddar aktiviteter...",
 	LOADING_FLIGHTS: "Laddar flyg...",
 	LOADING_ACCOMMODATIONS: "Laddar boenden...",
 	LOADING_ITINERARY: "Laddar resplan...",
@@ -7130,6 +7145,7 @@ var SRP = {
 	TRAVEL_GROUP: "旅行グループ",
 	EXCURSION: "エクスカーション",
 	LOADING_EXCURSIONS: "エクスカーションを読み込み中...",
+	LOADING_ACTIVITIES: "アクティビティを読み込み中...",
 	LOADING_FLIGHTS: "フライトを読み込み中...",
 	LOADING_ACCOMMODATIONS: "宿泊施設を読み込み中...",
 	LOADING_ITINERARY: "旅程を読み込み中...",
@@ -27471,7 +27487,9 @@ const initialState$1 = {
     trajectFlightAvailability: {},
     trajectDaySuggestions: {},
     trajectEditLineGuid: null,
-    trajectActivitiesDayOrder: null
+    trajectActivitiesDayOrder: null,
+    trajectResolving: false,
+    trajectItineraryView: false
 };
 const searchResultsSlice = toolkit.createSlice({
     name: 'searchResults',
@@ -27741,6 +27759,12 @@ const searchResultsSlice = toolkit.createSlice({
         setTrajectActivitiesDayOrder(state, action) {
             state.trajectActivitiesDayOrder = action.payload;
         },
+        setTrajectResolving(state, action) {
+            state.trajectResolving = action.payload;
+        },
+        setTrajectItineraryView(state, action) {
+            state.trajectItineraryView = action.payload;
+        },
         updateTrajectNodeResult(state, action) {
             const { lineGuid, result } = action.payload;
             const node = state.trajectNodeAvailability[lineGuid];
@@ -27756,10 +27780,12 @@ const searchResultsSlice = toolkit.createSlice({
             state.trajectDaySuggestions = {};
             state.trajectEditLineGuid = null;
             state.trajectActivitiesDayOrder = null;
+            state.trajectResolving = false;
+            state.trajectItineraryView = false;
         }
     }
 });
-const { setResults, setFilteredResults, setSelectedSearchResult, setPackagingAccoResults, setFilteredPackagingAccoResults, setFilteredPackagingFlightResults, setPackagingAccoSearchDetails, setSelectedPackagingAccoResult, setPackagingFlightResults, setSelectedPackagingFlight, setSelectedFlight, setSelectedFlightDetails, setBookingPackageDetails, selectFlight, setIsLoading, setFlightsLoading, setInitialFilters, setFilters, resetFilters, setInitialFlightFilters, setFlightFilters, resetFlightFilters, setSortType, setFlightSortType, setActiveTab, setCurrentPage, resetSearchState, setFlyInIsOpen, setEditablePackagingEntry, setTransactionId, setFlyInType, setPriceDetails, setItinerary, setSelectedOutwardKey, setSelectedReturnKey, resetFlightSelection, setExcursionSearchParams, setSelectedExcursionSearchResult, confirmExcursionForDay, removeConfirmedExcursionForDay, clearConfirmedExcursionsForDay, setBookPackagingEntry, setCurrentStep, setBookingNumber, setTrajectNodeLoading, setTrajectNodeAvailability, setTrajectNodeSelection, setTrajectFlightLoading, setTrajectFlightAvailability, setTrajectFlightSelection, setTrajectEditLineGuid, setTrajectActivitiesDayOrder, setTrajectDaySuggestionsLoading, setTrajectDaySuggestions, addEditableEntryLines, updateTrajectNodeResult, resetTrajectAvailability, updateEditableEntryLine, removeEditableEntryLines } = searchResultsSlice.actions;
+const { setResults, setFilteredResults, setSelectedSearchResult, setPackagingAccoResults, setFilteredPackagingAccoResults, setFilteredPackagingFlightResults, setPackagingAccoSearchDetails, setSelectedPackagingAccoResult, setPackagingFlightResults, setSelectedPackagingFlight, setSelectedFlight, setSelectedFlightDetails, setBookingPackageDetails, selectFlight, setIsLoading, setFlightsLoading, setInitialFilters, setFilters, resetFilters, setInitialFlightFilters, setFlightFilters, resetFlightFilters, setSortType, setFlightSortType, setActiveTab, setCurrentPage, resetSearchState, setFlyInIsOpen, setEditablePackagingEntry, setTransactionId, setFlyInType, setPriceDetails, setItinerary, setSelectedOutwardKey, setSelectedReturnKey, resetFlightSelection, setExcursionSearchParams, setSelectedExcursionSearchResult, confirmExcursionForDay, removeConfirmedExcursionForDay, clearConfirmedExcursionsForDay, setBookPackagingEntry, setCurrentStep, setBookingNumber, setTrajectNodeLoading, setTrajectNodeAvailability, setTrajectNodeSelection, setTrajectResolving, setTrajectItineraryView, setTrajectFlightLoading, setTrajectFlightAvailability, setTrajectFlightSelection, setTrajectEditLineGuid, setTrajectActivitiesDayOrder, setTrajectDaySuggestionsLoading, setTrajectDaySuggestions, addEditableEntryLines, updateTrajectNodeResult, resetTrajectAvailability, updateEditableEntryLine, removeEditableEntryLines } = searchResultsSlice.actions;
 var searchResultsReducer = searchResultsSlice.reducer;
 
 const ItemPicker = ({ items, selection, selectedSortByType, label, placeholder, classModifier, onPick, valueFormatter }) => {
@@ -28049,7 +28075,22 @@ const buildDestination = (line, node, result) => {
         null;
     return { id: 0, ...place, ...coordinates };
 };
-const buildTrajectNodeRequest = ({ node, line }, context, productCode) => ({
+const hasDestination = (destination) => !!destination && (!!destination.id || (!!destination.latitude && !!destination.longitude));
+const buildTrajectClientConfig = (context) => ({
+    host: context.tideConnection.host,
+    apiKey: context.tideConnection.apiKey
+});
+const buildTrajectSearchContext = (context, trajectEntry) => ({
+    transactionId: trajectEntry.entry.transactionId,
+    officeId: context.tideConnection.officeId ?? 1,
+    catalogueId: context.searchConfiguration.defaultCatalogueId ?? context.tideConnection.catalogueIds?.[0] ?? 1,
+    searchConfigurationId: context.searchConfiguration.id,
+    portalId: context.portalId ?? null,
+    agentId: context.agentId ?? null,
+    language: context.languageCode ?? 'en-GB',
+    rooms: getPackagingRoomsFromEntry(trajectEntry.entry)
+});
+const buildTrajectNodeRequest = ({ node, line }, context, productCode, destination) => ({
     transactionId: context.transactionId,
     officeId: context.officeId,
     agentId: context.agentId ?? null,
@@ -28060,25 +28101,69 @@ const buildTrajectNodeRequest = ({ node, line }, context, productCode) => ({
     language: context.language,
     serviceType: node.serviceType,
     fromDate: toDateOnlyString(line.from),
-    toDate: toDateOnlyString(line.to),
-    destination: buildDestination(line, node),
+    // An excursion happens on a day rather than over a span. The traject gives its line an end a day
+    // out, the way a night is counted, which asks the search for a window it does not have.
+    toDate: toDateOnlyString(node.serviceType === EXCURSION_SERVICE_TYPE ? line.from : line.to),
+    destination: destination ?? buildDestination(line, node),
     productCode,
     rooms: context.rooms,
     tagIds: []
 });
-/**
- * Entry lines for an excursion the traveller picked out of the suggestions.
- *
- * A traject node already has its lines and only needs stamping; a suggestion has none, so this
- * builds them — one per selected option, as the regular day-by-day excursion flow does, since an
- * excursion's options are ticket types (adult, child) rather than rooms. Where the search marks no
- * default, the first option of each room stands in.
- */
-const buildTrajectExcursionLines = (result) => {
-    const options = (result.rooms ?? []).flatMap((room) => {
-        const selected = (room.options ?? []).filter((x) => x.isSelected);
-        return selected.length ? selected : (room.options ?? []).slice(0, 1);
+const coversDay = ({ node, line }, dayOrder) => {
+    const nights = Math.max(dateFns.differenceInCalendarDays(new Date(line.to), new Date(line.from)), 1);
+    return dayOrder >= node.dayOrder && dayOrder < node.dayOrder + nights;
+};
+const getDayDestinationItem = (items, dayOrder) => {
+    const knowsWhereItIs = (x) => hasDestination(buildDestination(x.line, x.node));
+    const stay = items.find((x) => x.node.serviceType === ACCOMMODATION_SERVICE_TYPE && coversDay(x, dayOrder) && knowsWhereItIs(x));
+    if (stay)
+        return stay;
+    return ([...items]
+        .filter((x) => x.node.dayOrder <= dayOrder && knowsWhereItIs(x))
+        .sort((a, b) => a.node.dayOrder - b.node.dayOrder || a.node.order - b.node.order)
+        .pop() ?? null);
+};
+const getDayDestination = (items, availability, dayOrder) => {
+    const item = getDayDestinationItem(items, dayOrder);
+    if (!item)
+        return null;
+    const resolved = availability[item.line.guid];
+    const result = resolved?.results.find((x) => x.code === resolved.selectedCode) ?? null;
+    const destination = buildDestination(item.line, item.node, result);
+    return hasDestination(destination) ? destination : null;
+};
+const buildTrajectDayExcursionRequest = (date, destination, context) => ({
+    transactionId: context.transactionId,
+    officeId: context.officeId,
+    agentId: context.agentId ?? null,
+    catalogueId: context.catalogueId,
+    searchConfigurationId: context.searchConfigurationId,
+    portalId: context.portalId ?? null,
+    vendorConfigurationId: null,
+    language: context.language,
+    serviceType: EXCURSION_SERVICE_TYPE,
+    fromDate: toDateOnlyString(date),
+    toDate: toDateOnlyString(date),
+    destination,
+    productCode: '',
+    rooms: context.rooms,
+    tagIds: []
+});
+const getExcursionOptionGroups = (result) => {
+    const groups = new Map();
+    (result.rooms ?? [])
+        .flatMap((room) => room.options ?? [])
+        .forEach((option) => {
+        const key = [...(option.paxIds ?? [])].sort((a, b) => a - b).join(',');
+        groups.set(key, [...(groups.get(key) ?? []), option]);
     });
+    return [...groups.values()];
+};
+const excursionNeedsChoice = (result) => getExcursionOptionGroups(result).some((group) => group.length > 1 && !group.some((option) => option.isSelected));
+const buildTrajectExcursionLines = (result) => {
+    const options = getExcursionOptionGroups(result)
+        .map((group) => group.find((x) => x.isSelected) ?? (group.length === 1 ? group[0] : null))
+        .filter((x) => !!x);
     if (!options.length)
         return [];
     const guids = options.map((option) => option.guid || crypto.randomUUID());
@@ -28107,6 +28192,21 @@ const buildTrajectExcursionLines = (result) => {
         flightInformation: null
     }));
 };
+const buildExcursionSearchParams = (result) => ({
+    date: result.fromDate,
+    fromDate: result.fromDate,
+    toDate: result.toDate,
+    countryId: result.countryId,
+    regionId: result.regionId,
+    oordId: result.oordId,
+    locationId: result.locationId,
+    locationName: result.locationName,
+    accommodationCode: null,
+    accommodationName: null,
+    hotelCode: result.code,
+    hotelName: result.name,
+    rooms: result.rooms ?? []
+});
 const buildDayActivityCards = (items, availability, suggestions) => {
     const cards = [];
     const seen = new Set();
@@ -28123,11 +28223,27 @@ const buildDayActivityCards = (items, availability, suggestions) => {
         results.filter((x) => !!findCandidateForResult(item.node, x)).forEach((result) => push(result, item));
     });
     suggestions.forEach((result) => push(result));
-    // Whatever the nodes' own destination search found and the day's search did not — normally
-    // nothing, as they are the same search, but a node can resolve where a day has no place to look.
-    items.forEach((item) => (availability[item.line.guid]?.results ?? []).forEach((result) => push(result, item)));
+    items.forEach((item) => (availability[item.line.guid]?.results ?? []).forEach((result) => push(result)));
     return cards;
 };
+/**
+ * Where to search for a node.
+ *
+ * Normally the node says so itself, through the product it was configured with. An excursion slot
+ * left empty on the traject says nothing at all — no code, no alternatives, and a line with no
+ * place on it — so it falls back to wherever the party is staying that day, the same anchor the
+ * day's own activity search uses.
+ */
+const getNodeSearchDestination = (items, item) => {
+    const own = buildDestination(item.line, item.node);
+    if (hasDestination(own))
+        return own;
+    return getDayDestination(items, {}, item.node.dayOrder) ?? own;
+};
+const getConfiguredExcursionCodes = (items, dayOrder) => new Set(items
+    .filter((x) => x.node.dayOrder === dayOrder && x.node.serviceType === EXCURSION_SERVICE_TYPE)
+    .flatMap((x) => [x.node.code, ...getNodeCandidates(x.node).map((candidate) => candidate.code)])
+    .filter((code) => !!code));
 const getNodeCandidates = (node) => {
     const configured = (node.alternatives ?? []).filter((x) => !!x.code && x.code.trim().length > 0);
     if (configured.length)
@@ -28236,6 +28352,51 @@ const buildTrajectFlightRequest = ({ node, line }, context, pax) => ({
     outward: { date: dateToDateStruct(new Date(line.from)) },
     return: null
 });
+/**
+ * The entry as the backend can price it.
+ *
+ * A search caches an EntryLine per option and hands back that line's guid on the option. The
+ * backend then rebuilds the entry by looking each line up in that cache on its guid, so a line
+ * it cannot find is dropped — PackagingEntryBuilder.SyncEntryLines skips it, and an entry whose
+ * lines all came off a traject prices as nothing at all.
+ *
+ * A traject entry is rendered before any search runs, so its lines carry the guids the traject
+ * mapper gave them. This swaps in the guid of whatever each line resolved onto, leaving the
+ * lines the traveller added themselves alone — those were built from a search result and already
+ * carry the right one.
+ */
+const withCachedEntryLineGuids = (entry, trajectEntry, nodeAvailability, flightAvailability) => {
+    const cachedGuids = new Map();
+    getTrajectNodesWithLines(trajectEntry).forEach((item) => {
+        if (isTrajectFlightNode(item.node)) {
+            // A flight search caches the outward line under the guid it reports as outwardGuid.
+            const guid = flightAvailability[item.line.guid]?.selectedGuid;
+            if (guid)
+                cachedGuids.set(item.line.guid, guid);
+            return;
+        }
+        const availability = nodeAvailability[item.line.guid];
+        const result = availability?.results.find((x) => x.code === availability.selectedCode);
+        if (!result)
+            return;
+        // Room i took option i when the result was stamped on, so it takes option i here too.
+        item.lines.forEach((line, index) => {
+            const guid = getOptionForRoom(result, index)?.guid;
+            if (guid)
+                cachedGuids.set(line.guid, guid);
+        });
+    });
+    if (!cachedGuids.size)
+        return entry;
+    return {
+        ...entry,
+        lines: (entry.lines ?? []).map((line) => ({
+            ...line,
+            guid: cachedGuids.get(line.guid) ?? line.guid,
+            parentGuid: (line.parentGuid && cachedGuids.get(line.parentGuid)) ?? line.parentGuid
+        }))
+    };
+};
 const pickCheapestFlight = (flights) => [...flights].sort((a, b) => a.price - b.price)[0] ?? null;
 const applyFlightToLine = (line, flight) => {
     const segments = flight.outward?.segments ?? [];
@@ -31062,10 +31223,9 @@ const getOptionPaxIds = (option) => {
 const optionAppliesToPax = (option, paxId) => {
     return getOptionPaxIds(option).includes(paxId);
 };
-const optionAppliesToAllTravellers = (option, travellerCount) => {
+const optionAppliesToAllTravellers = (option, travellerIds) => {
     const paxIds = getOptionPaxIds(option);
-    const expected = Array.from({ length: travellerCount }, (_, i) => i);
-    return paxIds.length === expected.length && paxIds.every((id, index) => id === expected[index]);
+    return paxIds.length === travellerIds.length && travellerIds.every((id) => paxIds.includes(id));
 };
 const groupOptionsByExcursion = (options) => {
     const groupedMap = new Map();
@@ -31090,26 +31250,26 @@ const ExcursionDetails = () => {
         return null;
     }
     const translations = getTranslations(context.languageCode ?? 'en-GB');
-    const travellerCount = editablePackagingEntry.pax.length;
+    const travellerIds = editablePackagingEntry.pax.map((pax) => pax.id);
     const allOptions = React.useMemo(() => {
         return selectedExcursionSearchResult.rooms.flatMap((room) => room.options ?? []);
     }, [selectedExcursionSearchResult]);
     const sharedOptions = React.useMemo(() => {
-        return allOptions.filter((option) => optionAppliesToAllTravellers(option, travellerCount));
-    }, [allOptions, travellerCount]);
+        return allOptions.filter((option) => optionAppliesToAllTravellers(option, travellerIds));
+    }, [allOptions, travellerIds]);
     const sharedExcursions = React.useMemo(() => {
         return groupOptionsByExcursion(sharedOptions);
     }, [sharedOptions]);
     const paxGroups = React.useMemo(() => {
         return editablePackagingEntry.pax.map((pax) => {
-            const paxOptions = allOptions.filter((option) => optionAppliesToPax(option, pax.id) && !optionAppliesToAllTravellers(option, travellerCount));
+            const paxOptions = allOptions.filter((option) => optionAppliesToPax(option, pax.id) && !optionAppliesToAllTravellers(option, travellerIds));
             return {
                 pax,
                 paxId: pax.id,
                 excursions: groupOptionsByExcursion(paxOptions)
             };
         });
-    }, [editablePackagingEntry.pax, allOptions, travellerCount]);
+    }, [editablePackagingEntry.pax, allOptions, travellerIds]);
     const getSelectedSharedOption = () => {
         return sharedOptions.find((option) => option.isSelected);
     };
@@ -31117,11 +31277,11 @@ const ExcursionDetails = () => {
         return sharedOptions.find((option) => option.accommodationCode === accommodationCode && option.isSelected);
     };
     const getSelectedOptionForPax = (paxId) => {
-        return allOptions.find((option) => optionAppliesToPax(option, paxId) && !optionAppliesToAllTravellers(option, travellerCount) && option.isSelected);
+        return allOptions.find((option) => optionAppliesToPax(option, paxId) && !optionAppliesToAllTravellers(option, travellerIds) && option.isSelected);
     };
     const getSelectedOptionForExcursion = (paxId, accommodationCode) => {
         return allOptions.find((option) => optionAppliesToPax(option, paxId) &&
-            !optionAppliesToAllTravellers(option, travellerCount) &&
+            !optionAppliesToAllTravellers(option, travellerIds) &&
             option.accommodationCode === accommodationCode &&
             option.isSelected);
     };
@@ -31131,7 +31291,7 @@ const ExcursionDetails = () => {
             rooms: selectedExcursionSearchResult.rooms.map((room) => ({
                 ...room,
                 options: room.options.map((option) => {
-                    const isSharedOption = optionAppliesToAllTravellers(option, travellerCount);
+                    const isSharedOption = optionAppliesToAllTravellers(option, travellerIds);
                     if (paxId === undefined) {
                         if (!isSharedOption) {
                             return option;
@@ -31178,7 +31338,7 @@ const ExcursionDetails = () => {
             targetPrice = selectedOption.price;
         }
         else {
-            const firstOption = allOptions.find((option) => optionAppliesToPax(option, paxId) && !optionAppliesToAllTravellers(option, travellerCount) && option.accommodationCode === accommodationCode);
+            const firstOption = allOptions.find((option) => optionAppliesToPax(option, paxId) && !optionAppliesToAllTravellers(option, travellerIds) && option.accommodationCode === accommodationCode);
             targetPrice = firstOption?.price || 0;
         }
         return targetPrice - (currentSelectedPrice || 0);
@@ -31200,6 +31360,13 @@ const ExcursionDetails = () => {
         return 'flyin__acco__price';
     };
     const handleConfirm = () => {
+        if (context.trajectEntry) {
+            const lines = buildTrajectExcursionLines(selectedExcursionSearchResult);
+            if (lines.length)
+                dispatch(addEditableEntryLines(lines));
+            dispatch(setFlyInIsOpen(false));
+            return;
+        }
         const dayKey = getExcursionDayKey(excursionSearchParams.date);
         dispatch(confirmExcursionForDay({
             dayKey,
@@ -31441,6 +31608,12 @@ const TrajectDayActivitiesFlyIn = ({ isLoading }) => {
             dispatch(removeEditableEntryLines(added.map((line) => line.guid)));
             return;
         }
+        if (excursionNeedsChoice(result)) {
+            dispatch(setExcursionSearchParams(buildExcursionSearchParams(result)));
+            dispatch(setSelectedExcursionSearchResult(result));
+            dispatch(setFlyInType('excursion-details'));
+            return;
+        }
         const lines = buildTrajectExcursionLines(result);
         if (lines.length)
             dispatch(addEditableEntryLines(lines));
@@ -31455,7 +31628,7 @@ const TrajectDayActivitiesFlyIn = ({ isLoading }) => {
         dispatch(setFlyInIsOpen(false));
     };
     if (isLoading || suggestions?.status === 'loading') {
-        return React__default["default"].createElement(React__default["default"].Fragment, null, context.customSpinner ?? React__default["default"].createElement(Spinner, { label: translations.SRP.LOADING_EXCURSIONS }));
+        return React__default["default"].createElement(React__default["default"].Fragment, null, context.customSpinner ?? React__default["default"].createElement(Spinner, { label: translations.SRP.LOADING_ACTIVITIES }));
     }
     return (React__default["default"].createElement("div", { className: "flyin__content" },
         React__default["default"].createElement("div", { className: "search__result-row" },
@@ -33403,6 +33576,27 @@ const DayByDayExcursions = () => {
     })));
 };
 
+/**
+ * The entry to send to the backend, as opposed to the one the page works with.
+ *
+ * They differ only for a traject: the page keeps the line guids the traject was rendered with,
+ * because that is what joins its nodes to its lines, while pricing and booking need the guids the
+ * searches cached their lines under. Anything else passes through untouched, so this can be used
+ * wherever the entry leaves the component without checking which flow is running.
+ */
+const useBookableEntry = () => {
+    const context = React.useContext(SearchResultsConfigurationContext);
+    const { editablePackagingEntry, trajectNodeAvailability, trajectFlightAvailability } = reactRedux.useSelector((state) => state.searchResults);
+    const trajectEntry = context?.trajectEntry;
+    return React.useMemo(() => {
+        if (!editablePackagingEntry)
+            return null;
+        if (!trajectEntry)
+            return editablePackagingEntry;
+        return withCachedEntryLineGuids(editablePackagingEntry, trajectEntry, trajectNodeAvailability, trajectFlightAvailability);
+    }, [editablePackagingEntry, trajectEntry, trajectNodeAvailability, trajectFlightAvailability]);
+};
+
 const renderEditablePackagingEntrySummaryOptions = (editablePackagingEntry, priceDetails, translations, currencyCode) => {
     const priceDetailsByProduct = lodash.groupBy(priceDetails?.details ?? [], (detail) => `${detail.productCode}|${detail.accommodationCode}`);
     return (editablePackagingEntry?.lines ?? []).map((line) => {
@@ -33787,6 +33981,8 @@ const BookPackagingEntry = ({ activeSearchSeed, isLoading, isConfirmationPage })
             setSelectedPackagingAccoResult(selectedPackagingAccoResult);
         }
     }, [selectedPackagingAccoResultCode, packagingAccoResults]);
+    // What the page holds versus what the backend can look up; they differ for a traject.
+    const bookableEntry = useBookableEntry();
     if (!context || !editablePackagingEntry || !priceDetails || !config)
         return React__default["default"].createElement(Spinner, { label: translations.SUMMARY.PROCESS_BOOKING });
     const handleSummarySubmit = async (e) => {
@@ -33795,20 +33991,15 @@ const BookPackagingEntry = ({ activeSearchSeed, isLoading, isConfirmationPage })
         if (typeof window !== 'undefined') {
             window.scrollTo(0, 0);
         }
-        let updatedEditablePackagingEntry = {
-            ...editablePackagingEntry,
-            remarks
-        };
+        // Held apart from the entry itself so they can be put on both copies of it.
+        let bookingFields = { remarks };
         if (context.generatePaymentUrl && typeof window !== 'undefined') {
             const redirectUrl = new URL(window.location.href);
             redirectUrl.searchParams.set('bookingConfirmation', 'true');
             redirectUrl.searchParams.set('link', '');
-            updatedEditablePackagingEntry = {
-                ...updatedEditablePackagingEntry,
-                redirectUrl: redirectUrl.toString(),
-                returnPaymentUrl: true
-            };
+            bookingFields = { ...bookingFields, redirectUrl: redirectUrl.toString(), returnPaymentUrl: true };
         }
+        const updatedEditablePackagingEntry = { ...editablePackagingEntry, ...bookingFields };
         dispatch(setEditablePackagingEntry(updatedEditablePackagingEntry));
         try {
             const request = {
@@ -33816,7 +34007,8 @@ const BookPackagingEntry = ({ activeSearchSeed, isLoading, isConfirmationPage })
                 officeId: context.tideConnection.officeId,
                 catalogueId: context.searchConfiguration.defaultCatalogueId ?? 0,
                 agentId: context.agentId,
-                payload: updatedEditablePackagingEntry
+                // The page keeps the entry it works with; the backend gets the one it can look up.
+                payload: { ...(bookableEntry ?? editablePackagingEntry), ...bookingFields }
             };
             const bookingResponse = await build.bookPackagingEntry(config, request);
             dispatch(setBookingNumber(bookingResponse.number));
@@ -33848,6 +34040,41 @@ const BookPackagingEntry = ({ activeSearchSeed, isLoading, isConfirmationPage })
             React__default["default"].createElement(WLSidebar, { activeSearchSeed: activeSearchSeed, packagingAccoResult: selectedPackagingAccoResult }))));
 };
 
+const useTrajectDayActivities = () => {
+    const context = React.useContext(SearchResultsConfigurationContext);
+    const dispatch = reactRedux.useDispatch();
+    const { trajectDaySuggestions, trajectNodeAvailability } = reactRedux.useSelector((state) => state.searchResults);
+    const trajectEntry = context?.trajectEntry;
+    const showApiItems = !!context?.showApiItems;
+    const loadDay = React.useCallback(async (day) => {
+        if (!context || !trajectEntry)
+            return;
+        // Already asked for, or already answered: leave it be.
+        if (trajectDaySuggestions[day.order])
+            return;
+        const nodesWithLines = getTrajectNodesWithLines(trajectEntry);
+        const destination = getDayDestination(nodesWithLines, trajectNodeAvailability, day.order);
+        if (!destination)
+            return;
+        dispatch(setTrajectDaySuggestionsLoading(day.order));
+        try {
+            const results = (await build.searchPackagingExcursions(buildTrajectClientConfig(context), buildTrajectDayExcursionRequest(day.date, destination, buildTrajectSearchContext(context, trajectEntry)))) ?? [];
+            // With external items switched off a day only offers what Tide holds itself, and whatever
+            // the traject already books that day has a card of its own further up the block.
+            const configured = getConfiguredExcursionCodes(nodesWithLines, day.order);
+            dispatch(setTrajectDaySuggestions({
+                dayOrder: day.order,
+                results: results.filter((x) => showApiItems || !isExternalResult(x)).filter((x) => !configured.has(x.code))
+            }));
+        }
+        catch (error) {
+            console.error('Failed to load traject day activities', day.order, error);
+            dispatch(setTrajectDaySuggestions({ dayOrder: day.order, results: [] }));
+        }
+    }, [context, trajectEntry, showApiItems, trajectDaySuggestions, trajectNodeAvailability, dispatch]);
+    return loadDay;
+};
+
 const getNodeIcon = (node) => {
     if (isTrajectFlightNode(node))
         return 'ui-flight';
@@ -33863,9 +34090,10 @@ const MAX_DAY_ACTIVITIES = 6;
 const TrajectResults = ({ isLoading }) => {
     const context = React.useContext(SearchResultsConfigurationContext);
     const dispatch = reactRedux.useDispatch();
+    const loadDay = useTrajectDayActivities();
     const translations = getTranslations(context?.languageCode ?? 'en-GB');
     const locale = getLocale(context?.languageCode ?? 'en-GB');
-    const { trajectNodeAvailability, trajectFlightAvailability, trajectDaySuggestions, editablePackagingEntry } = reactRedux.useSelector((state) => state.searchResults);
+    const { trajectNodeAvailability, trajectFlightAvailability, trajectDaySuggestions, editablePackagingEntry, trajectResolving } = reactRedux.useSelector((state) => state.searchResults);
     const trajectEntry = context?.trajectEntry;
     const hideShowMoreResults = !!context?.hideShowMoreResults;
     const nodesWithLines = React.useMemo(() => (trajectEntry ? getTrajectNodesWithLines(trajectEntry) : []), [trajectEntry]);
@@ -33979,7 +34207,7 @@ const TrajectResults = ({ isLoading }) => {
                     React__default["default"].createElement(Icon, { name: getNodeIcon(node), height: 16 }),
                     React__default["default"].createElement("h3", null,
                         React__default["default"].createElement("strong", null, headerTitle || node.name))))),
-            status === 'loading' && (React__default["default"].createElement(Spinner, { label: node.serviceType === EXCURSION_SERVICE_TYPE ? translations.SRP.LOADING_EXCURSIONS : translations.SRP.LOADING_ACCOMMODATIONS })),
+            status === 'loading' && React__default["default"].createElement(Spinner, { label: translations.SRP.LOADING_ACCOMMODATIONS }),
             status === 'unavailable' && React__default["default"].createElement("div", { className: "no-results" }, translations.SRP.NO_RESULTS),
             status === 'resolved' && selected && (React__default["default"].createElement(React__default["default"].Fragment, null,
                 availability.preferredUnavailable && node.preferredAccommodationName && (React__default["default"].createElement("div", { className: "search__results__cards__actions" },
@@ -34015,8 +34243,6 @@ const TrajectResults = ({ isLoading }) => {
                 React__default["default"].createElement("div", { className: "search__results__label__text" },
                     React__default["default"].createElement(Icon, { name: "ui-flight", height: 16 }),
                     React__default["default"].createElement("h3", null,
-                        translations.SRP.SELECT,
-                        ' ',
                         React__default["default"].createElement("strong", null,
                             node.departureAirportCode,
                             " - ",
@@ -34042,10 +34268,22 @@ const TrajectResults = ({ isLoading }) => {
             dispatch(removeEditableEntryLines(added.map((line) => line.guid)));
             return;
         }
+        if (excursionNeedsChoice(result)) {
+            dispatch(setExcursionSearchParams(buildExcursionSearchParams(result)));
+            dispatch(setSelectedExcursionSearchResult(result));
+            dispatch(setFlyInType('excursion-details'));
+            dispatch(setFlyInIsOpen(true));
+            return;
+        }
         const lines = buildTrajectExcursionLines(result);
         if (lines.length)
             dispatch(addEditableEntryLines(lines));
     };
+    const handleShowItinerary = () => {
+        dispatch(setTrajectItineraryView(true));
+        if (typeof window !== 'undefined')
+            window.scrollTo(0, 0);
+    };
     const handleShowMoreActivities = (dayOrder) => {
         dispatch(setTrajectActivitiesDayOrder(dayOrder));
         dispatch(setFlyInType('traject-day-activities'));
@@ -34068,10 +34306,10 @@ const TrajectResults = ({ isLoading }) => {
         const items = getDayExcursionItems(day.order);
         const suggestions = trajectDaySuggestions[day.order];
         const cards = buildDayActivityCards(items, trajectNodeAvailability, suggestions?.results ?? []);
-        const isResolving = items.some((item) => (trajectNodeAvailability[item.line.guid]?.status ?? 'loading') === 'loading') || suggestions?.status === 'loading';
-        // A day with nothing configured and nothing found has nothing to say. A day whose own
-        // excursion came back empty does, so the gap is not passed off as a day without activities.
-        if (!cards.length && !items.length)
+        const nodesResolving = items.some((item) => (trajectNodeAvailability[item.line.guid]?.status ?? 'loading') === 'loading');
+        const isSearching = suggestions?.status === 'loading';
+        const canSearch = !!getDayDestination(nodesWithLines, trajectNodeAvailability, day.order);
+        if (!items.length && !canSearch)
             return null;
         const visible = cards.slice(0, MAX_DAY_ACTIVITIES);
         const hidden = cards.length - visible.length;
@@ -34084,16 +34322,16 @@ const TrajectResults = ({ isLoading }) => {
                     React__default["default"].createElement(Icon, { name: "ui-excursion", height: 16 }),
                     React__default["default"].createElement("h3", null,
                         React__default["default"].createElement("strong", null, translations.SRP.ACTIVITIES)))),
-            isResolving && !cards.length && React__default["default"].createElement(Spinner, { label: translations.SRP.LOADING_EXCURSIONS }),
-            !isResolving && !cards.length && React__default["default"].createElement("div", { className: "no-results" }, translations.SRP.NO_RESULTS),
-            !!cards.length && (React__default["default"].createElement(React__default["default"].Fragment, null,
-                React__default["default"].createElement("div", { className: "search__results__cards search__results__cards--scroll" }, visible.map(renderActivityCard)),
-                hidden > 0 && !hideShowMoreResults && (React__default["default"].createElement("div", { className: "search__results__cards__actions" },
-                    React__default["default"].createElement("button", { type: "button", className: "cta cta--secondary", onClick: () => handleShowMoreActivities(day.order) },
-                        translations.SRP.SHOW_MORE,
-                        " (",
-                        hidden,
-                        ")")))))));
+            (nodesResolving || isSearching) && !cards.length && React__default["default"].createElement(Spinner, { label: translations.SRP.LOADING_ACTIVITIES }),
+            !!cards.length && React__default["default"].createElement("div", { className: "search__results__cards search__results__cards--scroll" }, visible.map(renderActivityCard)),
+            !nodesResolving && !isSearching && !cards.length && (!!items.length || !!suggestions) && (React__default["default"].createElement("div", { className: "no-results" }, translations.SRP.NO_RESULTS)),
+            React__default["default"].createElement("div", { className: "search__results__cards__actions" },
+                !suggestions && canSearch && !cards.length && !hideShowMoreResults && (React__default["default"].createElement("button", { type: "button", className: "cta cta--secondary", onClick: () => loadDay(day) }, translations.SRP.SHOW_ACTIVITIES)),
+                hidden > 0 && !hideShowMoreResults && (React__default["default"].createElement("button", { type: "button", className: "cta cta--secondary", onClick: () => handleShowMoreActivities(day.order) },
+                    translations.SRP.SHOW_MORE,
+                    " (",
+                    hidden,
+                    ")")))));
     };
     /**
      * An activity the traject books is swapped for another, the way a hotel is; one the traveller
@@ -34105,32 +34343,35 @@ const TrajectResults = ({ isLoading }) => {
     };
     if (isLoading)
         return React__default["default"].createElement(Spinner, { label: translations.SRP.LOADING_ITINERARY });
-    return (React__default["default"].createElement(React__default["default"].Fragment, null, trajectEntry.traject.days.map((day) => {
-        const stay = stayByDay.get(day.order);
-        const dayNodes = (nodesByDay.get(day.order) ?? []).filter((node) => isRenderableNode(node) && lineByNodeId.has(node.nodeId));
-        const stayLeadsDay = !!stay && (stay.night > 0 || dayNodes[0]?.nodeId === stay.item.node.nodeId);
-        // Where the day's activities belong in the order: with the first excursion it carries.
-        const firstExcursionNodeId = dayNodes.find((node) => node.serviceType === EXCURSION_SERVICE_TYPE)?.nodeId;
-        const showDayHeader = stayLeadsDay || !!day.name?.trim();
-        return (React__default["default"].createElement(React__default["default"].Fragment, { key: `day-${day.order}` },
-            showDayHeader && renderDayHeader(day, stayLeadsDay ? stay : undefined),
-            dayNodes.map((node) => {
-                const item = lineByNodeId.get(node.nodeId);
-                if (node.serviceType === ACCOMMODATION_SERVICE_TYPE) {
-                    const stayStart = stayStartByNodeId.get(node.nodeId);
-                    const titledByDayHeader = stayLeadsDay && stay.item.node.nodeId === node.nodeId;
-                    return renderServiceNode(item, !titledByDayHeader, stayStart && getStayTitle(stayStart));
-                }
-                // Every excursion the day holds is drawn once, in one block, where the first of
-                // them falls in the order — so the activities still sit between the stay and the
-                // flight that follow them.
-                if (node.serviceType === EXCURSION_SERVICE_TYPE) {
-                    return node.nodeId === firstExcursionNodeId ? renderDayActivities(day) : null;
-                }
-                return renderFlightNode(item);
-            }),
-            firstExcursionNodeId === undefined && renderDayActivities(day)));
-    })));
+    return (React__default["default"].createElement(React__default["default"].Fragment, null,
+        trajectEntry.traject.days.map((day) => {
+            const stay = stayByDay.get(day.order);
+            const dayNodes = (nodesByDay.get(day.order) ?? []).filter((node) => isRenderableNode(node) && lineByNodeId.has(node.nodeId));
+            const stayLeadsDay = !!stay && (stay.night > 0 || dayNodes[0]?.nodeId === stay.item.node.nodeId);
+            // Where the day's activities belong in the order: with the first excursion it carries.
+            const firstExcursionNodeId = dayNodes.find((node) => node.serviceType === EXCURSION_SERVICE_TYPE)?.nodeId;
+            const showDayHeader = stayLeadsDay || !!day.name?.trim();
+            return (React__default["default"].createElement(React__default["default"].Fragment, { key: `day-${day.order}` },
+                showDayHeader && renderDayHeader(day, stayLeadsDay ? stay : undefined),
+                dayNodes.map((node) => {
+                    const item = lineByNodeId.get(node.nodeId);
+                    if (node.serviceType === ACCOMMODATION_SERVICE_TYPE) {
+                        const stayStart = stayStartByNodeId.get(node.nodeId);
+                        const titledByDayHeader = stayLeadsDay && stay.item.node.nodeId === node.nodeId;
+                        return renderServiceNode(item, !titledByDayHeader, stayStart && getStayTitle(stayStart));
+                    }
+                    // Every excursion the day holds is drawn once, in one block, where the first of
+                    // them falls in the order — so the activities still sit between the stay and the
+                    // flight that follow them.
+                    if (node.serviceType === EXCURSION_SERVICE_TYPE) {
+                        return node.nodeId === firstExcursionNodeId ? renderDayActivities(day) : null;
+                    }
+                    return renderFlightNode(item);
+                }),
+                firstExcursionNodeId === undefined && renderDayActivities(day)));
+        }),
+        React__default["default"].createElement("div", { className: "search__results__cards__actions" },
+            React__default["default"].createElement("button", { type: "button", className: "cta", disabled: trajectResolving, onClick: handleShowItinerary }, translations.STEPS.NEXT))));
 };
 
 const useTrajectAvailability = () => {
@@ -34144,6 +34385,7 @@ const useTrajectAvailability = () => {
             return;
         const controller = new AbortController();
         dispatch(resetTrajectAvailability());
+        dispatch(setTrajectResolving(true));
         const config = {
             host: context.tideConnection.host,
             apiKey: context.tideConnection.apiKey
@@ -34170,42 +34412,51 @@ const useTrajectAvailability = () => {
             const lineGuid = item.line.guid;
             const search = item.node.serviceType === EXCURSION_SERVICE_TYPE ? build.searchPackagingExcursions : build.searchPackagingAccommodations;
             dispatch(setTrajectNodeLoading(lineGuid));
+            const destination = getNodeSearchDestination(nodesWithLines, item);
+            const searchFor = async (productCode) => {
+                try {
+                    const results = (await search(config, buildTrajectNodeRequest(item, searchContext, productCode, destination), controller.signal)) ?? [];
+                    return results.filter((x) => showApiItems || !isExternalResult(x));
+                }
+                catch (error) {
+                    if (!controller.signal.aborted)
+                        console.error('Traject product unavailable', item.node.name, productCode, error);
+                    return [];
+                }
+            };
             try {
                 // With external items switched off the node only looks at products held inside Tide.
                 const candidates = getNodeCandidates(item.node).filter((x) => showApiItems || !isExternalCandidate(x));
-                const attempts = await Promise.all(candidates.map(async (candidate) => {
-                    try {
-                        const attempt = await search(config, buildTrajectNodeRequest(item, searchContext, candidate.code), controller.signal);
-                        return (attempt ?? []).find((result) => matchesCode(result, candidate.code)) ?? null;
-                    }
-                    catch (error) {
-                        if (!controller.signal.aborted)
-                            console.error('Traject hotel unavailable', candidate.code, error);
-                        return null;
-                    }
+                const areaResults = hideShowMoreResults ? [] : await searchFor('');
+                if (controller.signal.aborted)
+                    return [];
+                const configuredResults = [];
+                const found = await Promise.all(candidates.map(async (candidate) => {
+                    const known = areaResults.find((x) => matchesCode(x, candidate.code));
+                    if (known)
+                        return known;
+                    return (await searchFor(candidate.code)).find((x) => matchesCode(x, candidate.code)) ?? null;
                 }));
-                const configuredResults = attempts
-                    .filter((x) => !!x)
-                    .filter((x, i, all) => all.findIndex((y) => y.code === x.code) === i);
+                if (controller.signal.aborted)
+                    return [];
+                // Two configured codes can land on the same product — a hotel and one of its room types.
+                found.forEach((result) => {
+                    if (!result || configuredResults.some((x) => x.code === result.code))
+                        return;
+                    configuredResults.push(result);
+                });
+                const configuredCodes = new Set(configuredResults.map((x) => x.code));
+                const destinationResults = areaResults.filter((x) => !configuredCodes.has(x.code));
                 const preferredCandidate = candidates.find((x) => x.isPreferred) ?? candidates[0];
-                let preferredUnavailable = !!preferredCandidate && !configuredResults.some((x) => matchesCode(x, preferredCandidate.code));
-                // The destination search exists only to stock the show-more fly-in. With the button hidden
-                // a node is limited to its configured products; if none are available it simply reports so,
-                // rather than quietly substituting a hotel nobody configured.
-                const destinationResults = hideShowMoreResults
-                    ? []
-                    : ((await search(config, buildTrajectNodeRequest(item, searchContext, ''), controller.signal)) ?? [])
-                        .filter((x) => showApiItems || !isExternalResult(x))
-                        .filter((x) => !configuredResults.some((configured) => configured.code === x.code));
+                const preferredUnavailable = configuredResults.length
+                    ? !!preferredCandidate && !configuredResults.some((x) => matchesCode(x, preferredCandidate.code))
+                    : candidates.length > 0;
                 const picked = configuredResults[0] ?? pickCheapest(destinationResults);
-                const results = [...configuredResults, ...destinationResults];
-                if (!configuredResults.length)
-                    preferredUnavailable = candidates.length > 0;
                 if (controller.signal.aborted)
                     return [];
                 dispatch(setTrajectNodeAvailability({
                     lineGuid,
-                    results,
+                    results: [...configuredResults, ...destinationResults],
                     selectedCode: picked?.code ?? null,
                     preferredUnavailable
                 }));
@@ -34249,11 +34500,11 @@ const useTrajectAvailability = () => {
             }
         };
         (async () => {
-            const searchable = nodesWithLines.filter((x) => isSearchableTrajectNode(x.node));
-            const flightNodes = nodesWithLines.filter((x) => isTrajectFlightNode(x.node));
-            const unresolved = (await Promise.all([...searchable.map(resolveNode), ...flightNodes.map(resolveFlightNode)])).flat();
+            const resolvable = nodesWithLines.filter((x) => isSearchableTrajectNode(x.node) || isTrajectFlightNode(x.node));
+            const unresolved = (await Promise.all(resolvable.map((item) => (isTrajectFlightNode(item.node) ? resolveFlightNode(item) : resolveNode(item))))).flat();
             if (controller.signal.aborted)
                 return;
+            dispatch(setTrajectResolving(false));
             // A node with no availability anywhere cannot be priced or booked, so its line comes off
             // the entry. The card stays visible and reports the gap.
             const emptyLineGuids = unresolved.filter(Boolean);
@@ -34269,10 +34520,12 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
     const dispatch = reactRedux.useDispatch();
     const context = React.useContext(SearchResultsConfigurationContext);
     const translations = getTranslations(context?.languageCode ?? 'en-GB');
-    const { results, filteredResults, packagingAccoResults, filteredPackagingAccoResults, isLoading, flightsLoading, initialFilters, filters, flightFilters, selectedSortType, selectedFlightSortType, selectedSearchResult, selectedPackagingAccoResultCode, flyInIsOpen, packagingAccoSearchDetails, editablePackagingEntry, transactionId, flyInType, packagingFlightResults, confirmedExcursionsByDay, bookPackagingEntry, trajectEditLineGuid } = reactRedux.useSelector((state) => state.searchResults);
+    const { results, filteredResults, packagingAccoResults, filteredPackagingAccoResults, isLoading, flightsLoading, initialFilters, filters, flightFilters, selectedSortType, selectedFlightSortType, selectedSearchResult, selectedPackagingAccoResultCode, flyInIsOpen, packagingAccoSearchDetails, editablePackagingEntry, transactionId, flyInType, packagingFlightResults, confirmedExcursionsByDay, bookPackagingEntry, trajectEditLineGuid, trajectResolving, trajectItineraryView } = reactRedux.useSelector((state) => state.searchResults);
     const isMobile = useMediaQuery('(max-width: 1200px)');
     // Resolves live availability per traject node; no-op unless a traject entry is configured.
     useTrajectAvailability();
+    // The entry as the backend can price it: a traject swaps in the guids its searches cached.
+    const bookableEntry = useBookableEntry();
     const [initialFiltersSet, setInitialFiltersSet] = React.useState(false);
     const [initialFlightFiltersSet, setInitialFlightFiltersSet] = React.useState(false);
     const [filtersOpen, setFiltersOpen] = React.useState(false);
@@ -35039,6 +35292,10 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
         const fetchPriceDetails = async () => {
             if (!context || !editablePackagingEntry || lodash.isEmpty(editablePackagingEntry.lines))
                 return;
+            // A traject resolves one node at a time. Pricing each step would show a total that climbs
+            // as the trip fills in, so the whole trip is priced once, when the last node is in.
+            if (context.trajectEntry && trajectResolving)
+                return;
             setPricesAreLoading(true);
             try {
                 const config = {
@@ -35050,7 +35307,7 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
                     officeId: context.tideConnection.officeId,
                     catalogueId: context.searchConfiguration.defaultCatalogueId ?? lodash.first(context?.tideConnection?.catalogueIds) ?? 1,
                     agentId: context.agentId,
-                    payload: editablePackagingEntry
+                    payload: bookableEntry ?? editablePackagingEntry
                 };
                 const priceDetails = await build.getPriceDetails(config, request);
                 dispatch(setPriceDetails(priceDetails));
@@ -35064,8 +35321,9 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
         const fetchItinerary = async () => {
             if (!context || !context.packagingEntry || !editablePackagingEntry || lodash.isEmpty(editablePackagingEntry.lines))
                 return;
-            // The traject view renders its own day-by-day column, so the generated itinerary is unused.
-            if (context.trajectEntry)
+            // While a traject is being composed its own day-by-day column is the itinerary; the generated
+            // one is what the traveller reads the finished trip back from, so it waits until then.
+            if (context.trajectEntry && (trajectResolving || !trajectItineraryView))
                 return;
             setItineraryIsLoading(true);
             try {
@@ -35078,7 +35336,7 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
                     officeId: context.tideConnection.officeId,
                     catalogueId: context.searchConfiguration.defaultCatalogueId ?? lodash.first(context?.tideConnection?.catalogueIds) ?? 1,
                     agentId: context.agentId,
-                    payload: editablePackagingEntry
+                    payload: bookableEntry ?? editablePackagingEntry
                 };
                 const itinerary = await build.getItinerary(config, request);
                 dispatch(setItinerary(itinerary));
@@ -35091,7 +35349,7 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
         };
         fetchPriceDetails();
         fetchItinerary();
-    }, [editablePackagingEntry]);
+    }, [editablePackagingEntry, bookableEntry, trajectResolving, trajectItineraryView]);
     // Flight selection
     // const [selectedOutwardKey, setSelectedOutwardKey] = useState<string | null>(null);
     // const [selectedReturnKey, setSelectedReturnKey] = useState<string | null>(null);
@@ -35440,6 +35698,11 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
             address: {}
         };
     };
+    const handleComposeTraject = () => {
+        dispatch(setTrajectItineraryView(false));
+        if (typeof window !== 'undefined')
+            window.scrollTo(0, 0);
+    };
     const handleShowMoreFlights = (flyInType) => {
         dispatch(setFlyInType(flyInType));
         dispatch(setFlyInIsOpen(true));
@@ -35455,7 +35718,7 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
             context.searchConfiguration.qsmType != build.PortalQsmType.AccommodationAndFlight && context.showFilters && (React__default["default"].createElement(Filters, { initialFilters: initialFilters, filters: filters, isOpen: filtersOpen, handleSetIsOpen: () => setFiltersOpen(!filtersOpen), 
                 // handleApplyFilters={() => setSearchTrigger((prev) => prev + 1)}
                 isLoading: isLoading, setFilters: (filters) => dispatch(setFilters(filters)), resetFilters: (filters) => dispatch(resetFilters(filters)) })),
-            context.searchConfiguration.qsmType === build.PortalQsmType.AccommodationAndFlight && (React__default["default"].createElement(Itinerary, { isOpen: itineraryOpen, handleSetIsOpen: () => setItineraryOpen(!itineraryOpen), isLoading: isLoading || pricesAreLoading || flightsLoading || itineraryIsLoading, onEditAccommodation: handleEditAccommodation })),
+            context.searchConfiguration.qsmType === build.PortalQsmType.AccommodationAndFlight && (React__default["default"].createElement(Itinerary, { isOpen: itineraryOpen, handleSetIsOpen: () => setItineraryOpen(!itineraryOpen), isLoading: isLoading || pricesAreLoading || flightsLoading || itineraryIsLoading || trajectResolving, onEditAccommodation: handleEditAccommodation })),
             React__default["default"].createElement("div", { className: "search__results" },
                 isMobile && (React__default["default"].createElement("div", { className: "search__result-row" },
                     React__default["default"].createElement("div", { className: "search__results__actions" },
@@ -35529,7 +35792,11 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
                         React__default["default"].createElement("div", { className: "search__results__cards search__results__cards--extended" },
                             selectedReturnKey && selectedReturn && (React__default["default"].createElement(IndependentFlightOption, { key: `flight-${selectedReturnKey}`, item: selectedReturn.return, guid: selectedReturn.outwardGuid, selectedGuid: selectedReturn.outwardGuid, isOutward: false, showSelectedState: true, price: selectedReturn.price })),
                             uniqueReturnFlights.map((result) => (React__default["default"].createElement(IndependentFlightOption, { key: `flight-${result.outwardGuid}`, item: result.return, onSelect: () => dispatch(setSelectedReturnKey(getFlightKey(result.return.segments))), guid: result.outwardGuid, isOutward: false, currentSelectedPrice: selectedReturn?.price, price: result.price })))))),
-                    context.searchConfiguration.qsmType === build.PortalQsmType.AccommodationAndFlight && context.trajectEntry && (React__default["default"].createElement(TrajectResults, { isLoading: isLoading })),
+                    context.searchConfiguration.qsmType === build.PortalQsmType.AccommodationAndFlight && context.trajectEntry && !trajectItineraryView && (React__default["default"].createElement(TrajectResults, { isLoading: isLoading })),
+                    context.searchConfiguration.qsmType === build.PortalQsmType.AccommodationAndFlight && context.trajectEntry && trajectItineraryView && (React__default["default"].createElement(React__default["default"].Fragment, null,
+                        React__default["default"].createElement("div", { className: "search__results__cards__actions" },
+                            React__default["default"].createElement("button", { type: "button", className: "cta cta--secondary", onClick: handleComposeTraject }, translations.STEPS.PREVIOUS)),
+                        React__default["default"].createElement(FullItinerary, { isLoading: itineraryIsLoading }))),
                     context.searchConfiguration.qsmType === build.PortalQsmType.AccommodationAndFlight && context.packagingEntry && !context.trajectEntry && (React__default["default"].createElement(FullItinerary, { isLoading: itineraryIsLoading })))),
             React__default["default"].createElement(FlyIn, { srpType: context.searchConfiguration.qsmType, isOpen: flyInIsOpen, setIsOpen: handleFlyInToggle, handleConfirm: () => handleConfirmHotelSwap(), onPanelRef: (el) => (panelRef.current = el), detailsLoading: detailsIsLoading, flyInType: flyInType, isPackageEditFlow: !!context.packagingEntry, sortByTypes: sortByTypes, activeSearchSeed: activeSearchSeed, toggleFilters: () => setFiltersOpen(!filtersOpen), filtersOpen: filtersOpen })))))))));
 };