Merge pull request Expensify#73244 from twilight2294/patch-47

Author: blimpich

src/libs/TripReservationUtils.ts

@@ -103,7 +103,7 @@ function getTravelerName(traveler: ArrayValues<PnrData['pnrTravelers']>['persona
         name += ` ${traveler.name.given}`;
     }
 
-    return name.trim();
+    return name?.trim();
 }
 
 function getAddressFromLocation(
@@ -153,73 +153,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});
+                });
         });
     });
 
@@ -513,5 +515,6 @@ export {
     getReservationDetailsFromSequence,
     formatAirportInfo,
     getPNRReservationDataFromTripReport,
+    getAirReservations,
 };
 export type {ReservationData};