Skip to content

Fix: cursor position after flip (+/-) in new manual expense amount field#94543

Merged
puneetlath merged 3 commits into
mainfrom
claude-flipButtonCursorSelection
Jun 29, 2026
Merged

Fix: cursor position after flip (+/-) in new manual expense amount field#94543
puneetlath merged 3 commits into
mainfrom
claude-flipButtonCursorSelection

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

On the new manual expense flow, tapping the flip (+/-) button in the amount field updated the value but never moved the text cursor (selection). On an empty field the selection stayed at {0, 0} — i.e. before the prepended - — so the next digit typed produced an invalid string like 5-. validateAmount rejects that string, setFormattedNumber returns early, and the entered number disappears. This reproduced both reported symptoms: "cursor appears before negative sign" and "number disappears after entering a number".

handleFlipPress in NumberWithSymbolForm.tsx now shifts the cursor by the length of the toggled sign (+1 when adding -, -1 clamped to 0 when removing it), keeping it in the same logical position relative to the digits. For the empty-field case the selection becomes {1, 1}, placing the cursor right after the - so subsequent typing stays valid. This mirrors how the imperative updateNumber handler already manages selection.

PR Expensify/App#94134 (removing the isNewManualExpenseFlowEnabled beta) didn't introduce this — it exposed a pre-existing flaw in the new manual flow by enabling it by default. That PR was reverted in Expensify/App#94312 to clear the deploy blocker; this PR fixes the underlying bug so the new flow is correct when re-enabled.

Fixed Issues

$ #94255
PROPOSAL: #94255 (comment)

Tests

  1. Go to a workspace chat.
  2. Open FAB > Create expense > Manual.
  3. Tap the Amount field, then tap the flip (+/-) button.
  4. Verify the cursor appears after the negative sign.
  5. Enter a number and verify it is not discarded (e.g. -5).
  6. Tap flip again to remove the sign and verify the cursor/value stay consistent.
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

  1. Go to a workspace chat.
  2. Open FAB > Create expense > Manual.
  3. Tap the Amount field, then tap the flip (+/-) button.
  4. Verify the cursor appears after the negative sign.
  5. Enter a number and verify the number is not discarded.
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

Co-authored-by: thelullabyy <thelullabyy@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 The failing test (job 6) check is unrelated to this PR — it's a pre-existing/flaky failure, not something this PR introduced.

Failing test: NewChatPage › should keep a selected non-existing user visible in the top section after the search is cleared (tests/ui/NewChatPageTest.tsx:155).

Why it's unrelated:

  • This PR changes a single file, src/components/NumberWithSymbolForm.tsx (cursor position after the +/- flip in the amount field).
  • NumberWithSymbolForm is consumed only by amount/tax/IOU forms (MoneyRequestAmountForm, AmountForm, tax value pages, etc.). It is not imported by NewChatPage or anything in its render path, so this change cannot affect new-chat user-selection behavior.
  • The failure is a waitFor timeout on an async UI assertion — a classic flaky-test signature.

Recommendation: Re-run test (job 6). No code change is warranted here.

The checklist check is the PR author checklist (handled separately by a human), not a code failure.

@thelullabyy

Copy link
Copy Markdown
Contributor

@MelvinBot Please merge main. After that replace all [ ] characters in PR description by [x]. Finally, open this PR for review

1 similar comment
@thelullabyy

Copy link
Copy Markdown
Contributor

@MelvinBot Please merge main. After that replace all [ ] characters in PR description by [x]. Finally, open this PR for review

@thelullabyy

Copy link
Copy Markdown
Contributor

@MelvinBot Please merge main. After that replace all [ ] characters in PR description by [x]. Finally, open this PR for review

…orSelection

Co-authored-by: thelullabyy <thelullabyy@users.noreply.github.com>
@MelvinBot MelvinBot marked this pull request as ready for review June 27, 2026 05:41
@MelvinBot MelvinBot requested a review from a team as a code owner June 27, 2026 05:41
@melvin-bot melvin-bot Bot requested review from JmillsExpensify and thelullabyy and removed request for a team June 27, 2026 05:41
@melvin-bot

melvin-bot Bot commented Jun 27, 2026

Copy link
Copy Markdown

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

@melvin-bot melvin-bot Bot removed the request for review from a team June 27, 2026 05:41
@thelullabyy

thelullabyy commented Jun 27, 2026

Copy link
Copy Markdown
Contributor

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
Screen.Recording.2026-06-27.at.01.44.18.mov
Screen.Recording.2026-06-29.at.01.32.42.mov

@codecov

codecov Bot commented Jun 27, 2026

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/components/NumberWithSymbolForm.tsx 68.78% <0.00%> (-1.11%) ⬇️
... and 14 files with indirect coverage changes

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 31f05370d1

ℹ️ 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".

Comment on lines +474 to +477
setSelection((prevSelection) => ({
start: Math.max(prevSelection.start + offset, 0),
end: Math.max(prevSelection.end + offset, 0),
}));

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Preserve manual selection updates on native

On native, the other programmatic update paths set willSelectionBeUpdatedManually (and numberRef.current) before changing selection because the controlled TextInput can emit onSelectionChange while the value update is being applied. This flip path changes the value and then sets the cursor, but leaves that guard unset, so in the new manual expense flow on iOS/Android the selection event can write the old {0,0} selection back after adding -, leaving the cursor before the sign and causing the next digit to be rejected/disappear. Apply the same manual-selection guard used by setFormattedNumber/setNewNumber around this update.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Valid catch — fixed in 6b8c9a5.

On native, shouldIgnoreSelectionWhenUpdatedManually is true, so handleSelectionChange only ignores the spurious onSelectionChange event when willSelectionBeUpdatedManually.current is set. handleFlipPress was changing the value and the selection but never setting that guard (unlike setNewNumber/setFormattedNumber), so the controlled TextInput could write the stale {0,0} selection back and undo the cursor shift.

The flip handler now sets willSelectionBeUpdatedManually.current = true and numberRef.current = newValue before updating the value/selection, matching the other update paths.

@thelullabyy

Copy link
Copy Markdown
Contributor

@MelvinBot Please check this comment and fix if needed #94543 (comment)

@thelullabyy

Copy link
Copy Markdown
Contributor

@MelvinBot You are using the wrong template for PR description. Let's update to use this https://raw.githubusercontent.com/Expensify/App/main/.github/PULL_REQUEST_TEMPLATE.md

Remember to replace all [ ] by [x]

Co-authored-by: thelullabyy <thelullabyy@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team as a code owner June 27, 2026 05:53
@melvin-bot melvin-bot Bot requested review from puneetlath and removed request for a team June 27, 2026 05:53
@melvin-bot

melvin-bot Bot commented Jun 27, 2026

Copy link
Copy Markdown

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

@JmillsExpensify JmillsExpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thelullabyy thelullabyy left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@puneetlath puneetlath merged commit 045e20d into main Jun 29, 2026
38 of 41 checks passed
@puneetlath puneetlath deleted the claude-flipButtonCursorSelection branch June 29, 2026 16:48
@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.4.25-0 🚀

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

@OSBotify

OSBotify commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.4.25-2 🚀

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

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants