Fix category tax defaults not showing in the Category RHP rules summary by Krishna2323 · Pull Request #102647 · Expensify/App

Krishna2323 · 2026-09-30T11:23:24Z

Explanation of Change

Fixed Issues

$ #102645
PROPOSAL:

Tests

Prerequisite: a Control workspace with Categories, Rules and Taxes enabled, and at least two tax rates besides the workspace default (e.g. "VAT (20%)").

Go to Workspace > Rules > Create > Apply expense defaults > Category
Select category "Travel", set Tax to "VAT (20%)" and save
Verify the Expense defaults table shows the "Travel" rule with Update tax to "VAT (20%)"
Go to Workspace > Categories and open "Travel"
Verify the Category rules section shows Update tax to "VAT (20%)"
Open another category that has no tax default and verify no tax rule is listed
Back in "Travel", tap the tax rule
Verify the Expense defaults editor opens with Categories still underneath, and the Category row is locked (no chevron, not pressable)
Refresh the page and verify the editor stays open with Categories underneath
Tap Tax, pick a different rate (e.g. "GST (10%)")
Verify the picker returns to the editor showing the new rate
Tap Save and verify you land back on the "Travel" category RHP, and the summary now reads Update tax to "GST (10%)"
Tap the tax rule again, delete it from the header menu, and verify you return to the "Travel" RHP with the tax rule gone
Open a category with no tax default > Create new rule
Verify "Apply expense defaults" is listed, tap it
Verify the Expense defaults editor opens directly (no Merchant/Category chooser), with the category locked and no Reset link
Pick a tax rate, save, and verify you land on the category RHP with the new tax rule listed
Create new rule > Apply expense defaults again on the same category, verify it opens with the saved rate and a delete option
Disable all tax rates except the workspace default, then open a category with no tax default > Create new rule > Apply expense defaults, and verify the "add a tax rate" explainer shows
Regression: Workspace > Rules > Create > Apply expense defaults still shows the Merchant/Category chooser

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

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>

codecov · 2026-09-30T11:26:20Z

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	`30.94% <ø> (ø)`
src/SCREENS.ts	`100.00% <ø> (ø)`
src/libs/CategoryContextualRulesUtils.ts	`94.11% <100.00%> (+1.52%)`	⬆️
src/libs/CategoryTaxRulesUtils.ts	`78.68% <ø> (+9.83%)`	⬆️
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`62.50% <ø> (ø)`
...ages/workspace/categories/CategorySettingsPage.tsx	`0.00% <ø> (ø)`
...ce/rules/MerchantRules/EditCategoryTaxRulePage.tsx	`0.00% <0.00%> (ø)`
...gation/AppNavigator/ModalStackNavigators/index.tsx	`7.66% <0.00%> (-0.02%)`	⬇️
...ace/rules/MerchantRules/AddCategoryTaxRulePage.tsx	`0.00% <0.00%> (ø)`
... and 2 more
... and 16 files with indirect coverage changes

…ory RHP Signed-off-by: krishna2323 <belivethatkg@gmail.com>

melvin-bot · 2026-09-30T11:41:31Z

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

Krishna2323 · 2026-09-30T11:42:37Z

Recording the platform videos now. They should be updated in a few minutes.

Krishna2323 · 2026-09-30T11:42:49Z

@MelvinBot review

MelvinBot · 2026-09-30T11:49:32Z

Code review

The logic looks correct. I found no blocking bugs. The category RHP now reads the tax default from policy.rules.expenseRules, and it uses the same summary and pending-delete handling as the Expense defaults table. The new create and edit screens are registered in every place the existing require-fields screens are. CI is green except the checklist checks.

Please look at these before merging:

The generic tax suffix now matches every URL that ends in /tax. src/ROUTES.ts:1092-1095. getStateFromPath tries each matching dynamic suffix. It parses the base path again, and when no candidate passes the entryScreens check, it logs Log.warn. That now happens for existing static routes like workspaces/:policyID/rules/merchant-rules/:ruleID/tax (the tax picker on the Rules page), search/edit-multiple/tax, and the Sage Intacct import/tax page. Navigation still works, but each of those navigations adds an extra parse and a warning. A unique suffix such as tax-default avoids this and matches the naming of flag-for-review and require-fields.
AddCategoryTaxRulePage switches modes based on live Onyx data. AddCategoryTaxRulePage.tsx:24-30. After Save, the optimistic setPolicyCategoryTaxes write makes hasExistingRule true while the page is still closing. The page then re-renders as an edit: the delete icon appears, and the seed effect writes the draft again. Delete does the reverse. It's harmless today because isClosing blocks the not-found state, but the header may flicker during the exit animation. You could fix the mode when the page mounts, or skip the switch while isClosing is true.
"Apply expense defaults" now shows on the static rules/new?categoryName= route and drops the category there. RulesNewPage.tsx:113. Removing isWorkspaceOnly shows the option wherever isCategoryScopedCreate is true, and that includes !!categoryName on the static route. Only the dynamic screen goes to openCategoryTaxRule. The static route opens the workspace-wide chooser and loses the category. No code navigates there with a categoryName today, so only a hand-typed URL reaches it. To be safe, hide the option unless the screen is DYNAMIC_CATEGORY_RULES_NEW.
Test coverage gaps. The new tests only cover getCategoryContextualRules. Codecov reports lower coverage. Two cases are worth a unit test:
- The RulesNewPage branch: explainer compared with navigation, and an existing rule compared with no rate.
- The new or existing-rule choice in AddCategoryTaxRulePage.
PR body. The "Explanation of Change" and "PROPOSAL" sections are empty. The per-platform screenshot sections are also empty; only one video is attached.

Checked and fine

On the dynamic category screens, useMerchantRuleRoute reports isCreatedFromExpense = true, so the tax row opens the dynamic rule-tax picker. That is why RULES_MERCHANT_TAX_FROM_EXPENSE.entryScreens gained the two new screens. The category branch of saveRule returns before reading backToRoute, so the unused merchant back path does no harm.
AddTaxPage gets categoryName from the merged base-route params, and in any case it falls back on the draft's ruleType. The picker still hides the workspace default rate for a new category default.
Refresh on the new page seeds the draft correctly whether or not the policy has loaded yet. The edit branch runs first once the rule shows up.
Save, unchanged save, and delete all return to categorySettingsBackPath through useRuleDeleteHeaderProps.backTo. This works from both Workspace > Categories and Settings > Categories.
The summary text and the offline pending-delete behavior match getCategoryTaxRulesTableData.

I reviewed the code only. I didn't run the test steps in a browser. Reply with @MelvinBot test this if you want a web run.

…he static category route Signed-off-by: krishna2323 <belivethatkg@gmail.com>

github-actions · 2026-09-30T12:54:24Z

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

JmillsExpensify

Tests well on the adhoc. Product approved.

JmillsExpensify · 2026-09-30T13:38:58Z

@situchan canyou prioritize reviewing this PR as soon as you're able. This is a hole we'd like to plug quickly.

JS00001

Code looks good, and the feature tested well, lets get situ to run a final review

situchan · 2026-09-30T14:30:24Z

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 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 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 and each prop has a /** comment above it */
- The file is named correctly
- 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
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- 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 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 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

Android: mWeb Chrome

iOS: HybridApp

ios.mp4

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

situchan · 2026-09-30T15:13:15Z

    const styles = useThemeStyles();
    const illustrations = useMemoizedLazyIllustrations(['CardReaderAlt', 'Flag', 'CheckboxText', 'ReportReceipt', 'AiBot']);
-    const isCategoryScopedCreate = route.name === SCREENS.WORKSPACE.DYNAMIC_CATEGORY_RULES_NEW || !!categoryName;
+    const isCategorySettingsFlow = route.name === SCREENS.WORKSPACE.DYNAMIC_CATEGORY_RULES_NEW;


Reuse this flag in these places:

App/src/pages/workspace/rules/RulesNewPage.tsx

Line 67 in d324a7c

route.name === SCREENS.WORKSPACE.DYNAMIC_CATEGORY_RULES_NEW

App/src/pages/workspace/rules/RulesNewPage.tsx

Line 80 in d324a7c

route.name === SCREENS.WORKSPACE.DYNAMIC_CATEGORY_RULES_NEW

situchan

JS00001 · 2026-09-30T15:44:26Z

Comment is a NAB & krishna is offline, lets ship it

github-actions · 2026-09-30T15:45:40Z

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

OSBotify · 2026-09-30T15:49:34Z

✋ 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 · 2026-09-30T15:56:29Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-05041be-0ca1693-84df9b6e0c3fbf6eac62e247473dd73e57297dbe/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-05041be-0ca1693-2a474f54e0d6f87b68f34465adfceee352769222/index.html

Web 🕸️
https://102647.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-10-01T00:04:07Z

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

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

MelvinBot · 2026-10-01T00:08:55Z

No help site update needed. The articles already describe this flow: Create-expense-categories.md:136-140 says to click Create new rule in the Category rules section and choose Apply expense defaults to "Set a default tax rate for this category." This PR makes the app match that sentence, so no article sentence is now incorrect.

view run

OSBotify · 2026-10-01T22:49:46Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.5.0-5 🚀

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

Bundle Size Analysis (Sentry):

Android

Fix category tax defaults not showing in the Category RHP rules summary

fd293ce

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

melvin-bot Bot assigned Krishna2323 Sep 30, 2026

Open the category tax editor from Apply expense defaults in the categ…

ec0fe6a

…ory RHP Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 marked this pull request as ready for review September 30, 2026 11:41

Krishna2323 requested review from a team as code owners September 30, 2026 11:41

melvin-bot Bot requested review from JmillsExpensify and situchan September 30, 2026 11:41

melvin-bot Bot removed request for a team September 30, 2026 11:41

Krishna2323 mentioned this pull request Sep 30, 2026

[Due for payment 2026-10-08] Fix category tax defaults not showing in the Category RHP rules summary. #102645

Closed

Use a unique tax-default suffix and keep Apply expense defaults off t…

4f053d5

…he static category route Signed-off-by: krishna2323 <belivethatkg@gmail.com>

This comment has been minimized.

Sign in to view

JmillsExpensify approved these changes Sep 30, 2026

View reviewed changes

JS00001 approved these changes Sep 30, 2026

View reviewed changes

situchan reviewed Sep 30, 2026

View reviewed changes

situchan approved these changes Sep 30, 2026

View reviewed changes

melvin-bot Bot requested a review from JS00001 September 30, 2026 15:26

JS00001 approved these changes Sep 30, 2026

View reviewed changes

JS00001 merged commit 05041be into Expensify:main Sep 30, 2026
35 of 40 checks passed

OSBotify mentioned this pull request Sep 30, 2026

Deploy Checklist: New Expensify 2026-09-30 #102701

Closed

70 tasks done

Krishna2323 mentioned this pull request Oct 12, 2026

[Due for payment 2026-10-13] [Tracking] Rules Revamp Project #92735

Closed

Conversation

Krishna2323 commented Sep 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Sep 30, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Sep 30, 2026

Uh oh!

Krishna2323 commented Sep 30, 2026

Uh oh!

Krishna2323 commented Sep 30, 2026

Uh oh!

MelvinBot commented Sep 30, 2026

Code review

Uh oh!

github-actions Bot commented Sep 30, 2026

Uh oh!

This comment has been minimized.

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

JmillsExpensify commented Sep 30, 2026

Uh oh!

JS00001 left a comment

Choose a reason for hiding this comment

Uh oh!

situchan commented Sep 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

situchan Sep 30, 2026

Choose a reason for hiding this comment

Uh oh!

situchan left a comment

Choose a reason for hiding this comment

Uh oh!

JS00001 commented Sep 30, 2026

Uh oh!

Uh oh!

github-actions Bot commented Sep 30, 2026

Uh oh!

OSBotify commented Sep 30, 2026

Uh oh!

github-actions Bot commented Sep 30, 2026

Uh oh!

OSBotify commented Oct 1, 2026

Uh oh!

MelvinBot commented Oct 1, 2026

Uh oh!

OSBotify commented Oct 1, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Krishna2323 commented Sep 30, 2026 •

edited

Loading

codecov Bot commented Sep 30, 2026 •

edited by github-actions Bot

Loading

situchan commented Sep 30, 2026 •

edited

Loading