Skip to content

Fix tax amount input overwriting in-progress edits in new manual expense flow#94538

Merged
puneetlath merged 2 commits into
mainfrom
claude-fixTaxAmountInputForceSync
Jun 26, 2026
Merged

Fix tax amount input overwriting in-progress edits in new manual expense flow#94538
puneetlath merged 2 commits into
mainfrom
claude-fixTaxAmountInputForceSync

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

The inline tax amount input in the new manual expense flow re-added padding digits (.00) while the user was typing, because a force-sync useEffect in TaxFields.tsx overwrote the field on every keystroke.

The effect's guard compared raw strings: the in-progress text returned by getNumber() (e.g. "5.0") was compared against the re-padded taxAmountInput ("5.00"). Because the strings differ, the guard failed and updateNumber("5.00") overwrote the user's edit. This produced all three reported symptoms:

  • Deleting a digit from "5.00""5.0" got re-padded back to "5.00" (BUG 1/2).
  • Clearing the field and typing 10 stored 1000, which got re-padded to "10.00" (BUG 3).

The fix changes the guard to compare the numeric value instead of the formatted string. The current input is parsed to its backend amount (treating an empty field as 0) and compared against the stored taxAmount. An in-progress edit like "5.0" (≡ "5.00" ≡ backend 500) is now recognized as already in-sync and is left untouched. The field is only refreshed via updateNumber when the stored tax amount genuinely differs — e.g. when the tax rate is changed and the amount is recalculated externally.

Note: PR #94134 (which removed the isNewManualExpenseFlowEnabled beta) was reverted in #94312, so this input is currently behind the beta again. This change fixes the underlying bug so the new manual expense flow behaves correctly when the beta is re-enabled.

Fixed Issues

$ #94264
PROPOSAL: #94264 (comment)

Tests

Requires the new manual expense flow + Taxes enabled on the workspace.

  1. Enable Taxes in workspace settings.
  2. Go to a workspace chat → + → Create expense → Manual.
  3. Enter an amount, tap Tax and set it to a 5% rate.
  4. Focus the Tax amount field and press backspace once.
    • Verify the removed digit is not replaced with 0 (BUG 1).
  5. Press backspace again.
    • Verify the last two digits are not replaced with 00 (BUG 2).
  6. Clear the field and type 10.
    • Verify .00 is not auto-appended (BUG 3).
  7. Change the tax rate to a different percentage.
    • Verify the tax amount field correctly refreshes to the newly calculated amount.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests.

QA Steps

Requires the new manual expense flow + Taxes enabled on the workspace.

  1. Enable Taxes in workspace settings.
  2. Go to a workspace chat → + → Create expense → Manual.
  3. Enter an amount, tap Tax and set it to a 5% rate.
  4. Focus the Tax amount field and press backspace once.
    • Verify the removed digit is not replaced with 0 (BUG 1).
  5. Press backspace again.
    • Verify the last two digits are not replaced with 00 (BUG 2).
  6. Clear the field and type 10.
    • Verify .00 is not auto-appended (BUG 3).
  7. Change the tax rate to a different percentage.
    • Verify the tax amount field correctly refreshes to the newly calculated amount.
  • 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

…nse flow

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

Copy link
Copy Markdown
Contributor

@MelvinBot You are using the wrong PR description template. Please use this one

https://raw.githubusercontent.com/Expensify/App/main/.github/PULL_REQUEST_TEMPLATE.md

After that replace all [ ] by [x]

Finally, open PR for review

@thelullabyy

Copy link
Copy Markdown
Contributor

@codex review

@MelvinBot MelvinBot marked this pull request as ready for review June 26, 2026 04:39
@MelvinBot MelvinBot requested a review from a team as a code owner June 26, 2026 04:39
@melvin-bot melvin-bot Bot requested review from thelullabyy and removed request for a team June 26, 2026 04:39
@melvin-bot

melvin-bot Bot commented Jun 26, 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 requested review from trjExpensify and removed request for a team June 26, 2026 04:39
@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 Done, thelullabyy:

  • Rebuilt the PR description from the current PULL_REQUEST_TEMPLATE.md, preserving the Explanation of Change, Fixed Issues, and test steps.
  • Replaced all [ ] with [x].
  • Marked the PR as Ready for review.

// tax rate changed and the amount was recalculated externally).
const currentInput = numberFormRef.current?.getNumber();
if (currentInput !== undefined) {
const currentBackendAmount = currentInput.trim() === '' ? 0 : convertToBackendAmount(Number.parseFloat(currentInput));

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.

❌ CONSISTENCY-3 (docs)

This expression currentInput.trim() === '' ? 0 : convertToBackendAmount(Number.parseFloat(currentInput)) duplicates the exact string-to-backend-amount conversion already used in handleTaxAmountChange (newAmount.trim() === '' ? 0 : convertToBackendAmount(Number.parseFloat(newAmount))). Both apply the same empty-string-to-zero guard before converting. Consolidating keeps the parsing rules in one place so the two sites can't drift apart.

Extract a small local helper and call it in both spots:

const toBackendTaxAmount = (input: string) => (input.trim() === '' ? 0 : convertToBackendAmount(Number.parseFloat(input)));

// in handleTaxAmountChange
const taxAmountInSmallestCurrencyUnits = toBackendTaxAmount(newAmount);

// in the effect
const currentBackendAmount = toBackendTaxAmount(currentInput);

Reviewed at: e29f18f | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

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.

Good catch — addressed in 9750f66. Extracted a local toBackendTaxAmount helper and used it in both handleTaxAmountChange and the sync effect so the empty-string-to-zero guard and conversion live in one place.

@thelullabyy

Copy link
Copy Markdown
Contributor

@MelvinBot Please check this comment #94538 (comment)

@thelullabyy

thelullabyy commented Jun 26, 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-26.at.00.38.26.mov
Screen.Recording.2026-06-26.at.00.59.02.mov

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

melvin-bot Bot commented Jun 26, 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]

@codecov

codecov Bot commented Jun 26, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
...oneyRequestConfirmationList/sections/TaxFields.tsx 81.48% <87.50%> (+0.23%) ⬆️
... and 197 files with indirect coverage changes

@trjExpensify trjExpensify 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.

Another one bites the dust! 👍

@puneetlath puneetlath merged commit 7f3e84e into main Jun 26, 2026
40 checks passed
@puneetlath puneetlath deleted the claude-fixTaxAmountInputForceSync branch June 26, 2026 13:41
@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.21-2 🚀

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

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