Use ActivityIndicator below the header while CollectDepositAccount loads by MelvinBot · Pull Request #103420 · Expensify/App

MelvinBot · 2026-10-08T05:38:14Z

Explanation of Change

CollectDepositAccount renders its loading state inside the same ScreenWrapper as HeaderWithBackButtonAndTitle, so the header (and its back button) stays visible above the loader. Once #96098 flips FullScreenLoadingIndicator's shouldUseGoBackButton default to true, this page would show a second, redundant "Go Back" button under its own header.

This swaps the FullScreenLoadingIndicator for a plain ActivityIndicator (large, flex1), matching the pattern already used for loaders under a visible header elsewhere in Wallet (e.g. PersonalCards/steps/BankConnection). Nothing else on the page changes: the loading conditions are the same, and the header keeps its existing back behavior.

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

AI tests run locally

npm run lint-changed: passed (the existing rulesdir/no-inline-useOnyx-selector violation at the useOnyx selector line is pre-existing on main and grandfathered)
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

Sign in and go to Settings > Wallet.
Open /settings/wallet/collect-deposit-account/bank-account-details directly (on web, paste it in the URL bar; on native, use the deep link). To keep the loader on screen longer, throttle the network (for example, Slow 3G in browser dev tools).
Verify a spinner shows below the "Add bank account" header while the page loads.
Verify the header and its back button stay visible, and no second "Go Back" button appears under the header.
Verify the page then shows the "Where’s your bank account located?" country list.
Select any country and press Next. Verify the bank account details step loads with no spinner stuck on screen.
Web only: refresh the page. Verify the spinner shows under the header with no extra "Go Back" button, then the details step returns with the selected country kept.
Press the header back button. Verify you return to the country step.
Press the header back button again. Verify you return to Wallet.
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

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

codecov · 2026-10-08T05:42:19Z

Codecov Report

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

Files with missing lines	Coverage Δ
...es/settings/Wallet/CollectDepositAccount/index.tsx	`0.00% <0.00%> (ø)`
... and 7 files with indirect coverage changes

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

@MelvinBot add QA steps

MelvinBot · 2026-10-08T05:48:02Z

🤖 Android test steps verification results: ⚠️ partial

The Collect Deposit Account page loads its country selector under one header, with no duplicate Go Back button, and the back button works with no JS errors. The loading spinner itself rendered too fast to capture on the emulator, so step 1 is only partly proven.

Step	Status
While the page loads, one spinner shows below the header, with no second "Go Back" button and no full-screen loader over the header The loader was too brief to capture. In two tries, the first capture after navigation already showed the loaded page. Every capture and the full accessibility tree show exactly one Back button and no full-screen loader.	✅
After loading, the page shows its step content (country selector) under the header The "Add bank account" header shows one back chevron. Below it, the "Where's your bank account located?" country list and a disabled Next button appear. Both navigations gave the same result.	✅
The header back button leaves the page normally Tapping Back returned to the Wallet page with its Bank accounts and Cards sections. The app did not get stuck, and no extra header remained.	✅
Documented step: no errors appear in the JS console The app log shows no ReactNativeJS errors and no LogBox or red-box screen. The only error line is a handled native Fabric warning (`ReactNoCrashSoftException: Unable to find viewState ... for updateLayout`). It is not a JS console error.	✅

view run · view recording

MelvinBot · 2026-10-08T06:11:24Z

I added QA steps to the PR description. They open the bank account details step directly, which shows the loader under the "Add bank account" header and then redirects to the country step. The steps then cover Next, refresh, and back navigation.

I ran steps 1–9 on web, and all passed. The tester saw one spinner under the header and never a second "Go Back" button. The web tooling can't read the JS console, so I couldn't check step 10.

Separate observation (likely unrelated to this diff)

On dev, hard-reloading the bare /settings/wallet/collect-deposit-account URL left a spinner running for more than 2 minutes. This happened 3 times. Reloading the /bank-account-details URL always recovered. This PR only swaps the loader component, not the loading conditions, so it probably didn't cause this. It may be worth checking useLoadDepositAccountSetup on cold deep-link loads.

view run · view recording

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

situchan · 2026-10-08T06:31:28Z

@MelvinBot mark this PR ready for review

chatgpt-codex-connector · 2026-10-08T06:36:21Z

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:36:22Z

🤖 This PR is now marked ready for review.

The Tests and QA Steps sections still have TODO placeholders for the human co-author. Fill them in before review.

view run

melvin-bot · 2026-10-08T06:36:23Z

@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:43:21Z

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

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

OSBotify · 2026-10-08T17:18:10Z

✋ 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-08T17:24:01Z

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

github-actions · 2026-10-08T17:28:32Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-d6df084-b8010af-0c05f3ac2cda9b4e145f4da735e872ced7fc0600/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-d6df084-b8010af-aefc3ebc5afc33e41539418597f45bb49ca6bc1e/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-10-08T19:46:43Z

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

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

MelvinBot · 2026-10-08T19:51:44Z

No help site update needed. This PR only changes the loading spinner on the Collect Deposit Account page, which is loading behavior that no help article describes.

view run

OSBotify · 2026-10-09T20:32:21Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.5.6-6 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

Use ActivityIndicator below the header while CollectDepositAccount loads

34d8ffd

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:38

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-16] [$175] Enable the Go Back button by default (flip shouldUseGoBackButton) #96098

Open

situchan reviewed Oct 8, 2026

View reviewed changes

Comment thread src/pages/settings/Wallet/CollectDepositAccount/index.tsx Outdated

Center the CollectDepositAccount loader with fullScreenLoading styles

1227211

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

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

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

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

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

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

situchan approved these changes Oct 8, 2026

View reviewed changes

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

situchan mentioned this pull request Oct 8, 2026

Enable the Go Back button by default on FullScreenLoadingIndicator #99786

Merged

5 of 40 tasks

Julesssss approved these changes Oct 8, 2026

View reviewed changes

Julesssss merged commit d6df084 into main Oct 8, 2026
48 of 51 checks passed

Julesssss deleted the claude-collectDepositAccountActivityIndicator branch October 8, 2026 17:13

OSBotify mentioned this pull request Oct 8, 2026

Deploy Checklist: New Expensify 2026-10-08 #103502

Closed

90 tasks done

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 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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!

Uh oh!

OSBotify commented Oct 8, 2026

Uh oh!

github-actions Bot commented Oct 8, 2026

Uh oh!

github-actions Bot commented Oct 8, 2026

Uh oh!

OSBotify commented Oct 8, 2026

Uh oh!

MelvinBot commented Oct 8, 2026

Uh oh!

OSBotify commented Oct 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

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

MelvinBot commented Oct 8, 2026 •

edited

Loading