8000 [Merge] Merge tax rates v2 by dominictb · Pull Request #83587 · Expensify/App · GitHub
[go: up one dir, main page]
Skip to content

[Merge] Merge tax rates v2#83587

Merged
youssef-lr merged 20 commits intoExpensify:mainfrom
dominictb:feat/70058-2
Mar 12, 2026
Merged

[Merge] Merge tax rates v2#83587
youssef-lr merged 20 commits intoExpensify:mainfrom
dominictb:feat/70058-2

Conversation

@dominictb
Copy link
Contributor
@dominictb dominictb commented Feb 26, 2026 •
edited
Loading

Explanation of Change

Enable users to select tax rate when merging expenses, auto-calculate tax amount.

Fixed Issues

$ #70058 ✅
$ #83083 ✅
$ #83086 ✅
$ #83153 ✅
$ #83165 ✅
PROPOSAL:

Tests

Test case 1: Merge in the same workspace with tax enabled

  1. Create a workspace with tax enabled and create a few different tax rates
  2. Create 2 expenses with the same tax rate to the same workspace
  3. Go to any of these expenses > More > Merge with the other expense
  4. In confirmation step, Verify the tax rate from step 1 is automatically selected
  5. Verify the tax amount is automatically calculated based on selected amount and selected tax rate
  6. Create 2 other expenses with different tax rates
  7. Go to any of these expenses > More > Merge with the other expense
  8. In review details step, Verify the tax rates of theses expenses are selectable
  9. In confirmation step, Verify the tax amount is automatically calculated based on selected amount and selected tax rate

Test case 2: Merge in different workspaces with tax enabled in both workspaces

  1. Repeat steps 1 - 10 with 2 expenses from different workspaces with tax enabled in both workspaces
  2. This can lead to tax rate violation if the selected tax rate does not exist in the destination workspace

Test case 3: Merge in different workspaces with tax enabled and tax disabled

  1. Create a workspace with tax disabled
  2. Create 2 expenses: 1 with tax, 1 in tax-disabled workspace
  3. Verify merging these expenses doesn't show tax section and doesn't merge tax rates

Note to QA: We temporarily disable merging tax rates for tax-disabled workspaces. We'll implement this behavior separately later.

  • Verify that no errors appear in the JS console

Offline tests

Same as 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
    Screen.Recording.2025-11-06.at.15.17.04.mov
    Android: mWeb Chrome
    Screen.Recording.2025-11-06.at.15.20.35.mov
    iOS: Native
    Screen.Recording.2025-11-06.at.15.09.13-compressed.mov
    iOS: mWeb Safari
    Screen.Recording.2025-11-06.at.15.12.26-compressed.mov
    MacOS: Chrome / Safari

    Test case 1 & 2:

    Screen.Recording.2025-10-09.at.17.37.15-compressed.mov

@codecov
Copy link
codecov bot commented Feb 26, 2026 •
edited by github-actions bot
Loading

Codecov Report

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

Files with missing lines Coverage Δ
src/hooks/useSelectedTransactionsActions.ts 83.90% <100.00%> (+0.18%) ⬆️
src/libs/DebugUtils.ts 68.54% <100.00%> (+0.06%) ⬆️
src/libs/TransactionUtils/index.ts 83.18% <100.00%> (+0.03%) ⬆️
src/libs/actions/IOU/index.ts 73.87% <ø> (ø)
...s/workspace/accounting/AccountingContext/index.tsx 0.00% <ø> (ø)
src/pages/TransactionMerge/ConfirmationPage.tsx 0.00% <0.00%> (ø)
src/pages/TransactionMerge/ReceiptReviewPage.tsx 0.00% <0.00%> (ø)
src/libs/actions/MergeTransaction.ts 58.49% <80.00%> (+0.26%) ⬆️
.../TransactionMerge/MergeTransactionsListContent.tsx 0.00% <0.00%> (ø)
src/pages/TransactionMerge/DetailsReviewPage.tsx 0.00% <0.00%> (ø)
... and 3 more
... and 9 files with indirect coverage changes

@dominictb dominictb mentioned this pull request Feb 26, 2026
Open
7 tasks
@dominictb dominictb mentioned this pull request Feb 26, 2026
Open
@trjExpensify
Copy link
Contributor
trjExpensify commented Feb 27, 2026

@dominictb will this go to review today?

@dominictb

This comment was marked as resolved.

Sign in to view
@dominictb dominictb marked this pull request as ready for review March 2, 2026 13:26
@dominictb dominictb requested review from a team as code owners March 2, 2026 13:26
@melvin-bot melvin-bot bot requested review from hoangzinh and trjExpensify and removed request for a team March 2, 2026 13:26
@melvin-bot
Copy link
melvin-bot bot commented Mar 2, 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]

@dominictb
Copy link
Contributor Author
dominictb commented Mar 2, 2026

@hoangzinh I fixed the blockers and there were specific commits for each issues. I've labelled them in the commit message to make it easier for review. Let me know if you had questions.

There's only this one left #83157 where we're still discussing the behavior of tax vs non-tax merging on Slack.

github-actions[bot]
github-actions bot reviewed Mar 2, 2026
View reviewed changes
@dominictb
Copy link
Contributor Author
dominictb commented Mar 2, 2026 •
edited
Loading

Also, here is the full list of blockers caused by the previous PRs FYI. Some of them are fixed in this PR while some are either backend or minor/unclear bugs:

Backend

chatgpt-codex-connector[bot]
chatgpt-codex-connector bot reviewed Mar 2, 2026
View reviewed changes
Copy link
@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

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: 651b558499

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are tr 8000 iggered 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".

@trjExpensify
Copy link
Contributor
trjExpensify commented Mar 2, 2026

@hoangzinh can you prioritise your review?

@trjExpensify
Copy link
Contributor
trjExpensify commented Mar 11, 2026

Thank you, keen to finally put a pin in this one.

@hoangzinh
Copy link
Contributor
hoangzinh commented Mar 11, 2026

Bug: The app displays the default tax rate when merging expenses from a tax-enabled workspace and a tax-disabled workspace.

Screen.Recording.2026-03-11.at.18.36.38.mov

@hoangzinh
Copy link
Contributor
hoangzinh commented Mar 11, 2026

@dominictb can you double-check again if this issue #83089 is fixed?

I can reproduce that issue in this PR

Screen.Recording.2026-03-11.at.21.40.22.mov

@hoangzinh
Copy link
Contributor
hoangzinh commented Mar 11, 2026

Hopefully, we only have two bugs above 🙏

@dominictb
Copy link
Contributor Author
dominictb commented Mar 11, 2026

Tax vs non-tax will be handled later #83587 (comment). We'll skip tax fields for now.

@trjExpensify
Copy link
Contributor
trjExpensify commented Mar 11, 2026

Are we good here then?

hoangzinh
hoangzinh approved these changes Mar 11, 2026
View reviewed changes
Copy link
Contributor
@hoangzinh hoangzinh left a comment

Choose a reason for hiding this comment

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

LGTM 🚢

@melvin-bot melvin-bot bot requested a review from youssef-lr March 11, 2026 22:48
@hoangzinh
Copy link
Contributor
hoangzinh commented Mar 11, 2026

Are we good here then?

Yes 🙏

trjExpensify
trjExpensify approved these changes Mar 11, 2026
View reviewed changes
Copy link
Contributor
@trjExpensify trjExpensify left a comment

Choose a reason for hiding this comment

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

Core PR for a WN project. 👍

@youssef-lr
Copy link
Contributor
youssef-lr commented Mar 12, 2026

LGTM!

@youssef-lr youssef-lr merged commit 6a08455 into Expensify:main Mar 12, 2026
31 checks passed
@github-actions
Copy link
Contributor
github-actions bot commented Mar 12, 2026

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

@github-actions
Copy link
Contributor
github-actions bot commented Mar 12, 2026

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-6a08455-3d8daef-099d81665ef12600a5f8ac96537ab5e10588fd80/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-6a08455-3d8daef-ae8b58dc5f8cb54e133be47276fdc45cb2f262bb/index.html
Android iOS
Web 🕸️
https://83587.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@OSBotify
Copy link
Contributor
OSBotify commented Mar 12, 2026

✋ 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 github-actions bot mentioned this pull request Mar 12, 2026
Closed
@OSBotify OSBotify mentioned this pull request Mar 12, 2026
Open
85 tasks
@OSBotify
Copy link
Contributor
OSBotify commented Mar 12, 2026

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.3.37-0 🚀

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

@lanitochka17 lanitochka17 mentioned this pull request Mar 13, 2026
Open
7 tasks
@mitarachim mitarachim mentioned this pull request Mar 13, 2026
Open
7 tasks
@mitarachim
Copy link
mitarachim commented Mar 13, 2026

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

This was referenced Mar 13, 2026
Closed
Closed
@jponikarchuk jponikarchuk mentioned this pull request Mar 13, 2026
Open
7 tasks
@jponikarchuk
Copy link
jponikarchuk commented Mar 13, 2026

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

@mitarachim mitarachim mentioned this pull request Mar 13, 2026
Open
7 tasks
@mitarachim
Copy link
mitarachim commented Mar 13, 2026

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

@dominictb
Copy link
Contributor Author
dominictb commented Mar 13, 2026 •
edited
Loading

@mitarachim @jponikarchuk I demoted these issues:

@dominictb
Copy link
Contributor Author
dominictb commented Mar 13, 2026 •
edited
Loading

Demoted:

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

@chatgpt-codex-connector chatgpt-codex-connector[bot] chatgpt-codex-connector[bot] left review comments

@youssef-lr youssef-lr youssef-lr approved these changes

@trjExpensify trjExpensify trjExpensify approved these changes

+1 more reviewer

@hoangzinh hoangzinh hoangzinh approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@dominictb dominictb

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@dominictb @trjExpensify @hoangzinh @youssef-lr @OSBotify @mitarachim @jponikarchuk
0