Skip to content

Show loading spinner instead of not-found page for draft transaction receipt preview#84291

Draft
MelvinBot wants to merge 2 commits intomainfrom
claude-fixOdometerNotHerePage
Draft

Show loading spinner instead of not-found page for draft transaction receipt preview#84291
MelvinBot wants to merge 2 commits intomainfrom
claude-fixOdometerNotHerePage

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

Explanation of Change

When uploading an odometer photo and navigating back to the receipt preview screen, Onyx.merge (used by setMoneyRequestOdometerImage) is async. While the merge is pending, useOnyx returns undefined for the transaction draft with fetchStatus = 'loading'. This causes shouldShowNotFoundPage to evaluate to true (since !undefined === true), displaying a "not here" page instead of the receipt.

This PR updates the isLoading calculation in TransactionReceiptModalContent to also check the useOnyx fetch status for the draft transaction. When the draft transaction is still loading (pending Onyx merge), the component now shows a loading spinner instead of the "not here" page.

Changes:

  • Capture the ResultMetadata from useOnyx for the transaction draft
  • Use the existing isLoadingOnyxValue utility (same pattern as withFullTransactionOrNotFound) to check if the draft is in a 'loading' state
  • Include the draft loading state in the isLoading prop so the UI shows a spinner during the Onyx merge window

Fixed Issues

$ #82661

Tests

  1. Create a new odometer expense (requires odometerExpenses beta flag)
  2. Open the expense and click on the Distance tab
  3. Click the image thumbnail to upload an odometer photo
  4. Upload a photo
  5. Verify a loading spinner appears briefly instead of a "not here" page
  6. Verify the receipt preview loads correctly after the spinner
  • Verify that no errors appear in the JS console

Offline tests

This fix addresses a race condition during an async Onyx merge. Offline behavior is unchanged — the loading spinner will display until the merge completes or the user navigates away.

QA Steps

  1. Enable the odometerExpenses beta flag
  2. Create a new distance expense and select the Odometer option
  3. Upload an odometer start or end photo
  4. Immediately after upload, verify the receipt preview screen shows a loading spinner (not a "not here" page)
  5. Verify the photo appears correctly once loading completes
  6. Click the thumbnail on the odometer screen to view the photo again
  7. Verify the full-screen preview shows the photo (not "not here")
  • 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

…rge for draft transactions

When uploading an odometer photo and navigating to the receipt preview,
Onyx.merge is async and useOnyx returns undefined while the merge is
pending, causing shouldShowNotFoundPage to evaluate to true. This change
checks the useOnyx fetch status for the transaction draft and shows a
loading spinner during the pending merge instead of the "not here" page.

Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team March 5, 2026 16:00
@MelvinBot
Copy link
Copy Markdown
Contributor Author

I created this PR from an upstream branch since I don't have push access to your fork.

To take ownership of this branch and be able to push updates, run:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-fixOdometerNotHerePage
git checkout -b claude-fixOdometerNotHerePage upstream/claude-fixOdometerNotHerePage
git push -u origin claude-fixOdometerNotHerePage

Then you can close this PR and open a new one from your fork.

Replace || with ?? for isLoadingInitialReportActions fallback
to satisfy @typescript-eslint/prefer-nullish-coalescing rule.

Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>
@MelvinBot
Copy link
Copy Markdown
Contributor Author

Fixed the failing Changed files ESLint check. The issue was on line 599 of TransactionReceiptModalContent.tsx — the || (logical or) operator needed to be ?? (nullish coalescing) to satisfy the @typescript-eslint/prefer-nullish-coalescing rule. This is a safer operator since reportMetadata?.isLoadingInitialReportActions is a boolean-ish value that could be false, but the nullish coalescing correctly handles only null/undefined cases.

@MelvinBot
Copy link
Copy Markdown
Contributor Author

The failing check (test job 8) is unrelated to this PR's changes.

Analysis: The failure is in tests/ui/SessionTest.tsx — two deep linking/session tests that timed out (120s limit) and cascaded. This PR only modifies src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx, which has no connection to deep linking or session management. The SessionTest.tsx tests render the full <App /> component, making them susceptible to timing-based flakiness in CI.

Evidence:

  • Files changed in PR: src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx
  • Failing test: tests/ui/SessionTest.tsx (deep linking tests)
  • No imports or code paths connect these files

Re-running the test job should resolve this. You can re-trigger it from the Actions tab.

@eVoloshchak
Copy link
Copy Markdown
Contributor

@MelvinBot, is this issue not reproducible anymore after #82305 has been merged?

@MelvinBot
Copy link
Copy Markdown
Contributor Author

The specific reproduction steps in issue #82661 (which involve opening an existing expense, clicking Distance, then clicking the image thumbnail) are indeed no longer reproducible after #82305 merged. That PR hides the image thumbnails entirely when isEditing = true (IOURequestStepDistanceOdometer.tsx:532 and :580), so the user can't tap them and navigate to TransactionReceiptModalContent.

However, the underlying race condition bug still exists and can be triggered through the create flow:

  1. Start creating a new odometer expense (thumbnails are visible when isEditing = false)
  2. Upload a photo → setMoneyRequestOdometerImage calls Onyx.merge (async)
  3. Tap the thumbnail before the merge completes → navigates to TransactionReceiptModalContent with action = 'create'
  4. isDraftTransaction = true, but transactionDraft is still undefined (Onyx merge pending)
  5. shouldShowNotFoundPage = !undefined = true → "not here" page flashes

So this PR's fix is still needed — it makes isLoading check isLoadingOnyxValue(transactionDraftResult) so a spinner shows instead of the "not here" page during the brief Onyx merge window. The same race condition also applies in the editing-confirmation flow where thumbnails remain visible.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants