[CP Staging] Fix infinite spinner on the `Save` button in change card limit modal by OlGierd03 · Pull Request #96087 · Expensify/App

OlGierd03 · 2026-07-14T16:01:22Z

Explanation of Change

#92498 enabled an optimistic press spinner on form submit buttons by default. For forms built with FormProvider, the spinner is driven by the provider itself (via usePressLoading) and is cleared only when an external loading state (formState.isLoading/Onyx) turns true or the screen regains navigation focus.

The Expensify Card limit page hits neither path when the new limit drives newAvailableSpend <= 0: its onSubmit early-returns into a confirmation modal without setting any loading state and the modal is a global overlay (useConfirmModal/ModalContext), so the page never loses focus.

This PR adds a shouldShowLoadingImmediatelyOnPress opt-out prop to FormProvider (default true, so no other form changes behavior), mirroring the existing prop of the same name on FormAlertWithSubmitButton. When disabled, the submit button's loading state comes only from the external formState.isLoading/Onyx state and onSubmit runs without the press spinner. The prop is then set to false on DynamicExpensifyCardLimitPage.

Note

This PR also includes the change from #96106 (the Expensify Card PIN Next button spinner fix)

Fixed Issues

$ #96072
$ #96088

Tests

Expensify Card Save button loads infinitely after dismissing Change card limit modal

Precondition:

Workspace has at least one Expensify Card.

Go to workspace settings > Expensify Card.
Open Expensify Card.
Click Amount.
Change the amount to 0 > Save.
Click Cancel.

Expensify Card PIN Next button loads infinitely

The test steps have been copied from the Action Performed section of the issue description as I haven't been able to go through the required flow on my own

Precondition:
Log in as a Workspace Admin (applausetester+ecard@applause.expensifail.com)
Navigate to Workspace > Expensify Card
Invite the test user to the workspace if not already invited (Invite any validated expensifail account)
Issue a Physical Card (not a Virtual Card) to the test user

Steps:

Log in as the test user
Navigate to Account > Wallet
Select the newly issued card under Cards and click/tap "Get physical card"
If prompted, enter Name, Date of Birth, and Address information
Enter PIN "1111"
Click/tap "Reveal PIN"
Click/tap "Hide PIN"
Click/tap "Next" > Verify the error message "Please choose a more secure PIN" is displayed
Result: Next button starts loading infinitly
Replace the PIN with "1031"
Click/tap "Next"
Result: Button continue infinity load

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-07-14.at.18.56.03.mov

iOS: Native

Screen.Recording.2026-07-14.at.19.14.28.mov

MacOS: Chrome / Safari

Screen.Recording.2026-07-14.at.17.36.05.mov

melvin-bot · 2026-07-14T16:01:27Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

OlGierd03 · 2026-07-14T16:03:07Z

@codex review

codecov · 2026-07-14T16:06:12Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/pages/MissingPersonalDetails/subPages/PIN.tsx	`0.00% <ø> (ø)`
...ce/expensifyCard/DynamicExpensifyCardLimitPage.tsx	`0.00% <ø> (ø)`
src/components/Form/FormProvider.tsx	`62.44% <77.77%> (+0.28%)`	⬆️
... and 137 files with indirect coverage changes

chatgpt-codex-connector · 2026-07-14T16:10:09Z

Codex Review: Didn't find any major issues. Bravo.

Reviewed commit: f40be4fcb4

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

OlGierd03 · 2026-07-14T17:15:57Z

@rlinoz Here's the fix for the #96072

melvin-bot · 2026-07-14T17:16:35Z

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

OlGierd03 · 2026-07-14T17:54:15Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly.

I suggest updating FORMS.md in a follow-up. Alternatively, I could do it in this PR tomorrow morning

…ensify#96088)

rlinoz · 2026-07-14T19:20: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
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 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 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 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.
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

github-actions · 2026-07-14T19:35:59Z

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

…hange-card-limit-Save-button-infinite-spinner Fix infinite spinner on the `Save` button in change card limit modal (cherry picked from commit 81379d8) (cherry-picked to staging by roryabraham)

github-actions · 2026-07-14T19:41:41Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-81379d81d71-2773109-4a8c6e051c18ec4653170a9afead94834cb6f961/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-81379d8-2773109-c52cc0f1ecb061aaa80163e85a30d2a0da0157bf/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-14T19:41:41Z

✋ 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-07-14T20:07:37Z

🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.4.34-4 🚀

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

MelvinBot · 2026-07-14T20:10:26Z

Help site review — no changes required

I reviewed the changes in this PR against the help site articles under App/docs/articles and no documentation updates are needed, so I did not create a draft PR.

Why: This is a purely behavioral bug fix. It adds an internal shouldShowLoadingImmediatelyOnPress opt-out prop to FormProvider (default true) and sets it to false on the Expensify Card limit page and the Card PIN sub-page so their submit buttons stop spinning indefinitely when onSubmit early-returns into a confirmation modal or only flips local step state.

The user-facing flows that the help site documents are unchanged:

Changing an Expensify Card limit — the steps, page, and Save button are identical; only the broken infinite-spinner state is fixed.
Setting an Expensify Card PIN — same flow and Next button; only the stuck-spinner behavior is fixed.

No feature names, tab names, settings labels, button labels, or workflow steps were added, removed, or renamed, so there is nothing in the affected articles (e.g. Change-Expensify-Card-limit.md, Set-Up-and-Manage-the-Expensify-Card.md) that becomes inaccurate as a result of this change.

@OlGierd03 — since no help site changes are required, there is no draft PR to link. Let me know if you'd like me to reconsider any specific article.

Fix Card limit Save button infinite spinner

f40be4f

melvin-bot Bot assigned OlGierd03 Jul 14, 2026

OlGierd03 mentioned this pull request Jul 14, 2026

Expensify Card - Save button loads infinitely after dismissing Change card limit modal #96072

Closed

7 tasks

OlGierd03 marked this pull request as ready for review July 14, 2026 17:16

OlGierd03 requested review from a team as code owners July 14, 2026 17:16

melvin-bot Bot requested review from gijoe0295 and heyjennahay and removed request for a team and heyjennahay July 14, 2026 17:16

OlGierd03 mentioned this pull request Jul 14, 2026

Fix infinite spinner on the Next button in set Expensify Card PIN modal #96106

Closed

50 tasks

Fix Expensify Card Next button infinite spinner when setting PIN (Exp…

b214e02

…ensify#96088)

rlinoz requested review from rlinoz and rojiphil and removed request for gijoe0295 July 14, 2026 18:55

rlinoz approved these changes Jul 14, 2026

View reviewed changes

rlinoz merged commit 81379d8 into Expensify:main Jul 14, 2026
36 checks passed

rlinoz changed the title ~~Fix infinite spinner on the Save button in change card limit modal~~ [CP Stagin] Fix infinite spinner on the Save button in change card limit modal Jul 14, 2026

rlinoz changed the title ~~[CP Stagin] Fix infinite spinner on the Save button in change card limit modal~~ [CP Staging] Fix infinite spinner on the Save button in change card limit modal Jul 14, 2026

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jul 14, 2026

OSBotify mentioned this pull request Jul 14, 2026

Deploy Checklist: New Expensify 2026-07-14 #96044

Open

MelvinBot mentioned this pull request Jul 15, 2026

Web - Account - App crash when open account tab #96158

Closed

7 tasks

Uh oh!

Conversation

OlGierd03 commented Jul 14, 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!

melvin-bot Bot commented Jul 14, 2026

Uh oh!

OlGierd03 commented Jul 14, 2026

Uh oh!

codecov Bot commented Jul 14, 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!

chatgpt-codex-connector Bot commented Jul 14, 2026

Uh oh!

OlGierd03 commented Jul 14, 2026

Uh oh!

melvin-bot Bot commented Jul 14, 2026

Uh oh!

OlGierd03 commented Jul 14, 2026

Uh oh!

rlinoz commented Jul 14, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

github-actions Bot commented Jul 14, 2026

Uh oh!

github-actions Bot commented Jul 14, 2026

Uh oh!

OSBotify commented Jul 14, 2026

Uh oh!

OSBotify commented Jul 14, 2026

Uh oh!

MelvinBot commented Jul 14, 2026

Help site review — no changes required

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

OlGierd03 commented Jul 14, 2026 •

edited

Loading

codecov Bot commented Jul 14, 2026 •

edited by github-actions Bot

Loading