Replace FullScreenLoadingIndicator with ActivityIndicator in NewReportWorkspaceSelectionPage by MelvinBot · Pull Request #85519 · Expensify/App

MelvinBot · 2026-03-17T09:12:40Z

Explanation of Change

As part of the loading indicator standardization (#69850), FullScreenLoadingIndicator will soon enable shouldUseGoBackButton by default. In NewReportWorkspaceSelectionPage, HeaderWithBackButton is always visible alongside the loading indicator, so users already have a way to navigate back. Using FullScreenLoadingIndicator here would result in duplicate back controls.

This PR replaces FullScreenLoadingIndicator with a View-wrapped ActivityIndicator that reproduces the exact same visual output:

styles.flex1 fills remaining space below the header (same as before)
styles.fullScreenLoading provides the same background color (theme.componentBG), opacity (0.8), and centered layout
The custom ActivityIndicator from @components/ActivityIndicator auto-applies theme.spinner color and preserves telemetry via reasonAttributes

Fixed Issues

$ #84991
PROPOSAL: #84991 (comment)

Tests

Prerequisites: Log in with an account where user's billable actions are restricted in default policy and has 2 or more paid workspaces.

Log in to the app
Navigate to create a new report (click the FAB/+ button, then "Create report")
Verify the workspace selection page loads correctly with the "Create report" header and "Choose a workspace for this report" text
Verify no errors appear in the JS console related to NewReportWorkspaceSelectionPage or ActivityIndicator

Verify that no errors appear in the JS console

Offline tests

Prerequisites: Log in with an account where user's billable actions are restricted in default policy and has 2 or more paid workspaces.

Turn off network connection
Navigate to the workspace selection page
Verify the page renders correctly (the loading indicator should not appear since shouldShowLoadingIndicator is only true when isLoadingApp && !isOffline)

QA Steps

Prerequisites: Log in with an account where user's billable actions are restricted in default policy and has 2 or more paid workspaces.

Log in to the app
Navigate to create a new report (click the FAB/+ button, then "Create report")
Verify the workspace selection page loads correctly
Verify the loading spinner (if briefly visible during initial app load) appears centered with the correct background styling
Verify no errors appear in the JS console

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

…tWorkspaceSelectionPage Use a View-wrapped ActivityIndicator instead of FullScreenLoadingIndicator to avoid a duplicate back control when shouldUseGoBackButton becomes the default. Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

situchan · 2026-03-17T12:30:37Z

@MelvinBot mark as ready for review

MelvinBot · 2026-03-17T12:32:08Z

This PR has been marked as ready for review as requested by situchan.

melvin-bot · 2026-03-17T12:32:10Z

@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-03-17T12:52:37Z

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.mov

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

situchan · 2026-03-17T12:54:08Z

@MelvinBot do you have better Tests step?

App/src/pages/inbox/sidebar/FloatingActionButtonAndPopover.tsx

Lines 624 to 632 in 74dab13

    
           if ( 
        
               !workspaceIDForReportCreation || 
        
               (shouldRestrictUserBillableActions(workspaceIDForReportCreation, undefined, undefined, ownerBillingGraceEndPeriod) && 
        
                   groupPoliciesWithChatEnabled.length > 1) 
        
           ) { 
        
               // If we couldn't guess the workspace to create the report, or a guessed workspace is past it's grace period and we have other workspaces to choose from 
        
               Navigation.navigate(ROUTES.NEW_REPORT_WORKSPACE_SELECTION.getRoute()); 
        
               return; 
        
           }

Because of this condition, report is created directly inside default workspace, not allowing me to select workspace

MelvinBot · 2026-03-17T12:57:45Z

Good catch — the current test steps won't reach NewReportWorkspaceSelectionPage if your account has exactly one eligible workspace (or an active policy that auto-selects one), because getDefaultChatEnabledPolicy() in PolicyUtils.ts will pick it automatically and skip workspace selection entirely.

Here are updated test steps:

Tests

Prerequisites: Log in with an account that is a member of 2 or more paid workspaces (Collect or Control type) that have Expensify Chat enabled. Make sure you don't have an active policy set that would auto-select one (or switch to a personal/free workspace first).

Tap the FAB (+) button, then tap "Create report"
Verify the workspace selection page appears with the "Create report" header and "Choose a workspace for this report" text
Verify no JS console errors related to NewReportWorkspaceSelectionPage or ActivityIndicator

Alternative path (if you don't have 2+ paid workspaces):
You can also reach this page via the move expenses flow:

Open a report with an expense
Initiate moving the expense to a different report (from the three-dot menu on the expense)
When prompted to select a workspace, verify the workspace selection page renders correctly

Offline tests

With 2+ paid workspaces, turn off network connection
Tap FAB (+) → "Create report"
Verify the workspace selection page renders correctly without the loading spinner (since shouldShowLoadingIndicator is only true when isLoadingApp && !isOffline)

situchan · 2026-03-17T13:09:49Z

@MelvinBot this is better prerequisites:

Prerequisites: Log in with an account where user's billable actions are restricted in default policy and has 2 or more paid workspaces.

And apply to all Tests/Offline/QA Steps

MelvinBot · 2026-03-17T13:12:49Z

Updated the PR description to add the following prerequisites to the Tests, Offline tests, and QA Steps sections:

Prerequisites: Log in with an account where user's billable actions are restricted in default policy and has 2 or more paid workspaces.

OSBotify · 2026-03-18T18:36:55Z

✋ 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-03-18T19:02:54Z

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

github-actions · 2026-03-18T19:09:22Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-efdf88c-9a6f3c4-86af1c66ceede0ed548d7bfb643f15e22626372b/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-efdf88c-9a6f3c4-c78cf070e8f943fd0679badebcc3f4c0f394436b/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-19T20:25:55Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

IuliiaHerets · 2026-03-20T08:50:15Z

Hi @Julesssss. Is it possible to verify this internally? The QA team doesn't have an account that meets the precondition.

OSBotify · 2026-03-23T09:29:15Z

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

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

MelvinBot assigned situchan Mar 17, 2026

MelvinBot requested a review from a team March 17, 2026 09:12

MelvinBot mentioned this pull request Mar 17, 2026

[Due for payment 2026-03-30] [$125] Use valid loading indicator in NewReportWorkspaceSelectionPage.tsx #84991

Open

MelvinBot marked this pull request as ready for review March 17, 2026 12:32

MelvinBot requested a review from a team as a code owner March 17, 2026 12:32

melvin-bot bot requested review from situchan and trjExpensify and removed request for a team and trjExpensify March 17, 2026 12:32

melvin-bot bot removed the request for review from a team March 17, 2026 12:32

situchan approved these changes Mar 17, 2026

View reviewed changes

melvin-bot bot requested a review from Julesssss March 17, 2026 13:31

Julesssss approved these changes Mar 18, 2026

View reviewed changes

Julesssss merged commit efdf88c into main Mar 18, 2026
46 checks passed

Julesssss deleted the claude-useActivityIndicatorInNewReportWorkspaceSelection branch March 18, 2026 18:26

OSBotify mentioned this pull request Mar 19, 2026

Deploy Checklist: New Expensify 2026-03-19 #85862

Closed

Conversation

MelvinBot commented Mar 17, 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!

situchan commented Mar 17, 2026

Uh oh!

MelvinBot commented Mar 17, 2026

Uh oh!

melvin-bot bot commented Mar 17, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

situchan commented Mar 17, 2026

Uh oh!

MelvinBot commented Mar 17, 2026

Tests

Offline tests

Uh oh!

situchan commented Mar 17, 2026

Uh oh!

MelvinBot commented Mar 17, 2026

Uh oh!

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

github-actions bot commented Mar 18, 2026

Uh oh!

github-actions bot commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 19, 2026

Uh oh!

IuliiaHerets commented Mar 20, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

MelvinBot commented Mar 17, 2026 •

edited

Loading

situchan commented Mar 17, 2026 •

edited

Loading