Improve Form-SubmitButton INP by nabi-ebrahimi · Pull Request #95783 · Expensify/App

nabi-ebrahimi · 2026-07-10T06:54:38Z

Explanation of Change

This PR reduces redundant Onyx work in the shared Form-SubmitButton submit path. FormWrapper no longer subscribes to the same form Onyx key as FormProvider, and onValidate() now avoids clearing server errors and server error fields when no Onyx-backed errors exist. The submit alert state, server error message, server field errors, and combined loading state are derived once in FormProvider and passed to FormWrapper, while preserving the existing “fix the errors” focus behavior. No submit timing, offline handling, or form semantics were intentionally changed.

Fixed Issues

$ #94720
PROPOSAL: #94720 (Comment)

Tests

Open New Expensify on web.
Go to Settings > Profile > Display name.
Change the first name or last name.
Click Save.
Verify the updated name is saved successfully.

Error flow

Go to Settings > Profile > Display name.
Clear a required field.
Click Save.
Verify the form shows the validation error.
Click the “fix the errors” link in the alert.
Verify focus moves to the first invalid field.

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-07-10.at.9.51.09.PM.mov

Android: mWeb Chrome

Screen_Recording_20260710_213915_Chrome.mp4

iOS: Native

Screen.Recording.2026-07-10.at.9.02.54.PM.mov

iOS: mWeb Safari

Screen.Recording.2026-07-10.at.10.07.01.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-07-10.at.9.59.10.PM.mov

619389649-884e207c-08ca-448c-baaf-8be4f10dac2e

619389651-c079996b-ea2e-4c2e-a7be-ef1a1eea5f1e

melvin-bot · 2026-07-10T06:54:43Z

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

codecov · 2026-07-10T06:57:44Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/Form/FormProvider.tsx	`63.55% <100.00%> (+1.39%)`	⬆️
src/components/Form/FormWrapper.tsx	`90.62% <100.00%> (+8.27%)`	⬆️
... and 8 files with indirect coverage changes

melvin-bot · 2026-07-10T17:45:17Z

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

ikevin127 · 2026-07-10T20:04:41Z

@nabi-ebrahimi You mentioned 3 "Tests to add" in your proposal, but I'm not seeing any tests for the changes - are you still working on this PR or what's the status ? Note that eslint and typecheck are failing.

nabi-ebrahimi · 2026-07-11T07:54:27Z

@ikevin127 I’ve added the missing tests and fixed the TS issue. Could you please take another look? Thanks!

ikevin127 · 2026-07-11T20:21:39Z

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

iOS: Native

Simulator.Screen.Recording.-.iPhone.17.Pro.Max.-.2026-07-11.at.16.11.18.mov

MacOS: Chrome / Safari

Screen.Recording.2026-07-11.at.14.49.50.mov

ikevin127 · 2026-07-11T23:13:03Z

🧪 Test coverage of the diff — `~40–50%`

The two most important behavioral changes are essentially untested:

Conditional clearErrors/clearErrorFields (the core INP change) — no test asserts that clearErrors is skipped when hasServerError is false, or called when a server error exists. Since this is the whole point of the PR, it deserves a direct test.
The new prop wiring (isAlertVisible, serverErrorFields, serverErrorMessage) — the FormProvider.test.tsx mock only reads children, onSubmit, and isLoading:

const mockFormWrapper = jest.fn(({children, onSubmit, isLoading}: MockFormWrapperProps) => ( ... ));

So it never verifies that FormProvider derives/forwards the alert visibility or server error message correctly. The most refactor-sensitive lines have no assertion.

What is covered well:

✅ Debounced single-submit + isLoading forwarding from formState (FormProvider.test.tsx).
✅ Focus priority: local validation errors before server field errors, and the server-field fallback (FormWrapper.test.tsx).

Suggested additions:

Spy on clearErrors/clearErrorFields (@libs/actions/FormActions) and assert they are not called when formState has no errors/errorFields, and are called when it does.
Extend the FormProvider mock to capture isAlertVisible/serverErrorMessage and assert they reflect a seeded formState.errors / errorFields.

ikevin127 · 2026-07-11T23:13:41Z

@nabi-ebrahimi Completed the review, got 3 comments above that should be addressed before approval 🙌

nabi-ebrahimi · 2026-07-13T09:23:41Z

@ikevin127 Addressed your feedback and added the missing tests. Could you take another look? thanks!

ikevin127

🟢 LGTM: Tests well - Thanks for addressing the comments 🙌

Note

One small note (not a regression, just an observation):

The MockFormWrapperProps type was expanded to include isAlertVisible, serverErrorFields, serverErrorMessage, but the mock's render body still only destructures {children, onSubmit, isLoading}.

That's fine and intentional — the new assertions read from mockFormWrapper.mock.calls, not the rendered output, so the extra props don't need rendering. No action needed ✅

@nabi-ebrahimi Noticing some conflicts, please address before CME's final review to help streamline the process to merge. Thank you!

nabi-ebrahimi · 2026-07-14T06:57:05Z

@rlinoz, resolved the conflicts. All yours. Thanks!

nabi-ebrahimi · 2026-07-16T02:38:29Z

@rlinoz, could you please take a look at this pr when you get a chance. thanks.

rlinoz · 2026-07-16T11:59:49Z

Sorry, yes, reviewing now.

github-actions · 2026-07-16T12:31:53Z

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

github-actions · 2026-07-16T12:37:13Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-e8ac9f0470b-84c49dd-5a021d4fe9ae75735fc026dfacf05fe588cf13ca/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-e8ac9f0-84c49dd-f065827895cb9a08ccfa6514c3f5a916c67a361d/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-16T12:37:44Z

✋ 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-16T23:49:51Z

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.4.36-0 🚀

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

MelvinBot · 2026-07-16T23:51:57Z

🤖 I reviewed the changes in this PR against Expensify's help site content under App/docs/articles.

No help site changes are required.

This PR is an internal performance refactor of the shared Form components (FormProvider.tsx / FormWrapper.tsx) to reduce redundant Onyx work in the Form-SubmitButton submit path (an INP improvement). As stated in the PR description, "No submit timing, offline handling, or form semantics were intentionally changed."

The change is purely implementation-level:

Deduplicates the form Onyx subscription between FormProvider and FormWrapper.
Skips clearing server errors/fields in onValidate() when no Onyx-backed errors exist.
Preserves the existing "fix the errors" focus behavior.

Help site articles document user-facing product features, settings, and workflows — none of which change here. There are no new or renamed features, tabs, settings labels, or buttons to document, so no draft PR was created.

@nabi-ebrahimi, since no help site PR was needed, there's nothing to review here. If you believe this refactor does change documented behavior, let me know and I'll take another look.

Improve Form-SubmitButton INP

cd62235

melvin-bot Bot assigned nabi-ebrahimi Jul 10, 2026

nabi-ebrahimi marked this pull request as ready for review July 10, 2026 17:45

nabi-ebrahimi requested review from a team as code owners July 10, 2026 17:45

melvin-bot Bot requested review from heyjennahay and ikevin127 and removed request for a team July 10, 2026 17:45

melvin-bot Bot removed the request for review from a team July 10, 2026 17:45

github-actions Bot reviewed Jul 10, 2026

View reviewed changes

Comment thread src/components/Form/FormProvider.tsx Outdated

nabi-ebrahimi added 4 commits July 11, 2026 11:29

Merge branch 'main' into improve-form-submit-button-inp

9229a06

Fix FormProvider compiler and typing issues

a9bb642

Remove redundant form Onyx work

3368ac7

Add tests for form submit and error focus

e787fc6

ikevin127 reviewed Jul 11, 2026

View reviewed changes

Comment thread src/components/Form/FormProvider.tsx Outdated

ikevin127 reviewed Jul 11, 2026

View reviewed changes

Comment thread src/components/Form/FormWrapper.tsx Outdated

nabi-ebrahimi added 3 commits July 13, 2026 13:17

Merge branch 'main' into improve-form-submit-button-inp

a5315d1

remove dead form prop and simplify alert message

b73fae0

add FormProvider server error tests

62e06c7

ikevin127 approved these changes Jul 14, 2026

View reviewed changes

melvin-bot Bot requested a review from rlinoz July 14, 2026 01:41

nabi-ebrahimi added 3 commits July 14, 2026 11:00

Merge branch 'main' into improve-form-submit-button-inp

2eae37b

Mock usePressLoading in FormProvider tests

769c639

Mock usePressLoading in FormWrapper tests

0ceb11c

rlinoz approved these changes Jul 16, 2026

View reviewed changes

rlinoz merged commit e8ac9f0 into Expensify:main Jul 16, 2026
34 checks passed

github-actions Bot mentioned this pull request Jul 16, 2026

Investigate workflow job failing on main: test / test (job 5) #96296

Closed

OSBotify mentioned this pull request Jul 16, 2026

Deploy Checklist: New Expensify 2026-07-16 #96356

Open

52 tasks

Uh oh!

Conversation

nabi-ebrahimi commented Jul 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Error flow

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jul 10, 2026

Uh oh!

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

melvin-bot Bot commented Jul 10, 2026

Uh oh!

Uh oh!

ikevin127 commented Jul 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nabi-ebrahimi commented Jul 11, 2026

Uh oh!

ikevin127 commented Jul 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

ikevin127 commented Jul 11, 2026

🧪 Test coverage of the diff — ~40–50%

Uh oh!

ikevin127 commented Jul 11, 2026

Uh oh!

nabi-ebrahimi commented Jul 13, 2026

Uh oh!

ikevin127 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nabi-ebrahimi commented Jul 14, 2026

Uh oh!

nabi-ebrahimi commented Jul 16, 2026

Uh oh!

rlinoz commented Jul 16, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jul 16, 2026

Uh oh!

github-actions Bot commented Jul 16, 2026

Uh oh!

OSBotify commented Jul 16, 2026

Uh oh!

OSBotify commented Jul 16, 2026

Uh oh!

MelvinBot commented Jul 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

nabi-ebrahimi commented Jul 10, 2026 •

edited

Loading

codecov Bot commented Jul 10, 2026 •

edited by github-actions Bot

Loading

ikevin127 commented Jul 10, 2026 •

edited

Loading

ikevin127 commented Jul 11, 2026 •

edited

Loading

🧪 Test coverage of the diff — `~40–50%`

ikevin127 left a comment •

edited

Loading