Enable Go Back button on FullscreenLoadingIndicator in withReportOrNotFound by MelvinBot · Pull Request #88745 · Expensify/App

MelvinBot · 2026-04-24T18:06:11Z

Explanation of Change

Enable shouldUseGoBackButton on the existing FullscreenLoadingIndicator in withReportOrNotFound.tsx.

Previously the loading state used FullscreenLoadingIndicator without the "Go Back" button. This change enables shouldUseGoBackButton so that after a timeout, users see a "Go Back" button if the report takes too long to load — providing a way to navigate away from a stuck loading state.

Fixed Issues

$ #85390

Tests

Verify that no errors appear in the JS console
Navigate to a report that triggers the loading state in withReportOrNotFound (e.g. open a deep link to a report that needs to be fetched)
Verify that a loading spinner is displayed while the report loads
Verify that after a timeout, a "Go Back" button appears below the spinner
Tap the "Go Back" button and verify it navigates back
Verify that once the report finishes loading, the report page renders correctly

Offline tests

Turn off the network, then navigate to a report via deep link
Verify the loading spinner displays and after a timeout the "Go Back" button appears
Turn the network back on and verify the report loads correctly

QA Steps

Verify that no errors appear in the JS console
Navigate to a report that triggers the loading state in withReportOrNotFound (e.g. open a deep link to a report)
Verify that a loading spinner is displayed while the report loads
Verify that after a timeout, a "Go Back" button appears below the spinner
Tap the "Go Back" button and verify it navigates back
Verify that once the report finishes loading, the report page renders correctly

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

…rtOrNotFound FullscreenLoadingIndicator includes a Go Back button that would be redundant alongside the existing navigation controls (LHN, RHP, stack navigator) visible during the loading state. Replace it with an ActivityIndicator wrapped in a View that reproduces the same layout and background styling (absoluteFillObject, fullScreenLoading, w100). Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

….absoluteFill Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

MelvinBot · 2026-04-24T18:11:22Z

Fixed the failing ESLint check: replaced deprecated StyleSheet.absoluteFillObject with StyleSheet.absoluteFill in withReportOrNotFound.tsx:119.

situchan · 2026-05-14T14:02:30Z

@MelvinBot add Tests/QA Steps and check off all items in author checklist as verified by me. And pull main

MelvinBot · 2026-05-14T14:05:00Z

Updated the PR description:

Added Tests, Offline tests, and QA Steps covering the loading spinner behavior and absence of the "Go Back" button
Checked off all items in the PR Author Checklist as verified by situchan

situchan · 2026-05-14T14:47:36Z

@MelvinBot pull main

…icatorInWithReportOrNotFound Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

MelvinBot · 2026-05-14T14:57:28Z

Merged main into this branch. No conflicts.

situchan · 2026-05-14T15:09:48Z

+                    return (
+                        <View style={[StyleSheet.absoluteFill, styles.fullScreenLoading, styles.w100]}>
+                            <ActivityIndicator
+                                size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                                reasonAttributes={reasonAttributes}
+                            />
+                        </View>
+                    );


@MelvinBot which pattern should we follow based on https://github.com/Expensify/App/blob/main/.claude/skills/coding-standards/rules/ui-1-correct-loading-indicator.md?

MelvinBot · 2026-05-14T15:11:20Z

Per UI-1, ActivityIndicator is the correct pattern here. The rule states: when navigation (back button, LHN, stack navigator) is visible alongside the loader, use ActivityIndicator. When no navigation is visible, use FullscreenLoadingIndicator with shouldUseGoBackButton={true}.

withReportOrNotFound wraps report pages that render inside a navigation stack — the LHN and stack navigator controls remain visible while the loading indicator is shown. That means the user already has an escape route, so the "Go Back" button from FullscreenLoadingIndicator would be redundant. The current PR approach is correct.

situchan · 2026-05-14T15:14:33Z

Per UI-1, ActivityIndicator is the correct pattern here. The rule states: when navigation (back button, LHN, stack navigator) is visible alongside the loader, use ActivityIndicator. When no navigation is visible, use FullscreenLoadingIndicator with shouldUseGoBackButton={true}.

withReportOrNotFound wraps report pages that render inside a navigation stack — the LHN and stack navigator controls remain visible while the loading indicator is shown. That means the user already has an escape route, so the "Go Back" button from FullscreenLoadingIndicator would be redundant. The current PR approach is correct.

@MelvinBot but I don't see back navigation because of early return - never reaches wrapped component render

App/src/pages/inbox/report/withReportOrNotFound.tsx

Lines 117 to 130 in da0f92e

    
                   return <FullscreenLoadingIndicator reasonAttributes={reasonAttributes} />; 
        
               } 
        
               if (shouldShowNotFoundPage) { 
        
                   return <NotFoundPage isReportRelatedPage />; 
        
               } 
        
           } 
        
           if (!contentShown.current) { 
        
               contentShown.current = true; 
        
           } 
        
           return ( 
        
               <WrappedComponent

MelvinBot · 2026-05-14T15:19:31Z

You're right — I was wrong in my previous comment. On narrow/mobile screens, there is no visible navigation during the loading state:

Both the outer RHP navigator and inner modal stack navigator have headerShown: false, so there's no navigator-level back button.
The RHP takes 100% width on narrow screens, hiding the LHN completely.
The early return bypasses the wrapped component, so its HeaderWithBackButton never mounts.

The user sees only a bare spinner with no way to navigate back (except iOS swipe gesture or Android hardware back — but nothing on mobile web).

FullscreenLoadingIndicator with its "Go Back" button was actually serving a purpose here. The PR should either keep FullscreenLoadingIndicator or add an explicit back button to the loading state.

situchan · 2026-05-14T15:21:37Z

The PR should either keep FullscreenLoadingIndicator or add an explicit back button to the loading state.

@MelvinBot lets do former approach with shouldUseGoBackButton set.

Keep FullscreenLoadingIndicator instead of raw ActivityIndicator, and enable shouldUseGoBackButton so users get a "Go Back" option after a timeout. Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

situchan · 2026-05-14T15:25:17Z

@MelvinBot update Explanation of Change, Tests / Offline / QA Steps based on latest update

MelvinBot · 2026-05-14T15:25:29Z

Reverted to FullscreenLoadingIndicator with shouldUseGoBackButton enabled. The change now simply passes shouldUseGoBackButton to the existing component instead of replacing it with a raw ActivityIndicator. Updated the PR description and test steps accordingly.

MelvinBot · 2026-05-14T15:28:31Z

Updated the PR title to match the current implementation. The Explanation of Change, Tests, Offline tests, and QA Steps in the body already accurately reflect the latest change (enabling shouldUseGoBackButton on FullscreenLoadingIndicator).

situchan · 2026-05-14T15:29:47Z

@MelvinBot mark as ready for review

MelvinBot · 2026-05-14T15:31:32Z

I wasn't able to mark this PR as ready for review due to a permissions limitation. situchan, please manually mark it as ready by clicking Ready for review on the PR page.

situchan · 2026-05-14T15:34:00Z

@MelvinBot mark as ready for review

MelvinBot · 2026-05-14T15:35:28Z

Marked this PR as ready for review per situchan's request.

melvin-bot · 2026-05-14T15:35:30Z

@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 · 2026-05-14T15:58:29Z

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

Android: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

situchan

This PR is adding shouldUseGoBackButton to the existing FullscreenLoadingIndicator as no back button exists.

All other PRs in this batch are replacing FullscreenLoadingIndicator with ActivityIndicator as per UI-1 rule.

cc: @Julesssss

joekaufmanexpensify · 2026-05-14T21:14:46Z

No product review needed

Julesssss

Agree with your point.

Julesssss · 2026-05-15T17:02:41Z

This PR is adding shouldUseGoBackButton to the existing FullscreenLoadingIndicator as no back button exists.
All other PRs in this batch are replacing FullscreenLoadingIndicator with ActivityIndicator as per UI-1 rule.

Thanks @ShridharGoel, could you please just update the linked issue description to avoid confusion.

situchan · 2026-05-15T17:03:52Z

This PR is adding shouldUseGoBackButton to the existing FullscreenLoadingIndicator as no back button exists.
All other PRs in this batch are replacing FullscreenLoadingIndicator with ActivityIndicator as per UI-1 rule.

could you please just update the linked issue description to avoid confusion.

@MelvinBot do this please

MelvinBot · 2026-05-15T17:05:17Z

Updated the issue description to clarify that this PR enables shouldUseGoBackButton on the existing FullscreenLoadingIndicator (since no back button exists in this loading state), rather than replacing it with ActivityIndicator.

OSBotify · 2026-05-15T17:12:45Z

✋ 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 · 2026-05-15T17:25:08Z

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

github-actions · 2026-05-15T17:31:15Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-abd3fa1-a4d1061-93e49e983427b4e5e2f8daaa37d5f12a09bc3440/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-abd3fa1-a4d1061-c3f0840f8a39b63a0b2eb57aecea75e297a4d4e9/index.html

Web 🕸️
https://88745.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-15T18:27:12Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.3.75-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-15T18:28:41Z

No help site changes are required for this PR.

This PR adds shouldUseGoBackButton to a loading spinner in an internal HOC (withReportOrNotFound). It's a UX improvement to the loading state — not a user-facing feature, workflow, or setting that would be documented in help articles.

OSBotify · 2026-05-19T08:02:51Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.75-14 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot assigned situchan Apr 24, 2026

MelvinBot requested a review from a team April 24, 2026 18:06

MelvinBot mentioned this pull request Apr 24, 2026

[Due for payment 2026-05-26] [$125] Use valid loading indicator in withReportOrNotFound.tsx #85390

Closed

Fix: Replace deprecated StyleSheet.absoluteFillObject with StyleSheet…

f536ef0

….absoluteFill Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

Merge remote-tracking branch 'origin/main' into claude-useActivityInd…

7ae4228

…icatorInWithReportOrNotFound Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

situchan reviewed May 14, 2026

View reviewed changes

MelvinBot changed the title ~~Use ActivityIndicator instead of FullscreenLoadingIndicator in withReportOrNotFound~~ Enable Go Back button on FullscreenLoadingIndicator in withReportOrNotFound May 14, 2026

MelvinBot marked this pull request as ready for review May 14, 2026 15:35

MelvinBot requested a review from a team as a code owner May 14, 2026 15:35

melvin-bot Bot requested review from joekaufmanexpensify and situchan and removed request for a team May 14, 2026 15:35

melvin-bot Bot removed the request for review from a team May 14, 2026 15:35

situchan approved these changes May 14, 2026

View reviewed changes

melvin-bot Bot requested a review from Julesssss May 14, 2026 16:01

joekaufmanexpensify removed their request for review May 14, 2026 21:14

Julesssss approved these changes May 15, 2026

View reviewed changes

Julesssss merged commit abd3fa1 into main May 15, 2026
52 checks passed

Julesssss deleted the claude-useActivityIndicatorInWithReportOrNotFound branch May 15, 2026 17:02

OSBotify mentioned this pull request May 15, 2026

Deploy Checklist: New Expensify 2026-05-15 #90795

Closed

Uh oh!

Conversation

MelvinBot commented Apr 24, 2026 • 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!

MelvinBot commented Apr 24, 2026

Uh oh!

situchan commented May 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MelvinBot commented May 14, 2026

Uh oh!

situchan commented May 14, 2026

Uh oh!

MelvinBot commented May 14, 2026

Uh oh!

situchan May 14, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented May 14, 2026

Uh oh!

situchan commented May 14, 2026

Uh oh!

MelvinBot commented May 14, 2026

Uh oh!

situchan commented May 14, 2026

Uh oh!

situchan commented May 14, 2026

Uh oh!

MelvinBot commented May 14, 2026

Uh oh!

MelvinBot commented May 14, 2026

Uh oh!

situchan commented May 14, 2026

Uh oh!

MelvinBot commented May 14, 2026

Uh oh!

situchan commented May 14, 2026

Uh oh!

MelvinBot commented May 14, 2026

Uh oh!

melvin-bot Bot commented May 14, 2026

Uh oh!

situchan commented May 14, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

situchan left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify commented May 14, 2026

Uh oh!

Julesssss left a comment

Choose a reason for hiding this comment

Uh oh!

Julesssss commented May 15, 2026

Uh oh!

Uh oh!

situchan commented May 15, 2026

Uh oh!

MelvinBot commented May 15, 2026

Uh oh!

OSBotify commented May 15, 2026

Uh oh!

github-actions Bot commented May 15, 2026

Uh oh!

github-actions Bot commented May 15, 2026

Uh oh!

OSBotify commented May 15, 2026

Uh oh!

MelvinBot commented May 15, 2026

Uh oh!

MelvinBot commented Apr 24, 2026 •

edited

Loading

situchan commented May 14, 2026 •

edited

Loading

situchan left a comment •

edited

Loading