Use ActivityIndicator inside the Per Diem tab while the selected workspace loads by MelvinBot · Pull Request #103421 · Expensify/App

MelvinBot · 2026-10-08T05:39:22Z

Explanation of Change

IOURequestStepPerDiemWorkspace is only rendered inside the Per Diem tab of IOURequestStartPage (it has no standalone route). While a selected workspace's per diem data loads (pendingPolicyID is set and the device is online), it returns a FullScreenLoadingIndicator. That loader's absoluteFill covers only the tab content, so the start page's HeaderWithBackButton and TabSelector stay visible above it. Once #96098 flips FullScreenLoadingIndicator's shouldUseGoBackButton default to true, the tab would show a second, redundant "Go Back" button under the header.

This swaps it for the same ActivityIndicator pattern IOURequestStartPage already uses for its other tab-content loaders (View with styles.flex1 and styles.fullScreenLoading wrapping a large ActivityIndicator). The loading condition and the offline branch are unchanged.

This is one of the sites found in the re-audit before the flip.

AI tests run locally

npm run lint-changed: passed
npm run typecheck: passed
npm run react-compiler-compliance-check check <file>: passed
npm run spell-changed: passed
oxfmt: clean
Jest --findRelatedTests: 91/92 suites passed. tests/unit/pages/HomePage.test.tsx failed only in the parallel run and passes in isolation on both this change and main, so it's a pre-existing isolation flake.
Not run: Storybook smoke test (no stories touched), and no browser verification of the transient loading state.

Fixed Issues

$ #96098
PROPOSAL: #96098 (comment)

Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review"
// Please describe what tests you performed that validates your changed worked.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Prerequisite: an account that is a member of at least two workspaces with Per diem enabled (Workspace > More features > Per diem), each with at least one per diem rate.

Sign out and sign back in, so the workspaces' per diem rates are not already loaded. On web, you can set DevTools > Network to "Slow 3G" to make the loading state easier to see.
Click the FAB > Create expense > Per diem tab.
Select one of the workspaces.
While the workspace loads, verify:
- A spinner shows inside the Per diem tab content.
- The "Create expense" header and the tab bar stay visible above the spinner.
- No extra "Go back" button appears under the header.
Verify the Destination step opens after loading finishes, with no stuck spinner.
Repeat steps 1-3, but go offline right before step 3. Verify the "You appear to be offline" view shows inside the tab, and no spinner or crash appears.

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

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

codecov · 2026-10-08T05:43:45Z

Codecov Report

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

Files with missing lines	Coverage Δ
...ou/request/step/IOURequestStepPerDiemWorkspace.tsx	`0.00% <0.00%> (ø)`
... and 197 files with indirect coverage changes

situchan · 2026-10-08T05:47:52Z

@MelvinBot add QA steps

MelvinBot · 2026-10-08T05:55:15Z

🤖 Android test steps verification results: ❌ fail

Testing was blocked before the PR flow was reached. After Per Diem was enabled on a new workspace, the app's JS thread froze on the workspace Per Diem "More" popover (no JS log output for 5+ minutes, every tap had no effect), and the one permitted Metro restart did not recover it, so Create expense > Per Diem tab was never opened.

Step	Status
VERIFY 1: Per Diem tab present in Create expense (workspace with Per Diem enabled) Per Diem was enabled on a newly created workspace (the "Per diem" entry appeared in the workspace left nav), but the app froze before FAB > Create expense could be opened to check for the tab.	❌
VERIFY 2: Spinner inside Per Diem tab content, header and tab bar visible, no extra Go back button Not reached. The app became unresponsive before the Create expense flow was opened.	❌
VERIFY 3: Per Diem tab content loads normally after the spinner Not reached.	❌
VERIFY 4: Offline Per Diem tab shows the blocking view or cached content, no crash Not reached.	❌
VERIFY 5: No red-box errors or crashes during the flow No red box appeared, but the app froze: taps on the popover, header back, other screen areas, and system back produced no UI change. The app log shows no ReactNativeJS output for 5+ minutes, starting right after the Per Diem feature toggle finished. One Metro restart did not restore it.	❌

view run · view recording

MelvinBot · 2026-10-08T05:59:52Z

Here are the QA steps for this PR. I couldn't update the PR description from this run. Please paste these into the QA Steps section.

Prerequisite: an account that is a member of at least two workspaces with **Per diem** enabled (Workspace > More features > Per diem), each with at least one per diem rate.

1. Sign out and sign back in, so the workspaces' per diem rates are not already loaded. On web, you can set DevTools > Network to "Slow 3G" to make the loading state easier to see.
2. Click the FAB > **Create expense** > **Per diem** tab.
3. Select one of the workspaces.
4. While the workspace loads, verify:
    - A spinner shows inside the Per diem tab content.
    - The "Create expense" header and the tab bar stay visible above the spinner.
    - No extra "Go back" button appears under the header.
5. Verify the **Destination** step opens after loading finishes, with no stuck spinner.
6. Repeat steps 1-3, but go offline right before step 3. Verify the "You appear to be offline" view shows inside the tab, and no spinner or crash appears.
7. Verify that no errors appear in the JS console.

- [ ] Verify that no errors appear in the JS console

Why these steps

The loader only renders when you pick a workspace whose per diem rates are not in Onyx yet. While they load, pendingPolicyID is set (IOURequestStepPerDiemWorkspace.tsx:111-121). Signing in again clears the cached rates, and throttling the network keeps the loader on screen long enough to check it. Step 6 covers the offline branch, which this PR did not change. The loader may still be brief on a fast connection.

view run

situchan · 2026-10-08T06:34:17Z

@MelvinBot add QA steps like below:

Prerequisite: an account that is a member of at least two workspaces with **Per diem** enabled (Workspace > More features > Per diem), each with at least one per diem rate.

1. Sign out and sign back in, so the workspaces' per diem rates are not already loaded. On web, you can set DevTools > Network to "Slow 3G" to make the loading state easier to see.
2. Click the FAB > **Create expense** > **Per diem** tab.
3. Select one of the workspaces.
4. While the workspace loads, verify:
    - A spinner shows inside the Per diem tab content.
    - The "Create expense" header and the tab bar stay visible above the spinner.
    - No extra "Go back" button appears under the header.
5. Verify the **Destination** step opens after loading finishes, with no stuck spinner.
6. Repeat steps 1-3, but go offline right before step 3. Verify the "You appear to be offline" view shows inside the tab, and no spinner or crash appears.

MelvinBot · 2026-10-08T06:39:50Z

I added your QA steps to the QA Steps section of the PR description, word for word. They replace the TODO placeholder. I kept the "Verify that no errors appear in the JS console" checkbox below them, and left the rest of the description unchanged.

view run

situchan · 2026-10-08T06:44:18Z

@MelvinBot mark this PR ready for review

chatgpt-codex-connector · 2026-10-08T06:48:18Z

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Credits must be used to enable repository wide code reviews.

MelvinBot · 2026-10-08T06:48:19Z

🤖 This PR is now marked ready for review.

Heads-up: the Tests and QA Steps sections in the description are still TODO placeholders. Please fill them in before review.

view run

melvin-bot · 2026-10-08T06:48:20Z

@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-10-08T06:57:19Z

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 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 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)
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)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately
- 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
- 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 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 the PR adds or modifies the UI:
- I asked an AI agent to review the changes for accessibility issues and addressed its findings.
- I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
- I verified all new/changed elements have meaningful accessible names and roles.
- I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
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

test.mov

Julesssss · 2026-10-08T17:12:07Z

            return <FullPageOfflineBlockingView>{null}</FullPageOfflineBlockingView>;
        }
-        return <FullScreenLoadingIndicator />;
+        // This step only renders inside the Per Diem tab, so the header and tab bar stay visible above the loader


Comment unecessary I think

@MelvinBot address #103421 (comment)

Removed the comment in 612c8d64.

view run

Julesssss

Minor change please: https://github.com/Expensify/App/pull/103421/changes#r4221978820

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

melvin-bot · 2026-10-08T17:19:41Z

@situchan @Julesssss One of you needs to 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]

OSBotify · 2026-10-09T15:38:08Z

✋ 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-10-09T16:12:50Z

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

github-actions · 2026-10-09T16:17:34Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-38c8aeb-28f074c-e2e6bd4961c6e398be2710b5ffd5f6b018a1790d/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-38c8aeb-28f074c-3f341c481034bf7af814809db7b6a7e4df0fedab/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-10-09T20:50:22Z

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

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

MelvinBot · 2026-10-09T20:55:06Z

No help site update needed: this PR only changes which loading spinner appears inside the Per Diem tab while a workspace's per diem data loads, which is loading behavior and doesn't make any help article sentence incorrect.

view run

jponikarchuk · 2026-10-12T10:22:43Z

This PR failing because of the issue #103721
This issue is reproducible in: Web, Android app

situchan · 2026-10-12T11:04:04Z

This PR failing because of the issue #103721 This issue is reproducible in: Web, Android app

I managed to reproduce this in production so not blocker

bug.mov

jponikarchuk · 2026-10-13T08:41:29Z

This PR failing because of the issue #103838
This issue is reproducible in: Android and iOS app

situchan · 2026-10-13T09:43:23Z

This PR failing because of the issue #103838 This issue is reproducible in: Android and iOS app

I reproduced this in production too so not blocker

OSBotify · 2026-10-13T10:00:51Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.5.7-3 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

Use ActivityIndicator inside the Per Diem tab while the selected work…

35eedb6

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

MelvinBot assigned situchan Oct 8, 2026

MelvinBot requested a review from a team October 8, 2026 05:39

melvin-bot Bot added Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web labels Oct 8, 2026

MelvinBot mentioned this pull request Oct 8, 2026

[Due for payment 2026-10-21] [$175] Enable the Go Back button by default (flip shouldUseGoBackButton) #96098

Open

MelvinBot marked this pull request as ready for review October 8, 2026 06:48

MelvinBot requested a review from a team as a code owner October 8, 2026 06:48

melvin-bot Bot requested a review from situchan October 8, 2026 06:48

melvin-bot Bot removed the request for review from a team October 8, 2026 06:48

melvin-bot Bot requested review from flaviadefaria and removed request for a team October 8, 2026 06:48

situchan approved these changes Oct 8, 2026

View reviewed changes

melvin-bot Bot requested a review from Julesssss October 8, 2026 06:57

Julesssss reviewed Oct 8, 2026

View reviewed changes

Julesssss requested changes Oct 8, 2026

View reviewed changes

Remove unnecessary comment above Per Diem tab loader

612c8d6

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

MelvinBot requested a review from a team as a code owner October 8, 2026 17:19

melvin-bot Bot requested a review from Julesssss October 8, 2026 17:19

melvin-bot Bot requested review from situchan and removed request for a team October 8, 2026 17:19

situchan approved these changes Oct 8, 2026

View reviewed changes

Julesssss approved these changes Oct 9, 2026

View reviewed changes

Julesssss merged commit 38c8aeb into main Oct 9, 2026
44 of 46 checks passed

Julesssss deleted the claude-perDiemWorkspaceActivityIndicator branch October 9, 2026 15:33

OSBotify mentioned this pull request Oct 9, 2026

Deploy Checklist: New Expensify 2026-10-09 #103653

Closed

74 tasks done

applause-bot Bot mentioned this pull request Oct 12, 2026

[$175] 103421 - Per Diem - Not here page after going back online when the destination loads #103721

Open

2 of 7 tasks

applause-bot Bot mentioned this pull request Oct 13, 2026

[$175] The tab bar does not visible above the spinner #103838

Open

2 of 7 tasks

Conversation

MelvinBot commented Oct 8, 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!

codecov Bot commented Oct 8, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

situchan commented Oct 8, 2026

Uh oh!

MelvinBot commented Oct 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MelvinBot commented Oct 8, 2026

Uh oh!

situchan commented Oct 8, 2026

Uh oh!

MelvinBot commented Oct 8, 2026

Uh oh!

situchan commented Oct 8, 2026

Uh oh!

chatgpt-codex-connector Bot commented Oct 8, 2026

Uh oh!

MelvinBot commented Oct 8, 2026

Uh oh!

melvin-bot Bot commented Oct 8, 2026

Uh oh!

situchan commented Oct 8, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Julesssss Oct 8, 2026

Choose a reason for hiding this comment

Uh oh!

situchan Oct 8, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Oct 8, 2026

Choose a reason for hiding this comment

Uh oh!

Julesssss left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Oct 8, 2026

Uh oh!

Uh oh!

OSBotify commented Oct 9, 2026

Uh oh!

github-actions Bot commented Oct 9, 2026

Uh oh!

github-actions Bot commented Oct 9, 2026

Uh oh!

OSBotify commented Oct 9, 2026

Uh oh!

MelvinBot commented Oct 9, 2026

Uh oh!

jponikarchuk commented Oct 12, 2026

Uh oh!

situchan commented Oct 12, 2026

Uh oh!

jponikarchuk commented Oct 13, 2026

Uh oh!

situchan commented Oct 13, 2026

Uh oh!

OSBotify commented Oct 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

MelvinBot commented Oct 8, 2026 •

edited

Loading

codecov Bot commented Oct 8, 2026 •

edited by github-actions Bot

Loading

MelvinBot commented Oct 8, 2026 •

edited

Loading