@qite/tide-components 1.0.14-preview.5 → 1.0.14-preview.6

package/build/build-cjs/index.js

@@ -490,7 +490,10 @@ var SRP$f = {
 	LOADING_ACCOMMODATIONS: "جارٍ تحميل الإقامات...",
 	LOADING_ITINERARY: "جارٍ تحميل خط سير الرحلة...",
 	LOADING_OPTIONS: "جارٍ تحميل الخيارات...",
-	BOOK_AND_PAY: "احجز وادفع"
+	BOOK_AND_PAY: "احجز وادفع",
+	PRICE_DETAILS_FAILED: "تعذر حساب السعر.",
+	TRY_AGAIN: "حاول مرة أخرى",
+	BACK_TO_SERVICES: "العودة إلى الخدمات"
 };
 var ITINERARY$f = {
 	DAY: "اليوم",
@@ -997,7 +1000,10 @@ var SRP$e = {
 	LOADING_ACCOMMODATIONS: "Indlæser indkvarteringer...",
 	LOADING_ITINERARY: "Indlæser rejseplan...",
 	LOADING_OPTIONS: "Indlæser muligheder...",
-	BOOK_AND_PAY: "Book og betal"
+	BOOK_AND_PAY: "Book og betal",
+	PRICE_DETAILS_FAILED: "Prisen kunne ikke beregnes.",
+	TRY_AGAIN: "Prøv igen",
+	BACK_TO_SERVICES: "Tilbage til ydelser"
 };
 var ITINERARY$e = {
 	DAY: "Dag",
@@ -1504,7 +1510,10 @@ var SRP$d = {
 	LOADING_ACCOMMODATIONS: "Lade Unterkünfte...",
 	LOADING_ITINERARY: "Lade Reiseverlauf...",
 	LOADING_OPTIONS: "Lade Optionen...",
-	BOOK_AND_PAY: "Buchen und bezahlen"
+	BOOK_AND_PAY: "Buchen und bezahlen",
+	PRICE_DETAILS_FAILED: "Der Preis konnte nicht berechnet werden.",
+	TRY_AGAIN: "Erneut versuchen",
+	BACK_TO_SERVICES: "Zurück zu den Leistungen"
 };
 var ITINERARY$d = {
 	DAY: "Tag",
@@ -2015,7 +2024,10 @@ var SRP$c = {
 	LOADING_ACCOMMODATIONS: "Loading accommodations...",
 	LOADING_ITINERARY: "Loading itinerary...",
 	LOADING_OPTIONS: "Loading options...",
-	BOOK_AND_PAY: "Book and pay"
+	BOOK_AND_PAY: "Book and pay",
+	PRICE_DETAILS_FAILED: "The price could not be calculated.",
+	TRY_AGAIN: "Try again",
+	BACK_TO_SERVICES: "Back to services"
 };
 var ITINERARY$c = {
 	DAY: "Day",
@@ -2522,7 +2534,10 @@ var SRP$b = {
 	LOADING_ACCOMMODATIONS: "Cargando alojamientos...",
 	LOADING_ITINERARY: "Cargando itinerario...",
 	LOADING_OPTIONS: "Cargando opciones...",
-	BOOK_AND_PAY: "Reservar y pagar"
+	BOOK_AND_PAY: "Reservar y pagar",
+	PRICE_DETAILS_FAILED: "No se ha podido calcular el precio.",
+	TRY_AGAIN: "Volver a intentarlo",
+	BACK_TO_SERVICES: "Volver a los servicios"
 };
 var ITINERARY$b = {
 	DAY: "Día",
@@ -3033,7 +3048,10 @@ var SRP$a = {
 	LOADING_ACCOMMODATIONS: "Chargement des hébergements...",
 	LOADING_ITINERARY: "Chargement de l’itinéraire...",
 	LOADING_OPTIONS: "Chargement des options...",
-	BOOK_AND_PAY: "Réserver et payer"
+	BOOK_AND_PAY: "Réserver et payer",
+	PRICE_DETAILS_FAILED: "Le prix n’a pas pu être calculé.",
+	TRY_AGAIN: "Réessayer",
+	BACK_TO_SERVICES: "Retour aux services"
 };
 var ITINERARY$a = {
 	DAY: "Jour",
@@ -3540,7 +3558,10 @@ var SRP$9 = {
 	LOADING_ACCOMMODATIONS: "Chargement des hébergements...",
 	LOADING_ITINERARY: "Chargement de l’itinéraire...",
 	LOADING_OPTIONS: "Chargement des options...",
-	BOOK_AND_PAY: "Réserver et payer"
+	BOOK_AND_PAY: "Réserver et payer",
+	PRICE_DETAILS_FAILED: "Le prix n’a pas pu être calculé.",
+	TRY_AGAIN: "Réessayer",
+	BACK_TO_SERVICES: "Retour aux services"
 };
 var ITINERARY$9 = {
 	DAY: "Jour",
@@ -4047,7 +4068,10 @@ var SRP$8 = {
 	LOADING_ACCOMMODATIONS: "Hleðst inn í gistingar...",
 	LOADING_ITINERARY: "Hleðst inn í ferðaráætlun...",
 	LOADING_OPTIONS: "Hleðst inn í valkosti...",
-	BOOK_AND_PAY: "Panta og greiða"
+	BOOK_AND_PAY: "Panta og greiða",
+	PRICE_DETAILS_FAILED: "Ekki tókst að reikna verðið.",
+	TRY_AGAIN: "Reyna aftur",
+	BACK_TO_SERVICES: "Aftur í þjónustu"
 };
 var ITINERARY$8 = {
 	DAY: "Dagur",
@@ -4554,7 +4578,10 @@ var SRP$7 = {
 	LOADING_ACCOMMODATIONS: "Caricamento degli alloggi...",
 	LOADING_ITINERARY: "Caricamento dell'itinerario...",
 	LOADING_OPTIONS: "Caricamento delle opzioni...",
-	BOOK_AND_PAY: "Prenota e paga"
+	BOOK_AND_PAY: "Prenota e paga",
+	PRICE_DETAILS_FAILED: "Non è stato possibile calcolare il prezzo.",
+	TRY_AGAIN: "Riprova",
+	BACK_TO_SERVICES: "Torna ai servizi"
 };
 var ITINERARY$7 = {
 	DAY: "Giorno",
@@ -5065,7 +5092,10 @@ var SRP$6 = {
 	LOADING_ACCOMMODATIONS: "Accommodaties laden...",
 	LOADING_ITINERARY: "Reisplan laden...",
 	LOADING_OPTIONS: "Opties laden...",
-	BOOK_AND_PAY: "Boek en betaal"
+	BOOK_AND_PAY: "Boek en betaal",
+	PRICE_DETAILS_FAILED: "De prijs kon niet berekend worden.",
+	TRY_AGAIN: "Opnieuw proberen",
+	BACK_TO_SERVICES: "Terug naar diensten"
 };
 var ITINERARY$6 = {
 	DAY: "Dag",
@@ -5572,7 +5602,10 @@ var SRP$5 = {
 	LOADING_ACCOMMODATIONS: "Accommodaties laden...",
 	LOADING_ITINERARY: "Reisplan laden...",
 	LOADING_OPTIONS: "Opties laden...",
-	BOOK_AND_PAY: "Boeken en betalen"
+	BOOK_AND_PAY: "Boeken en betalen",
+	PRICE_DETAILS_FAILED: "De prijs kon niet worden berekend.",
+	TRY_AGAIN: "Opnieuw proberen",
+	BACK_TO_SERVICES: "Terug naar diensten"
 };
 var ITINERARY$5 = {
 	DAY: "Dag",
@@ -6079,7 +6112,10 @@ var SRP$4 = {
 	LOADING_ACCOMMODATIONS: "Laster overnattinger...",
 	LOADING_ITINERARY: "Laster reiserute...",
 	LOADING_OPTIONS: "Laster alternativer...",
-	BOOK_AND_PAY: "Bestill og betal"
+	BOOK_AND_PAY: "Bestill og betal",
+	PRICE_DETAILS_FAILED: "Prisen kunne ikke beregnes.",
+	TRY_AGAIN: "Prøv igjen",
+	BACK_TO_SERVICES: "Tilbake til tjenester"
 };
 var ITINERARY$4 = {
 	DAY: "Dag",
@@ -6586,7 +6622,10 @@ var SRP$3 = {
 	LOADING_ACCOMMODATIONS: "Ładowanie zakwaterowań...",
 	LOADING_ITINERARY: "Ładowanie planu podróży...",
 	LOADING_OPTIONS: "Ładowanie opcji...",
-	BOOK_AND_PAY: "Zarezerwuj i zapłać"
+	BOOK_AND_PAY: "Zarezerwuj i zapłać",
+	PRICE_DETAILS_FAILED: "Nie udało się obliczyć ceny.",
+	TRY_AGAIN: "Spróbuj ponownie",
+	BACK_TO_SERVICES: "Wróć do usług"
 };
 var ITINERARY$3 = {
 	DAY: "Dzień",
@@ -7093,7 +7132,10 @@ var SRP$2 = {
 	LOADING_ACCOMMODATIONS: "A carregar alojamentos...",
 	LOADING_ITINERARY: "A carregar itinerário...",
 	LOADING_OPTIONS: "A carregar opções...",
-	BOOK_AND_PAY: "Reservar e pagar"
+	BOOK_AND_PAY: "Reservar e pagar",
+	PRICE_DETAILS_FAILED: "Não foi possível calcular o preço.",
+	TRY_AGAIN: "Tentar novamente",
+	BACK_TO_SERVICES: "Voltar aos serviços"
 };
 var ITINERARY$2 = {
 	DAY: "Dia",
@@ -7600,7 +7642,10 @@ var SRP$1 = {
 	LOADING_ACCOMMODATIONS: "Laddar boenden...",
 	LOADING_ITINERARY: "Laddar resplan...",
 	LOADING_OPTIONS: "Laddar alternativ...",
-	BOOK_AND_PAY: "Boka och betala"
+	BOOK_AND_PAY: "Boka och betala",
+	PRICE_DETAILS_FAILED: "Priset kunde inte beräknas.",
+	TRY_AGAIN: "Försök igen",
+	BACK_TO_SERVICES: "Tillbaka till tjänster"
 };
 var ITINERARY$1 = {
 	DAY: "Dag",
@@ -8107,7 +8152,10 @@ var SRP = {
 	LOADING_ACCOMMODATIONS: "宿泊施設を読み込み中...",
 	LOADING_ITINERARY: "旅程を読み込み中...",
 	LOADING_OPTIONS: "オプションを読み込み中...",
-	BOOK_AND_PAY: "予約して支払う"
+	BOOK_AND_PAY: "予約して支払う",
+	PRICE_DETAILS_FAILED: "料金を計算できませんでした。",
+	TRY_AGAIN: "再試行",
+	BACK_TO_SERVICES: "サービスに戻る"
 };
 var ITINERARY = {
 	DAY: "日",
@@ -29235,6 +29283,8 @@ const initialState$1 = {
     selectedFlightDetails: null,
     bookingPackageDetails: null,
     priceDetails: null,
+    priceDetailsFailed: false,
+    priceDetailsRequest: 0,
     isLoading: false,
     flightsLoading: false,
     selectedSortType: null,
@@ -29395,6 +29445,12 @@ const searchResultsSlice = toolkit.createSlice({
         setPriceDetails(state, action) {
             state.priceDetails = action.payload;
         },
+        setPriceDetailsFailed(state, action) {
+            state.priceDetailsFailed = action.payload;
+        },
+        retryPriceDetails(state) {
+            state.priceDetailsRequest += 1;
+        },
         setItinerary(state, action) {
             state.itinerary = action.payload;
         },
@@ -29554,11 +29610,12 @@ const searchResultsSlice = toolkit.createSlice({
             flight.selectedGuid = null;
         },
         setTrajectTransferLoading(state, action) {
-            state.trajectTransferAvailability[action.payload] = { nodeId: action.payload, status: 'loading', result: null };
+            const { nodeId, key } = action.payload;
+            state.trajectTransferAvailability[nodeId] = { nodeId, key, status: 'loading', result: null };
         },
         setTrajectTransferAvailability(state, action) {
-            const { nodeId, result } = action.payload;
-            state.trajectTransferAvailability[nodeId] = { nodeId, status: result ? 'resolved' : 'unavailable', result };
+            const { nodeId, key, result } = action.payload;
+            state.trajectTransferAvailability[nodeId] = { nodeId, key, status: result ? 'resolved' : 'unavailable', result };
         },
         setTrajectDaySuggestionsLoading(state, action) {
             const dayOrder = action.payload;
@@ -29605,7 +29662,7 @@ const searchResultsSlice = toolkit.createSlice({
         }
     }
 });
-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, clearTrajectNodeSelection, setTrajectResolving, setTrajectItineraryView, setTrajectFlightLoading, setTrajectFlightAvailability, setTrajectFlightSelection, clearTrajectFlightSelection, setTrajectTransferLoading, setTrajectTransferAvailability, setTrajectEditLineGuid, setTrajectActivitiesDayOrder, setTrajectDaySuggestionsLoading, setTrajectDaySuggestions, addEditableEntryLines, upsertEditableEntryLines, removeTrajectNode, 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, setPriceDetailsFailed, retryPriceDetails, setItinerary, setSelectedOutwardKey, setSelectedReturnKey, resetFlightSelection, setExcursionSearchParams, setSelectedExcursionSearchResult, confirmExcursionForDay, removeConfirmedExcursionForDay, clearConfirmedExcursionsForDay, setBookPackagingEntry, setCurrentStep, setBookingNumber, setTrajectNodeLoading, setTrajectNodeAvailability, setTrajectNodeSelection, clearTrajectNodeSelection, setTrajectResolving, setTrajectItineraryView, setTrajectFlightLoading, setTrajectFlightAvailability, setTrajectFlightSelection, clearTrajectFlightSelection, setTrajectTransferLoading, setTrajectTransferAvailability, setTrajectEditLineGuid, setTrajectActivitiesDayOrder, setTrajectDaySuggestionsLoading, setTrajectDaySuggestions, addEditableEntryLines, upsertEditableEntryLines, removeTrajectNode, updateTrajectNodeResult, resetTrajectAvailability, updateEditableEntryLine, removeEditableEntryLines } = searchResultsSlice.actions;
 var searchResultsReducer = searchResultsSlice.reducer;
 
 const ItemPicker = ({ items, selection, selectedSortByType, label, placeholder, classModifier, onPick, valueFormatter }) => {
@@ -29770,211 +29827,9 @@ const getPackagingRequestRoomsFromBookingRooms = (rooms) => {
     });
 };
 
-// Administrative service lines (fees, insurances, reductions, ...) live on the entry but say
-// nothing about the journey itself, so the itinerary never draws them.
-const HIDDEN_ITINERARY_SERVICE_TYPES = new Set([
-    build.ServiceType.insurance,
-    build.ServiceType.extraService,
-    build.ServiceType.serviceFee,
-    build.ServiceType.gift,
-    build.ServiceType.reduction,
-    build.ServiceType.fee,
-    build.ServiceType.visum,
-    build.ServiceType.voucher,
-    build.ServiceType.specialServices
-]);
-// An inactive member of a line group is an alternative the traveller did not pick — not travelled.
-const isMeaningfulItineraryLine = (line) => {
-    return isActiveEntryLine(line) && !HIDDEN_ITINERARY_SERVICE_TYPES.has(line.serviceType ?? -1);
-};
-const getFlightLines = (flight) => {
-    return flight?.flightInformation?.flightLines ?? [];
-};
-const getDepartureTime = (flight) => {
-    const firstLine = lodash.first(getFlightLines(flight));
-    if (!firstLine?.departureTime)
-        return '';
-    return firstLine.departureTime.slice(0, 5);
-};
-const getArrivalTime = (flight) => {
-    const lastLine = lodash.last(getFlightLines(flight));
-    if (!lastLine?.arrivalTime)
-        return '';
-    return lastLine.arrivalTime.slice(0, 5);
-};
-const getDuration = (flight) => {
-    const lines = getFlightLines(flight);
-    if (!lines.length)
-        return '';
-    const totalTicks = lines.reduce((sum, line) => sum + (line.durationInTicks ?? 0), 0) || 0;
-    if (!totalTicks)
-        return '';
-    const seconds = totalTicks / 10_000_000;
-    const hours = Math.floor(seconds / 3600);
-    const minutes = Math.floor((seconds % 3600) / 60);
-    return `${hours}h ${minutes.toString().padStart(2, '0')}m`;
-};
-const numberOfNights = (segment) => {
-    return dateFns.differenceInCalendarDays(new Date(segment.to), new Date(segment.from));
-};
-const CHARTER_SERVICE_TYPE = 10;
-const CRUISE_SERVICE_TYPE = 11;
-const FERRY_SERVICE_TYPE = 12;
-const TRANSFER_SERVICE_TYPE$1 = 13;
-const BUS_SERVICE_TYPE = 14;
-const CAR_SERVICE_TYPE = 17;
-const CAMPER_SERVICE_TYPE = 18;
-const TRAIN_SERVICE_TYPE = 20;
-const RENTAL_SERVICE_TYPE = 22;
-const RESTAURANT_SERVICE_TYPE = 23;
-const EVENT_SERVICE_TYPE = 24;
-const TRAINING_SERVICE_TYPE = 25;
-/** Icon per service type, so every node on the itinerary reads at a glance. */
-const getServiceTypeIcon = (serviceType) => {
-    switch (serviceType) {
-        case ACCOMMODATION_SERVICE_TYPE:
-            return 'ui-hotel';
-        case EXCURSION_SERVICE_TYPE:
-            return 'ui-excursion';
-        case FLIGHT_SERVICE_TYPE:
-        case CHARTER_SERVICE_TYPE:
-            return 'ui-plane';
-        case RESTAURANT_SERVICE_TYPE:
-            return 'ui-utensils';
-        case CRUISE_SERVICE_TYPE:
-        case FERRY_SERVICE_TYPE:
-            return 'ui-ship';
-        case CAR_SERVICE_TYPE:
-        case CAMPER_SERVICE_TYPE:
-        case RENTAL_SERVICE_TYPE:
-            return 'ui-car';
-        case BUS_SERVICE_TYPE:
-            return 'ui-bus';
-        case TRAIN_SERVICE_TYPE:
-            return 'ui-train';
-        case TRANSFER_SERVICE_TYPE$1:
-            return 'ui-transfer';
-        case EVENT_SERVICE_TYPE:
-            return 'ui-ticket';
-        case TRAINING_SERVICE_TYPE:
-            return 'ui-group';
-        default:
-            return 'ui-location';
-    }
-};
-const getServiceTypeBadgeModifier = (serviceType) => {
-    switch (serviceType) {
-        case FLIGHT_SERVICE_TYPE:
-        case CHARTER_SERVICE_TYPE:
-        case CRUISE_SERVICE_TYPE:
-        case FERRY_SERVICE_TYPE:
-            return 'flight';
-        case ACCOMMODATION_SERVICE_TYPE:
-            return 'hotel';
-        case EXCURSION_SERVICE_TYPE:
-        case EVENT_SERVICE_TYPE:
-            return 'excursion';
-        case RESTAURANT_SERVICE_TYPE:
-            return 'restaurant';
-        default:
-            return '';
-    }
-};
-// DurationType, as the SDK numbers it.
-const DURATION_HOURS = 0;
-const DURATION_DAYS = 1;
-const DURATION_NIGHTS = 2;
-const DURATION_MINUTES = 3;
-/**
- * How long a node takes, in the same shape the flight legs are written in — an hour count only
- * once there is one, so a short drive reads as plain minutes.
- */
-const getTrajectNodeDuration = (node) => {
-    const minutes = toMinutes(node);
-    if (!minutes)
-        return '';
-    const hours = Math.floor(minutes / 60);
-    const rest = minutes % 60;
-    return hours ? `${hours}h ${rest.toString().padStart(2, '0')}m` : `${rest} min`;
-};
-const toMinutes = (node) => {
-    const duration = node.duration ?? 0;
-    if (duration <= 0)
-        return 0;
-    switch (node.durationType) {
-        case DURATION_MINUTES:
-            return duration;
-        case DURATION_HOURS:
-            return duration * 60;
-        case DURATION_DAYS:
-        case DURATION_NIGHTS:
-            return duration * 24 * 60;
-        default:
-            return 0;
-    }
-};
-// RouteTransportType, as the SDK numbers it. It says how a leg is travelled, which is not the
-// same question as what was sold: cycling and walking have no service type of their own.
-const TRANSPORT_PRIVATE = 1;
-const TRANSPORT_PUBLIC = 2;
-const TRANSPORT_RENTAL_CAR = 3;
-const TRANSPORT_BUS = 4;
-const TRANSPORT_CAMPER = 5;
-const TRANSPORT_CAR = 6;
-const TRANSPORT_CHARTER = 7;
-const TRANSPORT_CRUISE = 8;
-const TRANSPORT_FERRY = 9;
-const TRANSPORT_FLIGHT = 10;
-const TRANSPORT_TAXI = 11;
-const TRANSPORT_TRAIN = 12;
-const TRANSPORT_TRANSFER = 13;
-const TRANSPORT_WALKING = 15;
-const TRANSPORT_CYCLING = 16;
-/** Icon per way of travelling, where the route records one. */
-const getTransportTypeIcon = (transportType) => {
-    switch (transportType) {
-        case TRANSPORT_WALKING:
-            return 'ui-walking';
-        case TRANSPORT_CYCLING:
-            return 'ui-cycling';
-        case TRANSPORT_PRIVATE:
-        case TRANSPORT_RENTAL_CAR:
-        case TRANSPORT_CAMPER:
-        case TRANSPORT_CAR:
-            return 'ui-car';
-        case TRANSPORT_TAXI:
-        case TRANSPORT_TRANSFER:
-            return 'ui-transfer';
-        case TRANSPORT_PUBLIC:
-        case TRANSPORT_BUS:
-            return 'ui-bus';
-        case TRANSPORT_TRAIN:
-            return 'ui-train';
-        case TRANSPORT_CRUISE:
-        case TRANSPORT_FERRY:
-            return 'ui-ship';
-        case TRANSPORT_FLIGHT:
-        case TRANSPORT_CHARTER:
-            return 'ui-plane';
-        default:
-            return null;
-    }
-};
-const POI_TRAJECT_NODE_TYPE = 2;
-/**
- * A point of interest is a place on the map rather than a service, so it gets a marker. Anything
- * else goes by how it is travelled where the route says so — a leg on foot or by bike is sold as
- * nothing, and its service type falls back to a transfer — and by what it is where it does not.
- */
-const getTrajectNodeIcon = (node) => {
-    if (node.trajectNodeType === POI_TRAJECT_NODE_TYPE)
-        return 'ui-location';
-    return getTransportTypeIcon(node.transportType) ?? getServiceTypeIcon(node.serviceType);
-};
-const getTrajectNodeBadgeModifier = (node) => node.trajectNodeType === POI_TRAJECT_NODE_TYPE ? 'poi' : getServiceTypeBadgeModifier(node.serviceType);
-
 const REGULAR_TRAJECT_NODE_TYPE = 0;
 const CONNECTING_TRAJECT_NODE_TYPE = 1;
+const POI_TRAJECT_NODE_TYPE = 2;
 const isSearchableTrajectNode = (node) => node.serviceType === ACCOMMODATION_SERVICE_TYPE || node.serviceType === EXCURSION_SERVICE_TYPE;
 const isTrajectFlightNode = (node) => node.serviceType === FLIGHT_SERVICE_TYPE;
 const getTrajectNodesWithLines = (trajectEntry) => {
@@ -29989,7 +29844,7 @@ const getTrajectNodesWithLines = (trajectEntry) => {
         .filter((x) => !!x.line);
 };
 // Qite.Offer.Enums.ServiceType.Transfer: a traject's connecting node is booked as one.
-const TRANSFER_SERVICE_TYPE = 13;
+const TRANSFER_SERVICE_TYPE$1 = 13;
 // Qite.Offer.Enums.RequirementType. A Mandatory (0) stop, and one RequiredInGroup (3) — one of the node's
 // alternatives has to be booked — always keep a selection; only these two may be taken off the trip.
 const OPTIONAL_REQUIREMENT_TYPE = 1;
@@ -30017,7 +29872,53 @@ const getDroppedTrajectNodeIds = (trajectEntry, entry) => {
     return dropped;
 };
 const isTrajectTransferNode = (node) => node.trajectNodeType === CONNECTING_TRAJECT_NODE_TYPE && !!node.pickUp && !!node.dropOff;
-const buildTrajectTransferRequest = (node, context) => ({
+const getStopLine = (node, lines) => {
+    const guids = node.lineGuids?.length ? node.lineGuids : [node.lineGuid];
+    const own = lines.find((line) => guids.includes(line.guid));
+    const groupKey = own ? getLineGroupKey(own) : '';
+    return (groupKey ? getGroupLines(lines, groupKey)[0]?.[0] : undefined) ?? own;
+};
+const getMovedStopCoordinate = (node, originalLines, lines) => {
+    if (node.trajectNodeType !== REGULAR_TRAJECT_NODE_TYPE || !isSearchableTrajectNode(node))
+        return null;
+    const current = getStopLine(node, lines);
+    if (!current || current.latitude == null || current.longitude == null)
+        return null;
+    if (current.productCode === getStopLine(node, originalLines)?.productCode)
+        return null;
+    return { name: current.productName, latitude: current.latitude, longitude: current.longitude };
+};
+const getNightStay = (nodes, lines, night) => nodes.find((node) => {
+    if (node.trajectNodeType !== REGULAR_TRAJECT_NODE_TYPE || node.serviceType !== ACCOMMODATION_SERVICE_TYPE)
+        return false;
+    const line = getStopLine(node, lines);
+    const nights = Math.max(dateFns.differenceInCalendarDays(new Date(line?.to ?? node.to), new Date(line?.from ?? node.from)), 1);
+    return node.dayOrder <= night && night < node.dayOrder + nights;
+});
+const getTrajectTransferEndpoints = (trajectEntry, lines, connector) => {
+    if (!isTrajectTransferNode(connector))
+        return null;
+    const routeNodes = trajectEntry.entry.routeNodes ?? [];
+    const onRoute = routeNodes.find((node) => node.nodeId === connector.nodeId);
+    const nodes = onRoute ? routeNodes : trajectEntry.nodes ?? [];
+    const at = onRoute ?? connector;
+    const originalLines = trajectEntry.entry.lines ?? [];
+    const day = nodes.filter((node) => node.dayOrder === at.dayOrder).sort((a, b) => a.order - b.order);
+    const index = day.indexOf(at);
+    const isStop = (node) => node.trajectNodeType !== CONNECTING_TRAJECT_NODE_TYPE;
+    const previous = day.slice(0, index).filter(isStop).pop() ?? getNightStay(nodes, lines, at.dayOrder - 1);
+    const next = day.slice(index + 1).find(isStop) ?? getNightStay(nodes, lines, at.dayOrder);
+    const pickUp = (previous && getMovedStopCoordinate(previous, originalLines, lines)) ?? connector.pickUp;
+    const dropOff = (next && getMovedStopCoordinate(next, originalLines, lines)) ?? connector.dropOff;
+    const place = (coordinate) => `${coordinate.latitude.toFixed(5)},${coordinate.longitude.toFixed(5)}`;
+    return {
+        pickUp,
+        dropOff,
+        key: `${place(pickUp)}|${place(dropOff)}|${toDateOnlyString(connector.from)}`,
+        asDrawn: pickUp === connector.pickUp && dropOff === connector.dropOff
+    };
+};
+const buildTrajectTransferRequest = (node, endpoints, context) => ({
     transactionId: context.transactionId,
     officeId: context.officeId,
     agentId: context.agentId ?? null,
@@ -30025,10 +29926,11 @@ const buildTrajectTransferRequest = (node, context) => ({
     searchConfigurationId: context.searchConfigurationId,
     language: context.language,
     date: node.from,
-    pickUp: node.pickUp,
-    dropOff: node.dropOff,
+    pickUp: endpoints.pickUp,
+    dropOff: endpoints.dropOff,
     travellers: context.rooms.flatMap((room) => room.travellers)
 });
+const getTrajectTransferLines = (node, lines) => lines.filter((line) => line.trajectNodeId === node.nodeId || (!!node.lineGuids?.length && node.lineGuids.includes(line.guid)));
 const buildTrajectTransferLine = (node, result) => {
     const option = result.rooms?.[0]?.options?.find((x) => x.isSelected) ?? result.rooms?.[0]?.options?.[0];
     if (!option?.guid)
@@ -30042,7 +29944,7 @@ const buildTrajectTransferLine = (node, result) => {
         from: result.fromDate ?? node.from,
         to: result.toDate ?? node.to,
         moment: node.moment ?? '',
-        serviceType: TRANSFER_SERVICE_TYPE,
+        serviceType: TRANSFER_SERVICE_TYPE$1,
         productName: result.name,
         productCode: result.code,
         accommodationName: option.accommodationName,
@@ -30417,7 +30319,15 @@ const withCachedEntryLineGuids = (entry, trajectEntry, nodeAvailability, flightA
     const bookedMode = !!trajectEntry.entry.magicLink;
     const editableByGuid = new Map((entry.lines ?? []).map((line) => [line.guid, line]));
     const keepsOwnGuid = (guid) => bookedMode && !editableByGuid.get(guid)?.isChanged;
+    // A swapped line tells which stop of the dossier's route it replaces, so saving links the route to it.
+    const routeNodeIds = new Map();
+    if (bookedMode)
+        (trajectEntry.entry.routeNodes ?? []).forEach((node) => (node.lineGuids ?? []).forEach((guid) => routeNodeIds.set(guid, node.nodeId)));
+    const trajectNodeIds = new Map();
     getTrajectNodesWithLines(trajectEntry).forEach((item) => {
+        const routeNodeId = item.lines.map((line) => routeNodeIds.get(line.guid)).find((id) => id !== undefined);
+        if (routeNodeId !== undefined)
+            item.lines.filter((line) => !keepsOwnGuid(line.guid)).forEach((line) => trajectNodeIds.set(line.guid, routeNodeId));
         if (isTrajectFlightNode(item.node)) {
             if (keepsOwnGuid(item.line.guid))
                 return;
@@ -30440,14 +30350,15 @@ const withCachedEntryLineGuids = (entry, trajectEntry, nodeAvailability, flightA
                 cachedGuids.set(line.guid, guid);
         });
     });
-    if (!cachedGuids.size)
+    if (!cachedGuids.size && !trajectNodeIds.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
+            parentGuid: (line.parentGuid && cachedGuids.get(line.parentGuid)) ?? line.parentGuid,
+            trajectNodeId: trajectNodeIds.get(line.guid) ?? line.trajectNodeId
         }))
     };
 };
@@ -30481,214 +30392,214 @@ const applyFlightToLine = (line, flight) => {
 const isExternalResult = (result) => result.vendorId != null || result.vendorConfigurationId != null;
 const isExternalCandidate = (candidate) => candidate.externalVendorId != null || candidate.vendor != null;
 
-const badgeClass = (kind, modifier) => {
-    const base = `search__filter__itinerary__${kind}-badge`;
-    const fallback = kind === 'segment' ? `${base}--secondary` : `${base}--default`;
-    return `${base} ${modifier ? `${base}--${modifier}` : fallback}`;
+// Administrative service lines (fees, insurances, reductions, ...) live on the entry but say
+// nothing about the journey itself, so the itinerary never draws them.
+const HIDDEN_ITINERARY_SERVICE_TYPES = new Set([
+    build.ServiceType.insurance,
+    build.ServiceType.extraService,
+    build.ServiceType.serviceFee,
+    build.ServiceType.gift,
+    build.ServiceType.reduction,
+    build.ServiceType.fee,
+    build.ServiceType.visum,
+    build.ServiceType.voucher,
+    build.ServiceType.specialServices
+]);
+// An inactive member of a line group is an alternative the traveller did not pick — not travelled.
+const isMeaningfulItineraryLine = (line) => {
+    return isActiveEntryLine(line) && !HIDDEN_ITINERARY_SERVICE_TYPES.has(line.serviceType ?? -1);
 };
-const nightsOf = (node, line) => dateFns.differenceInCalendarDays(new Date(line?.to ?? node.to), new Date(line?.from ?? node.from));
-const TrajectItinerary = ({ trajectEntry, packagingEntry, translations }) => {
-    const timeline = React.useMemo(() => {
-        const linesByGuid = new Map((packagingEntry.lines ?? []).map((line) => [line.guid, line]));
-        const dropped = getDroppedTrajectNodeIds(trajectEntry, packagingEntry);
-        const nodes = [...(trajectEntry.nodes ?? [])]
-            .filter((node) => !dropped.has(node.nodeId))
-            .sort((a, b) => a.dayOrder - b.dayOrder || a.order - b.order)
-            .map((node) => {
-            // A connecting node has no line of its own; the transfer found for it carries its node id.
-            if (node.trajectNodeType === CONNECTING_TRAJECT_NODE_TYPE) {
-                return { node, lines: (packagingEntry.lines ?? []).filter((line) => line.trajectNodeId === node.nodeId) };
-            }
-            const guids = node.lineGuids?.length ? node.lineGuids : [node.lineGuid];
-            const lines = guids.map((guid) => linesByGuid.get(guid)).filter((x) => !!x);
-            const groupKey = lines.length ? getLineGroupKey(lines[0]) : '';
-            const active = groupKey ? getGroupLines(packagingEntry.lines ?? [], groupKey)[0] : undefined;
-            return { node, lines: active ?? lines };
-        });
-        const claimed = new Set(nodes.flatMap((item) => item.lines.map((line) => line.guid)));
-        const extras = (packagingEntry.lines ?? []).filter((line) => !claimed.has(line.guid)).filter(isMeaningfulItineraryLine);
-        if (!extras.length)
-            return nodes;
-        const dayOrderOf = (date) => trajectEntry.traject.days.find((day) => dateFns.isSameDay(new Date(day.date), new Date(date)))?.order ??
-            Math.max(dateFns.differenceInCalendarDays(new Date(date), new Date(trajectEntry.traject.startDate)), 0);
-        // One product bought once, however many option lines it took (an adult and a child ticket).
-        const grouped = new Map();
-        extras.forEach((line) => {
-            const key = `${line.productCode}|${line.from}`;
-            grouped.set(key, [...(grouped.get(key) ?? []), line]);
-        });
-        const byDay = new Map();
-        nodes.forEach((item) => byDay.set(item.node.dayOrder, [...(byDay.get(item.node.dayOrder) ?? []), item]));
-        [...grouped.values()].forEach((lines, index) => {
-            const line = lines[0];
-            const dayOrder = dayOrderOf(line.from);
-            const item = {
-                lines,
-                node: {
-                    nodeId: -(index + 1),
-                    lineGuid: line.guid,
-                    lineGuids: lines.map((x) => x.guid),
-                    dayOrder,
-                    order: Number.MAX_SAFE_INTEGER,
-                    name: line.productName,
-                    serviceType: line.serviceType,
-                    trajectNodeType: REGULAR_TRAJECT_NODE_TYPE,
-                    requirementType: 0,
-                    contentSource: 0,
-                    duration: 0,
-                    durationType: 0,
-                    alternatives: [],
-                    from: line.from,
-                    to: line.to
-                }
-            };
-            const dayItems = [...(byDay.get(dayOrder) ?? [])];
-            let at = dayItems.length;
-            while (at > 0 && dayItems[at - 1].node.trajectNodeType === CONNECTING_TRAJECT_NODE_TYPE)
-                at--;
-            dayItems.splice(at, 0, item);
-            byDay.set(dayOrder, dayItems);
-        });
-        return [...byDay.keys()].sort((a, b) => a - b).flatMap((dayOrder) => byDay.get(dayOrder));
-    }, [trajectEntry, packagingEntry]);
-    const stayByDay = React.useMemo(() => {
-        const map = new Map();
-        timeline
-            .filter(({ node }) => node.trajectNodeType === REGULAR_TRAJECT_NODE_TYPE && node.serviceType === ACCOMMODATION_SERVICE_TYPE)
-            .forEach(({ node, lines }) => {
-            const line = lines[0];
-            const nights = Math.max(nightsOf(node, line), 1);
-            const name = line?.productName || node.preferredAccommodationName || node.name || '';
-            for (let night = 0; night < nights; night++)
-                map.set(node.dayOrder + night, { name, night, nights });
-        });
-        return map;
-    }, [timeline]);
-    const renderDate = (value) => (React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-date" },
-        React__default["default"].createElement("p", { className: "search__filter__itinerary__transport-date-date" },
-            React__default["default"].createElement("strong", null, dateFns.format(new Date(value), 'd'))),
-        React__default["default"].createElement("p", null, dateFns.format(new Date(value), 'MMM'))));
-    const renderConnectingNode = ({ node, lines }) => {
-        const distance = node.distanceInKm ? `${Math.round(node.distanceInKm)} km` : '';
-        // How long the hop takes and how far it is, the way the traject editor puts them.
-        const journey = [getTrajectNodeDuration(node), distance].filter(Boolean).join(' · ');
-        const title = lines[0]?.productName || node.name;
-        return (React__default["default"].createElement("div", { className: "search__filter__itinerary__transport", key: `connect-${node.nodeId}` },
-            React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-timeline" },
-                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-timeline-line" })),
-            React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-item" },
-                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-date" }),
-                React__default["default"].createElement("div", { className: badgeClass('transport', getTrajectNodeBadgeModifier(node)) },
-                    React__default["default"].createElement(Icon, { name: getTrajectNodeIcon(node), height: 15 })),
-                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-details" },
-                    React__default["default"].createElement("h6", null, title || journey),
-                    !!title && !!journey && React__default["default"].createElement("p", { className: "search__filter__itinerary__transport-details-time" }, journey)))));
-    };
-    const renderOvernight = (item, index) => {
-        const { dayOrder } = item.node;
-        const closesTheDay = timeline[index + 1]?.node.dayOrder !== dayOrder;
-        const stay = stayByDay.get(dayOrder);
-        if (!closesTheDay || !stay)
+const getFlightLines = (flight) => {
+    return flight?.flightInformation?.flightLines ?? [];
+};
+const getDepartureTime = (flight) => {
+    const firstLine = lodash.first(getFlightLines(flight));
+    if (!firstLine?.departureTime)
+        return '';
+    return firstLine.departureTime.slice(0, 5);
+};
+const getArrivalTime = (flight) => {
+    const lastLine = lodash.last(getFlightLines(flight));
+    if (!lastLine?.arrivalTime)
+        return '';
+    return lastLine.arrivalTime.slice(0, 5);
+};
+const getDuration = (flight) => {
+    const lines = getFlightLines(flight);
+    if (!lines.length)
+        return '';
+    const totalTicks = lines.reduce((sum, line) => sum + (line.durationInTicks ?? 0), 0) || 0;
+    if (!totalTicks)
+        return '';
+    const seconds = totalTicks / 10_000_000;
+    const hours = Math.floor(seconds / 3600);
+    const minutes = Math.floor((seconds % 3600) / 60);
+    return `${hours}h ${minutes.toString().padStart(2, '0')}m`;
+};
+const numberOfNights = (segment) => {
+    return dateFns.differenceInCalendarDays(new Date(segment.to), new Date(segment.from));
+};
+const CHARTER_SERVICE_TYPE = 10;
+const CRUISE_SERVICE_TYPE = 11;
+const FERRY_SERVICE_TYPE = 12;
+const TRANSFER_SERVICE_TYPE = 13;
+const BUS_SERVICE_TYPE = 14;
+const CAR_SERVICE_TYPE = 17;
+const CAMPER_SERVICE_TYPE = 18;
+const TRAIN_SERVICE_TYPE = 20;
+const RENTAL_SERVICE_TYPE = 22;
+const RESTAURANT_SERVICE_TYPE = 23;
+const EVENT_SERVICE_TYPE = 24;
+const TRAINING_SERVICE_TYPE = 25;
+/** Icon per service type, so every node on the itinerary reads at a glance. */
+const getServiceTypeIcon = (serviceType) => {
+    switch (serviceType) {
+        case ACCOMMODATION_SERVICE_TYPE:
+            return 'ui-hotel';
+        case EXCURSION_SERVICE_TYPE:
+            return 'ui-excursion';
+        case FLIGHT_SERVICE_TYPE:
+        case CHARTER_SERVICE_TYPE:
+            return 'ui-plane';
+        case RESTAURANT_SERVICE_TYPE:
+            return 'ui-utensils';
+        case CRUISE_SERVICE_TYPE:
+        case FERRY_SERVICE_TYPE:
+            return 'ui-ship';
+        case CAR_SERVICE_TYPE:
+        case CAMPER_SERVICE_TYPE:
+        case RENTAL_SERVICE_TYPE:
+            return 'ui-car';
+        case BUS_SERVICE_TYPE:
+            return 'ui-bus';
+        case TRAIN_SERVICE_TYPE:
+            return 'ui-train';
+        case TRANSFER_SERVICE_TYPE:
+            return 'ui-transfer';
+        case EVENT_SERVICE_TYPE:
+            return 'ui-ticket';
+        case TRAINING_SERVICE_TYPE:
+            return 'ui-group';
+        default:
+            return 'ui-location';
+    }
+};
+const getServiceTypeBadgeModifier = (serviceType) => {
+    switch (serviceType) {
+        case FLIGHT_SERVICE_TYPE:
+        case CHARTER_SERVICE_TYPE:
+        case CRUISE_SERVICE_TYPE:
+        case FERRY_SERVICE_TYPE:
+            return 'flight';
+        case ACCOMMODATION_SERVICE_TYPE:
+            return 'hotel';
+        case EXCURSION_SERVICE_TYPE:
+        case EVENT_SERVICE_TYPE:
+            return 'excursion';
+        case RESTAURANT_SERVICE_TYPE:
+            return 'restaurant';
+        default:
+            return '';
+    }
+};
+// DurationType, as the SDK numbers it.
+const DURATION_HOURS = 0;
+const DURATION_DAYS = 1;
+const DURATION_NIGHTS = 2;
+const DURATION_MINUTES = 3;
+/**
+ * How long a node takes, in the same shape the flight legs are written in — an hour count only
+ * once there is one, so a short drive reads as plain minutes.
+ */
+const getTrajectNodeDuration = (node) => {
+    const minutes = toMinutes(node);
+    if (!minutes)
+        return '';
+    const hours = Math.floor(minutes / 60);
+    const rest = minutes % 60;
+    return hours ? `${hours}h ${rest.toString().padStart(2, '0')}m` : `${rest} min`;
+};
+const toMinutes = (node) => {
+    const duration = node.duration ?? 0;
+    if (duration <= 0)
+        return 0;
+    switch (node.durationType) {
+        case DURATION_MINUTES:
+            return duration;
+        case DURATION_HOURS:
+            return duration * 60;
+        case DURATION_DAYS:
+        case DURATION_NIGHTS:
+            return duration * 24 * 60;
+        default:
+            return 0;
+    }
+};
+// RouteTransportType, as the SDK numbers it. It says how a leg is travelled, which is not the
+// same question as what was sold: cycling and walking have no service type of their own.
+const TRANSPORT_PRIVATE = 1;
+const TRANSPORT_PUBLIC = 2;
+const TRANSPORT_RENTAL_CAR = 3;
+const TRANSPORT_BUS = 4;
+const TRANSPORT_CAMPER = 5;
+const TRANSPORT_CAR = 6;
+const TRANSPORT_CHARTER = 7;
+const TRANSPORT_CRUISE = 8;
+const TRANSPORT_FERRY = 9;
+const TRANSPORT_FLIGHT = 10;
+const TRANSPORT_TAXI = 11;
+const TRANSPORT_TRAIN = 12;
+const TRANSPORT_TRANSFER = 13;
+const TRANSPORT_WALKING = 15;
+const TRANSPORT_CYCLING = 16;
+/** Icon per way of travelling, where the route records one. */
+const getTransportTypeIcon = (transportType) => {
+    switch (transportType) {
+        case TRANSPORT_WALKING:
+            return 'ui-walking';
+        case TRANSPORT_CYCLING:
+            return 'ui-cycling';
+        case TRANSPORT_PRIVATE:
+        case TRANSPORT_RENTAL_CAR:
+        case TRANSPORT_CAMPER:
+        case TRANSPORT_CAR:
+            return 'ui-car';
+        case TRANSPORT_TAXI:
+        case TRANSPORT_TRANSFER:
+            return 'ui-transfer';
+        case TRANSPORT_PUBLIC:
+        case TRANSPORT_BUS:
+            return 'ui-bus';
+        case TRANSPORT_TRAIN:
+            return 'ui-train';
+        case TRANSPORT_CRUISE:
+        case TRANSPORT_FERRY:
+            return 'ui-ship';
+        case TRANSPORT_FLIGHT:
+        case TRANSPORT_CHARTER:
+            return 'ui-plane';
+        default:
             return null;
-        return (React__default["default"].createElement("div", { className: "search__filter__itinerary__transport", key: `overnight-${item.node.nodeId}` },
-            React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-timeline" },
-                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-timeline-line" })),
-            React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-item" },
-                renderDate(item.node.from),
-                React__default["default"].createElement("div", { className: badgeClass('transport', getServiceTypeBadgeModifier(ACCOMMODATION_SERVICE_TYPE)) },
-                    React__default["default"].createElement(Icon, { name: "ui-bed", height: 15 })),
-                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-details" },
-                    React__default["default"].createElement("h6", null, stay.name),
-                    React__default["default"].createElement("p", { className: "search__filter__itinerary__transport-details-time" },
-                        stay.night + 1,
-                        " ",
-                        translations.SRP.OF,
-                        " ",
-                        stay.nights,
-                        " ",
-                        translations.SRP.NIGHTS)))));
-    };
-    const renderFlightNode = ({ node, lines }) => {
-        const line = lines[0];
-        return (React__default["default"].createElement("div", { className: "search__filter__itinerary__transport", key: `flight-${node.nodeId}` },
-            React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-timeline" },
-                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-timeline-line" })),
-            React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-item" },
-                renderDate(line?.from ?? node.from),
-                React__default["default"].createElement("div", { className: badgeClass('transport', getServiceTypeBadgeModifier(FLIGHT_SERVICE_TYPE)) },
-                    React__default["default"].createElement(Icon, { name: "ui-plane", height: 15 })),
-                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-details" },
-                    React__default["default"].createElement("h6", null, line?.productName || node.name),
-                    !!getDepartureTime(line) && (React__default["default"].createElement("p", { className: "search__filter__itinerary__transport-details-plane" },
-                        React__default["default"].createElement("span", null,
-                            React__default["default"].createElement(Icon, { name: "ui-plane-depart", height: 14 }),
-                            " ",
-                            React__default["default"].createElement("strong", null, getDepartureTime(line))),
-                        ' ',
-                        "-",
-                        ' ',
-                        React__default["default"].createElement("span", null,
-                            React__default["default"].createElement(Icon, { name: "ui-plane-arrive", height: 14 }),
-                            " ",
-                            React__default["default"].createElement("strong", null, getArrivalTime(line))))),
-                    !!getDuration(line) && (React__default["default"].createElement("p", { className: "search__filter__itinerary__transport-details-time" },
-                        React__default["default"].createElement("span", null,
-                            React__default["default"].createElement(Icon, { name: "ui-clock", height: 20 }),
-                            " ",
-                            getDuration(line))))))));
-    };
-    const renderServiceNode = ({ node, lines }) => {
-        const line = lines[0];
-        const isStay = node.serviceType === ACCOMMODATION_SERVICE_TYPE;
-        const nights = isStay ? nightsOf(node, line) : 0;
-        return (React__default["default"].createElement("div", { className: "search__filter__itinerary__segments", key: `node-${node.nodeId}` },
-            React__default["default"].createElement("div", { className: "search__filter__itinerary__segments__wrapper" },
-                React__default["default"].createElement("div", { className: "search__filter__itinerary__segments-timeline" },
-                    React__default["default"].createElement("div", { className: "search__filter__itinerary__segments-timeline-line" })),
-                React__default["default"].createElement("div", { className: "search__filter__itinerary__segment" },
-                    React__default["default"].createElement("div", { className: "search__filter__itinerary__segment-item" },
-                        React__default["default"].createElement("div", { className: `search__filter__itinerary__segment-date ${isStay && nights > 0 ? 'search__filter__itinerary__segment-nights' : ''}` }, isStay && nights > 0 ? (React__default["default"].createElement(React__default["default"].Fragment, null,
-                            React__default["default"].createElement("p", { className: "search__filter__itinerary__segment-date-date" },
-                                React__default["default"].createElement("strong", null, nights)),
-                            React__default["default"].createElement(Icon, { name: "ui-moon", width: 16, height: 16 }))) : (React__default["default"].createElement(React__default["default"].Fragment, null,
-                            React__default["default"].createElement("p", { className: "search__filter__itinerary__segment-date-date" },
-                                React__default["default"].createElement("strong", null, dateFns.format(new Date(line?.from ?? node.from), 'd'))),
-                            React__default["default"].createElement("p", null, dateFns.format(new Date(line?.from ?? node.from), 'MMM'))))),
-                        React__default["default"].createElement("div", { className: badgeClass('segment', getTrajectNodeBadgeModifier(node)) },
-                            React__default["default"].createElement(Icon, { name: getTrajectNodeIcon(node), width: 15, height: 15 })),
-                        React__default["default"].createElement("div", { className: "search__filter__itinerary__segment-details" },
-                            React__default["default"].createElement("h6", null, line?.productName || node.preferredAccommodationName || node.name),
-                            isStay &&
-                                lines.map((roomLine, index) => (React__default["default"].createElement(React__default["default"].Fragment, { key: roomLine.guid },
-                                    lines.length > 1 && (React__default["default"].createElement("strong", null,
-                                        translations.SHARED.ROOM,
-                                        "\u00A0",
-                                        index + 1)),
-                                    roomLine.accommodationName && (React__default["default"].createElement("div", { className: "search__filter__itinerary__segment-details__room" },
-                                        React__default["default"].createElement(Icon, { name: "ui-bed", width: 12, height: 12 }),
-                                        roomLine.accommodationName)),
-                                    roomLine.regimeName && (React__default["default"].createElement("div", { className: "search__filter__itinerary__segment-details__room" },
-                                        React__default["default"].createElement(Icon, { name: "ui-utensils", width: 12, height: 12 }),
-                                        roomLine.regimeName))))),
-                            !isStay && React__default["default"].createElement("p", { className: "search__filter__itinerary__segment-details-text" }, dateFns.format(new Date(line?.from ?? node.from), 'EEE. d MMM yyyy'))))))));
-    };
-    return (React__default["default"].createElement(React__default["default"].Fragment, null, timeline.map((item, index) => {
-        if (item.node.trajectNodeType === CONNECTING_TRAJECT_NODE_TYPE) {
-            return (React__default["default"].createElement(React__default["default"].Fragment, { key: `connect-${item.node.nodeId}` },
-                renderConnectingNode(item),
-                renderOvernight(item, index)));
-        }
-        if (item.node.trajectNodeType === REGULAR_TRAJECT_NODE_TYPE && item.node.serviceType === FLIGHT_SERVICE_TYPE)
-            return renderFlightNode(item);
-        return renderServiceNode(item);
-    })));
+    }
 };
+/**
+ * A point of interest is a place on the map rather than a service, so it gets a marker. Anything
+ * else goes by how it is travelled where the route says so — a leg on foot or by bike is sold as
+ * nothing, and its service type falls back to a transfer — and by what it is where it does not.
+ */
+const getTrajectNodeIcon = (node) => {
+    if (node.trajectNodeType === POI_TRAJECT_NODE_TYPE)
+        return 'ui-location';
+    return getTransportTypeIcon(node.transportType) ?? getServiceTypeIcon(node.serviceType);
+};
+const getTrajectNodeBadgeModifier = (node) => node.trajectNodeType === POI_TRAJECT_NODE_TYPE ? 'poi' : getServiceTypeBadgeModifier(node.serviceType);
 
 /**
  * A booked entry opened through its magic link knows nothing about the traject it may once have
  * been composed from — the dossier only keeps the lines. To give it the same day-by-day services
  * screen a traject gets, the traject structure is rebuilt from those lines: every booked service
  * becomes a node whose one "alternative" is the booked product itself, and the days span the trip.
+ * The points of interest on the dossier's own route (entry.routeNodes) are added between them.
  *
  * The synthesized response keeps the entry untouched (magic link included), which is also how the
  * rest of the component tells this mode apart from a real traject: see isBookedEntryTraject.
@@ -30765,21 +30676,24 @@ const buildBookedTrajectEntry = (entry) => {
     const tos = lines.map((line) => new Date(line.to).getTime());
     const start = froms.length ? new Date(Math.min(...froms)) : new Date();
     const end = tos.length ? new Date(Math.max(...tos)) : start;
+    // Local midnights, written the way the backend writes a traject's days. A UTC date (toDateOnlyString)
+    // names another day away from Greenwich, and every line looked up by its day would slide onto it.
     const dayCount = Math.max(dateFns.differenceInCalendarDays(end, start), 0) + 1;
     const days = Array.from({ length: dayCount }, (_, order) => ({
         order,
         name: '',
-        date: toDateOnlyString(dateFns.addDays(start, order))
+        date: dateFns.format(dateFns.addDays(start, order), "yyyy-MM-dd'T00:00:00'")
     }));
-    const dayOrderOf = (line) => Math.max(dateFns.differenceInCalendarDays(new Date(line.from), start), 0);
+    const dayOrderOf = (item) => Math.min(Math.max(dateFns.differenceInCalendarDays(new Date(item.from), start), 0), dayCount - 1);
     const flights = lodash.sortBy(lines.filter((line) => line.serviceType === FLIGHT_SERVICE_TYPE && isActiveEntryLine(line)), (line) => new Date(line.from).getTime(), (line) => line.order);
     const outward = lodash.first(flights);
     const homeward = flights.length > 1 ? lodash.last(flights) : undefined;
-    const placeInDay = (line) => (line === outward ? -1 : line === homeward ? 1 : 0);
-    const orderedGroups = groupNodeLines(lines).sort((a, b) => {
-        const [lineA, lineB] = [a.lines[0], b.lines[0]];
-        return dayOrderOf(lineA) - dayOrderOf(lineB) || placeInDay(lineA) - placeInDay(lineB) || lineA.order - lineB.order;
-    });
+    // The dossier keeps its lines in route order, so a node's order is its line's — except that the
+    // outward flight opens its day and the homeward one closes it, whatever else that day holds.
+    const homewardOrder = Math.max(0, ...(entry.lines ?? []).map((line) => line.order)) + 1;
+    const orderOf = (line) => (line === outward ? -1 : line === homeward ? homewardOrder : line.order);
+    const orderedGroups = groupNodeLines(lines).sort((a, b) => dayOrderOf(a.lines[0]) - dayOrderOf(b.lines[0]) || orderOf(a.lines[0]) - orderOf(b.lines[0]));
+    const idBase = Math.max(0, ...(entry.routeNodes ?? []).map((routeNode) => routeNode.nodeId));
     const nodes = orderedGroups.map(({ lines: groupLines, alternatives }, index) => {
         const line = groupLines[0];
         const flightLines = line.flightInformation?.flightLines ?? [];
@@ -30789,9 +30703,9 @@ const buildBookedTrajectEntry = (entry) => {
         return {
             lineGuid: line.guid,
             lineGuids: groupLines.map((x) => x.guid),
-            nodeId: index + 1,
+            nodeId: idBase + index + 1,
             dayOrder: dayOrderOf(line),
-            order: index,
+            order: orderOf(line),
             name: (alternatives.length && getLineGroupKey(line)) || line.productName,
             serviceType: line.serviceType,
             trajectNodeType: REGULAR_TRAJECT_NODE_TYPE,
@@ -30809,6 +30723,23 @@ const buildBookedTrajectEntry = (entry) => {
             to: line.to
         };
     });
+    const linesByGuid = new Map((entry.lines ?? []).map((line) => [line.guid, line]));
+    let anchorOrder = -2;
+    let step = 0;
+    (entry.routeNodes ?? []).forEach((routeNode) => {
+        const anchor = linesByGuid.get(routeNode.lineGuid);
+        if (anchor) {
+            anchorOrder = orderOf(anchor);
+            step = 0;
+            if (routeNode.trajectNodeType === CONNECTING_TRAJECT_NODE_TYPE)
+                nodes.push({ ...routeNode, dayOrder: dayOrderOf(routeNode), order: anchorOrder });
+            return;
+        }
+        if (routeNode.trajectNodeType !== POI_TRAJECT_NODE_TYPE)
+            return;
+        step++;
+        nodes.push({ ...routeNode, nodeId: idBase + nodes.length + 1, dayOrder: dayOrderOf(routeNode), order: anchorOrder + step / 1000 });
+    });
     return {
         entry,
         traject: {
@@ -30930,6 +30861,222 @@ const buildBookedFlightResult = (line) => {
     };
 };
 
+const badgeClass = (kind, modifier) => {
+    const base = `search__filter__itinerary__${kind}-badge`;
+    const fallback = kind === 'segment' ? `${base}--secondary` : `${base}--default`;
+    return `${base} ${modifier ? `${base}--${modifier}` : fallback}`;
+};
+const nightsOf = (node, line) => dateFns.differenceInCalendarDays(new Date(line?.to ?? node.to), new Date(line?.from ?? node.from));
+const TrajectItinerary = ({ trajectEntry, packagingEntry, translations }) => {
+    const timeline = React.useMemo(() => {
+        const linesByGuid = new Map((packagingEntry.lines ?? []).map((line) => [line.guid, line]));
+        const dropped = getDroppedTrajectNodeIds(trajectEntry, packagingEntry);
+        const nodes = [...(trajectEntry.nodes ?? [])]
+            .filter((node) => !dropped.has(node.nodeId))
+            .sort((a, b) => a.dayOrder - b.dayOrder || a.order - b.order)
+            .map((node) => {
+            if (node.trajectNodeType === CONNECTING_TRAJECT_NODE_TYPE) {
+                return { node, lines: getTrajectTransferLines(node, packagingEntry.lines ?? []) };
+            }
+            const guids = node.lineGuids?.length ? node.lineGuids : [node.lineGuid];
+            const lines = guids.map((guid) => linesByGuid.get(guid)).filter((x) => !!x);
+            const groupKey = lines.length ? getLineGroupKey(lines[0]) : '';
+            const active = groupKey ? getGroupLines(packagingEntry.lines ?? [], groupKey)[0] : undefined;
+            return { node, lines: active ?? lines };
+        });
+        const claimed = new Set(nodes.flatMap((item) => item.lines.map((line) => line.guid)));
+        const extras = (packagingEntry.lines ?? []).filter((line) => !claimed.has(line.guid)).filter(isMeaningfulItineraryLine);
+        if (!extras.length)
+            return nodes;
+        const dayOrderOf = (date) => trajectEntry.traject.days.find((day) => dateFns.isSameDay(new Date(day.date), new Date(date)))?.order ??
+            Math.max(dateFns.differenceInCalendarDays(new Date(date), new Date(trajectEntry.traject.startDate)), 0);
+        // One product bought once, however many option lines it took (an adult and a child ticket).
+        const grouped = new Map();
+        extras.forEach((line) => {
+            const key = `${line.productCode}|${line.from}`;
+            grouped.set(key, [...(grouped.get(key) ?? []), line]);
+        });
+        const byDay = new Map();
+        nodes.forEach((item) => byDay.set(item.node.dayOrder, [...(byDay.get(item.node.dayOrder) ?? []), item]));
+        const flightNodes = nodes.filter(({ node }) => node.trajectNodeType === REGULAR_TRAJECT_NODE_TYPE && node.serviceType === FLIGHT_SERVICE_TYPE);
+        const homeward = flightNodes.length > 1 ? flightNodes[flightNodes.length - 1] : undefined;
+        // A booked entry's nodes are ordered as the dossier orders its lines (see buildBookedTrajectEntry).
+        const bookedOrders = isBookedEntryTraject(trajectEntry) ? new Map((trajectEntry.entry.lines ?? []).map((line) => [line.guid, line.order])) : undefined;
+        [...grouped.values()].forEach((lines, index) => {
+            const line = lines[0];
+            const dayOrder = dayOrderOf(line.from);
+            const bookedOrder = bookedOrders?.get(line.guid);
+            const item = {
+                lines,
+                node: {
+                    nodeId: -(index + 1),
+                    lineGuid: line.guid,
+                    lineGuids: lines.map((x) => x.guid),
+                    dayOrder,
+                    order: bookedOrder ?? Number.MAX_SAFE_INTEGER,
+                    name: line.productName,
+                    serviceType: line.serviceType,
+                    trajectNodeType: REGULAR_TRAJECT_NODE_TYPE,
+                    requirementType: 0,
+                    contentSource: 0,
+                    duration: 0,
+                    durationType: 0,
+                    alternatives: [],
+                    from: line.from,
+                    to: line.to
+                }
+            };
+            const dayItems = [...(byDay.get(dayOrder) ?? [])];
+            // A booked line goes where the dossier's order puts it; one the traveller added closes its
+            // day, but before the hops that leave it and the flight home.
+            let at = dayItems.length;
+            if (bookedOrder !== undefined) {
+                at = dayItems.findIndex((x) => x.node.order > bookedOrder);
+                if (at < 0)
+                    at = dayItems.length;
+            }
+            else {
+                while (at > 0 && (dayItems[at - 1].node.trajectNodeType === CONNECTING_TRAJECT_NODE_TYPE || dayItems[at - 1] === homeward))
+                    at--;
+            }
+            dayItems.splice(at, 0, item);
+            byDay.set(dayOrder, dayItems);
+        });
+        return [...byDay.keys()].sort((a, b) => a - b).flatMap((dayOrder) => byDay.get(dayOrder));
+    }, [trajectEntry, packagingEntry]);
+    const stayByDay = React.useMemo(() => {
+        const map = new Map();
+        timeline
+            .filter(({ node }) => node.trajectNodeType === REGULAR_TRAJECT_NODE_TYPE && node.serviceType === ACCOMMODATION_SERVICE_TYPE)
+            .forEach(({ node, lines }) => {
+            const line = lines[0];
+            const nights = Math.max(nightsOf(node, line), 1);
+            const name = line?.productName || node.preferredAccommodationName || node.name || '';
+            for (let night = 0; night < nights; night++)
+                map.set(node.dayOrder + night, { name, night, nights });
+        });
+        return map;
+    }, [timeline]);
+    const renderDate = (value) => (React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-date" },
+        React__default["default"].createElement("p", { className: "search__filter__itinerary__transport-date-date" },
+            React__default["default"].createElement("strong", null, dateFns.format(new Date(value), 'd'))),
+        React__default["default"].createElement("p", null, dateFns.format(new Date(value), 'MMM'))));
+    const renderConnectingNode = ({ node, lines }) => {
+        const distance = node.distanceInKm ? `${Math.round(node.distanceInKm)} km` : '';
+        // How long the hop takes and how far it is, the way the traject editor puts them.
+        const journey = [getTrajectNodeDuration(node), distance].filter(Boolean).join(' · ');
+        const title = lines[0]?.productName || node.name;
+        return (React__default["default"].createElement("div", { className: "search__filter__itinerary__transport", key: `connect-${node.nodeId}` },
+            React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-timeline" },
+                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-timeline-line" })),
+            React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-item" },
+                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-date" }),
+                React__default["default"].createElement("div", { className: badgeClass('transport', getTrajectNodeBadgeModifier(node)) },
+                    React__default["default"].createElement(Icon, { name: getTrajectNodeIcon(node), height: 15 })),
+                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-details" },
+                    React__default["default"].createElement("h6", null, title || journey),
+                    !!title && !!journey && React__default["default"].createElement("p", { className: "search__filter__itinerary__transport-details-time" }, journey)))));
+    };
+    const renderOvernight = (item, index) => {
+        const { dayOrder } = item.node;
+        const closesTheDay = timeline[index + 1]?.node.dayOrder !== dayOrder;
+        const stay = stayByDay.get(dayOrder);
+        if (!closesTheDay || !stay)
+            return null;
+        return (React__default["default"].createElement("div", { className: "search__filter__itinerary__transport", key: `overnight-${item.node.nodeId}` },
+            React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-timeline" },
+                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-timeline-line" })),
+            React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-item" },
+                renderDate(item.node.from),
+                React__default["default"].createElement("div", { className: badgeClass('transport', getServiceTypeBadgeModifier(ACCOMMODATION_SERVICE_TYPE)) },
+                    React__default["default"].createElement(Icon, { name: "ui-bed", height: 15 })),
+                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-details" },
+                    React__default["default"].createElement("h6", null, stay.name),
+                    React__default["default"].createElement("p", { className: "search__filter__itinerary__transport-details-time" },
+                        stay.night + 1,
+                        " ",
+                        translations.SRP.OF,
+                        " ",
+                        stay.nights,
+                        " ",
+                        translations.SRP.NIGHTS)))));
+    };
+    const renderFlightNode = ({ node, lines }) => {
+        const line = lines[0];
+        return (React__default["default"].createElement("div", { className: "search__filter__itinerary__transport", key: `flight-${node.nodeId}` },
+            React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-timeline" },
+                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-timeline-line" })),
+            React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-item" },
+                renderDate(line?.from ?? node.from),
+                React__default["default"].createElement("div", { className: badgeClass('transport', getServiceTypeBadgeModifier(FLIGHT_SERVICE_TYPE)) },
+                    React__default["default"].createElement(Icon, { name: "ui-plane", height: 15 })),
+                React__default["default"].createElement("div", { className: "search__filter__itinerary__transport-details" },
+                    React__default["default"].createElement("h6", null, line?.productName || node.name),
+                    !!getDepartureTime(line) && (React__default["default"].createElement("p", { className: "search__filter__itinerary__transport-details-plane" },
+                        React__default["default"].createElement("span", null,
+                            React__default["default"].createElement(Icon, { name: "ui-plane-depart", height: 14 }),
+                            " ",
+                            React__default["default"].createElement("strong", null, getDepartureTime(line))),
+                        ' ',
+                        "-",
+                        ' ',
+                        React__default["default"].createElement("span", null,
+                            React__default["default"].createElement(Icon, { name: "ui-plane-arrive", height: 14 }),
+                            " ",
+                            React__default["default"].createElement("strong", null, getArrivalTime(line))))),
+                    !!getDuration(line) && (React__default["default"].createElement("p", { className: "search__filter__itinerary__transport-details-time" },
+                        React__default["default"].createElement("span", null,
+                            React__default["default"].createElement(Icon, { name: "ui-clock", height: 20 }),
+                            " ",
+                            getDuration(line))))))));
+    };
+    const renderServiceNode = ({ node, lines }) => {
+        const line = lines[0];
+        const isStay = node.serviceType === ACCOMMODATION_SERVICE_TYPE;
+        const nights = isStay ? nightsOf(node, line) : 0;
+        return (React__default["default"].createElement("div", { className: "search__filter__itinerary__segments", key: `node-${node.nodeId}` },
+            React__default["default"].createElement("div", { className: "search__filter__itinerary__segments__wrapper" },
+                React__default["default"].createElement("div", { className: "search__filter__itinerary__segments-timeline" },
+                    React__default["default"].createElement("div", { className: "search__filter__itinerary__segments-timeline-line" })),
+                React__default["default"].createElement("div", { className: "search__filter__itinerary__segment" },
+                    React__default["default"].createElement("div", { className: "search__filter__itinerary__segment-item" },
+                        React__default["default"].createElement("div", { className: `search__filter__itinerary__segment-date ${isStay && nights > 0 ? 'search__filter__itinerary__segment-nights' : ''}` }, isStay && nights > 0 ? (React__default["default"].createElement(React__default["default"].Fragment, null,
+                            React__default["default"].createElement("p", { className: "search__filter__itinerary__segment-date-date" },
+                                React__default["default"].createElement("strong", null, nights)),
+                            React__default["default"].createElement(Icon, { name: "ui-moon", width: 16, height: 16 }))) : (React__default["default"].createElement(React__default["default"].Fragment, null,
+                            React__default["default"].createElement("p", { className: "search__filter__itinerary__segment-date-date" },
+                                React__default["default"].createElement("strong", null, dateFns.format(new Date(line?.from ?? node.from), 'd'))),
+                            React__default["default"].createElement("p", null, dateFns.format(new Date(line?.from ?? node.from), 'MMM'))))),
+                        React__default["default"].createElement("div", { className: badgeClass('segment', getTrajectNodeBadgeModifier(node)) },
+                            React__default["default"].createElement(Icon, { name: getTrajectNodeIcon(node), width: 15, height: 15 })),
+                        React__default["default"].createElement("div", { className: "search__filter__itinerary__segment-details" },
+                            React__default["default"].createElement("h6", null, line?.productName || node.preferredAccommodationName || node.name),
+                            isStay &&
+                                lines.map((roomLine, index) => (React__default["default"].createElement(React__default["default"].Fragment, { key: roomLine.guid },
+                                    lines.length > 1 && (React__default["default"].createElement("strong", null,
+                                        translations.SHARED.ROOM,
+                                        "\u00A0",
+                                        index + 1)),
+                                    roomLine.accommodationName && (React__default["default"].createElement("div", { className: "search__filter__itinerary__segment-details__room" },
+                                        React__default["default"].createElement(Icon, { name: "ui-bed", width: 12, height: 12 }),
+                                        roomLine.accommodationName)),
+                                    roomLine.regimeName && (React__default["default"].createElement("div", { className: "search__filter__itinerary__segment-details__room" },
+                                        React__default["default"].createElement(Icon, { name: "ui-utensils", width: 12, height: 12 }),
+                                        roomLine.regimeName))))),
+                            !isStay && React__default["default"].createElement("p", { className: "search__filter__itinerary__segment-details-text" }, dateFns.format(new Date(line?.from ?? node.from), 'EEE. d MMM yyyy'))))))));
+    };
+    return (React__default["default"].createElement(React__default["default"].Fragment, null, timeline.map((item, index) => {
+        if (item.node.trajectNodeType === CONNECTING_TRAJECT_NODE_TYPE) {
+            return (React__default["default"].createElement(React__default["default"].Fragment, { key: `connect-${item.node.nodeId}` },
+                renderConnectingNode(item),
+                renderOvernight(item, index)));
+        }
+        if (item.node.trajectNodeType === REGULAR_TRAJECT_NODE_TYPE && item.node.serviceType === FLIGHT_SERVICE_TYPE)
+            return renderFlightNode(item);
+        return renderServiceNode(item);
+    })));
+};
+
 const getSegmentIcon = (segment) => {
     switch (segment.serviceType) {
         case 3:
@@ -30969,10 +31116,10 @@ const SERVICE_TYPE_PRIORITY = {
 const getServiceTypePriority = (serviceType) => {
     return SERVICE_TYPE_PRIORITY[serviceType ?? -1] ?? 2;
 };
-const Itinerary = ({ isOpen, handleSetIsOpen, isLoading, onEditAccommodation, onSaveEntry }) => {
+const Itinerary = ({ isOpen, handleSetIsOpen, isLoading, onEditAccommodation }) => {
     const context = React.useContext(SearchResultsConfigurationContext);
     const translations = getTranslations(context?.languageCode ?? 'en-GB');
-    const { editablePackagingEntry, priceDetails, trajectItineraryView } = reactRedux.useSelector((state) => state.searchResults);
+    const { editablePackagingEntry, priceDetails, priceDetailsFailed, trajectItineraryView } = reactRedux.useSelector((state) => state.searchResults);
     const dispatch = reactRedux.useDispatch();
     const packagingEntry = editablePackagingEntry ?? context?.packagingEntry;
     const sortedLines = React.useMemo(() => {
@@ -31038,7 +31185,9 @@ const Itinerary = ({ isOpen, handleSetIsOpen, isLoading, onEditAccommodation, on
                         packagingEntry.dossierNumber)),
                     React__default["default"].createElement("h4", { className: "search__filter__image__title" }, (location || '') + (location && country ? ' - ' : '') + (country || ''))))),
                 React__default["default"].createElement("div", { className: "search__filter__prices" }, isLoading ? (React__default["default"].createElement(Spinner, { label: translations.PRODUCT.LOADING_PRICE })) : (React__default["default"].createElement(React__default["default"].Fragment, null,
-                    React__default["default"].createElement("div", { className: "search__filter__prices__wrapper" },
+                    priceDetailsFailed ? (React__default["default"].createElement("div", { className: "search__filter__prices__wrapper" },
+                        React__default["default"].createElement("p", { className: "info-message--error" }, translations.SRP.PRICE_DETAILS_FAILED),
+                        React__default["default"].createElement("button", { type: "button", className: "cta cta--secondary", onClick: () => dispatch(retryPriceDetails()) }, translations.SRP.TRY_AGAIN))) : (React__default["default"].createElement("div", { className: "search__filter__prices__wrapper" },
                         React__default["default"].createElement("h3", { className: "search__filter__prices--amount" }, formatPrice$3(pricePerPerson, 'EUR')),
                         React__default["default"].createElement("p", null, translations.SRP.PACKAGE_PRICE_PER_PERSON),
                         React__default["default"].createElement("p", null,
@@ -31047,8 +31196,8 @@ const Itinerary = ({ isOpen, handleSetIsOpen, isLoading, onEditAccommodation, on
                                 formatPrice$3(totalPrice, 'EUR'),
                                 " ",
                                 translations.SRP.TOTAL,
-                                ")"))),
-                    isBookedEntryTraject(context?.trajectEntry) ? (React__default["default"].createElement("button", { className: "cta", onClick: onSaveEntry, disabled: !hasBookedEntryChanges(context?.packagingEntry, packagingEntry) }, translations.SRP.BOOK_AND_PAY)) : isBooked ? (React__default["default"].createElement("span", { className: "cta cta--disabled search__filter__prices--booked", "aria-disabled": "true" }, translations.SHARED.BOOKED)) : (React__default["default"].createElement("button", { className: "cta", onClick: handleConfirm }, translations.SRP.BOOK_AND_PAY)),
+                                ")")))),
+                    isBookedEntryTraject(context?.trajectEntry) ? (React__default["default"].createElement("button", { className: "cta", onClick: handleConfirm, disabled: priceDetailsFailed || !hasBookedEntryChanges(context?.packagingEntry, packagingEntry) }, translations.SRP.BOOK_AND_PAY)) : isBooked ? (React__default["default"].createElement("span", { className: "cta cta--disabled search__filter__prices--booked", "aria-disabled": "true" }, translations.SHARED.BOOKED)) : (React__default["default"].createElement("button", { className: "cta", onClick: handleConfirm, disabled: priceDetailsFailed }, translations.SRP.BOOK_AND_PAY)),
                     !!context?.trajectEntry && (React__default["default"].createElement("button", { type: "button", className: "cta cta--secondary", onClick: () => handleTrajectView(!trajectItineraryView) }, trajectItineraryView ? translations.SRP.SHOW_SERVICES : translations.SRP.VIEW_FULL_ITINERARY))))),
                 React__default["default"].createElement("div", { className: "search__filter__itinerary" },
                     React__default["default"].createElement("p", null, translations.SRP.DAY_BY_DAY),
@@ -36347,10 +36496,12 @@ const travellersSettings = {
 const BookPackagingEntry = ({ activeSearchSeed, isLoading, isConfirmationPage }) => {
     const context = React.useContext(SearchResultsConfigurationContext);
     const dispatch = reactRedux.useDispatch();
-    const { editablePackagingEntry, priceDetails, currentStep, bookingNumber, selectedPackagingAccoResultCode, packagingAccoResults } = reactRedux.useSelector((state) => state.searchResults);
+    const { editablePackagingEntry, priceDetails, priceDetailsFailed, currentStep, bookingNumber, selectedPackagingAccoResultCode, packagingAccoResults } = reactRedux.useSelector((state) => state.searchResults);
+    // A booked entry opened through its magic link is saved onto its own dossier instead of booked again.
+    const bookedMode = isBookedEntryTraject(context?.trajectEntry);
     const [countries, setCountries] = React.useState([]);
     const [userValidated, setUserValidated] = React.useState(true);
-    const [remarks, setRemarks] = React.useState('');
+    const [remarks, setRemarks] = React.useState(() => editablePackagingEntry?.remarks ?? '');
     const [isSubmitting, setIsSubmitting] = React.useState(false);
     const [selectedPackagingAccoResult, setSelectedPackagingAccoResult] = React.useState(null);
     const translations = React.useMemo(() => getTranslations(context?.languageCode ?? 'en-GB'), [context?.languageCode]);
@@ -36410,7 +36561,27 @@ const BookPackagingEntry = ({ activeSearchSeed, isLoading, isConfirmationPage })
     }, [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)
+    // What was already typed stays on the entry, so the form comes back filled in when the traveller returns.
+    const handleBackToServices = () => {
+        if (currentStep === 0 && editablePackagingEntry) {
+            dispatch(setEditablePackagingEntry(applyTravelersFormValuesToEditablePackagingEntry(editablePackagingEntry, formik$1.values)));
+        }
+        dispatch(setCurrentStep(0));
+        dispatch(setBookPackagingEntry(false));
+        if (typeof window !== 'undefined')
+            window.scrollTo(0, 0);
+    };
+    // Nothing can be confirmed without a price for the entry as it is now; the confirmation itself needs none.
+    if (context && priceDetailsFailed && currentStep < 2) {
+        return (React__default["default"].createElement("div", { className: "booking" },
+            React__default["default"].createElement("div", { className: "booking__content" },
+                React__default["default"].createElement("div", { className: "booking__panel" },
+                    React__default["default"].createElement("p", { className: "info-message--error" }, translations.SRP.PRICE_DETAILS_FAILED),
+                    React__default["default"].createElement("div", { className: "booking__navigator" },
+                        React__default["default"].createElement("button", { type: "button", className: "cta cta--secondary", onClick: handleBackToServices }, translations.SRP.BACK_TO_SERVICES),
+                        React__default["default"].createElement("button", { type: "button", className: "cta", onClick: () => dispatch(retryPriceDetails()) }, translations.SRP.TRY_AGAIN))))));
+    }
+    if (!context || !editablePackagingEntry || !config || (!priceDetails && currentStep < 2))
         return React__default["default"].createElement(Spinner, { label: translations.SUMMARY.PROCESS_BOOKING });
     const handleSummarySubmit = async (e) => {
         e.preventDefault();
@@ -36420,7 +36591,7 @@ const BookPackagingEntry = ({ activeSearchSeed, isLoading, isConfirmationPage })
         }
         // 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') {
+        if (!bookedMode && context.generatePaymentUrl && typeof window !== 'undefined') {
             const redirectUrl = new URL(window.location.href);
             redirectUrl.searchParams.set('bookingConfirmation', 'true');
             redirectUrl.searchParams.set('link', '');
@@ -36437,6 +36608,13 @@ const BookPackagingEntry = ({ activeSearchSeed, isLoading, isConfirmationPage })
                 // The page keeps the entry it works with; the backend gets the one it can look up.
                 payload: { ...(bookableEntry ?? editablePackagingEntry), ...bookingFields }
             };
+            if (bookedMode) {
+                const saved = await build.savePackagingEntry(config, request);
+                dispatch(setBookingNumber(saved.dossierNumber ?? editablePackagingEntry.dossierNumber ?? ''));
+                dispatch(setCurrentStep(2));
+                setIsSubmitting(false);
+                return;
+            }
             const bookingResponse = await build.bookPackagingEntry(config, request);
             dispatch(setBookingNumber(bookingResponse.number));
             if (bookingResponse.paymentUrl) {
@@ -36459,8 +36637,8 @@ const BookPackagingEntry = ({ activeSearchSeed, isLoading, isConfirmationPage })
                         ".\u00A0",
                         stepLabels[step])) },
                     isConfirmationPage && isLoading && React__default["default"].createElement(Spinner, { label: translations.SUMMARY.PROCESS_BOOKING }),
-                    currentStep === 0 && (React__default["default"].createElement(SharedTravelersForm, { formik: formik$1, translations: translations, travellersSettings: travellersSettings, countries: countries, travelersFirstStep: false, isUnavailable: false, useCompactForm: false, showAgentSelection: false, paxFields: paxFields })),
-                    currentStep === 1 && (React__default["default"].createElement(SharedSummary, { translations: translations, travelerFormValues: formik$1.values, isSubmitting: isSubmitting, skipPayment: !context.generatePaymentUrl, userValidated: userValidated, remarks: remarks, enableVoucher: false, allowOption: false, isOffer: false, onUserValidatedChange: setUserValidated, onRemarksChange: setRemarks, onSubmit: handleSummarySubmit, renderOptions: () => renderEditablePackagingEntrySummaryOptions(editablePackagingEntry, priceDetails, translations, selectedPackagingAccoResult?.currencyCode), renderPreviousButton: () => (React__default["default"].createElement("button", { type: "button", title: translations.STEPS.PREVIOUS, onClick: () => dispatch(setCurrentStep(0)), className: "cta cta--secondary" }, translations.STEPS.PREVIOUS)) })),
+                    currentStep === 0 && (React__default["default"].createElement(SharedTravelersForm, { formik: formik$1, translations: translations, travellersSettings: travellersSettings, countries: countries, travelersFirstStep: false, isUnavailable: false, useCompactForm: false, showAgentSelection: false, paxFields: paxFields, renderPreviousButton: () => (React__default["default"].createElement("button", { type: "button", title: translations.SRP.BACK_TO_SERVICES, onClick: handleBackToServices, className: "cta cta--secondary" }, translations.SRP.BACK_TO_SERVICES)) })),
+                    currentStep === 1 && priceDetails && (React__default["default"].createElement(SharedSummary, { translations: translations, travelerFormValues: formik$1.values, isSubmitting: isSubmitting, skipPayment: bookedMode || !context.generatePaymentUrl, userValidated: userValidated, remarks: remarks, enableVoucher: false, allowOption: false, isOffer: false, onUserValidatedChange: setUserValidated, onRemarksChange: setRemarks, onSubmit: handleSummarySubmit, renderOptions: () => renderEditablePackagingEntrySummaryOptions(editablePackagingEntry, priceDetails, translations, selectedPackagingAccoResult?.currencyCode), renderPreviousButton: () => (React__default["default"].createElement("button", { type: "button", title: translations.STEPS.PREVIOUS, onClick: () => dispatch(setCurrentStep(0)), className: "cta cta--secondary" }, translations.STEPS.PREVIOUS)) })),
                     currentStep === 2 && (React__default["default"].createElement(SharedConfirmation, { bookingNumber: bookingNumber ?? editablePackagingEntry?.dossierNumber ?? '', isOption: false, isOffer: false, translations: translations.CONFIRMATION })),
                     currentStep === 3 && React__default["default"].createElement("div", null))),
             React__default["default"].createElement("div", { className: "backdrop", id: "backdrop" }),
@@ -36881,6 +37059,16 @@ const TrajectResults = ({ isLoading }) => {
     })));
 };
 
+const getSearchContext = (context, trajectEntry) => ({
+    transactionId: trajectEntry.entry.transactionId,
+    officeId: context.tideConnection.officeId ?? 1,
+    catalogueId: context.searchConfiguration.defaultCatalogueId ?? lodash.first(context.tideConnection.catalogueIds) ?? 1,
+    searchConfigurationId: context.searchConfiguration.id,
+    portalId: context.portalId ?? null,
+    agentId: context.agentId ?? null,
+    language: context.languageCode ?? 'en-GB',
+    rooms: getPackagingRoomsFromEntry(trajectEntry.entry)
+});
 const useTrajectAvailability = () => {
     const context = React.useContext(SearchResultsConfigurationContext);
     const dispatch = reactRedux.useDispatch();
@@ -36899,16 +37087,7 @@ const useTrajectAvailability = () => {
             host: context.tideConnection.host,
             apiKey: context.tideConnection.apiKey
         };
-        const searchContext = {
-            transactionId: trajectEntry.entry.transactionId,
-            officeId: context.tideConnection.officeId ?? 1,
-            catalogueId: context.searchConfiguration.defaultCatalogueId ?? lodash.first(context.tideConnection.catalogueIds) ?? 1,
-            searchConfigurationId: context.searchConfiguration.id,
-            portalId: context.portalId ?? null,
-            agentId: context.agentId ?? null,
-            language: context.languageCode ?? 'en-GB',
-            rooms: getPackagingRoomsFromEntry(trajectEntry.entry)
-        };
+        const searchContext = getSearchContext(context, trajectEntry);
         // Flight searches take passengers rather than rooms; the API buckets by age.
         // The ids must be the entry's own pax ids: the flight lines this search caches carry them as
         // EntryLinePax.PaxId, and booking maps those onto the entry's travelers (PackagingService.SyncPaxIds).
@@ -37048,30 +37227,9 @@ const useTrajectAvailability = () => {
                 return item.lines.map((x) => x.guid);
             }
         };
-        const resolveTransferNode = async (node) => {
-            dispatch(setTrajectTransferLoading(node.nodeId));
-            try {
-                const results = (await build.searchPackagingTransfers(config, buildTrajectTransferRequest(node, searchContext), controller.signal)) ?? [];
-                if (controller.signal.aborted)
-                    return [];
-                const result = results[0] ?? null;
-                dispatch(setTrajectTransferAvailability({ nodeId: node.nodeId, result: result && buildTrajectTransferLine(node, result) ? result : null }));
-            }
-            catch (error) {
-                if (controller.signal.aborted)
-                    return [];
-                console.error('Failed to resolve traject transfer', node.name, error);
-                dispatch(setTrajectTransferAvailability({ nodeId: node.nodeId, result: null }));
-            }
-            return [];
-        };
         (async () => {
             const resolvable = nodesWithLines.filter((x) => isSearchableTrajectNode(x.node) || isTrajectFlightNode(x.node));
-            const transfers = bookedMode ? [] : (trajectEntry.nodes ?? []).filter(isTrajectTransferNode);
-            const unresolved = (await Promise.all([
-                ...resolvable.map((item) => (isTrajectFlightNode(item.node) ? resolveFlightNode(item) : resolveNode(item))),
-                ...transfers.map(resolveTransferNode)
-            ])).flat();
+            const unresolved = (await Promise.all(resolvable.map((item) => (isTrajectFlightNode(item.node) ? resolveFlightNode(item) : resolveNode(item))))).flat();
             if (controller.signal.aborted)
                 return;
             dispatch(setTrajectResolving(false));
@@ -37083,22 +37241,87 @@ const useTrajectAvailability = () => {
         })();
         return () => controller.abort();
     }, [trajectEntry, showApiItems, hideShowMoreResults]);
+    const transferSearches = React.useRef(new Map());
+    React.useEffect(() => {
+        const searches = transferSearches.current;
+        return () => {
+            searches.forEach((search) => search.controller.abort());
+            searches.clear();
+        };
+    }, [trajectEntry]);
+    React.useEffect(() => {
+        if (!context || !trajectEntry || !editablePackagingEntry)
+            return;
+        const bookedMode = isBookedEntryTraject(trajectEntry);
+        const searches = transferSearches.current;
+        const dropped = getDroppedTrajectNodeIds(trajectEntry, editablePackagingEntry);
+        const lines = editablePackagingEntry.lines ?? [];
+        const config = { host: context.tideConnection.host, apiKey: context.tideConnection.apiKey };
+        const searchContext = getSearchContext(context, trajectEntry);
+        const cancel = (nodeId) => {
+            const search = searches.get(nodeId);
+            if (!search)
+                return;
+            search.controller.abort();
+            searches.delete(nodeId);
+            dispatch(setTrajectTransferAvailability({ nodeId, key: search.key, result: null }));
+        };
+        (trajectEntry.nodes ?? []).filter(isTrajectTransferNode).forEach((node) => {
+            const endpoints = dropped.has(node.nodeId) ? null : getTrajectTransferEndpoints(trajectEntry, lines, node);
+            if (!endpoints || (bookedMode && endpoints.asDrawn))
+                return cancel(node.nodeId);
+            if (searches.get(node.nodeId)?.key === endpoints.key || trajectTransferAvailability[node.nodeId]?.key === endpoints.key)
+                return;
+            cancel(node.nodeId);
+            const controller = new AbortController();
+            const { key } = endpoints;
+            searches.set(node.nodeId, { key, controller });
+            dispatch(setTrajectTransferLoading({ nodeId: node.nodeId, key }));
+            build.searchPackagingTransfers(config, buildTrajectTransferRequest(node, endpoints, searchContext), controller.signal)
+                .then((results) => {
+                if (controller.signal.aborted)
+                    return;
+                const result = results?.[0] ?? null;
+                dispatch(setTrajectTransferAvailability({ nodeId: node.nodeId, key, result: result && buildTrajectTransferLine(node, result) ? result : null }));
+            })
+                .catch((error) => {
+                if (controller.signal.aborted)
+                    return;
+                console.error('Failed to resolve traject transfer', node.name, error);
+                dispatch(setTrajectTransferAvailability({ nodeId: node.nodeId, key, result: null }));
+            })
+                .finally(() => {
+                if (searches.get(node.nodeId)?.controller === controller)
+                    searches.delete(node.nodeId);
+            });
+        });
+    }, [trajectEntry, editablePackagingEntry, trajectTransferAvailability]);
     React.useEffect(() => {
-        if (!trajectEntry || !editablePackagingEntry || isBookedEntryTraject(trajectEntry))
+        if (!trajectEntry || !editablePackagingEntry)
             return;
+        const bookedMode = isBookedEntryTraject(trajectEntry);
         const dropped = getDroppedTrajectNodeIds(trajectEntry, editablePackagingEntry);
-        const guids = new Set((editablePackagingEntry.lines ?? []).map((line) => line.guid));
+        const lines = editablePackagingEntry.lines ?? [];
+        const guids = new Set(lines.map((line) => line.guid));
         const toAdd = [];
         const toRemove = [];
         (trajectEntry.nodes ?? []).filter(isTrajectTransferNode).forEach((node) => {
-            const result = trajectTransferAvailability[node.nodeId]?.result;
-            const line = result ? buildTrajectTransferLine(node, result) : null;
-            if (!line)
-                return;
-            if (dropped.has(node.nodeId) && guids.has(line.guid))
-                toRemove.push(line.guid);
-            if (!dropped.has(node.nodeId) && !guids.has(line.guid))
-                toAdd.push(line);
+            const endpoints = dropped.has(node.nodeId) ? null : getTrajectTransferEndpoints(trajectEntry, lines, node);
+            let wanted = [];
+            if (endpoints && bookedMode && endpoints.asDrawn) {
+                wanted = getTrajectTransferLines(node, trajectEntry.entry.lines ?? []);
+            }
+            else if (endpoints) {
+                const availability = trajectTransferAvailability[node.nodeId];
+                const line = availability?.key === endpoints.key && availability.result ? buildTrajectTransferLine(node, availability.result) : null;
+                if (line)
+                    wanted = [line];
+            }
+            const wantedGuids = new Set(wanted.map((line) => line.guid));
+            getTrajectTransferLines(node, lines)
+                .filter((line) => !wantedGuids.has(line.guid))
+                .forEach((line) => toRemove.push(line.guid));
+            wanted.filter((line) => !guids.has(line.guid)).forEach((line) => toAdd.push(line));
         });
         if (toRemove.length)
             dispatch(removeEditableEntryLines(toRemove));
@@ -37112,7 +37335,8 @@ 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, trajectResolving, trajectItineraryView } = 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, priceDetailsRequest, trajectTransferAvailability } = reactRedux.useSelector((state) => state.searchResults);
+    const trajectBusy = trajectResolving || Object.values(trajectTransferAvailability).some((transfer) => transfer.status === 'loading');
     const isMobile = useMediaQuery('(max-width: 1200px)');
     // Resolves live availability per traject node; no-op unless a traject entry is configured.
     useTrajectAvailability();
@@ -37124,7 +37348,6 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
     const [detailsIsLoading, setDetailsIsLoading] = React.useState(false);
     const [pricesAreLoading, setPricesAreLoading] = React.useState(false);
     const [itineraryIsLoading, setItineraryIsLoading] = React.useState(false);
-    const [entrySaving, setEntrySaving] = React.useState(false);
     const [itineraryOpen, setItineraryOpen] = React.useState(false);
     const [isBookingConfirmation, setIsBookingConfirmation] = React.useState(false);
     const [selectedAccommodationSeed, setSelectedAccommodationSeed] = React.useState(null);
@@ -37882,40 +38105,16 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
     React.useEffect(() => {
         setInitialFiltersSet(false);
     }, [activeSearchSeed]);
-    const handleSaveEntry = async () => {
-        if (!context || !bookableEntry || entrySaving)
-            return;
-        setEntrySaving(true);
-        try {
-            const config = {
-                host: context.tideConnection.host,
-                apiKey: context.tideConnection.apiKey
-            };
-            const request = {
-                language: context.languageCode ?? 'en-GB',
-                officeId: context.tideConnection.officeId,
-                catalogueId: context.searchConfiguration.defaultCatalogueId ?? lodash.first(context?.tideConnection?.catalogueIds) ?? 1,
-                agentId: context.agentId,
-                payload: bookableEntry
-            };
-            await build.savePackagingEntry(config, request);
-            if (typeof window !== 'undefined')
-                window.location.reload();
-        }
-        catch (err) {
-            console.error('Failed to save the entry', err);
-            setEntrySaving(false);
-        }
-    };
     React.useEffect(() => {
         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)
+            if (context.trajectEntry && trajectBusy)
                 return;
             setPricesAreLoading(true);
+            dispatch(setPriceDetailsFailed(false));
             try {
                 const config = {
                     host: context.tideConnection.host,
@@ -37934,18 +38133,21 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
             }
             catch (err) {
                 console.error('Error fetching price details', err);
+                // A price from before the change would be wrong for the entry as it is now.
+                dispatch(setPriceDetails(null));
+                dispatch(setPriceDetailsFailed(true));
                 setPricesAreLoading(false);
             }
         };
         fetchPriceDetails();
-    }, [editablePackagingEntry, bookableEntry, trajectResolving]);
+    }, [editablePackagingEntry, bookableEntry, trajectBusy, priceDetailsRequest]);
     React.useEffect(() => {
         const fetchItinerary = async () => {
             if (!context || !context.packagingEntry || !editablePackagingEntry || lodash.isEmpty(editablePackagingEntry.lines))
                 return;
             // 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))
+            if (context.trajectEntry && (trajectBusy || !trajectItineraryView))
                 return;
             setItineraryIsLoading(true);
             try {
@@ -37970,7 +38172,7 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
             }
         };
         fetchItinerary();
-    }, [editablePackagingEntry, bookableEntry, trajectResolving, trajectItineraryView]);
+    }, [editablePackagingEntry, bookableEntry, trajectBusy, trajectItineraryView]);
     // Flight selection
     // const [selectedOutwardKey, setSelectedOutwardKey] = useState<string | null>(null);
     // const [selectedReturnKey, setSelectedReturnKey] = useState<string | null>(null);
@@ -38348,7 +38550,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 || trajectResolving || entrySaving, onEditAccommodation: handleEditAccommodation, onSaveEntry: handleSaveEntry })),
+            context.searchConfiguration.qsmType === build.PortalQsmType.AccommodationAndFlight && (React__default["default"].createElement(Itinerary, { isOpen: itineraryOpen, handleSetIsOpen: () => setItineraryOpen(!itineraryOpen), isLoading: isLoading || pricesAreLoading || flightsLoading || itineraryIsLoading || trajectBusy, 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" },