Skip to content

feat: Add Tax, Billable, and Reimbursable selectors in the Split details page - #94434

Merged
luacmartins merged 48 commits into
Expensify:mainfrom
truph01:feat/94038
Aug 20, 2026
Merged

luacmartins merged 48 commits into
Expensify:mainfrom
truph01:feat/94038

Conversation

@truph01

@truph01 truph01 commented Jun 24, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

  • src/types/onyx/IOU.ts — Add taxCode?: string, taxAmount?: number, taxValue?: number to the SplitExpense interface.
  • SplitExpenseEditPage.tsx — Add UI rows for Tax Rate, Reimbursable, and Billable (gated by the appropriate policy flags), navigating to the existing MONEY_REQUEST_STEP_TAX_RATE, MONEY_REQUEST_STEP_BILLABLE, and MONEY_REQUEST_STEP_REIMBURSABLE routes.
  • SplitExpenseItems.ts (initSplitExpenseItemData) — Seed taxCode/taxAmount/taxValue from the parent transaction when initializing split items.
  • SplitExpenseItems.ts (updateSplitExpenseField) — Carry taxCode/taxAmount/taxValue through from the draft transaction when saving a split edit.
  • SplitTransactionUpdate.ts — Include taxCode/taxAmount/taxValue in the splits API payload and in the optimistic Onyx merge.
  • SplitTransactionSplitsParam type — Add taxCode, taxAmount, taxValue fields.

Fixed Issues

$ #94038
PROPOSAL: #94038 (comment)

Tests

  1. Create a workspace, enable tax > add a second tax rate + enable rules
  2. Create an expense on the workspace
  3. In the expense click More > Split
  4. Open one of the splits
  5. Verify: In the expense details of the split, the user should be able to set the tax rate on the individual split and set reimbursable/billable details.

Test 2:

  1. Submit a $100 workspace expense; apply the 20% tax rate. Open it and confirm the Tax amount row reads $16.67.
  2. Tap Tax amount -> change to $10.00 -> Save. Confirm the tax row now is $10.00.
  3. Open the expense → Split expense. You'll see 2 splits of $50.00.
  4. Save.
  5. Open each of the 2 resulting expenses and read the Tax amount row
  6. Verify: Tax amount of each split expenses display as $5

Test 3:

  1. Submit a $100 workspace expense; apply the default tax rate (0%)
  2. Split expense
  3. Set split 1 to use 5%, split 2 to use 10%
  4. Tap "Make splits even"
  5. Tap submit
  6. Verify the tax amount of 2 split expenses, they are $2.38 and $4.55

Test 4:

  1. Submit an expense with amount: $10 and taxRate: 5% => taxAmount: $0.48
  2. Split that expense into 2, and adjust 1st split expense to: taxRate: 10%, amount: $4
  3. Submit split
  4. 1st split expense has taxAmount: $0.36.
  5. Verify that the tax amount of the 2nd split expense is $0.29?
  • 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 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
Screen.Recording.2026-07-08.at.16.51.54.mov

@truph01

truph01 commented Jun 24, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@codecov

codecov Bot commented Jun 24, 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/ROUTES.ts 25.90% <ø> (+1.99%) ⬆️
src/libs/actions/IOU/SplitTransactionUpdate.ts 91.30% <100.00%> (+0.12%) ⬆️
src/libs/actions/SplitExpenses.ts 88.09% <100.00%> (+0.44%) ⬆️
src/libs/actions/IOU/SplitExpenseItems.ts 94.92% <77.77%> (-0.62%) ⬇️
.../request/step/DynamicIOURequestStepTaxRatePage.tsx 0.00% <0.00%> (ø)
src/pages/iou/SplitExpenseEditPage.tsx 0.00% <0.00%> (ø)
... and 38 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: bccd150adf

ℹ️ 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 thread src/pages/iou/SplitExpenseEditPage.tsx Resolved
@truph01
truph01 marked this pull request as ready for review July 8, 2026 09:52
@truph01
truph01 requested review from a team as code owners July 8, 2026 09:52
@melvin-bot
melvin-bot Bot requested review from flaviadefaria and hoangzinh and removed request for a team July 8, 2026 09:52
@melvin-bot

melvin-bot Bot commented Jul 8, 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]

@melvin-bot
melvin-bot Bot removed the request for review from a team July 8, 2026 09:52

@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: 3b4042d749

ℹ️ 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 +620 to +621
reimbursable: transactionDetails?.reimbursable,
billable: transactionDetails?.billable,

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Preserve edited flags in existing split updates

Saving these new per-split reimbursable/billable values here only works for brand-new split creation. In the existing-split update path, updateSplitTransactions overwrites currentSplit.reimbursable and currentSplit.billable from the old splitTransaction before building the final UPDATE_SPLIT_TRANSACTION payload, so toggling either switch on an already-created split appears to save locally but the API receives the old values and the change is lost on sync.

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.

@MelvinBot Explain more about this concern

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.

The reviewer is flagging a mismatch between where you write the toggled values and where they get consumed when the split already exists on the server.

What the reviewer means

  1. In updateSplitExpenseField you correctly copy the edited values into the draft split — SplitExpenseItems.ts:620-621. That's fine for the draft.

  2. But in updateSplitTransactions, the existing-split path (if (splitTransaction)) overwrites those values back to the old server values before building the field-change payload — SplitTransactionUpdate.ts:749-752:

    currentSplit.reimbursable = splitTransaction.reimbursable;
    currentSplit.billable = splitTransaction.billable;

    transactionChanges is built from {...currentSplit} just above at :736, so after this overwrite reimbursable/billable equal the old values. The diff loop at :754 then deletes any key where newValue === oldValue, so those two fields drop out of transactionChanges and never reach getUpdateMoneyRequestParams at :796. For a brand-new split (splitTransaction is falsy) this block is skipped — that's why the reviewer says it "only works for brand-new split creation."

Does it still hold on the current commit?

Partly. The splits API param now carries the new values — SplitTransactionUpdate.ts:278-279 — so the server side should persist a toggle on an existing split. The gap the overwrite still leaves is on the optimistic/local side: because the fields are stripped from transactionChanges, the individual split transaction's optimistic Onyx update (and its modifiedExpense action) won't reflect the toggle until the server response arrives. So offline, or in the moment right after saving, the split can still show the old reimbursable/billable.

How to confirm: toggle reimbursable/billable on an already-created split, save while offline (or watch the split's transaction in Onyx before the API responds), and check whether it reflects the new value immediately. If it snaps back to the old value until the response lands, the concern is real for the optimistic path and worth fixing (e.g. don't reset currentSplit.reimbursable/billable to the old values, or add them explicitly to transactionChanges). If it updates immediately, it's already covered.

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.

I tested and it fine

Comment thread src/pages/iou/SplitExpenseEditPage.tsx Resolved
@hoangzinh

hoangzinh commented Jul 9, 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

Android: HybridApp
Screen.Recording.2026-08-04.at.18.12.43.mov
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-08-04.at.18.05.19.mov

Comment thread src/pages/iou/SplitExpenseEditPage.tsx Resolved
splitExpense.taxAmount ??
calculateIOUAmount(splitExpenses.length - 1, originalTransactionDetails?.taxAmount ?? 0, originalTransactionDetails?.currency ?? CONST.CURRENCY.USD, false),
taxValue: splitExpense.taxValue ?? originalTransactionDetails?.taxValue,
billable: originalTransactionDetails?.billable,

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.

Can you check if we can update billable and reimbursable for a split 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.

Resolved via 4a2250f

}

function updateSplitExpenseDraftField(fields: Partial<OnyxTypes.Transaction>) {
Onyx.merge(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`, fields);

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.

Should we pass transactionID, instead of hardcoded CONST.IOU.OPTIMISTIC_TRANSACTION_ID?

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.

I think we can leave it as is, since none of the current callers need to pass a transaction ID other than CONST.IOU.OPTIMISTIC_TRANSACTION_ID.

@OSBotify OSBotify mentioned this pull request Aug 21, 2026
55 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

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

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Help site docs review — changes required.

This PR adds Tax, Reimbursable, and Billable fields to the individual split edit screen (gated by the workspace's tax tracking / rules settings). The existing help article Split-Expenses.md only documented category, tag, date, and description per split, so a docs update is warranted.

Draft PR: #99126

What changed in the docs
  • Updated the "split by amount" and "edit a split expense" steps to mention setting the Tax rate and toggling Reimbursable / Billable, noting these appear only when enabled on the workspace.
  • Added an FAQ covering setting a tax rate / marking a split reimbursable or billable.
  • Added related keywords.

Labels verified against src/languages/en.ts (common.tax → Tax, common.reimbursable → Reimbursable, common.billable → Billable).

@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


view run

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #99131 was identified to be related to this PR.

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #99133 was identified to be related to this PR.

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #99138 was identified to be related to this PR.

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #99140 was identified to be related to this PR.

@jponikarchuk

Copy link
Copy Markdown

Deploy Blocker #99142 was identified to be related to this PR.

@jponikarchuk

Copy link
Copy Markdown

Deploy Blocker #99144 was identified to be related to this PR.

@jponikarchuk

Copy link
Copy Markdown

Deploy Blocker #99147 was identified to be related to this PR.

@lanitochka17

Copy link
Copy Markdown

Deploy Blocker #99198 was identified to be related to this PR.

@lanitochka17

Copy link
Copy Markdown

Deploy Blocker #99200 was identified to be related to this PR.

@lanitochka17

Copy link
Copy Markdown

Deploy Blocker #99205 was identified to be related to this PR.

@lanitochka17

Copy link
Copy Markdown

Deploy Blocker #99211 was identified to be related to this PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Beamanator in version: 9.4.58-4 🚀

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.