Fix regressions from [Rules Revamp] Release 2 by Krishna2323 · Pull Request #95444 · Expensify/App

Krishna2323 · 2026-07-06T21:08:27Z

Explanation of Change

Fixed Issues

$ #95305
$ #95358

PROPOSAL:

Tests

Prerequisites

Workspace admin on a Control workspace with Rules and Categories enabled
rulesRevamp beta enabled
Attendee tracking enabled (for edit/offline tests)
At least 2–3 categories

#95305 — Category enable page when categories are disabled

Go to More features and disable Categories.
Open Rules.
Create Require fields or Flag for review rule.
Open category selection page
Verify the empty state is shown with the folder illustration and an option to enable categories.

#95358 — None not shown in category picker

Go to + Rule → Require fields → Category.
Confirm None is not shown or selectable in the list.

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: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Monosnap.screencast.2026-07-30.20-33-47.mp4

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

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

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

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

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

Krishna2323 · 2026-07-06T21:27:06Z

@codex review

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 76ffee7ce0

ℹ️ 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".

codecov · 2026-07-06T21:37:48Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/pages/settings/Rules/Fields/AddTaxRatePage.tsx	`0.00% <0.00%> (ø)`
.../workspace/rules/MerchantRules/AddCategoryPage.tsx	`0.00% <0.00%> (ø)`
...pages/workspace/rules/MerchantRules/AddTagPage.tsx	`0.00% <0.00%> (ø)`
...pages/workspace/rules/MerchantRules/AddTaxPage.tsx	`0.00% <0.00%> (ø)`
...MerchantTypeRules/MerchantTypeRuleCategoryPage.tsx	`0.00% <0.00%> (ø)`
...rc/pages/settings/Rules/Fields/AddCategoryPage.tsx	`0.00% <0.00%> (ø)`
src/pages/settings/Rules/Fields/AddTagPage.tsx	`0.00% <0.00%> (ø)`
src/components/Rule/RuleSelectionBase.tsx	`0.00% <0.00%> (ø)`
...rReviewRules/FlagForReviewRuleCategoryPageBase.tsx	`0.00% <0.00%> (ø)`
...eFieldsRules/RequireFieldsRuleCategoryPageBase.tsx	`0.00% <0.00%> (ø)`
... and 1 more
... and 10 files with indirect coverage changes

…ting until policy loads. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

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

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

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

melvin-bot · 2026-07-30T14:29:49Z

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:

Look at the code and make sure there are no malicious changes.
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

Krishna2323 · 2026-07-30T14:31:42Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9ae1fbf4fa

ℹ️ 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".

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

melvin-bot · 2026-07-30T15:05:49Z

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

dubielzyk-expensify · 2026-07-31T00:25:08Z

Looks good from my end too 👍

JS00001 · 2026-07-31T16:01:28Z

@situchan over to you

situchan · 2026-07-31T16:02:00Z

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: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-08-03.at.3.31.15.PM.mov

Krishna2323 · 2026-08-03T14:12:34Z

@situchan bump

situchan · 2026-08-03T14:13:29Z

On it

situchan · 2026-08-03T14:32:51Z

Rules - Require fields and Flag for review are not hidden when Categories are disabled #95305

This is still reproducible

situchan · 2026-08-03T14:34:31Z

Please update Tests step to avoid confusion. As we're showing guide page instead of hiding tabs

Krishna2323 · 2026-08-03T14:37:40Z

Test step updated

situchan · 2026-08-03T14:39:44Z

+    useFocusEffect(() => {
+        fetchPolicyCategories();
+    });


I am not sure this tutorial considered auto memoization by React Compiler but do we not need useCallback here?

cc: @MelvinBot

Correct — you don't need an explicit useCallback here. That React Navigation warning is written for codebases without React Compiler, and App runs the compiler on every src/ file.

Why: useFocusEffect re-runs its effect whenever the callback's reference changes. Without memoization an inline arrow is a new reference every render, so the effect would fire on every re-render while focused — that's what the docs are guarding against. React Compiler auto-memoizes the inline callback passed to useFocusEffect and fetchPolicyCategories based on their captured deps (areCategoriesEnabled, policyCategories, policyID), which is functionally equivalent to wrapping them in useCallback. So a manual useCallback would just be redundant. The compiler covers this file — the babel sources filter only excludes tests/ and node_modules/.

One caveat worth knowing: App runs two compiler implementations — oxc on web and babel-plugin-react-compiler on native — and they don't always memoize a file identically (REACT_COMPILER.md). If one memoizes this file and the other doesn't, the CI memoization divergence check will flag it, and the documented fix is to add the manual useCallback back. So: rely on the compiler by default, and only reach for useCallback if that check fails on this file.

situchan · 2026-08-03T14:41:11Z

+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const illustrations = useMemoizedLazyIllustrations(['FolderOpen']);
+    const policyData = usePolicyData(policyID);


Minor perf: usePolicyData (computes reports + transactions + violations across all policy reports) is quite heavy for the empty state.
enablePolicyCategories only reads policyData.policy?.id and policyData.categories.
Since this component only renders when categories are disabled, impact is limited — but a lighter path (usePolicy + the categories useOnyx) would avoid the unnecessary derived work.

enablePolicyCategories also passes policyData into pushTransactionAutoSelectionsOnyxData and pushTransactionViolationsOnyxData.

ok then leave as is

situchan · 2026-08-03T14:49:35Z

    const [form] = useOnyx(ONYXKEYS.FORMS.REQUIRE_FIELDS_RULE_FORM);
    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
+    const areCategoriesEnabled = !!policy?.areCategoriesEnabled;
+    const arePolicyCategoriesLoading = areCategoriesEnabled && policyCategories === undefined;


Bug: permanent spinner when offline

Test in non-default workspace. Clear cache and restart to clear categories.

Screen.Recording.2026-08-03.at.3.46.39.PM.mov

situchan · 2026-08-03T14:49:50Z

    const [form] = useOnyx(ONYXKEYS.FORMS.FLAG_FOR_REVIEW_RULE_FORM);
    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
+    const areCategoriesEnabled = !!policy?.areCategoriesEnabled;
+    const arePolicyCategoriesLoading = areCategoriesEnabled && policyCategories === undefined;


Same bug here

…mp-regressions

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

Krishna2323 · 2026-08-03T19:25:53Z

@JS00001, could you please review and merge this? It would help avoid conflicts in the next PR.

github-actions · 2026-08-04T13:22:05Z

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

github-actions · 2026-08-04T13:28:16Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-28eda1dc22e-a84bac1-b8a337189c09db2e5804a2d0ed76d156eac18161/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-28eda1d-a84bac1-d0099ff6d777d0455dea1da00f6ae6bc39e5668f/index.html

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

👀 View the workflow run that generated this build 👀

m-natarajan · 2026-08-04T21:49:43Z

@Krishna2323 @JS00001 @situchan To confirm, Is applause.expensifail.com domain enabled for rulesRevamp beta?

OSBotify · 2026-08-04T21:59:18Z

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

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

MelvinBot · 2026-08-04T22:03:45Z

🤖 I reviewed the changes in this PR against the help site files under docs/articles.

Conclusion: No help site changes are required.

This PR fixes two regressions in the Rules feature (plus a supporting refactor):

Rules - Require fields and Flag for review are not hidden when Categories are disabled #95305 — shows an empty state (folder illustration + Enable categories button) on the rule's category-selection page when Categories are disabled.
Rules - "None" remains on category list and is selectable after selecting a category. #95358 — removes a stray, selectable None option from the category picker.
A refactor splitting RuleSelectionBase into a base component + Picker sub-component, plus the localized empty-state copy.

Both linked issues confirm this is a not-yet-in-production feature and the fixes are UI edge-case corrections — they don't add or change any configurable behavior. The relevant help article, Workspace Rules, documents Rules conceptually (expense/category/spend/tag rules) and doesn't describe category-picker contents or empty states at this granularity. Nothing documented there becomes inaccurate as a result of these changes, so no draft docs PR was created.

If you'd like the broader Require fields / Flag for review workspace rules from the Rules Revamp documented on the help site (they aren't currently covered as top-level rules in the article), that would be a separate, larger docs effort — let me know and I can scope it.

@Krishna2323, no linked help site PR was created because no docs changes are required. If you believe a help article should be updated to reflect this behavior, reply here and I'll create the draft PR.

mitarachim · 2026-08-04T23:08:48Z

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

Krishna2323 added 5 commits July 7, 2026 02:17

Fix Require fields and Flag for review tabs showing when Categories a…

88d9805

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

Fix Require fields rule row flicker and stale toggles during pending …

b620886

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

Fix Require fields category picker not resetting draft on category ch…

1bfb2f4

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

Fix None option appearing in Require fields category picker after sel…

cb9a0d4

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

Fix Require fields rules missing from Copy Settings preview and optim…

76ffee7

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

melvin-bot Bot assigned Krishna2323 Jul 6, 2026

fix knip check.

19ee80a

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

chatgpt-codex-connector Bot reviewed Jul 6, 2026

View reviewed changes

Comment thread src/components/Rule/RuleSelectionBase.tsx Outdated

Comment thread src/pages/workspace/rules/PolicyRulesPageRevamp.tsx Outdated

Krishna2323 added 6 commits July 7, 2026 03:12

Address Codex review: preserve None default and defer category tab ga…

483dfea

…ting until policy loads. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Use read-only styling for locked category on category rule edit pages.

fd45277

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

remove none option from category picker.

a06adad

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

Merge upstream/main into krishna2323/issue-95304-rules-revamp-regress…

de32fdb

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

Merge branch 'main' into krishna2323/issue-95304-rules-revamp-regress…

d1add78

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

Show enable-categories empty state in rule category RHP

9ae1fbf

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

chatgpt-codex-connector Bot reviewed Jul 30, 2026

View reviewed changes

Comment thread src/components/Rule/RuleCategoriesDisabledEmptyState.tsx Outdated

Krishna2323 added 2 commits July 30, 2026 20:31

fix: fetch categories after enabling them

aeda120

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

fix: align category loading with RHP patterns

796563f

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

Krishna2323 marked this pull request as ready for review July 30, 2026 15:05

Krishna2323 requested review from a team as code owners July 30, 2026 15:05

melvin-bot Bot requested review from joekaufmanexpensify and situchan and removed request for a team July 30, 2026 15:05

melvin-bot Bot removed the request for review from a team July 30, 2026 15:05

Krishna2323 mentioned this pull request Jul 30, 2026

Rules - "None" remains on category list and is selectable after selecting a category. #95358

Open

7 tasks

dubielzyk-expensify self-requested a review July 31, 2026 00:25

JS00001 previously approved these changes Jul 31, 2026

View reviewed changes

situchan suggested changes Aug 3, 2026

View reviewed changes

Krishna2323 added 2 commits August 3, 2026 20:27

Merge branch 'Expensify:main' into krishna2323/issue-95304-rules-reva…

7e6d03b

…mp-regressions

Fix permanent spinner on rule category pages when offline

6aee12c

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

Krishna2323 dismissed JS00001’s stale review via 6aee12c August 3, 2026 15:12

situchan approved these changes Aug 3, 2026

View reviewed changes

melvin-bot Bot requested review from JS00001 and luacmartins August 3, 2026 15:15

JS00001 approved these changes Aug 4, 2026

View reviewed changes

JS00001 merged commit 28eda1d into Expensify:main Aug 4, 2026
54 of 71 checks passed

github-actions Bot mentioned this pull request Aug 4, 2026

Investigate workflow job failing on main: typecheck / typecheck #97793

Closed

OSBotify mentioned this pull request Aug 4, 2026

Deploy Checklist: New Expensify 2026-08-04 #97828

Open

49 tasks

This was referenced Aug 4, 2026

Rules - Categories can be enabled from Rules when accounting is connected #97839

Open

Android & iOS - Rules - Category empty state is not centered in landscape mode #97840

Open

Uh oh!

Conversation

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

Uh oh!

Explanation of Change

Fixed Issues

Tests

Prerequisites

#95305 — Category enable page when categories are disabled

#95358 — None not shown in category picker

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

Krishna2323 commented Jul 6, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

codecov Bot commented Jul 6, 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 Jul 30, 2026

Uh oh!

Krishna2323 commented Jul 30, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

melvin-bot Bot commented Jul 30, 2026

Uh oh!

dubielzyk-expensify commented Jul 31, 2026

Uh oh!

JS00001 commented Jul 31, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Krishna2323 commented Aug 3, 2026

Uh oh!

situchan commented Aug 3, 2026

Uh oh!

situchan commented Aug 3, 2026

Uh oh!

situchan commented Aug 3, 2026

Uh oh!

Krishna2323 commented Aug 3, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Aug 3, 2026

Uh oh!

Uh oh!

github-actions Bot commented Aug 4, 2026

Uh oh!

Krishna2323 commented Jul 6, 2026 •

edited

Loading

codecov Bot commented Jul 6, 2026 •

edited by github-actions Bot

Loading

situchan commented Jul 31, 2026 •

edited

Loading