Skip to content

Add null checks for rail PNR journey data to prevent crash#85143

Merged
rlinoz merged 3 commits intomainfrom
claude-fixRailPnrJourneyStatusCrash
Mar 13, 2026
Merged

Add null checks for rail PNR journey data to prevent crash#85143
rlinoz merged 3 commits intomainfrom
claude-fixRailPnrJourneyStatusCrash

Conversation

@MelvinBot
Copy link
Contributor

@MelvinBot MelvinBot commented Mar 12, 2026

Explanation of Change

The isPnrCancelled function in TripReservationUtils.ts crashes when a rail PNR has an undefined inwardJourney (e.g., one-way rail trips or corrupted/incomplete booking data). The code destructures outwardJourney and inwardJourney from data.railPnr and immediately accesses .journeyStatus without null checks, causing Cannot read property 'journeyStatus' of undefined.

This triggers the React error boundary, showing the "Uh-oh, something went wrong!" screen and making the app completely unusable for affected users. Production logs confirm this crash is blocking at least 2 users from accessing their accounts.

Changes:

  1. TripReservationUtils.ts: Added defensive null checks for both outwardJourney and inwardJourney in isPnrCancelled. Missing journeys are treated as cancelled (consistent with the existing logic where both must be active for the PNR to be considered non-cancelled).
  2. TripData.ts: Made inwardJourney optional in the RailPnr type since one-way rail trips don't have a return journey.
  3. TripReservationUtilsTest.ts: Added 2 unit tests covering the undefined inwardJourney scenario.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/609823

Tests

  1. Open the app with a user account that has rail travel reservations
  2. Verify the UpcomingTravelSection renders without crashing
  3. Verify that one-way rail trips (no inwardJourney) do not crash the app
  4. Verify that cancelled one-way rail trips are correctly filtered out
  5. Run npx jest tests/unit/TripReservationUtilsTest.ts and verify all tests pass, including the new tests for undefined inwardJourney
  • Verify that no errors appear in the JS console

Offline tests

N/A — This is a data-handling fix that does not change offline behavior.

QA Steps

  1. Sign in as a user who has upcoming rail travel reservations
  2. Verify the home page loads without the "Uh-oh, something went wrong!" error
  3. If possible, test with a user who has a one-way rail booking to confirm no crash occurs
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native

N/A — No UI changes, logic-only fix in utility function

Android: mWeb Chrome

N/A — No UI changes, logic-only fix in utility function

iOS: Native

N/A — No UI changes, logic-only fix in utility function

iOS: mWeb Safari

N/A — No UI changes, logic-only fix in utility function

MacOS: Chrome / Safari

N/A — No UI changes, logic-only fix in utility function

@MelvinBot @mountiny
Add null checks for rail PNR journey data in isPnrCancelled
4bece00 
The isPnrCancelled function crashes when a rail PNR has an undefined
inwardJourney (e.g., one-way rail trips or corrupted data), causing
"Cannot read property 'journeyStatus' of undefined" which triggers
the error boundary "Uh-oh, something went wrong!" screen.

This adds defensive null-checking for both outwardJourney and
inwardJourney, treating missing journeys as cancelled. Also makes
inwardJourney optional in the RailPnr type since one-way trips
don't have a return journey.

Co-authored-by: Vit Horacek <mountiny@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team March 12, 2026 21:19
@mountiny mountiny marked this pull request as ready for review March 12, 2026 21:23
@mountiny mountiny requested a review from a team as a code owner March 12, 2026 21:23
@melvin-bot melvin-bot bot requested a review from jjcoffee March 12, 2026 21:23
@melvin-bot
Copy link

melvin-bot bot commented Mar 12, 2026

@jjcoffee 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]

@melvin-bot melvin-bot bot requested review from trjExpensify and removed request for a team March 12, 2026 21:23
@github-actions
Copy link
Contributor

github-actions bot commented Mar 12, 2026

🚧 @mountiny has triggered a test Expensify/App build. You can view the workflow run here.

@codecov
Copy link

codecov bot commented Mar 12, 2026 •
edited by github-actions bot
Loading

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/libs/TripReservationUtils.ts 80.53% <100.00%> (+0.17%) ⬆️
... and 9 files with indirect coverage changes

@mountiny
Copy link
Contributor

mountiny commented Mar 12, 2026

@MelvinBot can you fix the typecheck and the eslint?

@MelvinBot @mountiny
Fix: resolve typecheck error for optional inwardJourney spread in tests
4f38b11 
Extract railPnrData.inwardJourney via asDefined() so spreading it into
test objects produces required (not optional) property types, matching
the RailPnr journey type signature.

Co-authored-by: Vit Horacek <mountiny@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team as a code owner March 12, 2026 21:30
@melvin-bot melvin-bot bot requested a review from situchan March 12, 2026 21:30
@MelvinBot
Copy link
Contributor Author

MelvinBot commented Mar 12, 2026

Fixed the failing typecheck: The inwardJourney property was made optional in the RailPnr type, so spreading railPnrData.inwardJourney in tests produced optional property types that didn't match the required type signature. Extracted it via asDefined() (like the other PNR data helpers) so the spread produces the correct required types.

@melvin-bot melvin-bot bot removed the request for review from a team March 12, 2026 21:30
@melvin-bot
Copy link

melvin-bot bot commented Mar 12, 2026

@situchan 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]

@situchan
Copy link
Contributor

situchan commented Mar 12, 2026

Does this require C+ review?

@mountiny
Copy link
Contributor

mountiny commented Mar 12, 2026

I dont think it does

@mountiny
Copy link
Contributor

mountiny commented Mar 12, 2026

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
  • 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 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
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@MelvinBot
Copy link
Contributor Author

MelvinBot commented Mar 12, 2026

The typecheck is already fixed — the latest TypeScript Checks run completed successfully after the previous fix commit.

The full ESLint check failure is unrelated to this PR. The error is:

src/libs/ReportUtils.ts:1216:5 — 'allReportsViolations' is assigned a value but never used (@typescript-eslint/no-unused-vars)

This is a pre-existing issue on main — the variable is declared and assigned inside an Onyx.connect callback but never read anywhere in the codebase. The Changed files ESLint check (which only lints files changed by this PR) passed successfully, confirming this PR's code has no ESLint issues.

@mountiny
Copy link
Contributor

mountiny commented Mar 12, 2026

I will test it with the account that faced the issue

@github-actions

This comment has been minimized.

Sign in to view
@MelvinBot
Copy link
Contributor Author

MelvinBot commented Mar 12, 2026

The TypeScript check failure was already fixed in commit 4f38b11 and is now passing.

The remaining failing check is the full ESLint check, which is unrelated to this PR.

Analysis: The ESLint error is 'allReportsViolations' is assigned a value but never used at src/libs/ReportUtils.ts:1216. This variable is declared and populated via Onyx.connect() but never referenced elsewhere in the file. This is a pre-existing issue on main — the same error exists on the main branch.

Evidence: This PR only modifies src/libs/TripReservationUtils.ts, src/types/onyx/TripData.ts, and tests/unit/TripReservationUtilsTest.ts. The file src/libs/ReportUtils.ts is not touched by this PR. The "Changed files ESLint check" (which only lints files in the diff) passes successfully.

@MelvinBot
Copy link
Contributor Author

MelvinBot commented Mar 12, 2026

The failing ESLint check is unrelated to this PR.

Analysis: The full ESLint check fails due to 1 error: 'allReportsViolations' is assigned a value but never used in src/libs/ReportUtils.ts:1216. This variable is declared and assigned via Onyx.connect but never referenced anywhere in the file. The same code exists identically on main — this is a pre-existing issue.

Evidence: This PR only modifies src/libs/TripReservationUtils.ts, src/types/onyx/TripData.ts, and tests/unit/TripReservationUtilsTest.ts. The "Changed files ESLint check" (which lints only the PR diff) passed. The failure is in ReportUtils.ts, which is not touched by this PR.

@mountiny
Copy link
Contributor

mountiny commented Mar 12, 2026

Can you sync with main? the Eslint is fixed there @MelvinBot

@MelvinBot @mountiny
Merge remote-tracking branch 'origin/main' into claude-fixRailPnrJour…
b252fcf 
…neyStatusCrash

Co-authored-by: Vit Horacek <mountiny@users.noreply.github.com>
@MelvinBot
Copy link
Contributor Author

MelvinBot commented Mar 12, 2026

Synced with main — the ESLint fix for the unused allReportsViolations variable is now included in this branch.

@mountiny
Copy link
Contributor

mountiny commented Mar 13, 2026

I confirmed on the Adhoc that I can load the report and operate fine

@mountiny mountiny requested review from rlinoz and removed request for jjcoffee and situchan March 13, 2026 09:49
rlinoz
rlinoz approved these changes Mar 13, 2026
View reviewed changes
Copy link
Contributor

@rlinoz rlinoz left a comment

Choose a reason for hiding this comment

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

Thanks for fixing it!

@rlinoz rlinoz merged commit 5b66827 into main Mar 13, 2026
35 checks passed
@rlinoz rlinoz deleted the claude-fixRailPnrJourneyStatusCrash branch March 13, 2026 11:16
@github-actions
Copy link
Contributor

github-actions bot commented Mar 13, 2026

🚧 @rlinoz has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify
Copy link
Contributor

OSBotify commented Mar 13, 2026

✋ 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
Copy link
Contributor

github-actions bot commented Mar 13, 2026

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #85143.

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-5b66827-59ef620-3cc896fc4855ef5ba40036734a4bc5345cddb27f/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-5b66827-59ef620-fc9867cb543d5054331d0806038591fe7b07c26c/index.html
Android iOS
Web 🕸️
https://85143.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@OSBotify OSBotify mentioned this pull request Mar 16, 2026
Closed
74 tasks
@OSBotify
Copy link
Contributor

OSBotify commented Mar 16, 2026

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

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

@lanitochka17 lanitochka17 mentioned this pull request Mar 16, 2026
Open
7 tasks
@jponikarchuk jponikarchuk mentioned this pull request Mar 17, 2026
Open
7 tasks
@OSBotify
Copy link
Contributor

OSBotify commented Mar 17, 2026

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.38-4 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rlinoz rlinoz rlinoz approved these changes

@trjExpensify trjExpensify Awaiting requested review from trjExpensify

Assignees

@mountiny mountiny

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@MelvinBot @mountiny @situchan @OSBotify @rlinoz