Remove returnKeyType for numeric/phone pad keyboards on iOS by MelvinBot · Pull Request #85444 · Expensify/App

MelvinBot · 2026-03-16T17:17:10Z

Explanation of Change

On iOS, phone/numeric pad keyboards don't have a built-in return key. When FormProvider unconditionally set returnKeyType: 'go' on all single-line TextInputs, React Native's native iOS code (RCTTextInputComponentView.mm) created a UIToolbar input accessory view with a visible "Go" button above the keyboard. This duplicated the form's existing submit button (e.g. "Save").

This PR detects numeric keyboard types (tel, numeric, decimal, phone-pad, number-pad, decimal-pad) in FormProvider.registerInput and skips setting returnKeyType for them. The onSubmitEditing handler is still set, so hardware keyboard form submission continues to work.

Fixed Issues

$ #85005
PROPOSAL: #85005 (comment)

Tests

Open the app on iOS
Go to Settings > Profile > Phone Number (in the Private section)
Tap on the phone number input to bring up the keyboard
Verify the "Go" toolbar button no longer appears above the keyboard
Verify the "Save" button is still present and functional
On a desktop/web browser, verify you can still press Enter to submit the phone number form

Verify that no errors appear in the JS console

Offline tests

Go to Settings > Profile > Phone Number while offline
Verify the phone number input does not show the extra "Go" button
Verify the form behaves correctly when going back online

QA Steps

On iOS native, go to Settings > Profile > Phone Number
Tap the phone number input field
Verify the "Go" button no longer appears above the keyboard
Verify the "Save" button works correctly to save the phone number
On web/desktop, verify pressing Enter in the phone number field still submits the form

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

N/A - This is an iOS-specific fix

Android: mWeb Chrome

N/A - This is an iOS-specific fix

iOS: Native

The "Go" toolbar button above the keyboard will no longer appear on phone number inputs.

iOS: mWeb Safari

N/A - mWeb Safari does not show the toolbar button

MacOS: Chrome / Safari

No visual change - Enter key still submits the form as before.

On iOS, phone/numeric pad keyboards don't have a built-in return key. When FormProvider set returnKeyType: 'go' on these inputs, React Native's native iOS code created a UIToolbar with a visible "Go" button above the keyboard, duplicating the form's existing submit button. This change detects numeric keyboard types (tel, numeric, decimal, phone-pad, number-pad, decimal-pad) and skips setting returnKeyType for them, removing the extra toolbar button while keeping onSubmitEditing for hardware keyboard submission. Co-authored-by: Linh Vo <linhvovan29546@users.noreply.github.com>

melvin-bot · 2026-03-16T17:17:15Z

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

codecov · 2026-03-16T17:25:27Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/CONST/index.ts	`93.60% <ø> (+0.05%)`	⬆️
src/components/Form/FormProvider.tsx	`60.20% <100.00%> (+0.41%)`	⬆️
src/components/Form/isNumericKeyboard.ts	`100.00% <100.00%> (ø)`
... and 135 files with indirect coverage changes

linhvovan29546 · 2026-03-17T02:28:42Z

src/components/Form/FormProvider.tsx

+            // Numeric/phone pad keyboards on iOS don't have a built-in return key. Setting returnKeyType
+            // on these creates a visible toolbar button (e.g. "Go") that duplicates the form's submit button.
+            const inputPropsRecord = inputProps as Record<string, unknown>;
+            const isNumericKeyboard =


@MelvinBot Could you please create a helper function for this and write some unit tests as well?

Done! Extracted the logic into a dedicated isNumericKeyboard helper function in src/components/Form/isNumericKeyboard.ts and added unit tests in tests/unit/isNumericKeyboardTest.ts covering all inputMode and keyboardType variants (including edge cases with mixed props and empty props).

Moved the numeric keyboard detection logic from FormProvider into a dedicated isNumericKeyboard helper and added comprehensive unit tests covering all inputMode and keyboardType variants. Co-authored-by: Linh Vo <linhvovan29546@users.noreply.github.com>

Co-authored-by: Linh Vo <linhvovan29546@users.noreply.github.com>

MelvinBot · 2026-03-17T02:36:21Z

Fixed the failing Prettier check: sorted the import of isNumericKeyboard to come after FormWrapper in src/components/Form/FormProvider.tsx.

MelvinBot · 2026-03-17T02:39:06Z

I analyzed the failing checks on this PR. Here's the summary:

Prettier check — Was failing due to import ordering in FormProvider.tsx. This was already fixed in commit 5d77b31 ("Fix: sort imports to satisfy Prettier") and is now passing in the latest run.
Remote Build iOS (build (Expensify Dev, Debug, true)) — Failed with a transient DNS resolution error:
```
Error: getaddrinfo ENOTFOUND ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com
```
This is an infrastructure issue (S3 bucket DNS lookup failed) completely unrelated to this PR's changes. A re-run should resolve it.
PR Reviewer Checklist — This is an expected manual checklist check.

No additional code fixes are needed. The Prettier issue is already resolved, and the iOS build failure is a transient infrastructure problem. The latest CI run is currently in progress with all completed checks passing.

MelvinBot · 2026-03-17T02:41:03Z

The failing check is unrelated to this PR.

Analysis: The build (Expensify Dev, Debug, true) check failed with a DNS resolution error during the iOS remote cache step:

Error: getaddrinfo ENOTFOUND ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com

This is a transient CI infrastructure issue — the S3 bucket used for build caching was temporarily unreachable.

Evidence: The PR only modifies src/components/Form/FormProvider.tsx, src/components/Form/isNumericKeyboard.ts, and tests/unit/isNumericKeyboardTest.ts. The failure occurred in the remote cache lookup step before any project code was compiled. All other build variants (Debug, New Expensify Dev, developmentDebug) passed successfully.

Re-running the failed check should resolve this.

MelvinBot · 2026-03-17T02:48:41Z

The failing checks are unrelated to this PR's changes.

1. build (Expensify Dev, Debug, true) — Infrastructure failure. The iOS remote build cache failed with a DNS resolution error (ENOTFOUND ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com). This is a transient network/S3 issue, not caused by any code change.

2. test (job 8) — Flaky test. tests/ui/SessionTest.tsx timed out (120s) on the deep linking test "should not remember the report path of the last deep link login after signing out and in again". This test covers session/deep-link behavior, which is unrelated to the Form/numeric keyboard changes in this PR.

Evidence: This PR only modifies src/components/Form/FormProvider.tsx, adds src/components/Form/isNumericKeyboard.ts, and adds tests/unit/isNumericKeyboardTest.ts. Neither failing check involves these files.

linhvovan29546 · 2026-03-17T03:03:54Z

src/components/Form/isNumericKeyboard.ts

+ * Numeric/phone pad keyboards on iOS don't have a built-in return key. Setting returnKeyType
+ * on these creates a visible toolbar button (e.g. "Go") that duplicates the form's submit button.
+ */
+function isNumericKeyboard(inputProps: Record<string, unknown>): boolean {


@MelvinBot Could you please use InputComponentBaseProps instead of Record<string, unknown>?

type NumericKeyboardProps = Pick<InputComponentBaseProps, 'inputMode' | 'keyboardType'>;

Done! Added inputMode and keyboardType to InputComponentBaseProps in types.ts, created a NumericKeyboardProps type using Pick<InputComponentBaseProps, 'inputMode' | 'keyboardType'>, and removed the Record<string, unknown> cast from FormProvider.tsx. Updated the tests accordingly.

linhvovan29546 · 2026-03-17T03:06:06Z

src/components/Form/isNumericKeyboard.ts

+        inputProps.keyboardType === 'phone-pad' ||
+        inputProps.keyboardType === 'number-pad' ||
+        inputProps.keyboardType === 'decimal-pad'


@MelvinBot Please use CONST variable

Done! Replaced all string literals with CONST variables — added CONST.KEYBOARD_TYPE.PHONE_PAD (which was missing) and now using CONST.KEYBOARD_TYPE.PHONE_PAD, CONST.KEYBOARD_TYPE.NUMBER_PAD, and CONST.KEYBOARD_TYPE.DECIMAL_PAD in both the helper and unit tests.

MelvinBot · 2026-03-17T03:06:15Z

The two failing checks are unrelated to this PR's changes:

1. build (Expensify Dev, Debug, true) — DNS resolution failure for the S3 remote build cache (getaddrinfo ENOTFOUND ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com). This is an infrastructure issue, not a code issue.

2. test (job 8) — Timeout in tests/ui/SessionTest.tsx:111 ("should not remember the report path of the last deep link login after signing out and in again" exceeded 120s). This is a known flaky test — the test.yml workflow is also failing on main (runs from Mar 14-16 all show failures). This test file is unrelated to the files changed in this PR (FormProvider.tsx, isNumericKeyboard.ts, isNumericKeyboardTest.ts).

No fix needed from this PR. Re-running the checks should resolve both failures.

Added inputMode and keyboardType to InputComponentBaseProps and created a NumericKeyboardProps type using Pick, replacing Record<string, unknown>. Co-authored-by: Linh Vo <linhvovan29546@users.noreply.github.com>

MelvinBot · 2026-03-17T03:08:32Z

The previous failing checks are unrelated to this PR's changes:

Jest Unit Tests (tests/ui/SessionTest.tsx:111) — Flaky timeout in the "Deep linking > should not remember the report path of the last deep link login after signing out and in again" test. This test exceeded the 120s timeout and is unrelated to the Form component changes in this PR.
Remote Build iOS — DNS resolution failure (ENOTFOUND ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com) when trying to access the S3 remote build cache. This is an infrastructure issue.

Evidence: This PR only modifies src/components/Form/FormProvider.tsx, src/components/Form/isNumericKeyboard.ts, src/components/Form/types.ts, and tests/unit/isNumericKeyboardTest.ts. Neither failure involves these files.

A new CI run is already in progress — these flaky/infra failures should not recur.

Added CONST.KEYBOARD_TYPE.PHONE_PAD and replaced all string literals ('phone-pad', 'number-pad', 'decimal-pad') with their CONST equivalents in isNumericKeyboard and unit tests. Co-authored-by: Linh Vo <linhvovan29546@users.noreply.github.com>

linhvovan29546 · 2026-03-17T03:59:23Z

@MelvinBot Make PR is ready for review

MelvinBot · 2026-03-17T04:01:25Z

I was unable to mark the PR as ready for review due to a permission issue in my environment. You can mark it ready yourself by clicking the "Ready for review" button at the bottom of the PR, or by running:

gh pr ready 85444 --repo Expensify/App

linhvovan29546 · 2026-03-17T04:04:17Z

@MelvinBot Mark this ready for review

melvin-bot · 2026-03-17T04:06:42Z

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

MelvinBot · 2026-03-17T04:06:44Z

Done — this PR has been marked as Ready for review. ✅

linhvovan29546 · 2026-03-17T04:09:02Z

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

Screen.Recording.2026-03-17.at.10.56.14.mov

Android: mWeb Chrome

Screen.Recording.2026-03-17.at.10.54.39.mov

iOS: HybridApp

Screen.Recording.2026-03-17.at.10.44.37.mov

iOS: mWeb Safari

Screen.Recording.2026-03-17.at.10.49.09.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-17.at.10.43.28.mov

melvin-bot · 2026-03-17T04:18:57Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #85005 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

JmillsExpensify

Fix LGTM. Product approved.

OSBotify · 2026-03-17T18:19:48Z

✋ 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-03-17T18:20:50Z

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

github-actions · 2026-03-17T18:27:55Z

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

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

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-18T13:30:51Z

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

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

OSBotify · 2026-03-18T14:06:52Z

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

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

OSBotify · 2026-03-23T09:28:48Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-4 🚀

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

MelvinBot assigned linhvovan29546 Mar 16, 2026

MelvinBot requested a review from a team March 16, 2026 17:17

MelvinBot mentioned this pull request Mar 16, 2026

[Due for payment 2026-03-30] [$250] Phone number inputs have a random "Go" button in the bottom right corner on iOS Native. #85005

Open

7 tasks

linhvovan29546 reviewed Mar 17, 2026

View reviewed changes

MelvinBot and others added 2 commits March 17, 2026 02:33

Fix: sort imports to satisfy Prettier

5d77b31

Co-authored-by: Linh Vo <linhvovan29546@users.noreply.github.com>

linhvovan29546 reviewed Mar 17, 2026

View reviewed changes

Use InputComponentBaseProps type for isNumericKeyboard

406bebe

Added inputMode and keyboardType to InputComponentBaseProps and created a NumericKeyboardProps type using Pick, replacing Record<string, unknown>. Co-authored-by: Linh Vo <linhvovan29546@users.noreply.github.com>

MelvinBot marked this pull request as ready for review March 17, 2026 04:06

MelvinBot requested a review from a team as a code owner March 17, 2026 04:06

melvin-bot bot requested review from JmillsExpensify and linhvovan29546 and removed request for a team March 17, 2026 04:06

linhvovan29546 approved these changes Mar 17, 2026

View reviewed changes

melvin-bot bot requested a review from carlosmiceli March 17, 2026 04:19

JmillsExpensify approved these changes Mar 17, 2026

View reviewed changes

carlosmiceli approved these changes Mar 17, 2026

View reviewed changes

carlosmiceli merged commit fbddade into main Mar 17, 2026
41 of 42 checks passed

carlosmiceli deleted the claude-removeReturnKeyTypeForNumericKeyboards branch March 17, 2026 18:06

OSBotify mentioned this pull request Mar 18, 2026

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

Closed

100 tasks

Conversation

MelvinBot commented Mar 16, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 16, 2026

Uh oh!

codecov bot commented Mar 16, 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!

linhvovan29546 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!

MelvinBot commented Mar 17, 2026

Uh oh!

MelvinBot commented Mar 17, 2026

Uh oh!

MelvinBot commented Mar 17, 2026

Uh oh!

linhvovan29546 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!

linhvovan29546 Mar 17, 2026 • 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!

MelvinBot Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Mar 17, 2026

Uh oh!

MelvinBot commented Mar 17, 2026

Uh oh!

linhvovan29546 commented Mar 17, 2026

Uh oh!

MelvinBot commented Mar 17, 2026

Uh oh!

linhvovan29546 commented Mar 17, 2026

Uh oh!

melvin-bot bot commented Mar 17, 2026

Uh oh!

MelvinBot commented Mar 17, 2026

Uh oh!

linhvovan29546 commented Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 17, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 17, 2026

Uh oh!

github-actions bot commented Mar 17, 2026

Uh oh!

github-actions bot commented Mar 17, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

codecov bot commented Mar 16, 2026 •

edited by github-actions bot

Loading

linhvovan29546 Mar 17, 2026 •

edited

Loading

linhvovan29546 commented Mar 17, 2026 •

edited

Loading