Skip to content

Fix: Flight details show incorrect negative layover time between legs of round trip #73244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blimpich merged 7 commits into from
Oct 24, 2025
Merged

Fix: Flight details show incorrect negative layover time between legs of round trip #73244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aba321b
Update TripReservationUtils.ts
twilight2294 Oct 22, 2025
2678b04
Update TripReservationUtilsTest.ts
twilight2294 Oct 22, 2025
d803e2a
Create TripAirReservationData.ts
twilight2294 Oct 22, 2025
9be3e53
Update TripAirReservationData.ts
twilight2294 Oct 22, 2025
8d1dd6a
Merge branch 'Expensify:main' into patch-47
twilight2294 Oct 23, 2025
8212a9e
Update tests/unit/TripReservationUtilsTest.ts
twilight2294 Oct 24, 2025
9b315c0
Update TripAirReservationData.ts
twilight2294 Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 70 additions & 67 deletions src/libs/TripReservationUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function getTravelerName(traveler: ArrayValues<PnrData['pnrTravelers']>['persona
name += ` ${traveler.name.given}`;
}

return name.trim();
return name?.trim();

@twilight2294 twilight2294 Oct 22, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

App crashes if we do not have name so updated it

}

function getAddressFromLocation(
Expand Down Expand Up @@ -152,73 +152,75 @@ function getAirReservations(pnr: Pnr, travelers: PnrTraveler[]): Array<{reservat
pnrData.travelerInfos.forEach((travelerInfo) => {
travelerInfo.tickets.forEach((ticket) => {
const flightCoupons = ticket.flightCoupons;
flightCoupons.forEach((flightDetails, index) => {
const legIdx = flightDetails.legIdx;
const flightIdx = flightDetails.flightIdx;
const flightObject = pnrData.legs?.at(legIdx)?.flights.at(flightIdx);

const airlineCode = flightObject?.marketing.airlineCode;
const longAirlineName = airlineInfo.find((info) => info.airlineCode === airlineCode)?.airlineName ?? airlineCode;

const company = {
shortName: airlineCode ?? '',
phone: '',
longName: longAirlineName ?? '',
};

const origin = flightObject?.origin;
const originAirport = airports.find((airport) => airport.airportCode === origin);
const start = {
date: flightObject?.departureDateTime?.iso8601 ?? '',
timezoneOffset: '',
shortName: origin,
longName: originAirport?.airportName ?? origin,
cityName: `${originAirport?.cityName}, ${originAirport?.stateCode}, ${originAirport?.countryName}`,
};

const dest = flightObject?.destination;
const destAirport = airports.find((airport) => airport.airportCode === dest);
const end = {
date: flightObject?.arrivalDateTime?.iso8601 ?? '',
timezoneOffset: '',
shortName: dest,
longName: destAirport?.airportName ?? dest,
cityName: `${destAirport?.cityName}, ${destAirport?.stateCode}, ${destAirport?.countryName}`,
};

const route = {
number: flightObject?.marketing.num ?? '',
airlineCode: `${flightObject?.marketing.airlineCode}${flightObject?.marketing.num}`,
class: flightObject?.cabin,
};

const confirmations = [
{
name: 'Confirmation Number',
value: flightObject?.vendorConfirmationNumber ?? '',
},
];
const traveler = findTravelerInfo(travelers, travelerInfo.userId.id);
const reservationObject: Reservation = {
company,
start,
end,
route,
legId: legIdx,
confirmations,
arrivalGate: flightObject?.arrivalGate,
seatNumber: getSeatByLegAndFlight(travelerInfo, legIdx, flightIdx),
type: CONST.RESERVATION_TYPE.FLIGHT,
duration: parseDurationToSeconds(flightObject?.duration.iso8601 ?? ''),
reservationID: pnr.pnrId,
travelerPersonalInfo: {
name: getTravelerName(traveler),
email: traveler?.email ?? '',
},
};
flightCoupons
.sort((a, b) => a.legIdx - b.legIdx)
.forEach((flightDetails, index) => {
const legIdx = flightDetails.legIdx;
const flightIdx = flightDetails.flightIdx;
const flightObject = pnrData.legs?.at(legIdx)?.flights.at(flightIdx);

const airlineCode = flightObject?.marketing.airlineCode;
const longAirlineName = airlineInfo.find((info) => info.airlineCode === airlineCode)?.airlineName ?? airlineCode;

const company = {
shortName: airlineCode ?? '',
phone: '',
longName: longAirlineName ?? '',
};

const origin = flightObject?.origin;
const originAirport = airports.find((airport) => airport.airportCode === origin);
const start = {
date: flightObject?.departureDateTime?.iso8601 ?? '',
timezoneOffset: '',
shortName: origin,
longName: originAirport?.airportName ?? origin,
cityName: `${originAirport?.cityName}, ${originAirport?.stateCode}, ${originAirport?.countryName}`,
};

const dest = flightObject?.destination;
const destAirport = airports.find((airport) => airport.airportCode === dest);
const end = {
date: flightObject?.arrivalDateTime?.iso8601 ?? '',
timezoneOffset: '',
shortName: dest,
longName: destAirport?.airportName ?? dest,
cityName: `${destAirport?.cityName}, ${destAirport?.stateCode}, ${destAirport?.countryName}`,
};

const route = {
number: flightObject?.marketing.num ?? '',
airlineCode: `${flightObject?.marketing.airlineCode}${flightObject?.marketing.num}`,
class: flightObject?.cabin,
};

const confirmations = [
{
name: 'Confirmation Number',
value: flightObject?.vendorConfirmationNumber ?? '',
},
];
const traveler = findTravelerInfo(travelers, travelerInfo.userId.id);
const reservationObject: Reservation = {
company,
start,
end,
route,
legId: legIdx,
confirmations,
arrivalGate: flightObject?.arrivalGate,
seatNumber: getSeatByLegAndFlight(travelerInfo, legIdx, flightIdx),
type: CONST.RESERVATION_TYPE.FLIGHT,
duration: parseDurationToSeconds(flightObject?.duration.iso8601 ?? ''),
reservationID: pnr.pnrId,
travelerPersonalInfo: {
name: getTravelerName(traveler),
email: traveler?.email ?? '',
},
};

reservationList.push({reservation: reservationObject, reservationIndex: index});
});
reservationList.push({reservation: reservationObject, reservationIndex: index});
});
});
});

Expand Down Expand Up @@ -512,5 +514,6 @@ export {
getReservationDetailsFromSequence,
formatAirportInfo,
getPNRReservationDataFromTripReport,
getAirReservations,
};
export type {ReservationData};
Loading
Loading