Skip to content

Add category tax defaults to Expense defaults - #99420

Merged
JS00001 merged 51 commits into
Expensify:mainfrom
Krishna2323:krishna2323/issue-99410
Sep 4, 2026
Merged

JS00001 merged 51 commits into
Expensify:mainfrom
Krishna2323:krishna2323/issue-99410

Conversation

@Krishna2323

@Krishna2323 Krishna2323 commented Aug 25, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #99410
PROPOSAL:

Tests

Create — choose the type

  1. Rules → + Rule → Apply expense defaults: verify the chooser shows Apply expense defaults / What should this rule match on? with Merchant and Category cards.
  2. With taxes off/no tax rates: verify Category is locked and tapping it shows Turn on taxes first.
  3. Deep-link to workspaces/<id>/rules/merchant-rules/new: verify it redirects to the chooser.

Create — category rule

  1. Chooser → Category: verify required Category condition and only Tax under defaults. No merchant/default rows or Preview matches.
  2. Verify apply-to-existing is locked and tapping it shows Category rules apply going forward.
  3. Open Tax: verify no None option and workspace default rate isn't listed.
  4. Select 3 categories + 1 tax → Save: verify 3 rows are created with the correct category/tax.
  5. Search categories: verify filtering works, selected categories stay pinned, and select-all only selects filtered results.
  6. With taxes off → Tax: verify Taxes are not enabled empty state with Enable taxes, and enabling returns to a working picker.

Create — merchant rule

  1. Chooser → Merchant: verify required Merchant, all defaults available, and Preview matches + apply-to-existing are usable.
  2. Save a merchant rule with a category default: verify it appears under Merchants.

Reset

  1. Set a condition on an unsaved rule → Reset: verify condition/defaults clear while staying scoped to the same type.
  2. With nothing selected or on a saved rule: verify Reset is absent.

Edit

  1. Open a Categories row: verify category + tax are pre-filled and are the only rows.
  2. Change category (verify radios, not checkboxes) → Save: verify old row is removed and new category keeps the rate, with no not-found flash.
  3. Change only tax → Save: verify the row updates.
  4. Deep-link to workspaces/<id>/rules/category-tax-rules/edit/<category>: verify correct values load.
  5. As an auditor, open a Categories and Merchants row: verify both are read-only — no chevrons, Save, or Delete, and no not-found page.

Delete

  1. Delete a category rule: verify it disappears.
  2. Bulk delete 2 merchant + 1 category rule: verify all disappear.
  3. Verify Merchant types rows are locked/non-selectable.
  4. Delete a category rule → create an expense in that category: verify tax falls back to the workspace default.
  5. Delete the category or tax rate used by a category rule: verify the rule disappears with it.
    6 Delete a category that a merchant rule matches on: verify the merchant rule stays listed and still opens

Sections / sorting

Unchanged — all four existing steps still apply.

Validation

  1. Merchant rule, save with nothing: verify Enter a merchant, and apply at least one default.
  2. Merchant rule, default without merchant: verify Please enter a merchant.
  3. Category rule, save without category: verify Please select a category.
  4. Category rule, category without tax: verify Please select a tax rate.
  • Verify that no errors appear in the JS console

Offline tests

  1. Delete merchant rule offline: verify row greys out and stays. Online: verify it disappears immediately.
  2. Delete category rule: verify it disappears both offline and online — expected since category tax rules can't carry a pending state.
  3. Move a category rule's category offline with a failing connection: verify neither rule disappears and the local array reverts to its pre-move state.

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
    • MacOS: Desktop
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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_hybrid.mp4
Android: mWeb Chrome
android_mWeb.mp4
iOS: Native
ios_hybrid.mp4
iOS: mWeb Safari
ios_mWeb.mp4
MacOS: Chrome / Safari
web_chrome.mp4

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@melvin-bot

melvin-bot Bot commented Aug 25, 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 bun ./scripts/generateTranslations.ts --help

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

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323
Krishna2323 marked this pull request as ready for review August 26, 2026 14:38
@Krishna2323
Krishna2323 requested review from a team as code owners August 26, 2026 14:38
@melvin-bot
melvin-bot Bot requested review from situchan and removed request for a team August 26, 2026 14:38
@melvin-bot

melvin-bot Bot commented Aug 26, 2026

Copy link
Copy Markdown

@situchan 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 requested review from flaviadefaria and removed request for a team August 26, 2026 14:38
Comment thread src/libs/CategoryTaxRulesUtils.ts Resolved
Comment thread src/libs/actions/Policy/Category.ts Resolved
Comment thread src/libs/actions/Policy/Category.ts Resolved
Comment thread src/libs/actions/Policy/Category.ts Resolved
Comment thread src/libs/actions/Policy/Category.ts Resolved
Signed-off-by: krishna2323 <belivethatkg@gmail.com>

@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: 1bdb3ab7b4

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/libs/actions/Policy/Category.ts Resolved
Comment thread src/libs/actions/Policy/Category.ts Resolved
@OSBotify

OSBotify commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

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

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Yes — help site changes are required. Draft PR: #100489

This PR adds a capability the help site never described: an expense default that matches on a Category and sets a default Tax rate. Every existing article only covers merchant-matching rules, and the Default tax rate bullet in Workspace Rules still points only at the category settings page.

What the docs PR changes

New — Set-a-default-tax-rate-for-a-category.md

The full workflow: prerequisites, creating the rule via Rules > Expense defaults > Add rule > Apply expense defaults > Category, editing and bulk deleting rows listed under Categories, and what happens afterward — applies to new expenses only, falls back to the workspace default when deleted, and is removed with its category or tax rate. FAQ covers the locked Category option, the Taxes are not enabled empty state, the missing None option, both validation errors, and auditor read-only access.

Updated — Workspace-Rules.md

The Default tax rate bullet now notes the rate is also managed from the Expense defaults tab and links to the new article. Both paths write the same expenseRules entry.

Updated — Workspace-Merchant-Rules.md

Added the chooser step for the tabbed page, corrected Save Rule to Save rule, and pointed at the new article for the category rule type.

One thing to confirm

The tabbed Rules page is behind the rulesRevamp beta. I drove the current web UI to check, and the Rules page still shows Expenses, Merchant, and Agent rules sections with an Add merchant rule button — no tabs, no Add rule button.

So rather than replacing the current instructions, the new steps use the same conditional phrasing Import-Merchant-Rules.md already uses ("If the Rules page shows tabs…"). Once the beta is fully rolled out, that wording can be dropped from all three articles. Flagging in case you'd prefer the articles written for the revamped UI unconditionally instead.

All UI strings came from src/languages/en.ts on this PR — tab Expense defaults, button Add rule, Apply expense defaults / What should this rule match on? / Merchant / Category, sections Categories / Merchants / Merchant types, and the Turn on taxes first, Category rules apply going forward, and Taxes are not enabled copy.

npm run spell-changed passes on all three files.


@Krishna2323, 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 #100504 was identified to be related to this PR.

@jponikarchuk

Copy link
Copy Markdown

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

@mitarachim

Copy link
Copy Markdown

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

@jponikarchuk

Copy link
Copy Markdown

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

@jponikarchuk

Copy link
Copy Markdown

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

@jponikarchuk

Copy link
Copy Markdown

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

@lanitochka17

Copy link
Copy Markdown

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

@jponikarchuk

Copy link
Copy Markdown

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

@nlemma

nlemma commented Sep 8, 2026 •

Copy link
Copy Markdown

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

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