Skip to content

Add Canadian Multiple Tax Export template to New Expensify for workspaces using CAD - #97853

Merged
NikkiWines merged 7 commits into
Expensify:mainfrom
dukenv0307:fix/97255-canadian-multiple-tax-export
Aug 12, 2026
Merged

Add Canadian Multiple Tax Export template to New Expensify for workspaces using CAD#97853
NikkiWines merged 7 commits into
Expensify:mainfrom
dukenv0307:fix/97255-canadian-multiple-tax-export

Conversation

@dukenv0307

@dukenv0307 dukenv0307 commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Adds the Canadian Multiple Tax Export template to New Expensify for workspaces whose output currency is CAD, and includes the fixes for the three regressions the original PR caused before it was reverted

Fixed Issues

$ #97231
PROPOSAL:

Tests

Precondition:

  1. Create a workspace, open its settings, set Output currency = CAD
  2. Enable tax on the workspace; add at least one tax rate

Test case 1:

  1. Submit an expense with tax on that workspace (so the export has tax data)
  2. Open the report containing that expense
  3. Click the Export button (header/three-dot menu)
  4. Verify Canadian Multiple Tax Export appears in the default templates group
  5. Select it
  6. Verify that: the export runs and the CSV (Concierge chat) has GST/PST columns + CURRENCY = CAD and the tax amount, rate, ... are correct

Test case 2:

  1. Go to staging.new.expensify.com
  2. Go to workspace chat.
  3. Create a report.
  4. Go to Spend > Reports.
  5. Select the report via the checkbox.
  6. Click More > Export.
    → Verify that Canadian Multiple Tax Export icon shows the default export icon.
  7. Exit selection mode.
  8. Click Filter > Exported to.
    → Verify that Canadian Multiple Tax Export icon shows the default export icon.

Test case 3:

  1. Go to staging.new.expensify.com
  2. Create an expense in both workspaces with CAD currency.
  3. Go to Spend > Reports.
  4. Select both reports.
  5. Click the dropdown button > Export.
  6. Verify that Canadian Multiple Tax Export is present when bulk selecting reports from CAD workspaces.
  7. Select several reports, but 1 of them isn't CAD
  8. Verify that Canadian Multiple Tax Export isn't present when bulk selecting reports from CAD workspaces.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as above

  • 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-08-05.at.2.23.21.PM.mov
Screenshot 2026-08-05 at 2 44 01 PM

@melvin-bot

melvin-bot Bot commented Aug 5, 2026

Copy link
Copy Markdown

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

@codecov

codecov Bot commented Aug 5, 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/CONST/index.ts 94.81% <ø> (ø)
src/hooks/useExportedToFilterOptions.ts 100.00% <100.00%> (ø)
src/hooks/useSearchBulkActions.ts 60.30% <100.00%> (+0.56%) ⬆️
src/libs/AccountingUtils.ts 75.00% <100.00%> (+11.36%) ⬆️
src/libs/SearchQueryUtils.ts 87.54% <100.00%> (+0.20%) ⬆️
src/libs/actions/Search.ts 48.39% <100.00%> (+0.43%) ⬆️
...ts/Search/SearchList/ListItem/ExportedIconCell.tsx 63.46% <0.00%> (-0.69%) ⬇️
...nts/Search/FilterComponents/ExportedToSelector.tsx 0.00% <0.00%> (-2.57%) ⬇️
... and 10 files with indirect coverage changes

@dukenv0307
dukenv0307 marked this pull request as ready for review August 5, 2026 07:44
@dukenv0307
dukenv0307 requested review from a team as code owners August 5, 2026 07:44
@melvin-bot
melvin-bot Bot requested review from abdulrahuman5196 and trjExpensify and removed request for a team August 5, 2026 07:44
@melvin-bot

melvin-bot Bot commented Aug 5, 2026

Copy link
Copy Markdown

@abdulrahuman5196 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 August 5, 2026 07:44
@dukenv0307
dukenv0307 requested review from NikkiWines and thelullabyy and removed request for abdulrahuman5196 August 5, 2026 07:45

@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: 5dc7ec2e8f

ℹ️ 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/hooks/useSearchBulkActions.ts
trjExpensify
trjExpensify previously approved these changes Aug 5, 2026

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

Someone asked for this again today! 👍

@dukenv0307

Copy link
Copy Markdown
Contributor Author

@thelullabyy kindly bump

@thelullabyy

thelullabyy commented Aug 6, 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

iOS: HybridApp
Screen.Recording.2026-08-02.at.18.03.34.mov
MacOS: Chrome / Safari
Screen.Recording.2026-08-02.at.17.43.32.mov

@thelullabyy

Copy link
Copy Markdown
Contributor

I think we should update the test steps, currently I still can see the Canadian Multiple Tax Export though only converted amount is in CAD @dukenv0307

Go to staging.new.expensify.com
Create an expense in both workspaces with CAD currency.
Go to Spend > Reports.
Select both reports.
Click the dropdown button > Export.
Verify that Canadian Multiple Tax Export is present when bulk selecting reports from CAD workspaces.
Select several reports, but 1 of them isn't CAD
Verify that Canadian Multiple Tax Export isn't present when bulk selecting reports from CAD workspaces.
image image

@dukenv0307

Copy link
Copy Markdown
Contributor Author

@thelullabyy I think canadian tax filing is workspace-level. A CAD workspace files in CAD; a foreign-currency expense still belongs on that report, converted. Excluding it would produce an incomplete tax export, which is worse than including it.

@thelullabyy

Copy link
Copy Markdown
Contributor

Alright, then... it looks good now

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

I think we should also add template this to getFilterDisplayValue in SearchQueryUtils.cpp. Weird that we haven't added other there though 🤔

Comment thread src/components/Search/FilterComponents/ExportedToSelector.tsx
Comment thread src/languages/de.ts Outdated
@dukenv0307

Copy link
Copy Markdown
Contributor Author

@NikkiWines Done

NikkiWines
NikkiWines previously approved these changes Aug 11, 2026

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

:shipit:

NikkiWines
NikkiWines previously approved these changes Aug 11, 2026
@dukenv0307

Copy link
Copy Markdown
Contributor Author

Merged main again. @NikkiWines can you check it again 🙏 ?

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

👍

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

re-approving from product 👍

@NikkiWines
NikkiWines merged commit 87d3101 into Expensify:main Aug 12, 2026
39 of 40 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

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

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/NikkiWines in version: 9.4.53-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Help site review complete — changes are required.

This PR adds a new default export template, Canadian Multiple Tax Export, that appears in the export template menu for both expenses and reports whenever a workspace's output currency is set to CAD. The two New Expensify help articles that list the available export templates don't mention it, so they need updating.

Draft help site PR: #98478

What it updates:

  • How to Export Reports — adds the template to the "What export templates can I choose from?" list plus a new FAQ on when it appears.
  • How to Export Expenses — same additions.

The template name is used verbatim from the app's language strings (export.multipleTaxExportCanadian Multiple Tax Export), and the CAD-only / all-selected-must-be-CAD gating matches getExportTemplates in src/libs/actions/Search.ts and doAllSelectedItemsBelongToCADPolicies in src/hooks/useSearchBulkActions.ts.

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

@jponikarchuk

Copy link
Copy Markdown

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

@jponikarchuk

Copy link
Copy Markdown

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

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.

8 participants