Skip to content

fix: hide tax row on per diem and time split expenses (#99200) - #99756

Merged
luacmartins merged 4 commits into
Expensify:mainfrom
truph01:fix/99200
Sep 3, 2026
Merged

luacmartins merged 4 commits into
Expensify:mainfrom
truph01:fix/99200

Conversation

@truph01

@truph01 truph01 commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #99200
PROPOSAL: #99200 (comment)

Tests

Precondition:

 - Enable Taxes.
 - Workspace has per diem rates.
  1. Go to ND
  2. Go to workspace chat.
  3. Create a per diem expense.
  4. Open the expense.
  5. Click More > Split.
  6. Click on any split.
  7. Verify: Tax field should be hidden when splitting per diem expense because per diem expense does not have tax rate.
  • 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 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 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

MacOS: Chrome / Safari
Screen.Recording.2026-08-28.at.20.17.56.mov

@truph01
truph01 requested review from a team as code owners August 28, 2026 13:18
@melvin-bot
melvin-bot Bot requested review from hoangzinh and removed request for a team August 28, 2026 13:18
@melvin-bot

melvin-bot Bot commented Aug 28, 2026

Copy link
Copy Markdown

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

@codecov

codecov Bot commented Aug 28, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/pages/iou/DynamicSplitExpenseEditPage.tsx 0.00% <0.00%> (ø)
... and 7 files with indirect coverage changes

@hoangzinh

hoangzinh commented Sep 1, 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 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
    • 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
    • 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 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

Screen.Recording.2026-09-02.at.11.17.19.mov

Comment on lines +207 to +208
const isSplitPerDiemRequest = isPerDiemRequest(splitExpenseDraftTransaction) || isPerDiemRequest(transaction);
const isSplitTimeRequest = isTimeRequest(splitExpenseDraftTransaction) || isTimeRequest(transaction);

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.

@truph01 can you elaborate on why we need to check on both splitExpenseDraftTransaction and transaction?

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.

@hoangzinh Checking on both splitExpenseDraftTransaction and transaction is redundant. I updated to use only transaction.

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

🚢

@melvin-bot
melvin-bot Bot requested a review from luacmartins September 2, 2026 15:27
@luacmartins

luacmartins commented Sep 2, 2026 •

Copy link
Copy Markdown
Contributor

@truph01 Jest is failing. Can you merge main please?

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

@luacmartins
luacmartins merged commit f61829c into Expensify:main Sep 3, 2026
35 of 36 checks passed
@github-actions

github-actions Bot commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Sep 3, 2026

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.

@OSBotify

OSBotify commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.4.73-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Help site review: one docs update needed

This PR hides the tax field on split rows for per diem and time expenses. The help site never documented a tax field on split rows, so nothing existing was wrong — but the new expense-type-dependent behavior wasn't documented anywhere, and users on workspaces with Taxes enabled will see the field on some split rows and not others.

Draft PR: #100488 — adds one FAQ entry to docs/articles/new-expensify/reports-and-expenses/Split-Expenses.md plus tax-related search keywords. Labeled HelpDot, assigned to you.

What I checked and what changed

Articles reviewed

  • new-expensify/reports-and-expenses/Split-Expenses.md — the only article covering the split row edit screen. Its steps say a row can update "category, tag, date, or description", which already omits tax, so no existing line contradicted the fix. No section covered the tax field on splits.
  • new-expensify/reports-and-expenses/Per-Diem-Expenses.md, new-expensify/workspaces/Enable-Time-Tracking-and-Set-a-Default-Hourly-Rate.md, new-expensify/workspaces/Configure-Per-Diem-in-a-workspace.md — no mentions of tax or splitting, so no edits required.
  • new-expensify/workspaces/Track-Taxes.md — describes enabling taxes and applying rates per expense; nothing about per-expense-type exclusions on splits. Left unchanged and linked from the new FAQ entry instead.

Added FAQ entry

Why don’t I see a tax field on a per diem or time split?

Per diem and time expenses are calculated from a workspace rate that doesn’t carry a tax rate, so no tax field appears on their split rows even when Taxes is enabled for the workspace. Splits of other expense types, such as cash or company card expenses, still show a tax field when Taxes is enabled. The field is labeled Tax unless your workspace renamed it.

Guidelines applied

  • HELP_AUTHORING_GUIDELINES.md — kept to one workflow per article, used an FAQ question heading (exempt from the task-based ## rule only inside # FAQ), no new # heading, added realistic search keywords.
  • HELPSITE_NAMING_CONVENTIONS.md — bolded UI labels (Taxes, Tax) in Sentence case with no quotation marks.
  • TEMPLATE.md — the article already follows the template; I appended to the existing # FAQ rather than restructuring.

UI verification (web)

  • The expense More menu option is labeled Split.
  • The split row edit screen renders one row per editable field with Remove split and Save buttons.
  • No tax field appears on a workspace without Taxes enabled, matching the "field appears only when taxes are enabled" wording.
  • The field's label comes from the workspace's tax rates name and falls back to Tax (DynamicSplitExpenseEditPage.tsx:518), which is why the FAQ notes the rename case.

I did not verify a per diem split with taxes enabled in the live UI — that needs a non-USD workspace with per diem rates configured. The wording is based on the merged code path (DynamicSplitExpenseEditPage.tsx:207-213), so please confirm it matches what you saw while testing.

@truph01, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

@OSBotify

OSBotify commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.4.73-3 🚀

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