Use tripdata payload to get reservations setup by parasharrajat · Pull Request #63853 · Expensify/App

parasharrajat · 2025-06-10T14:10:16Z

Explanation of Change

Fixed Issues

$ #63256
PROPOSAL:

Tests

Book various types of travel on Expensify Travel for trains, flights, car, hotel.
Go back to app.
Verify that summaries of all these bookings are visible normally.
And clicking them you are taken to view the details.

Verify that no errors appear in the JS console

Offline tests

You can't book travel offline.

QA Steps

Click FAB button. Click Book Travel button.
Book Car, flight, hotel, Rail booking in a trip.
Go back to app.
Find the report linked to that trip in the travel workspace.
Verify that all bookings summary is visible as usual.
Click them one by one and verify that you can see the details of each.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

18.06.2025_02.24.35_REC.mp4

Android: mWeb Chrome

18.06.2025_02.18.31_REC.mp4

iOS: Native

18.06.2025_02.19.37_REC.mp4

iOS: mWeb Safari

18.06.2025_02.16.24_REC.mp4

MacOS: Chrome / Safari

18.06.2025_02.06.57_REC.mp4

MacOS: Desktop

18.06.2025_02.23.57_REC.mp4

melvin-bot · 2025-06-12T00:24:53Z

@hoangzinh Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

parasharrajat · 2025-06-12T00:28:08Z

@hoangzinh Ready for initial testing and Q&A. I will add tests and checklist tomorrow.

hoangzinh · 2025-06-12T22:26:55Z

Thank you @parasharrajat. I will try to review the PR soon

hoangzinh · 2025-06-13T10:00:38Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Screen.Recording.2025-06-18.at.23.32.05.android.mov

Android: mWeb Chrome

Screen.Recording.2025-06-18.at.23.34.15.android.chrome.mov

iOS: HybridApp

Screen.Recording.2025-06-18.at.23.37.20.mov

iOS: mWeb Safari

Screen.Recording.2025-06-18.at.23.19.32.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2025-06-18.at.23.12.13.web.mov

MacOS: Desktop

Screen.Recording.2025-06-18.at.23.15.29.desktop.mov

src/ROUTES.ts

src/libs/TripReservationUtils.ts

src/pages/Travel/TripDetailsPage.tsx

hoangzinh · 2025-06-13T10:27:45Z

src/pages/Travel/TripDetailsPage.tsx

+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID ?? route.params.reportID}`, {canBeMissing: true});
+    console.debug('[TripDetailsPage] Rendering', parentReport?.tripData);


Will we revert those change? If parentReport doesn't exist, we already have fallback in getReservationsFromTripReport

I reverted the comment. What else are you suggesting to revert?

hoangzinh · 2025-06-13T10:35:47Z

src/components/ReportActionItem/TripDetailsView.tsx

+    if (!tripRoomReport) {
+        return null;
+    }


It makes sense for me to return null here. But I prefer we should revert it to avoid hidden logic that we haven't been aware of

But the next logic with throw an error as it requires the tripRoomReport data. Also, if data is not present, there will be no data for reservationsData; thus, reservationsData for loop will not render anything. There will be an empty header called tripSummary. So I don't think there is any hidden logic here. When data is available, the tripsummary header and data is shown as once instead of first showing empty trip summary header.

src/libs/TripReservationUtils.ts

hoangzinh · 2025-06-13T10:55:20Z

@parasharrajat can you add unit tests for this new func?

parasharrajat · 2025-06-15T18:43:55Z

@hoangzinh Let's start testing. I will add unit tests along the way when we are finalized on payload.

rlinoz

It looks really good and tests are going well!

src/pages/home/report/TripSummary.tsx

src/components/ReportActionItem/TripRoomPreview.tsx

hoangzinh · 2025-06-16T16:03:38Z

Bug 1: All system messages are not displayed on trip detail page

hoangzinh · 2025-06-16T16:08:44Z

Bug 2: In the flight details page, it displays a different header with staging

hoangzinh · 2025-06-16T16:11:56Z

Bug 3: It doesn't display layover info in Flight details page if you have be layover

hoangzinh · 2025-06-16T16:15:48Z

Bug 4: Confirmation number + address are different with staging in Car details page. It also doesn't have "Cancellation policy"

hoangzinh · 2025-06-16T16:20:39Z

@rlinoz I'm unable to book a train in Spotnana staging. If you can, can you help test train if it still displays the same as staging? Thank you.

rlinoz · 2025-06-16T17:37:22Z

Bug1: I think we are missing a merge with main, the messages are recently merged.

Great catches btw.

I will check about the train.

rlinoz · 2025-06-16T17:42:36Z

This one just worked for me in case you want to try to repro:

parasharrajat · 2025-06-16T18:39:41Z

@rlinoz

#63853 (comment)

This is where I think my parsing is correct, then what we have currently on staging. We are showing post code and countries, etc., in other bookings, but not for the car on staging. Is there any special reason for it?

Or if you want me to follow the same mapping as staging, I can update that.

parasharrajat · 2025-06-17T16:48:10Z

I had to use another key called sequenceIndex to refer to the correct booking in all the reservations. It is just incremental via and remains unique across all reservations. The Reservation Index in `transaction.receipt.reservationList was referring to the reservations in a single transaction/booking.

Normally, we can have multiple bookings under the same PNR, and a single booking can be multiple reservations, for example, connecting flights. The reservation index refers to the reservation in a booking. Thus, they can be the same under a single PNR. This makes it bad to use them to refer to a particular reservation when we are parsing all PNRs together from the payload into a list of reservations.

Example 
1. PNR 1 => Flight A
2. PNR 1 => [Flight B, Flight C] 

Parsed reservation list 
[ (PNR1, Flight A, index 0), (PNR1, Flight B, index 0), (PNR1, Flight C, index 1)]

We still need this reservationsIndex when we need to calculate the layover time, as we need to know the previous connecting flight.

cc: @hoangzinh @rlinoz

parasharrajat · 2025-06-17T16:59:47Z

Ready for review.

…avel-update

rlinoz · 2025-06-17T21:51:43Z

For rails the coach number and seats are wrong

reservationObject["seatNumber"] = legDetails["allocatedSpaces"][0]["seatNumber"].getString();
reservationObject["coachNumber"] = legDetails["allocatedSpaces"][0]["coachNumber"].getString();

Other than that rails seems correct!

src/components/ReportActionItem/TripRoomPreview.tsx

src/pages/Travel/TripDetailsPage.tsx

parasharrajat · 2025-06-18T07:08:44Z

Done.

rlinoz · 2025-06-18T12:31:00Z

Nice, let's get this done!

Rails is working correctly, going over the PR now.

@hoangzinh are you able to finish the review today?

hoangzinh · 2025-06-18T14:17:06Z

Yes, I can

hoangzinh

LGTM

rlinoz

Just one very minor nitpick, then we can merge

src/libs/TripReservationUtils.ts

rlinoz · 2025-06-19T16:26:04Z

Thanks!

OSBotify · 2025-06-19T16:34:18Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-06-20T13:15:45Z

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.1.70-0 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

github-actions · 2025-06-24T18:49:51Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.1.70-7 🚀

platform	result
🖥 desktop 🖥	failure ❌
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	failure ❌

github-actions · 2025-06-24T19:01:32Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.1.70-7 🚀

platform	result
🖥 desktop 🖥	failure ❌
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	failure ❌

github-actions · 2025-06-24T19:22:33Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.1.70-7 🚀

platform	result
🖥 desktop 🖥	failure ❌
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	failure ❌

github-actions · 2025-06-24T20:37:54Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.1.70-7 🚀

platform	result
🖥 desktop 🖥	failure ❌
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	failure ❌

github-actions · 2025-06-24T21:18:09Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.1.70-7 🚀

platform	result
🖥 desktop 🖥	failure ❌
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	success ✅

parasharrajat added 5 commits June 10, 2025 19:39

Use tripdata payload to get reserverations setup

eb346ba

Add Reserversations for Air, Car, Hotel

118b746

UI adjustments

28d193b

Type fixes

0aadb6f

cleanup

8e78526

parasharrajat mentioned this pull request Jun 11, 2025

[hold for payment 2025-07-09] [$500] Point NewDot itinerary generation to the rNVP instead of expenses #63256

Closed

parasharrajat added 2 commits June 12, 2025 04:26

Add rail pnr info

03e609d

More updates

67e2bbe

parasharrajat marked this pull request as ready for review June 12, 2025 00:24

parasharrajat requested a review from a team as a code owner June 12, 2025 00:24

melvin-bot bot requested review from hoangzinh and removed request for a team June 12, 2025 00:24

hoangzinh reviewed Jun 13, 2025

View reviewed changes

Refactors

13c9392

fix tests

a980c6c

rlinoz requested changes Jun 16, 2025

View reviewed changes

src/pages/home/report/TripSummary.tsx Show resolved Hide resolved

src/components/ReportActionItem/TripRoomPreview.tsx Show resolved Hide resolved

Fixes

9b59756

parasharrajat added 2 commits June 17, 2025 22:24

Fix lint warnings

22c938c

Remove trip transactions dependency

20a16ee

parasharrajat added 2 commits June 18, 2025 01:37

Merge branch 'main' of github.com:Expensify/App into parasharrajat/tr…

b44a57e

…avel-update

Use fare from tripdata payload

479aa6f

parasharrajat requested review from hoangzinh and rlinoz June 17, 2025 20:36

hoangzinh reviewed Jun 18, 2025

View reviewed changes

src/components/ReportActionItem/TripRoomPreview.tsx Outdated Show resolved Hide resolved

src/pages/Travel/TripDetailsPage.tsx Outdated Show resolved Hide resolved

Fixes and cleanup

c87c0a2

hoangzinh approved these changes Jun 18, 2025

View reviewed changes

rlinoz requested changes Jun 18, 2025

View reviewed changes

src/libs/TripReservationUtils.ts Outdated Show resolved Hide resolved

Make totalFare optional

79952c6

rlinoz approved these changes Jun 19, 2025

View reviewed changes

rlinoz merged commit 9838da2 into Expensify:main Jun 19, 2025
18 checks passed

github-actions bot mentioned this pull request Jun 20, 2025

Deploy Checklist: New Expensify 2025-06-20 #64643

Closed

53 tasks

rlinoz mentioned this pull request Jun 23, 2025

[CP Staging] Revert "Use tripdata payload to get reservations setup" #64769

Merged

		const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID ?? route.params.reportID}`, {canBeMissing: true});
		console.debug('[TripDetailsPage] Rendering', parentReport?.tripData);

Conversation

parasharrajat commented Jun 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jun 12, 2025

Uh oh!

parasharrajat commented Jun 12, 2025

Uh oh!

hoangzinh commented Jun 12, 2025

Uh oh!

hoangzinh commented Jun 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hoangzinh Jun 13, 2025

Choose a reason for hiding this comment

Uh oh!

parasharrajat Jun 16, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh Jun 13, 2025

Choose a reason for hiding this comment

Uh oh!

parasharrajat Jun 15, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hoangzinh commented Jun 13, 2025

Uh oh!

parasharrajat commented Jun 15, 2025

Uh oh!

rlinoz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

hoangzinh commented Jun 16, 2025

Uh oh!

hoangzinh commented Jun 16, 2025

Uh oh!

hoangzinh commented Jun 16, 2025

Uh oh!

hoangzinh commented Jun 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hoangzinh commented Jun 16, 2025

Uh oh!

rlinoz commented Jun 16, 2025

Uh oh!

rlinoz commented Jun 16, 2025

Uh oh!

parasharrajat commented Jun 16, 2025

Uh oh!

parasharrajat commented Jun 17, 2025

Uh oh!

parasharrajat commented Jun 17, 2025

Uh oh!

rlinoz commented Jun 17, 2025

Uh oh!

Uh oh!

Uh oh!

parasharrajat commented Jun 18, 2025

Uh oh!

rlinoz commented Jun 18, 2025

Uh oh!

parasharrajat commented Jun 10, 2025 •

edited

Loading

hoangzinh commented Jun 13, 2025 •

edited

Loading

hoangzinh commented Jun 16, 2025 •

edited

Loading