Skip to content

Show empty tax rate column when tax is deleted instead of default#87672

Draft
MelvinBot wants to merge 1 commit intomainfrom
claude-fixTaxRateDefaultAfterDeletion
Draft

Show empty tax rate column when tax is deleted instead of default#87672
MelvinBot wants to merge 1 commit intomainfrom
claude-fixTaxRateDefaultAfterDeletion

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

@MelvinBot MelvinBot commented Apr 10, 2026

Explanation of Change

When tax is deleted from an expense via "Delete tax" (introduced in #84769), taxCode is set to ''. However, getTaxName() used the || operator to fall back to the default tax code when taxCode was falsy, so '' || defaultTaxCode evaluated to the workspace's default tax code. This caused the tax rate column to display the default rate instead of being empty.

This PR adds an early return in getTaxName() when taxCode is explicitly '', and switches the remaining fallback from || to ?? so that only null/undefined trigger the default — not an intentionally cleared empty string.

Fixed Issues

$ #87667
PROPOSAL: #87667 (comment)

Tests

  1. Enable Taxes in a workspace
  2. Create two expenses with 5% tax rates in that workspace's chat
  3. Go to workspace settings > More features > Disable Taxes
  4. Open the expense report
  5. Open any expense, click Tax field, click "Delete tax"
  6. Close the expense detail
  7. Verify the tax rate column is empty (not showing the default tax rate)
  • Verify that no errors appear in the JS console

Offline tests

N/A - this is a display-only fix for how an already-saved transaction field is rendered.

QA Steps

Same as Tests

  • 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 shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 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)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.
  • 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.
  • 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.
Checks run
Check Result
Prettier Pass
ESLint Pass
TypeScript (tsgo) Pass
Unit tests (TransactionUtils, MergeTransactionUtils) Pass (255/255)

Screenshots/Videos

Android: Native

N/A - logic-only change

Android: mWeb Chrome

N/A - logic-only change

iOS: Native

N/A - logic-only change

iOS: mWeb Safari

N/A - logic-only change

MacOS: Chrome / Safari

N/A - logic-only change

@MelvinBot @roryabraham
Return undefined from getTaxName when taxCode is explicitly empty
85514cc 
When tax is deleted via "Delete tax", taxCode is set to ''. Previously,
getTaxName used || which treated '' as falsy and fell back to the default
tax code, causing the tax rate column to show the default rate instead of
being empty.

Co-authored-by: Rory Abraham <roryabraham@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team April 10, 2026 19:36
@MelvinBot MelvinBot mentioned this pull request Apr 10, 2026
Open
7 tasks
@roryabraham
Copy link
Copy Markdown
Contributor

roryabraham commented Apr 10, 2026

@codex review

@chatgpt-codex-connector
Copy link
Copy Markdown

chatgpt-codex-connector bot commented Apr 10, 2026

Codex Review: Didn't find any major issues. Chef's kiss.

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

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 10, 2026

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

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 10, 2026

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-85514cc-b19dd1e-a52f8561e028360f9603cd4be1b77d3d286d6f2c/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-85514cc-b19dd1e-6dcdc7d48f0b29343cf4e5774ff37dd8893154b8/index.html
Android iOS
Web 🕸️
https://87672.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

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

Reviewers

No reviews

Assignees

@roryabraham roryabraham

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@MelvinBot @roryabraham