Replace FullScreenLoadingIndicator with ActivityIndicator in VerifyAccountPageBase by MelvinBot · Pull Request #85517 · Expensify/App

MelvinBot · 2026-03-17T09:06:43Z

Explanation of Change

As part of loading indicator standardization (#69850), FullScreenLoadingIndicator will soon enable shouldUseGoBackButton by default. In VerifyAccountPageBase.tsx, this component is rendered alongside HeaderWithBackButton, which would result in duplicate back controls.

This PR replaces FullScreenLoadingIndicator with a View-wrapped ActivityIndicator that reproduces the exact same visual styles (componentBG background, 0.8 opacity, centered large spinner in the flex-filling content area below the header). Since VerifyAccountPageBase is a shared base component used by 15+ verify account pages, this single change fixes the loading pattern for all of them.

Fixed Issues

$ #84993
PROPOSAL: #84993 (comment)

Tests

Navigate to any page that uses VerifyAccountPageBase (e.g. Settings > Contact methods > Validate account)
Trigger the validation flow so isUserValidated becomes true
Verify the loading state shows a centered spinner with the same background and opacity as before
Verify there is only one back button (in the header), not two

Verify that no errors appear in the JS console

Offline tests

N/A — this is a pure UI component swap with no network behavior change.

QA Steps

Navigate to any page that uses VerifyAccountPageBase (e.g. Settings > Contact methods > Validate account)
Trigger the validation flow so isUserValidated becomes true
Verify the loading state shows a centered spinner with the same background and opacity as before
Verify there is only one back button (in the header)

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

…countPageBase As part of loading indicator standardization, replace FullScreenLoadingIndicator with a styled View + ActivityIndicator in VerifyAccountPageBase.tsx to prevent duplicate back controls when shouldUseGoBackButton becomes the default. Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

MelvinBot · 2026-03-17T09:07:05Z

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-useValidLoadingIndicatorInVerifyAccountPageBase
git checkout -b claude-useValidLoadingIndicatorInVerifyAccountPageBase upstream/claude-useValidLoadingIndicatorInVerifyAccountPageBase
git push -u origin claude-useValidLoadingIndicatorInVerifyAccountPageBase

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

MelvinBot · 2026-03-17T09:17:43Z

The failing check (test (job 5)) is unrelated to this PR.

Failing test: tests/unit/useAgentZeroStatusIndicatorTest.ts — "should clear optimistic waiting state when server label arrives"

Expected: "Concierge is looking up categories..."
Received: "Thinking..."

Why it's unrelated: This PR only modifies src/pages/settings/VerifyAccountPageBase.tsx (replacing FullScreenLoadingIndicator with ActivityIndicator). The failing test is for the useAgentZeroStatusIndicator hook, which is a completely different feature with no connection to the changed file. This appears to be a flaky test where the Onyx state update doesn't propagate within the test's timing window.

situchan · 2026-03-17T12:35:20Z

src/pages/settings/VerifyAccountPageBase.tsx

-                    style={[styles.flex1, styles.pRelative]}
-                    reasonAttributes={{context: 'VerifyAccountPageBase', isUserValidated} satisfies SkeletonSpanReasonAttributes}
-                />
+                <View style={[styles.flex1, styles.pRelative, styles.alignItemsCenter, styles.justifyContentCenter, {backgroundColor: theme.componentBG, opacity: 0.8}]}>


@MelvinBot use existing styles.fullScreenLoading, similar to #84798

Updated — replaced the inline styles with styles.fullScreenLoading and removed the now-unused useTheme import, matching the pattern from #84798.

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

MelvinBot · 2026-03-17T12:38:16Z

The failing check is unrelated to this PR.

Analysis: The only non-checklist failure is test (job 5), where tests/unit/useAgentZeroStatusIndicatorTest.ts fails on the test "should clear optimistic waiting state when server label arrives" — it expects "Concierge is looking up categories..." but receives "Thinking...". This test is completely unrelated to the changes in this PR, which only modifies src/pages/settings/VerifyAccountPageBase.tsx.

Evidence: The main branch also has test failures in its recent CI runs (e.g. run 23162452674). This is a pre-existing test issue, not caused by this PR's changes.

situchan · 2026-03-17T12:39:09Z

src/pages/settings/VerifyAccountPageBase.tsx

                />
-                <FullScreenLoadingIndicator
-                    style={[styles.flex1, styles.pRelative]}
-                    reasonAttributes={{context: 'VerifyAccountPageBase', isUserValidated} satisfies SkeletonSpanReasonAttributes}


@MelvinBot restore this prop reasonAttributes. We need it

Restored the reasonAttributes prop on ActivityIndicator — it accepts the same prop as FullScreenLoadingIndicator did, so the telemetry span is preserved.

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

MelvinBot · 2026-03-17T12:42:54Z

The failing check is unrelated to this PR.

Failing test: tests/unit/useAgentZeroStatusIndicatorTest.ts — should clear optimistic waiting state when server label arrives

Expected: "Concierge is looking up categories..."
Received: "Thinking..."

Analysis: This test is for the useAgentZeroStatusIndicator hook, which is completely unrelated to this PR's change in VerifyAccountPageBase.tsx (replacing FullScreenLoadingIndicator with ActivityIndicator). The main branch also has test failures in CI, confirming pre-existing instability.

Evidence: The only file changed in this PR is src/pages/settings/VerifyAccountPageBase.tsx. The failing test doesn't reference or depend on this file.

A new set of checks is currently running and may pass on retry.

situchan · 2026-03-17T12:43:26Z

@MelvinBot mark as ready for review

MelvinBot · 2026-03-17T12:44:50Z

Marked this PR as ready for review.

melvin-bot · 2026-03-17T12:44:53Z

@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]

codecov · 2026-03-17T12:55:42Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/pages/settings/VerifyAccountPageBase.tsx	`0.00% <0.00%> (ø)`
... and 40 files with indirect coverage changes

situchan · 2026-03-17T13:31:42Z

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

github-actions · 2026-03-17T19:51:17Z

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

github-actions · 2026-03-17T19:56:45Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-a910e49-da2c958-7d7090c1895899b695622f0db921a6b89697c504/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-a910e49-da2c958-765ddd9b4770d84050ec15b59ee9ff4d1cd11af2/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-17T20:00:03Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2026-03-18T13:31:03Z

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

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

jponikarchuk · 2026-03-18T14:02:04Z

Deploy Blocker #85654 was identified to be related to this PR.

OSBotify · 2026-03-18T14:07:04Z

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

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

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

🚀 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:06

MelvinBot mentioned this pull request Mar 17, 2026

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

Open

situchan reviewed Mar 17, 2026

View reviewed changes

Use styles.fullScreenLoading instead of inline styles

a620926

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

situchan reviewed Mar 17, 2026

View reviewed changes

Restore reasonAttributes prop on ActivityIndicator

9213317

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

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

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

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

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 17, 2026

View reviewed changes

Julesssss merged commit a910e49 into main Mar 17, 2026
40 of 41 checks passed

Julesssss deleted the claude-useValidLoadingIndicatorInVerifyAccountPageBase branch March 17, 2026 19:50

OSBotify mentioned this pull request Mar 18, 2026

Deploy Checklist: New Expensify 2026-03-18 #85646

Closed

100 tasks

Conversation

MelvinBot commented Mar 17, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented Mar 17, 2026

Uh oh!

MelvinBot commented Mar 17, 2026

Uh oh!

situchan Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Mar 17, 2026

Uh oh!

situchan Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Mar 17, 2026

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!

codecov bot commented Mar 17, 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 Mar 17, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

github-actions bot commented Mar 17, 2026

Uh oh!

github-actions bot commented Mar 17, 2026

Uh oh!

OSBotify commented Mar 17, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

jponikarchuk commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Mar 17, 2026 •

edited by github-actions bot

Loading