Skip to content

Fix: Time expenses are created with tax#87993

Open
dominictb wants to merge 7 commits intoExpensify:mainfrom
dominictb:fix/time-expenses-are-created-with-tax
Open

Fix: Time expenses are created with tax#87993
dominictb wants to merge 7 commits intoExpensify:mainfrom
dominictb:fix/time-expenses-are-created-with-tax

Conversation

@dominictb
Copy link
Copy Markdown
Contributor

@dominictb dominictb commented Apr 15, 2026 •
edited
Loading

Explanation of Change

Time expenses, without tax support, are created with the workspace's default tax rate because we always fallback to:

App/src/pages/iou/request/step/IOURequestStepConfirmation.tsx

Line 323 in 25bfe2a

const transactionTaxCode = (transaction?.taxCode ? transaction?.taxCode : defaultTaxCode) ?? '';

We currently only hide it away from the UI so they appear as no tax but the transaction itself still has taxCode, taxValue and taxAmount.

This PR avoids creating time expenses with the default tax fallback.

Fixed Issues

$ #87600
PROPOSAL:

Tests

Preconditions:

  • Workspace has Taxes enabled and non-zero tax rates
  1. Go to workspace settings > Taxes > Settings
  2. Set Workspace currency default and Foreign currency default to a non-zero tax rate
  3. Create a time expense
  4. Go to Reports > Expenses > Filters > Tax rate
  5. Select the default tax rate in step 2 > Save > View results
  6. Verify the time expense created in step 3 does not appear here
  • Verify that no errors appear in the JS console

Offline tests

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.

Screenshots/Videos

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

@dominictb
Revert "Hide tax fields for time and per diem expenses"
26d8869 
This reverts commit 5aa0800.

Revert "Move time/perDiem guard from shouldShowTax to shouldShowTaxDisabledAlert"

This reverts commit 06fddc4.

Revert "Hide tax fields for time and per diem expenses in MoneyRequestView"

This reverts commit 4aca2df.
@dominictb
fix: time expenses are created with tax
236b57d
@dominictb
remove time expense check when showing tax name
5c2ad9f
@dominictb dominictb marked this pull request as ready for review April 15, 2026 17:26
@dominictb dominictb requested review from a team as code owners April 15, 2026 17:26
@melvin-bot melvin-bot bot requested review from heyjennahay and hoangzinh and removed request for a team April 15, 2026 17:26
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 15, 2026

@hoangzinh 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 April 15, 2026 17:26
github-actions[bot]
github-actions bot reviewed Apr 15, 2026
View reviewed changes
Comment thread tests/ui/TimeExpenseConfirmationTest.tsx
const submitButton = screen.getByText(/create.*expense/i);
fireEvent.press(submitButton);
await waitForBatchedUpdatesWithAct();

Copy link
Copy Markdown
Contributor

@github-actions github-actions bot Apr 15, 2026

Choose a reason for hiding this comment

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

❌ CONSISTENCY-5 (docs)

The eslint-disable-next-line @typescript-eslint/no-unsafe-member-access comment lacks an explanation of why the rule is being disabled. ESLint disables without justification can mask underlying issues and make it harder for future developers to understand the exception.

Add a comment explaining why the disable is needed, for example:

// We need to access mock call args dynamically and TypeScript cannot infer the type safely
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access

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

hoangzinh
hoangzinh reviewed Apr 16, 2026
View reviewed changes
Comment thread src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -320,7 +318,7 @@ function IOURequestStepConfirmation({
const isEditingReceipt = hasReceipt(transaction);
const customUnitRateID = getRateID(transaction) ?? '';
const defaultTaxCode = getDefaultTaxCode(policy, transaction);
const transactionTaxCode = (transaction?.taxCode ? transaction?.taxCode : defaultTaxCode) ?? '';
const transactionTaxCode = isTimeRequest ? '' : ((transaction?.taxCode ? transaction?.taxCode : defaultTaxCode) ?? '');
Copy link
Copy Markdown
Contributor

@hoangzinh hoangzinh Apr 16, 2026

Choose a reason for hiding this comment

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

Instead of only checking isTimeRequest, should we also verify isTaxTrackingEnabled to address this issue more broadly?

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

Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@heyjennahay heyjennahay Awaiting requested review from heyjennahay

+1 more reviewer

@hoangzinh hoangzinh hoangzinh left review comments

Reviewers whose approvals may not affect merge requirements

At least 1 approving review is required to merge this pull request.

Assignees

@dominictb dominictb

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@dominictb @hoangzinh