@qite/tide-components 1.0.14-preview.3 → 1.0.14-preview.4

package/build/build-cjs/index.js

@@ -16133,6 +16133,7 @@ var ENDPOINT$1 = "/api/web/packaging";
 var ENDPOINT_START_TRANSACTION = ENDPOINT$1 + "/start";
 var ENDPOINT_ACCOMMODATIONS = ENDPOINT$1 + "/accommodations";
 var ENDPOINT_EXCURSIONS = ENDPOINT$1 + "/excursions";
+var ENDPOINT_TRANSFERS = ENDPOINT$1 + "/transfers";
 var ENDPOINT_FLIGHTS = ENDPOINT$1 + "/flights";
 var ENDPOINT_PRICE_DETAILS = ENDPOINT$1 + "/price-details";
 var ENDPOINT_BOOK = ENDPOINT$1 + "/book";
@@ -16165,6 +16166,12 @@ var searchPackagingExcursions = function (config, request, signal) {
   var body = JSON.stringify(request);
   return post(url, apiKey, body, config.token, signal, true);
 };
+var searchPackagingTransfers = function (config, request, signal) {
+  var url = "" + config.host + ENDPOINT_TRANSFERS;
+  var apiKey = config.apiKey;
+  var body = JSON.stringify(request);
+  return post(url, apiKey, body, config.token, signal, true);
+};
 var getEntry = function (config, magicLinkCode, signal) {
   var apiKey = config.apiKey;
   var url = "" + config.host + ENDPOINT_ENTRY(magicLinkCode);
@@ -16342,6 +16349,7 @@ exports.searchOords = searchOords;
 exports.searchPackagingAccommodations = searchPackagingAccommodations;
 exports.searchPackagingExcursions = searchPackagingExcursions;
 exports.searchPackagingFlights = searchPackagingFlights;
+exports.searchPackagingTransfers = searchPackagingTransfers;
 exports.searchRegions = searchRegions;
 exports.searchWithErrorMapping = searchWithErrorMapping;
 exports.sendContactForm = sendContactForm;
@@ -19834,10 +19842,30 @@ function formatBirthDate$1(birthDate) {
 // A field can have separate "main-booker"/other-pax variants sharing the same identity
 // (customFieldConfigurationId for custom fields, fieldName for built-in fields).
 const MAIN_BOOKER_GROUP = 'main-booker';
+const MAIN_BOOKER_FIELD_PREFIX = 'mainBooker';
 const isCustomPaxField = (field) => field.customFieldConfigurationId != null;
+// Tide names the built-in main-booker fields with a prefix ('mainBookerGender', 'mainBookerCountryId', ...),
+// the other-pax ones without ('gender', 'countryId'). Strip it so both are variants of the same field.
+function normalizeBuiltInFieldName(field) {
+    if (isCustomPaxField(field) || !field.fieldName?.startsWith(MAIN_BOOKER_FIELD_PREFIX))
+        return field;
+    const stripped = field.fieldName.slice(MAIN_BOOKER_FIELD_PREFIX.length);
+    if (!stripped)
+        return field;
+    return { ...field, fieldName: stripped.charAt(0).toLowerCase() + stripped.slice(1) };
+}
+// Once Tide sends built-in fields, that configuration decides which built-in fields are shown/required;
+// the hardcoded formFields / core defaults are only the fallback for when it doesn't.
+function hasConfiguredBuiltInPaxFields(paxFields = []) {
+    return paxFields.some((f) => !isCustomPaxField(f));
+}
+// The main booker's address/contact details are then asked on the main booker's own traveler block.
+function hasConfiguredMainBookerFields(paxFields = []) {
+    return paxFields.some((f) => !isCustomPaxField(f) && f.group === MAIN_BOOKER_GROUP);
+}
 function resolveApplicablePaxFields(fields, isMainBooker) {
     const variantsByKey = new Map();
-    fields.forEach((field) => {
+    fields.map(normalizeBuiltInFieldName).forEach((field) => {
         const key = field.customFieldConfigurationId ?? field.fieldName;
         const variants = variantsByKey.get(key) ?? [];
         variants.push(field);
@@ -19899,11 +19927,50 @@ const BUILT_IN_FIELD_PATHS = {
 // The 4 fields that always render/validate regardless of paxFields config (fallback behavior).
 const CORE_FIELD_NAMES = new Set(['gender', 'firstName', 'lastName', 'dateOfBirth']);
 const ADDRESS_FIELD_NAMES = ['street', 'location', 'countryId', 'postalCode', 'number'];
+// Built-in fields have no dataType from Tide; their control type and label follow from the fieldName.
+// gender, hasInsurance, countryId, weight and height have a dedicated control and only need a label here.
+function getBuiltInFieldControlMeta(translations) {
+    return {
+        gender: { label: translations.TRAVELERS_FORM.GENDER_ID },
+        firstName: { label: translations.TRAVELERS_FORM.FIRST_NAME },
+        lastName: { label: translations.TRAVELERS_FORM.LAST_NAME },
+        dateOfBirth: { type: 'date', label: translations.TRAVELERS_FORM.BIRTHDATE },
+        nickname: { label: translations.TRAVELERS_FORM.NICKNAME },
+        birthplace: { label: translations.TRAVELERS_FORM.BIRTHPLACE },
+        nationality: { label: translations.TRAVELERS_FORM.NATIONALITY },
+        preferredLanguageId: { type: 'number', label: translations.TRAVELERS_FORM.PREFERRED_LANGUAGE },
+        email: { type: 'email', label: translations.TRAVELERS_FORM.TRAVELER_EMAIL },
+        phone: { type: 'tel', label: translations.TRAVELERS_FORM.TRAVELER_PHONE },
+        mobile: { type: 'tel', label: translations.TRAVELERS_FORM.TRAVELER_MOBILE },
+        passportNumber: { label: translations.TRAVELERS_FORM.PASSPORT_NUMBER },
+        passportIssueDate: { type: 'date', label: translations.TRAVELERS_FORM.PASSPORT_ISSUE_DATE },
+        passportIssuedLocation: { label: translations.TRAVELERS_FORM.PASSPORT_ISSUED_LOCATION },
+        passportExpiryDate: { type: 'date', label: translations.TRAVELERS_FORM.PASSPORT_EXPIRY_DATE },
+        emergencyNumber: { type: 'tel', label: translations.TRAVELERS_FORM.EMERGENCY_NUMBER },
+        hasInsurance: { label: translations.TRAVELERS_FORM.HAS_INSURANCE },
+        insuranceName: { label: translations.TRAVELERS_FORM.INSURANCE_NAME },
+        info: { label: translations.TRAVELERS_FORM.INFO },
+        weight: { label: translations.TRAVELERS_FORM.WEIGHT },
+        height: { label: translations.TRAVELERS_FORM.HEIGHT },
+        street: { label: translations.TRAVELERS_FORM.STREET },
+        location: { label: translations.TRAVELERS_FORM.CITY },
+        countryId: { label: translations.TRAVELERS_FORM.COUNTRY },
+        postalCode: { label: translations.TRAVELERS_FORM.ZIPCODE },
+        number: { label: translations.TRAVELERS_FORM.HOUSE_NUMBER }
+    };
+}
+// The form's gender radio values ('m'/'f'/'x') <-> Tide's Gender enum.
+const GENDER_BY_FORM_VALUE = { m: build.Gender.male, f: build.Gender.female, x: build.Gender.other };
+function formValueFromGender(gender) {
+    return Object.keys(GENDER_BY_FORM_VALUE).find((key) => GENDER_BY_FORM_VALUE[key] === gender) ?? '';
+}
 // Shared by buildPax (new-booking) and applyTravelersFormValuesToEditablePackagingEntry
 // (edit-booking), now that PackagingEntryPax and BookingPackagePax have the same shape.
 function applyTravelerToPax(pax, traveler, mainBookerId) {
     return {
         ...pax,
+        // Unanswered (optional) gender keeps whatever the pax already had.
+        gender: GENDER_BY_FORM_VALUE[traveler.gender] ?? pax.gender,
         firstName: traveler.firstName ?? '',
         lastName: traveler.lastName ?? '',
         dateOfBirth: traveler.birthDate || null,
@@ -20063,7 +20130,13 @@ function mapPackagingEntryPaxToTraveler(roomTraveler) {
         customFields: roomTraveler.customFields ?? []
     };
 }
-function createInitialValuesFromEditablePackagingEntry(editablePackagingEntry, agentAdressId) {
+// Keeps the values already on the entry's pax and adds an empty slot for every configured custom field it lacks,
+// so the form renders/validates the same set as createTraveler does for a new booking.
+function mergeCustomFields(existing = [], paxFields) {
+    const missing = buildEmptyCustomFields(paxFields).filter((empty) => !existing.some((c) => c.customFieldConfigurationId === empty.customFieldConfigurationId));
+    return [...existing, ...missing];
+}
+function createInitialValuesFromEditablePackagingEntry(editablePackagingEntry, agentAdressId, paxFields = editablePackagingEntry?.paxFields ?? []) {
     const pax = editablePackagingEntry?.pax ?? [];
     const rooms = editablePackagingEntry.rooms.map((room) => {
         const roomPax = pax.filter((x) => room.paxIds.includes(x.id));
@@ -20076,8 +20149,9 @@ function createInitialValuesFromEditablePackagingEntry(editablePackagingEntry, a
                     firstName: roomTraveler.firstName ?? '',
                     lastName: roomTraveler.lastName ?? '',
                     birthDate: roomTraveler.dateOfBirth ? dateFns.format(new Date(roomTraveler.dateOfBirth), 'yyyy-MM-dd') : '',
-                    gender: '',
-                    ...mapPackagingEntryPaxToTraveler(roomTraveler)
+                    gender: formValueFromGender(roomTraveler.gender),
+                    ...mapPackagingEntryPaxToTraveler(roomTraveler),
+                    customFields: mergeCustomFields(roomTraveler.customFields, paxFields)
                 };
             }),
             children: children.map((roomTraveler) => {
@@ -20086,9 +20160,10 @@ function createInitialValuesFromEditablePackagingEntry(editablePackagingEntry, a
                     firstName: roomTraveler.firstName ?? '',
                     lastName: roomTraveler.lastName ?? '',
                     birthDate: roomTraveler.dateOfBirth ? dateFns.format(new Date(roomTraveler.dateOfBirth), 'yyyy-MM-dd') : '',
-                    gender: '',
+                    gender: formValueFromGender(roomTraveler.gender),
                     isBaby: isBabyAge(roomTraveler.age),
-                    ...mapPackagingEntryPaxToTraveler(roomTraveler)
+                    ...mapPackagingEntryPaxToTraveler(roomTraveler),
+                    customFields: mergeCustomFields(roomTraveler.customFields, paxFields)
                 };
             })
         };
@@ -20113,7 +20188,8 @@ function applyTravelersFormValuesToEditablePackagingEntry(editablePackagingEntry
     const travelers = values.rooms.flatMap((room) => [...room.adults, ...room.children]);
     // The backend treats the main booker's per-pax address as authoritative, so keep the
     // booking-level address in sync with it rather than sending two independent values.
-    const mainBookerAddress = travelers.find((x) => x.id === values.mainBookerId)?.address;
+    const mainBookerTraveler = travelers.find((x) => x.id === values.mainBookerId);
+    const mainBookerAddress = mainBookerTraveler?.address;
     return {
         ...editablePackagingEntry,
         pax: (editablePackagingEntry.pax ?? []).map((pax) => {
@@ -20129,8 +20205,9 @@ function applyTravelersFormValuesToEditablePackagingEntry(editablePackagingEntry
             place: mainBookerAddress?.location || values.place,
             country: mainBookerAddress?.country || values.country,
             travelAgentId: values.travelAgentId,
-            phone: values.phone,
-            email: values.email
+            // When Tide configures the main-booker fields, contact details live on the main booker's traveler block.
+            phone: values.phone || mainBookerTraveler?.mobile || mainBookerTraveler?.phone,
+            email: values.email || mainBookerTraveler?.email
         }
     };
 }
@@ -20287,30 +20364,7 @@ const SharedTravelersForm = ({ formik, translations, travellersSettings, countri
             return (React__default["default"].createElement("div", { key: field.customFieldConfigurationId, style: { gridColumn: `span ${field.col || 12}` } }, getCustomFieldControl(field, value, name)));
         })));
     };
-    // Fields with a dedicated control (gender, hasInsurance, countryId) aren't listed here.
-    const BUILT_IN_FIELD_CONTROL_META = {
-        firstName: { label: translations.TRAVELERS_FORM.FIRST_NAME },
-        lastName: { label: translations.TRAVELERS_FORM.LAST_NAME },
-        dateOfBirth: { type: 'date', label: translations.TRAVELERS_FORM.BIRTHDATE },
-        nickname: { label: translations.TRAVELERS_FORM.NICKNAME },
-        birthplace: { label: translations.TRAVELERS_FORM.BIRTHPLACE },
-        nationality: { label: translations.TRAVELERS_FORM.NATIONALITY },
-        preferredLanguageId: { type: 'number', label: translations.TRAVELERS_FORM.PREFERRED_LANGUAGE },
-        email: { type: 'email', label: translations.TRAVELERS_FORM.TRAVELER_EMAIL },
-        phone: { label: translations.TRAVELERS_FORM.TRAVELER_PHONE },
-        mobile: { label: translations.TRAVELERS_FORM.TRAVELER_MOBILE },
-        passportNumber: { label: translations.TRAVELERS_FORM.PASSPORT_NUMBER },
-        passportIssueDate: { type: 'date', label: translations.TRAVELERS_FORM.PASSPORT_ISSUE_DATE },
-        passportIssuedLocation: { label: translations.TRAVELERS_FORM.PASSPORT_ISSUED_LOCATION },
-        passportExpiryDate: { type: 'date', label: translations.TRAVELERS_FORM.PASSPORT_EXPIRY_DATE },
-        emergencyNumber: { label: translations.TRAVELERS_FORM.EMERGENCY_NUMBER },
-        insuranceName: { label: translations.TRAVELERS_FORM.INSURANCE_NAME },
-        info: { label: translations.TRAVELERS_FORM.INFO },
-        street: { label: translations.TRAVELERS_FORM.STREET },
-        location: { label: translations.TRAVELERS_FORM.CITY },
-        postalCode: { label: translations.TRAVELERS_FORM.ZIPCODE },
-        number: { label: translations.TRAVELERS_FORM.HOUSE_NUMBER }
-    };
+    const BUILT_IN_FIELD_CONTROL_META = getBuiltInFieldControlMeta(translations);
     const renderBuiltInFieldControl = (fieldName, isRequired, travelerValues, namePrefix) => {
         const path = BUILT_IN_FIELD_PATHS[fieldName] ?? fieldName;
         const name = `${namePrefix}.${path}`;
@@ -20345,7 +20399,7 @@ const SharedTravelersForm = ({ formik, translations, travellersSettings, countri
     const resolveBuiltInField = (fieldName, travelerValues) => {
         const isMainBooker = travelerValues.id === formik.values.mainBookerId;
         const configured = getBuiltInPaxField(paxFields, fieldName, isMainBooker);
-        const fallback = CORE_FIELD_DEFAULTS[fieldName];
+        const fallback = hasConfiguredBuiltInPaxFields(paxFields) ? undefined : CORE_FIELD_DEFAULTS[fieldName];
         if (!configured && !fallback)
             return undefined;
         return { isRequired: configured?.isRequired ?? fallback.isRequired, col: configured?.col ?? fallback.col };
@@ -20357,7 +20411,14 @@ const SharedTravelersForm = ({ formik, translations, travellersSettings, countri
         return (React__default["default"].createElement("div", { key: fieldName, style: { gridColumn: `span ${resolved.col || 12}` } }, renderBuiltInFieldControl(fieldName, resolved.isRequired, travelerValues, namePrefix)));
     };
     const renderTravelerAddressFields = (travelerValues, namePrefix) => {
-        const fields = ADDRESS_FIELD_NAMES.map((fieldName) => renderBuiltInField(fieldName, travelerValues, namePrefix)).filter(Boolean);
+        const isMainBooker = travelerValues.id === formik.values.mainBookerId;
+        // Configured order when Tide sends one, so the configured col widths line up as intended.
+        const fieldNames = hasConfiguredBuiltInPaxFields(paxFields)
+            ? getApplicableBuiltInPaxFields(paxFields, isMainBooker)
+                .map((field) => field.fieldName)
+                .filter((fieldName) => ADDRESS_FIELD_NAMES.includes(fieldName))
+            : ADDRESS_FIELD_NAMES;
+        const fields = fieldNames.map((fieldName) => renderBuiltInField(fieldName, travelerValues, namePrefix)).filter(Boolean);
         if (!fields.length)
             return null;
         return React__default["default"].createElement("div", { className: "travelers-form__custom-fields-grid" }, fields);
@@ -20400,15 +20461,18 @@ const SharedTravelersForm = ({ formik, translations, travellersSettings, countri
             return (React__default["default"].createElement("div", { className: "form__row" },
                 React__default["default"].createElement(LabeledInput, { hasError: hasVisibleError(`${namePrefix}.age`), extraClassName: "form__group--md-33", label: translations.TRAVELERS_FORM.AGE, required: true, name: `${namePrefix}.age`, onChange: formik.handleChange, onBlur: formik.handleBlur, value: travelerValues.age })));
         }
-        // 'birthDate' (the legacy formFields type string) is normalized to the paxFields catalog's
-        // 'dateOfBirth' fieldName for config lookups.
-        const baseFieldNames = (travellersSettings?.formFields?.length ? travellersSettings.formFields.map((field) => field.type) : ['gender', 'firstName', 'lastName', 'dateOfBirth']).map((fieldName) => (fieldName === 'birthDate' ? 'dateOfBirth' : fieldName));
         const isMainBooker = travelerValues.id === formik.values.mainBookerId;
-        const extraFieldNames = getApplicableBuiltInPaxFields(paxFields, isMainBooker)
-            .map((field) => field.fieldName)
-            .filter((fieldName) => !baseFieldNames.includes(fieldName) && !ADDRESS_FIELD_NAMES.includes(fieldName));
+        // With a Tide field configuration, exactly the configured fields render, in their configured order.
+        // Without one, fall back to formFields ('birthDate', the legacy type string, maps to 'dateOfBirth').
+        const fieldNames = hasConfiguredBuiltInPaxFields(paxFields)
+            ? getApplicableBuiltInPaxFields(paxFields, isMainBooker)
+                .map((field) => field.fieldName)
+                .filter((fieldName) => !ADDRESS_FIELD_NAMES.includes(fieldName))
+            : (travellersSettings?.formFields?.length
+                ? travellersSettings.formFields.map((field) => field.type)
+                : ['gender', 'firstName', 'lastName', 'dateOfBirth']).map((fieldName) => (fieldName === 'birthDate' ? 'dateOfBirth' : fieldName));
         return (React__default["default"].createElement(React__default["default"].Fragment, null,
-            React__default["default"].createElement("div", { className: "travelers-form__custom-fields-grid" }, [...baseFieldNames, ...extraFieldNames].map((fieldName) => renderBuiltInField(fieldName, travelerValues, namePrefix))),
+            React__default["default"].createElement("div", { className: "travelers-form__custom-fields-grid" }, fieldNames.map((fieldName) => renderBuiltInField(fieldName, travelerValues, namePrefix))),
             renderTravelerAddressFields(travelerValues, namePrefix),
             renderCustomFields(travelerValues, namePrefix),
             travelersFirstStep && isAdult && formik.values.rooms[roomIndex].adults.length > 1 && (React__default["default"].createElement("button", { type: "button", className: "cta cta--secondary", onClick: () => handleRemoveTraveler(roomIndex, travelerIndex) }, translations.TRAVELERS_FORM.REMOVE_TRAVELER))));
@@ -20446,7 +20510,7 @@ const SharedTravelersForm = ({ formik, translations, travellersSettings, countri
                     renderTravelerFields(travelerValues, `rooms[${roomIndex}].children[${index}]`, false, roomIndex, index)))),
                 !useCompactForm && travelersFirstStep && (React__default["default"].createElement("div", { className: "form__region" },
                     React__default["default"].createElement("button", { type: "button", className: "cta cta--select", onClick: () => handleAddTraveler(roomIndex) }, translations.TRAVELERS_FORM.ADD_TRAVELER)))))),
-            !useCompactForm && (bookingType !== 'b2b' || travellersSettings?.mainBookerFormFields?.length) ? (React__default["default"].createElement("div", { className: "form__region" },
+            useCompactForm || hasConfiguredMainBookerFields(paxFields) ? null : bookingType !== 'b2b' || travellersSettings?.mainBookerFormFields?.length ? (React__default["default"].createElement("div", { className: "form__region" },
                 React__default["default"].createElement("div", { className: "form__region-header" },
                     React__default["default"].createElement("h5", { className: "form__region-heading" }, translations.TRAVELERS_FORM.MAIN_BOOKER),
                     React__default["default"].createElement("p", { className: "form__region-label" }, lodash.compact([lodash.compact([mainBooker?.firstName, mainBooker?.lastName]).join(' '), formatBirthDate$1(mainBooker?.birthDate)]).join(', '))),
@@ -20465,9 +20529,9 @@ const SharedTravelersForm = ({ formik, translations, travellersSettings, countri
                     React__default["default"].createElement("div", { className: "form__row" },
                         React__default["default"].createElement(LabeledInput, { hasError: hasVisibleError('phone'), extraClassName: "form__group--md-33", label: translations.TRAVELERS_FORM.PHONE, required: true, name: "phone", onChange: formik.handleChange, onBlur: formik.handleBlur, value: formik.values.phone }),
                         React__default["default"].createElement(LabeledInput, { type: "email", hasError: hasVisibleError('email'), extraClassName: "form__group--md-33", label: translations.TRAVELERS_FORM.EMAIL, required: true, name: "email", onChange: formik.handleChange, onBlur: formik.handleBlur, value: formik.values.email }),
-                        React__default["default"].createElement(LabeledInput, { type: "email", hasError: hasVisibleError('emailConfirmation'), extraClassName: "form__group--md-33", label: translations.TRAVELERS_FORM.REPEAT_EMAIL, required: true, name: "emailConfirmation", onChange: formik.handleChange, onBlur: formik.handleBlur, value: formik.values.emailConfirmation })))))) : !useCompactForm ? (React__default["default"].createElement("div", { className: "form__region" },
+                        React__default["default"].createElement(LabeledInput, { type: "email", hasError: hasVisibleError('emailConfirmation'), extraClassName: "form__group--md-33", label: translations.TRAVELERS_FORM.REPEAT_EMAIL, required: true, name: "emailConfirmation", onChange: formik.handleChange, onBlur: formik.handleBlur, value: formik.values.emailConfirmation })))))) : (React__default["default"].createElement("div", { className: "form__region" },
                 React__default["default"].createElement("div", { className: "form__row" },
-                    React__default["default"].createElement(LabeledInput, { hasError: hasVisibleError('phone'), extraClassName: "form__group--md-33", label: translations.TRAVELERS_FORM.PHONE, required: true, name: "phone", onChange: formik.handleChange, onBlur: formik.handleBlur, value: formik.values.phone })))) : null,
+                    React__default["default"].createElement(LabeledInput, { hasError: hasVisibleError('phone'), extraClassName: "form__group--md-33", label: translations.TRAVELERS_FORM.PHONE, required: true, name: "phone", onChange: formik.handleChange, onBlur: formik.handleBlur, value: formik.values.phone })))),
             !useCompactForm && showAgentSelection && (React__default["default"].createElement("div", { className: "form__region" },
                 React__default["default"].createElement("div", { className: "form__region-header" },
                     React__default["default"].createElement("h5", { className: "form__region-heading" }, translations.TRAVELERS_FORM.BOOK_WITH_AGENT),
@@ -21078,8 +21142,9 @@ const selectBookingPackagePax = toolkit.createSelector(selectTravelersFormValues
     formValues?.rooms.forEach((r) => r.adults.forEach((x) => {
         const adultPax = buildPax(x, formValues?.mainBookerId);
         if (adultPax.isMainBooker) {
-            adultPax.mobilePhone = formValues?.phone;
-            adultPax.email = formValues?.email;
+            // Without the main booker block (Tide configures main-booker fields), keep the traveler's own details.
+            adultPax.mobilePhone = formValues?.phone || adultPax.mobilePhone;
+            adultPax.email = formValues?.email || adultPax.email;
         }
         pax.push(adultPax);
     }));
@@ -21103,8 +21168,8 @@ const selectBookingAddress = toolkit.createSelector(selectTravelersFormValues, s
         postalCode: mainBookerAddress?.postalCode || formValues?.zipCode,
         location: mainBookerAddress?.location || formValues?.place,
         country: mainBookerAddress?.country || formValues?.country,
-        mobilePhone: formValues?.phone,
-        email: formValues?.email
+        mobilePhone: mainBooker.mobilePhone,
+        email: mainBooker.email
     };
 });
 const selectSubFormAnswers = (state) => state.booking.subFormAnswers;
@@ -26241,6 +26306,10 @@ const Summary = () => {
                 React__default["default"].createElement("button", { title: settings.isOffer ? translations.STEPS.SUBMIT_OFFER : translations.STEPS.SUBMIT_BOOKING, className: buildClassName(['cta', !userValidated && 'cta--disabled']), disabled: !userValidated, name: "default" }, settings.isOffer ? translations.STEPS.SUBMIT_OFFER : translations.STEPS.SUBMIT_BOOKING))))));
 };
 
+// lodash isEmpty is true for every number, which would flag a filled-in preferredLanguageId as missing.
+function isBlank(value) {
+    return value === null || value === undefined || (typeof value === 'string' && value.trim() === '');
+}
 function isValidEmail(email) {
     return !/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,24}$/i.test(email);
 }
@@ -26264,9 +26333,14 @@ function getAge(birthDateText, startDateText) {
 }
 const validateForm = (values, agentRequired, bookingType, translations, formFields, mainBookerFormFields, maxChildAge = CHILD_MAX_AGE, maxBabyAge = BABY_MAX_AGE, paxFields = []) => {
     const errors = {};
+    const usesFieldConfiguration = hasConfiguredBuiltInPaxFields(paxFields);
+    const builtInFieldMeta = getBuiltInFieldControlMeta(translations);
     const isFormFieldPresent = (type) => {
         return formFields?.some((f) => f.type === type) ?? true;
     };
+    // The 4 core fields: with a Tide field configuration they're required only when configured so for the
+    // traveler's role (main booker / other pax); without one, whenever formFields lists them (legacy behavior).
+    const isCoreFieldRequired = (traveler, legacyType, fieldName = legacyType) => usesFieldConfiguration ? !!getBuiltInPaxField(paxFields, fieldName, traveler.id === values.mainBookerId)?.isRequired : isFormFieldPresent(legacyType);
     const isMainBookerFormFieldPresent = (type) => {
         return mainBookerFormFields?.some((f) => f.type === type) ?? true;
     };
@@ -26318,16 +26392,16 @@ const validateForm = (values, agentRequired, bookingType, translations, formFiel
             const fieldPath = BUILT_IN_FIELD_PATHS[field.fieldName];
             if (!fieldPath)
                 return;
-            if (lodash.isEmpty(lodash.get(traveler, fieldPath))) {
-                lodash.set(errors, `${path}.${fieldPath}`, formatTravelerField(room, pax, field.fieldName));
+            if (isBlank(lodash.get(traveler, fieldPath))) {
+                lodash.set(errors, `${path}.${fieldPath}`, formatTravelerField(room, pax, builtInFieldMeta[field.fieldName]?.label ?? field.fieldName));
             }
         });
     };
     values.rooms.forEach((r, rIndex) => r.adults.forEach((adult, index) => {
-        if (lodash.isEmpty(adult.gender) && isFormFieldPresent('gender')) {
+        if (lodash.isEmpty(adult.gender) && isCoreFieldRequired(adult, 'gender')) {
             lodash.set(errors, `rooms[${rIndex}].adults[${index}].gender`, formatTravelerField(rIndex + 1, index + 1, translations.TRAVELERS_FORM.GENDER));
         }
-        if (isFormFieldPresent('firstName')) {
+        if (isCoreFieldRequired(adult, 'firstName') || !lodash.isEmpty(adult.firstName)) {
             if (lodash.isEmpty(adult.firstName)) {
                 lodash.set(errors, `rooms[${rIndex}].adults[${index}].firstName`, formatTravelerField(rIndex + 1, index + 1, translations.TRAVELERS_FORM.FIRST_NAME));
             }
@@ -26335,7 +26409,7 @@ const validateForm = (values, agentRequired, bookingType, translations, formFiel
                 lodash.set(errors, `rooms[${rIndex}].adults[${index}].firstName`, formatTravelerFieldInvalidCharacters(rIndex + 1, index + 1, translations.TRAVELERS_FORM.FIRST_NAME));
             }
         }
-        if (isFormFieldPresent('lastName')) {
+        if (isCoreFieldRequired(adult, 'lastName') || !lodash.isEmpty(adult.lastName)) {
             if (lodash.isEmpty(adult.lastName)) {
                 lodash.set(errors, `rooms[${rIndex}].adults[${index}].lastName`, formatTravelerField(rIndex + 1, index + 1, translations.TRAVELERS_FORM.LAST_NAME));
             }
@@ -26343,7 +26417,7 @@ const validateForm = (values, agentRequired, bookingType, translations, formFiel
                 lodash.set(errors, `rooms[${rIndex}].adults[${index}].lastName`, formatTravelerFieldInvalidCharacters(rIndex + 1, index + 1, translations.TRAVELERS_FORM.LAST_NAME));
             }
         }
-        if (isFormFieldPresent('birthDate')) {
+        if (isCoreFieldRequired(adult, 'birthDate', 'dateOfBirth') || !lodash.isEmpty(adult.birthDate)) {
             if (lodash.isEmpty(adult.birthDate) || !isValidBirthDate(adult.birthDate)) {
                 lodash.set(errors, `rooms[${rIndex}].adults[${index}].birthDate`, formatTravelerField(rIndex + 1, index + 1, translations.TRAVELERS_FORM.BIRTHDATE));
             }
@@ -26359,10 +26433,10 @@ const validateForm = (values, agentRequired, bookingType, translations, formFiel
         validateRequiredBuiltInFields(adult, `rooms[${rIndex}].adults[${index}]`, rIndex + 1, index + 1);
     }));
     values.rooms.forEach((r, rIndex) => r.children.forEach((child, index) => {
-        if (lodash.isEmpty(child.gender) && isFormFieldPresent('gender')) {
+        if (lodash.isEmpty(child.gender) && isCoreFieldRequired(child, 'gender')) {
             lodash.set(errors, `rooms[${rIndex}].children[${index}].gender`, formatTravelerField(rIndex + 1, r.adults.length + index + 1, translations.TRAVELERS_FORM.GENDER));
         }
-        if (isFormFieldPresent('firstName')) {
+        if (isCoreFieldRequired(child, 'firstName') || !lodash.isEmpty(child.firstName)) {
             if (lodash.isEmpty(child.firstName)) {
                 lodash.set(errors, `rooms[${rIndex}].children[${index}].firstName`, formatTravelerField(rIndex + 1, r.adults.length + index + 1, translations.TRAVELERS_FORM.FIRST_NAME));
             }
@@ -26370,7 +26444,7 @@ const validateForm = (values, agentRequired, bookingType, translations, formFiel
                 lodash.set(errors, `rooms[${rIndex}].children[${index}].firstName`, formatTravelerFieldInvalidCharacters(rIndex + 1, r.adults.length + index + 1, translations.TRAVELERS_FORM.FIRST_NAME));
             }
         }
-        if (isFormFieldPresent('lastName')) {
+        if (isCoreFieldRequired(child, 'lastName') || !lodash.isEmpty(child.lastName)) {
             if (lodash.isEmpty(child.lastName)) {
                 lodash.set(errors, `rooms[${rIndex}].children[${index}].lastName`, formatTravelerField(rIndex + 1, r.adults.length + index + 1, translations.TRAVELERS_FORM.LAST_NAME));
             }
@@ -26378,7 +26452,7 @@ const validateForm = (values, agentRequired, bookingType, translations, formFiel
                 lodash.set(errors, `rooms[${rIndex}].children[${index}].lastName`, formatTravelerFieldInvalidCharacters(rIndex + 1, r.adults.length + index + 1, translations.TRAVELERS_FORM.LAST_NAME));
             }
         }
-        if (isFormFieldPresent('birthDate')) {
+        if (isCoreFieldRequired(child, 'birthDate', 'dateOfBirth') || !lodash.isEmpty(child.birthDate)) {
             if (lodash.isEmpty(child.birthDate) || !isValidBirthDate(child.birthDate)) {
                 lodash.set(errors, `rooms[${rIndex}].children[${index}].birthDate`, formatTravelerField(rIndex + 1, r.adults.length + index + 1, translations.TRAVELERS_FORM.BIRTHDATE));
             }
@@ -26404,7 +26478,8 @@ const validateForm = (values, agentRequired, bookingType, translations, formFiel
     if (values.mainBookerId < 0) {
         errors.mainBookerId = translations.TRAVELERS_FORM.VALIDATION.NO_MAIN_BOOKER_SELECTED;
     }
-    if (bookingType != 'b2b' || mainBookerFormFields?.length) {
+    if (hasConfiguredMainBookerFields(paxFields)) ;
+    else if (bookingType != 'b2b' || mainBookerFormFields?.length) {
         if (lodash.isEmpty(values.street) && isMainBookerFormFieldPresent('street')) {
             errors.street = format$1(translations.TRAVELERS_FORM.VALIDATION.MAIN_BOOKER_FIELD, [translations.TRAVELERS_FORM.STREET]);
         }
@@ -29183,6 +29258,7 @@ const initialState$1 = {
     bookingNumber: undefined,
     trajectNodeAvailability: {},
     trajectFlightAvailability: {},
+    trajectTransferAvailability: {},
     trajectDaySuggestions: {},
     trajectEditLineGuid: null,
     trajectActivitiesDayOrder: null,
@@ -29395,6 +29471,12 @@ const searchResultsSlice = toolkit.createSlice({
             node.selectedCode = code;
             node.status = 'resolved';
         },
+        clearTrajectNodeSelection(state, action) {
+            const node = state.trajectNodeAvailability[action.payload];
+            if (!node)
+                return;
+            node.selectedCode = null;
+        },
         updateEditableEntryLine(state, action) {
             if (!state.editablePackagingEntry)
                 return;
@@ -29408,6 +29490,32 @@ const searchResultsSlice = toolkit.createSlice({
                 return;
             state.editablePackagingEntry.lines = [...(state.editablePackagingEntry.lines ?? []), ...action.payload];
         },
+        upsertEditableEntryLines(state, action) {
+            if (!state.editablePackagingEntry)
+                return;
+            const lines = [...(state.editablePackagingEntry.lines ?? [])];
+            action.payload.forEach((line) => {
+                const index = lines.findIndex((x) => x.guid === line.guid);
+                if (index === -1)
+                    lines.push(line);
+                else
+                    lines[index] = line;
+            });
+            state.editablePackagingEntry.lines = lines;
+            const restored = new Set(action.payload.map((line) => line.trajectNodeId).filter((x) => x != null));
+            if (restored.size && state.editablePackagingEntry.removedTrajectNodeIds?.length) {
+                state.editablePackagingEntry.removedTrajectNodeIds = state.editablePackagingEntry.removedTrajectNodeIds.filter((x) => !restored.has(x));
+            }
+        },
+        removeTrajectNode(state, action) {
+            if (!state.editablePackagingEntry)
+                return;
+            const guids = new Set(action.payload.lineGuids);
+            state.editablePackagingEntry.lines = (state.editablePackagingEntry.lines ?? []).filter((x) => !guids.has(x.guid));
+            const removed = state.editablePackagingEntry.removedTrajectNodeIds ?? [];
+            if (!removed.includes(action.payload.nodeId))
+                state.editablePackagingEntry.removedTrajectNodeIds = [...removed, action.payload.nodeId];
+        },
         removeEditableEntryLines(state, action) {
             if (!state.editablePackagingEntry)
                 return;
@@ -29439,6 +29547,19 @@ const searchResultsSlice = toolkit.createSlice({
             flight.selectedGuid = action.payload.guid;
             flight.status = 'resolved';
         },
+        clearTrajectFlightSelection(state, action) {
+            const flight = state.trajectFlightAvailability[action.payload];
+            if (!flight)
+                return;
+            flight.selectedGuid = null;
+        },
+        setTrajectTransferLoading(state, action) {
+            state.trajectTransferAvailability[action.payload] = { nodeId: action.payload, status: 'loading', result: null };
+        },
+        setTrajectTransferAvailability(state, action) {
+            const { nodeId, result } = action.payload;
+            state.trajectTransferAvailability[nodeId] = { nodeId, status: result ? 'resolved' : 'unavailable', result };
+        },
         setTrajectDaySuggestionsLoading(state, action) {
             const dayOrder = action.payload;
             state.trajectDaySuggestions[dayOrder] = {
@@ -29475,6 +29596,7 @@ const searchResultsSlice = toolkit.createSlice({
         resetTrajectAvailability(state) {
             state.trajectNodeAvailability = {};
             state.trajectFlightAvailability = {};
+            state.trajectTransferAvailability = {};
             state.trajectDaySuggestions = {};
             state.trajectEditLineGuid = null;
             state.trajectActivitiesDayOrder = null;
@@ -29483,7 +29605,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, setTrajectResolving, setTrajectItineraryView, setTrajectFlightLoading, setTrajectFlightAvailability, setTrajectFlightSelection, setTrajectEditLineGuid, setTrajectActivitiesDayOrder, setTrajectDaySuggestionsLoading, setTrajectDaySuggestions, addEditableEntryLines, updateTrajectNodeResult, resetTrajectAvailability, updateEditableEntryLine, removeEditableEntryLines } = searchResultsSlice.actions;
+const { setResults, setFilteredResults, setSelectedSearchResult, setPackagingAccoResults, setFilteredPackagingAccoResults, setFilteredPackagingFlightResults, setPackagingAccoSearchDetails, setSelectedPackagingAccoResult, setPackagingFlightResults, setSelectedPackagingFlight, setSelectedFlight, setSelectedFlightDetails, setBookingPackageDetails, selectFlight, setIsLoading, setFlightsLoading, setInitialFilters, setFilters, resetFilters, setInitialFlightFilters, setFlightFilters, resetFlightFilters, setSortType, setFlightSortType, setActiveTab, setCurrentPage, resetSearchState, setFlyInIsOpen, setEditablePackagingEntry, setTransactionId, setFlyInType, setPriceDetails, setItinerary, setSelectedOutwardKey, setSelectedReturnKey, resetFlightSelection, setExcursionSearchParams, setSelectedExcursionSearchResult, confirmExcursionForDay, removeConfirmedExcursionForDay, clearConfirmedExcursionsForDay, setBookPackagingEntry, setCurrentStep, setBookingNumber, setTrajectNodeLoading, setTrajectNodeAvailability, setTrajectNodeSelection, 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 }) => {
@@ -29698,7 +29820,7 @@ const numberOfNights = (segment) => {
 const CHARTER_SERVICE_TYPE = 10;
 const CRUISE_SERVICE_TYPE = 11;
 const FERRY_SERVICE_TYPE = 12;
-const TRANSFER_SERVICE_TYPE = 13;
+const TRANSFER_SERVICE_TYPE$1 = 13;
 const BUS_SERVICE_TYPE = 14;
 const CAR_SERVICE_TYPE = 17;
 const CAMPER_SERVICE_TYPE = 18;
@@ -29730,7 +29852,7 @@ const getServiceTypeIcon = (serviceType) => {
             return 'ui-bus';
         case TRAIN_SERVICE_TYPE:
             return 'ui-train';
-        case TRANSFER_SERVICE_TYPE:
+        case TRANSFER_SERVICE_TYPE$1:
             return 'ui-transfer';
         case EVENT_SERVICE_TYPE:
             return 'ui-ticket';
@@ -29866,6 +29988,81 @@ 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;
+// 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;
+const OPTIONAL_IN_GROUP_REQUIREMENT_TYPE = 2;
+const canRemoveTrajectNode = (node) => node.requirementType === OPTIONAL_REQUIREMENT_TYPE || node.requirementType === OPTIONAL_IN_GROUP_REQUIREMENT_TYPE;
+const getDroppedTrajectNodeIds = (trajectEntry, entry) => {
+    const dropped = new Set();
+    if (!entry || !!trajectEntry.entry.magicLink)
+        return dropped;
+    const removed = new Set(entry.removedTrajectNodeIds ?? []);
+    if (!removed.size)
+        return dropped;
+    const byDay = new Map();
+    [...(trajectEntry.nodes ?? [])]
+        .sort((a, b) => a.dayOrder - b.dayOrder || a.order - b.order)
+        .forEach((node) => byDay.set(node.dayOrder, [...(byDay.get(node.dayOrder) ?? []), node]));
+    byDay.forEach((nodes) => nodes.forEach((node, index) => {
+        if (node.trajectNodeType !== REGULAR_TRAJECT_NODE_TYPE || !canRemoveTrajectNode(node) || !removed.has(node.nodeId))
+            return;
+        dropped.add(node.nodeId);
+        [nodes[index - 1], nodes[index + 1]]
+            .filter((x) => !!x && x.trajectNodeType === CONNECTING_TRAJECT_NODE_TYPE)
+            .forEach((x) => dropped.add(x.nodeId));
+    }));
+    return dropped;
+};
+const isTrajectTransferNode = (node) => node.trajectNodeType === CONNECTING_TRAJECT_NODE_TYPE && !!node.pickUp && !!node.dropOff;
+const buildTrajectTransferRequest = (node, context) => ({
+    transactionId: context.transactionId,
+    officeId: context.officeId,
+    agentId: context.agentId ?? null,
+    catalogueId: context.catalogueId,
+    searchConfigurationId: context.searchConfigurationId,
+    language: context.language,
+    date: node.from,
+    pickUp: node.pickUp,
+    dropOff: node.dropOff,
+    travellers: context.rooms.flatMap((room) => room.travellers)
+});
+const buildTrajectTransferLine = (node, result) => {
+    const option = result.rooms?.[0]?.options?.find((x) => x.isSelected) ?? result.rooms?.[0]?.options?.[0];
+    if (!option?.guid)
+        return null;
+    return {
+        guid: option.guid,
+        parentGuid: null,
+        order: 0,
+        trajectNodeId: node.nodeId,
+        isChanged: true,
+        from: result.fromDate ?? node.from,
+        to: result.toDate ?? node.to,
+        moment: node.moment ?? '',
+        serviceType: TRANSFER_SERVICE_TYPE,
+        productName: result.name,
+        productCode: result.code,
+        accommodationName: option.accommodationName,
+        accommodationCode: option.accommodationCode,
+        regimeName: option.regimeName,
+        regimeCode: option.regimeCode,
+        vendor: result.vendorType ?? null,
+        externalVendorId: result.vendorId ?? null,
+        groupKey: '',
+        isActive: true,
+        country: result.countryId ? { id: result.countryId, name: result.countryName, localizations: [] } : null,
+        region: result.regionId ? { id: result.regionId, name: result.regionName, localizations: [] } : null,
+        oord: result.oordId ? { id: result.oordId, name: result.oordName, localizations: [] } : null,
+        location: result.locationId ? { id: result.locationId, name: result.locationName, localizations: [] } : null,
+        longitude: result.longitude ?? null,
+        latitude: result.latitude ?? null,
+        pax: (option.paxIds ?? []).map((paxId, paxIndex) => ({ paxId, room: 0, order: paxIndex })),
+        flightInformation: null
+    };
+};
 const getCoordinates = (line, node, result) => {
     const sources = [
         ...(result ? [result] : []),
@@ -30293,9 +30490,15 @@ const nightsOf = (node, line) => dateFns.differenceInCalendarDays(new Date(line?
 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]) : '';
@@ -30365,10 +30568,11 @@ const TrajectItinerary = ({ trajectEntry, packagingEntry, translations }) => {
         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 }) => {
+    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" })),
@@ -30377,8 +30581,8 @@ const TrajectItinerary = ({ trajectEntry, packagingEntry, translations }) => {
                 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, node.name || journey),
-                    !!node.name && !!journey && React__default["default"].createElement("p", { className: "search__filter__itinerary__transport-details-time" }, journey)))));
+                    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;
@@ -33629,7 +33833,7 @@ const TrajectResultsFlyIn = ({ isLoading }) => {
         if (!result)
             return;
         dispatch(setTrajectNodeSelection({ lineGuid: item.line.guid, code }));
-        buildNodeSelectionLines(item, result, bookedMode, editablePackagingEntry?.lines ?? []).forEach((line) => dispatch(updateEditableEntryLine(line)));
+        dispatch(upsertEditableEntryLines(buildNodeSelectionLines(item, result, bookedMode, editablePackagingEntry?.lines ?? [])));
         dispatch(setTrajectEditLineGuid(null));
         dispatch(setFlyInIsOpen(false));
     };
@@ -33674,7 +33878,7 @@ const TrajectFlightsFlyIn = ({ isLoading }) => {
         if (!flight)
             return;
         dispatch(setTrajectFlightSelection({ lineGuid: item.line.guid, guid: flight.outwardGuid }));
-        dispatch(updateEditableEntryLine(applyFlightToLine(item.line, flight)));
+        dispatch(upsertEditableEntryLines([applyFlightToLine(item.line, flight)]));
         dispatch(setTrajectEditLineGuid(null));
         dispatch(setFlyInIsOpen(false));
     };
@@ -33737,10 +33941,16 @@ const TrajectDayActivitiesFlyIn = ({ isLoading }) => {
         if (!item)
             return;
         dispatch(setTrajectNodeSelection({ lineGuid: item.line.guid, code: result.code }));
-        buildNodeSelectionLines(item, result, bookedMode, editablePackagingEntry?.lines ?? []).forEach((line) => dispatch(updateEditableEntryLine(line)));
+        dispatch(upsertEditableEntryLines(buildNodeSelectionLines(item, result, bookedMode, editablePackagingEntry?.lines ?? [])));
         dispatch(setTrajectActivitiesDayOrder(null));
         dispatch(setFlyInIsOpen(false));
     };
+    const handleRemove = ({ item }) => {
+        if (!item)
+            return;
+        dispatch(clearTrajectNodeSelection(item.line.guid));
+        dispatch(removeTrajectNode({ nodeId: item.node.nodeId, lineGuids: item.lines.map((line) => line.guid) }));
+    };
     if (isLoading || suggestions?.status === 'loading') {
         return React__default["default"].createElement(React__default["default"].Fragment, null, context.customSpinner ?? React__default["default"].createElement(Spinner, { label: translations.SRP.LOADING_ACTIVITIES }));
     }
@@ -33754,7 +33964,8 @@ const TrajectDayActivitiesFlyIn = ({ isLoading }) => {
             const { result, item } = card;
             const isSelected = item ? trajectNodeAvailability[item.line.guid]?.selectedCode === result.code : getAddedLines(result).length > 0;
             const isBookedCard = !!item && bookedMode && matchesCode(result, item.node.code ?? '');
-            return (React__default["default"].createElement(TrajectNodeCard, { key: `activity-${result.code}`, node: item?.node, result: result, isSelected: isSelected, languageCode: context.languageCode, translations: translations, onSelect: () => (item ? handleSelect(card) : handleToggle(result)), selectLabel: item ? undefined : translations.SRP.ADD, selectedLabel: item ? (isBookedCard ? translations.SHARED.BOOKED : undefined) : translations.SRP.REMOVE }));
+            const canRemove = !!item && isSelected && !bookedMode && canRemoveTrajectNode(item.node);
+            return (React__default["default"].createElement(TrajectNodeCard, { key: `activity-${result.code}`, node: item?.node, result: result, isSelected: isSelected, languageCode: context.languageCode, translations: translations, onSelect: () => (!item ? handleToggle(result) : canRemove ? handleRemove(card) : handleSelect(card)), selectLabel: item ? undefined : translations.SRP.ADD, selectedLabel: item && !canRemove ? (isBookedCard ? translations.SHARED.BOOKED : undefined) : translations.SRP.REMOVE }));
         })))));
 };
 
@@ -36148,16 +36359,18 @@ const BookPackagingEntry = ({ activeSearchSeed, isLoading, isConfirmationPage })
             apiKey: context.tideConnection.apiKey
         };
     }, [context]);
+    // The field configuration on the entry is leading for which traveler fields are shown and required.
+    const paxFields = editablePackagingEntry?.paxFields ?? [];
     const initialValues = React.useMemo(() => {
         if (!editablePackagingEntry) {
             return {};
         }
-        return createInitialValuesFromEditablePackagingEntry(editablePackagingEntry);
+        return createInitialValuesFromEditablePackagingEntry(editablePackagingEntry, undefined, paxFields);
     }, [editablePackagingEntry?.transactionId]);
     const formik$1 = formik.useFormik({
         initialValues,
         enableReinitialize: true,
-        validate: (values) => validateForm(values, false, 'b2c', translations, travellersSettings.formFields, travellersSettings.mainBookerFormFields, undefined, undefined, editablePackagingEntry?.paxFields ?? []),
+        validate: (values) => validateForm(values, false, 'b2c', translations, travellersSettings.formFields, travellersSettings.mainBookerFormFields, undefined, undefined, paxFields),
         onSubmit: (values) => {
             if (!editablePackagingEntry)
                 return;
@@ -36242,7 +36455,7 @@ 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: editablePackagingEntry?.paxFields ?? [] })),
+                    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 === 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))),
@@ -36342,11 +36555,13 @@ const TrajectResults = ({ isLoading }) => {
         });
         return map;
     }, [trajectEntry]);
+    const droppedNodeIds = trajectEntry ? getDroppedTrajectNodeIds(trajectEntry, editablePackagingEntry) : new Set();
+    const droppedKey = [...droppedNodeIds].sort((a, b) => a - b).join(',');
     const { stayByDay, stayStartByNodeId } = React.useMemo(() => {
         const byDay = new Map();
         const byNodeId = new Map();
         nodesWithLines
-            .filter((x) => x.node.serviceType === ACCOMMODATION_SERVICE_TYPE)
+            .filter((x) => x.node.serviceType === ACCOMMODATION_SERVICE_TYPE && !droppedNodeIds.has(x.node.nodeId))
             .forEach((item) => {
             const nights = Math.max(dateFns.differenceInCalendarDays(new Date(item.line.to), new Date(item.line.from)), 1);
             byNodeId.set(item.node.nodeId, { item, night: 0, nights });
@@ -36355,7 +36570,7 @@ const TrajectResults = ({ isLoading }) => {
             }
         });
         return { stayByDay: byDay, stayStartByNodeId: byNodeId };
-    }, [nodesWithLines]);
+    }, [nodesWithLines, droppedKey]);
     /** Whether every node of the trip has an answer, one way or the other. */
     const tripResolved = React.useMemo(() => nodesWithLines
         .filter((x) => isSearchableTrajectNode(x.node) || isTrajectFlightNode(x.node))
@@ -36382,7 +36597,20 @@ const TrajectResults = ({ isLoading }) => {
         if (!result)
             return;
         dispatch(setTrajectNodeSelection({ lineGuid: item.line.guid, code }));
-        buildNodeSelectionLines(item, result, bookedMode, editablePackagingEntry?.lines ?? []).forEach((line) => dispatch(updateEditableEntryLine(line)));
+        dispatch(upsertEditableEntryLines(buildNodeSelectionLines(item, result, bookedMode, editablePackagingEntry?.lines ?? [])));
+    };
+    /**
+     * An optional stop can be taken off the trip; a mandatory one, or one of which the group needs a pick,
+     * only swapped. A booked entry's services are never taken off here.
+     */
+    const canRemove = (item) => !bookedMode && canRemoveTrajectNode(item.node);
+    const handleRemoveNode = (item) => {
+        dispatch(clearTrajectNodeSelection(item.line.guid));
+        dispatch(removeTrajectNode({ nodeId: item.node.nodeId, lineGuids: item.lines.map((line) => line.guid) }));
+    };
+    const handleRemoveFlight = (item) => {
+        dispatch(clearTrajectFlightSelection(item.line.guid));
+        dispatch(removeTrajectNode({ nodeId: item.node.nodeId, lineGuids: item.lines.map((line) => line.guid) }));
     };
     /** The remaining legs for a flight node open in the fly-in, as the regular flight results do. */
     const handleShowMoreFlights = (item) => {
@@ -36450,9 +36678,17 @@ const TrajectResults = ({ isLoading }) => {
         // A hotel row holds the hotels configured on the node; a portal can also let it fill up with
         // non-preferred hotels found in the area, the rest staying behind "show more".
         const fill = showNonPreferredHotels && node.serviceType === ACCOMMODATION_SERVICE_TYPE ? others.slice(0, Math.max(MAX_HOTEL_RESULTS - 1 - configured.length, 0)) : [];
-        const remaining = others.length - fill.length;
         // No entry yet means the node's search has been queued but not dispatched — still loading.
         const status = availability?.status ?? 'loading';
+        // A stop taken off the trip keeps its results in view, to pick one back.
+        const isRemoved = status === 'resolved' && !selected && results.length > 0;
+        const removable = canRemove(item);
+        const shown = selected
+            ? [selected, ...configured, ...fill]
+            : configured.length || fill.length
+                ? [...configured, ...fill]
+                : others.slice(0, MAX_HOTEL_RESULTS);
+        const remaining = results.length - shown.length;
         return (React__default["default"].createElement(React__default["default"].Fragment, { key: line.guid },
             showHeader && (React__default["default"].createElement("div", { className: "search__results__label search__results__label--secondary" },
                 React__default["default"].createElement("div", { className: "search__results__label__date" },
@@ -36464,13 +36700,18 @@ const TrajectResults = ({ isLoading }) => {
                         React__default["default"].createElement("strong", null, headerTitle || node.name))))),
             status === 'loading' && React__default["default"].createElement(Spinner, { label: translations.SRP.LOADING_ACCOMMODATIONS }),
             status === 'unavailable' && React__default["default"].createElement("div", { className: "no-results" }, translations.SRP.NO_RESULTS),
-            status === 'resolved' && selected && (React__default["default"].createElement(React__default["default"].Fragment, null,
-                availability.preferredUnavailable && node.preferredAccommodationName && (React__default["default"].createElement("div", { className: "search__results__cards__actions" },
+            status === 'resolved' && (selected || isRemoved) && (React__default["default"].createElement(React__default["default"].Fragment, null,
+                selected && availability.preferredUnavailable && node.preferredAccommodationName && (React__default["default"].createElement("div", { className: "search__results__cards__actions" },
                     React__default["default"].createElement("span", null,
                         node.preferredAccommodationName,
                         " \u2014 ",
                         translations.SRP.NO_RESULTS))),
-                React__default["default"].createElement(TrajectCardRow, { selectionKey: selected.code }, [selected, ...configured, ...fill].map((result) => (React__default["default"].createElement(TrajectNodeCard, { key: result.code, node: node, result: result, isSelected: result.code === selected.code, languageCode: context.languageCode, translations: translations, onSelect: () => handleSelect(item, result.code), onEditOptions: node.serviceType === ACCOMMODATION_SERVICE_TYPE ? () => handleEditOptions(item) : undefined, showNights: node.serviceType === ACCOMMODATION_SERVICE_TYPE })))),
+                React__default["default"].createElement(TrajectCardRow, { selectionKey: selected?.code ?? '' }, shown.map((result) => {
+                    const isSelected = result.code === selected?.code;
+                    return (React__default["default"].createElement(TrajectNodeCard, { key: result.code, node: node, result: result, isSelected: isSelected, languageCode: context.languageCode, translations: translations, onSelect: () => (isSelected && removable ? handleRemoveNode(item) : handleSelect(item, result.code)), onEditOptions: node.serviceType === ACCOMMODATION_SERVICE_TYPE ? () => handleEditOptions(item) : undefined, showNights: node.serviceType === ACCOMMODATION_SERVICE_TYPE, 
+                        // selectedLabel={bookedMode && matchesCode(result, node.code ?? '') ? translations.SHARED.BOOKED : undefined}
+                        selectedLabel: removable ? translations.SRP.REMOVE : undefined }));
+                })),
                 remaining > 0 && !hideShowMoreResults && (React__default["default"].createElement("div", { className: "search__results__cards__actions" },
                     React__default["default"].createElement("button", { type: "button", className: "cta cta--secondary", onClick: () => handleShowMore(item) },
                         translations.SRP.SHOW_MORE,
@@ -36480,7 +36721,7 @@ const TrajectResults = ({ isLoading }) => {
     };
     const handleSelectFlight = (item, flight) => {
         dispatch(setTrajectFlightSelection({ lineGuid: item.line.guid, guid: flight.outwardGuid }));
-        dispatch(updateEditableEntryLine(buildFlightSelectionLine(item, flight, bookedMode)));
+        dispatch(upsertEditableEntryLines([buildFlightSelectionLine(item, flight, bookedMode)]));
     };
     const renderFlightNode = (item) => {
         const { node, line } = item;
@@ -36489,7 +36730,9 @@ const TrajectResults = ({ isLoading }) => {
         const flights = availability?.results ?? [];
         const selected = flights.find((x) => x.outwardGuid === availability?.selectedGuid) ?? null;
         const others = flights.filter((x) => x.outwardGuid !== availability?.selectedGuid);
-        const visible = others.slice(0, 2);
+        const isRemoved = status === 'resolved' && !selected && flights.length > 0;
+        const removable = canRemove(item);
+        const visible = others.slice(0, selected ? 2 : 3);
         return (React__default["default"].createElement(React__default["default"].Fragment, { key: line.guid },
             React__default["default"].createElement("div", { className: "search__results__label search__results__label--secondary" },
                 React__default["default"].createElement("div", { className: "search__results__label__date" },
@@ -36504,15 +36747,15 @@ const TrajectResults = ({ isLoading }) => {
                             node.arrivalAirportCode)))),
             status === 'loading' && React__default["default"].createElement(Spinner, { label: translations.SRP.LOADING_FLIGHTS }),
             status === 'unavailable' && React__default["default"].createElement("div", { className: "no-results" }, translations.SRP.NO_RESULTS),
-            status === 'resolved' && selected && (React__default["default"].createElement(React__default["default"].Fragment, null,
+            status === 'resolved' && (selected || isRemoved) && (React__default["default"].createElement(React__default["default"].Fragment, null,
                 React__default["default"].createElement("div", { className: "search__results__cards search__results__cards--extended" },
-                    React__default["default"].createElement(IndependentFlightOption, { key: `flight-${selected.outwardGuid}`, item: selected.outward, guid: selected.outwardGuid, selectedGuid: selected.outwardGuid, isOutward: true, showSelectedState: true, price: selected.price, selectedLabel: bookedMode && selected.outwardGuid === line.guid ? translations.SHARED.BOOKED : undefined }),
-                    visible.map((result) => (React__default["default"].createElement(IndependentFlightOption, { key: `flight-${result.outwardGuid}`, item: result.outward, guid: result.outwardGuid, isOutward: true, price: result.price, currentSelectedPrice: selected.price, onSelect: () => handleSelectFlight(item, result) })))),
-                others.length > 2 && !hideShowMoreResults && (React__default["default"].createElement("div", { className: "search__results__cards__actions" },
+                    selected && (React__default["default"].createElement(IndependentFlightOption, { key: `flight-${selected.outwardGuid}`, item: selected.outward, guid: selected.outwardGuid, selectedGuid: selected.outwardGuid, isOutward: true, showSelectedState: true, price: selected.price, onSelect: removable ? () => handleRemoveFlight(item) : undefined, selectedLabel: bookedMode && selected.outwardGuid === line.guid ? translations.SHARED.BOOKED : removable ? translations.SRP.REMOVE : undefined })),
+                    visible.map((result) => (React__default["default"].createElement(IndependentFlightOption, { key: `flight-${result.outwardGuid}`, item: result.outward, guid: result.outwardGuid, isOutward: true, price: result.price, currentSelectedPrice: selected?.price, onSelect: () => handleSelectFlight(item, result) })))),
+                others.length > visible.length && !hideShowMoreResults && (React__default["default"].createElement("div", { className: "search__results__cards__actions" },
                     React__default["default"].createElement("button", { type: "button", className: "cta cta--secondary", onClick: () => handleShowMoreFlights(item) },
                         translations.SRP.SHOW_MORE,
                         " (",
-                        others.length - 2,
+                        others.length - visible.length,
                         ")")))))));
     };
     /** The lines a suggested activity put on the entry, which is also how we know it was added. */
@@ -36588,13 +36831,21 @@ const TrajectResults = ({ isLoading }) => {
                     ")")))));
     };
     /**
-     * An activity the traject books is swapped for another, the way a hotel is; one the traveller
-     * found for themselves is added to the trip or taken back off it.
+     * An activity the traject books is swapped for another, the way a hotel is, or - when it is optional -
+     * taken off the trip; one the traveller found for themselves is added to the trip or taken back off it.
      */
     const renderActivityCard = ({ result, item }) => {
         const isSelected = isActivitySelected({ result, item });
         const isBookedCard = !!item && bookedMode && matchesCode(result, item.node.code ?? '');
-        return (React__default["default"].createElement(TrajectNodeCard, { key: `activity-${result.code}`, node: item?.node, result: result, isSelected: isSelected, languageCode: context.languageCode, translations: translations, onSelect: () => (item ? handleSelect(item, result.code) : handleToggleActivity(result)), selectLabel: item ? undefined : translations.SRP.ADD, selectedLabel: item ? (isBookedCard ? translations.SHARED.BOOKED : undefined) : translations.SRP.REMOVE }));
+        const removable = !!item && canRemove(item);
+        const handleClick = () => {
+            if (!item)
+                return handleToggleActivity(result);
+            if (isSelected && removable)
+                return handleRemoveNode(item);
+            handleSelect(item, result.code);
+        };
+        return (React__default["default"].createElement(TrajectNodeCard, { key: `activity-${result.code}`, node: item?.node, result: result, isSelected: isSelected, languageCode: context.languageCode, translations: translations, onSelect: handleClick, selectLabel: item ? undefined : translations.SRP.ADD, selectedLabel: item && !removable ? (isBookedCard ? translations.SHARED.BOOKED : undefined) : translations.SRP.REMOVE }));
     };
     if (isLoading)
         return React__default["default"].createElement(Spinner, { label: translations.SRP.LOADING_ITINERARY });
@@ -36629,6 +36880,7 @@ const TrajectResults = ({ isLoading }) => {
 const useTrajectAvailability = () => {
     const context = React.useContext(SearchResultsConfigurationContext);
     const dispatch = reactRedux.useDispatch();
+    const { editablePackagingEntry, trajectTransferAvailability } = reactRedux.useSelector((state) => state.searchResults);
     const trajectEntry = context?.trajectEntry;
     const showApiItems = !!context?.showApiItems;
     const hideShowMoreResults = !!context?.hideShowMoreResults;
@@ -36654,12 +36906,14 @@ const useTrajectAvailability = () => {
             rooms: getPackagingRoomsFromEntry(trajectEntry.entry)
         };
         // 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).
         const pax = trajectEntry.entry.pax ?? [];
         const ageOf = (p) => p.age ?? 30;
-        const adults = pax.filter((p) => ageOf(p) >= 12).length;
-        const kids = pax.filter((p) => ageOf(p) >= 2 && ageOf(p) < 12).length;
-        const babies = pax.filter((p) => ageOf(p) < 2).length;
-        const flightPax = lodash.concat(Array.from({ length: adults }, (_, index) => ({ id: index, age: 31 })), Array.from({ length: kids }, (_, index) => ({ id: index + adults, age: 8 })), Array.from({ length: babies }, (_, index) => ({ id: index + adults + kids, age: 1 })));
+        const adults = pax.filter((p) => ageOf(p) >= 12);
+        const kids = pax.filter((p) => ageOf(p) >= 2 && ageOf(p) < 12);
+        const babies = pax.filter((p) => ageOf(p) < 2);
+        const flightPax = lodash.concat(adults.map((p) => ({ id: p.id, age: 31 })), kids.map((p) => ({ id: p.id, age: 8 })), babies.map((p) => ({ id: p.id, age: 1 })));
         const nodesWithLines = getTrajectNodesWithLines(trajectEntry);
         // The other members of a line group are alternatives whether or not a search still finds
         // them; the ones it does not are drawn from their lines, as the booked service itself is.
@@ -36790,9 +37044,30 @@ 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 unresolved = (await Promise.all(resolvable.map((item) => (isTrajectFlightNode(item.node) ? resolveFlightNode(item) : resolveNode(item))))).flat();
+            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();
             if (controller.signal.aborted)
                 return;
             dispatch(setTrajectResolving(false));
@@ -36804,6 +37079,28 @@ const useTrajectAvailability = () => {
         })();
         return () => controller.abort();
     }, [trajectEntry, showApiItems, hideShowMoreResults]);
+    React.useEffect(() => {
+        if (!trajectEntry || !editablePackagingEntry || isBookedEntryTraject(trajectEntry))
+            return;
+        const dropped = getDroppedTrajectNodeIds(trajectEntry, editablePackagingEntry);
+        const guids = new Set((editablePackagingEntry.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);
+        });
+        if (toRemove.length)
+            dispatch(removeEditableEntryLines(toRemove));
+        if (toAdd.length)
+            dispatch(addEditableEntryLines(toAdd));
+    }, [trajectEntry, editablePackagingEntry, trajectTransferAvailability]);
 };
 
 const SearchResultsContainer = ({ onBookingStarted }) => {
@@ -37108,10 +37405,9 @@ const SearchResultsContainer = ({ onBookingStarted }) => {
             const item = getTrajectNodesWithLines(context.trajectEntry).find((x) => x.line.guid === trajectEditLineGuid);
             const result = packagingAccoSearchDetails.find((x) => x.code === selectedPackagingAccoResultCode);
             if (item && result) {
-                const currentLines = item.lines
-                    .map((line) => editablePackagingEntry?.lines?.find((x) => x.guid === line.guid))
-                    .filter((x) => !!x);
-                applyResultToLines(currentLines, result).forEach((line) => dispatch(updateEditableEntryLine(line)));
+                // A stop the traveller took off has no lines left on the entry: the traject's own put it back.
+                const currentLines = item.lines.map((line) => editablePackagingEntry?.lines?.find((x) => x.guid === line.guid) ?? line);
+                dispatch(upsertEditableEntryLines(applyResultToLines(currentLines, result)));
                 dispatch(updateTrajectNodeResult({ lineGuid: trajectEditLineGuid, result }));
             }
             dispatch(setTrajectEditLineGuid(null));