Skip to content

Part 1 - [Rules Revamp] Clean-up and Polish #95289

Merged
luacmartins merged 4 commits into
Expensify:mainfrom
Krishna2323:krishna2323/issue-94964-pr1
Jul 6, 2026
Merged

Part 1 - [Rules Revamp] Clean-up and Polish #95289
luacmartins merged 4 commits into
Expensify:mainfrom
Krishna2323:krishna2323/issue-94964-pr1

Conversation

@Krishna2323

@Krishna2323 Krishna2323 commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #94968
$ #94970
$ #94965
PROPOSAL:

Tests

Prerequisites

  1. Use a Control workspace with Categories, Tags, and Rules enabled.
  2. Enable the rulesRevamp beta on your account.

1. Categories — Settings removed (#94970)

  1. Go to Workspace > Categories.
  2. Click the dropdown in the header.
  3. Confirm Settings is not in the menu.
  4. Confirm other actions (e.g. Import/Download) still appear if available.

2. Tags settings — toggles removed (#94965)

  1. Go to Workspace > Tags (single-level tags workspace).
  2. Click Settings.
  3. Confirm Custom tag name is still visible.
  4. Confirm Require tags toggle is not shown.
  5. Confirm Track billable expenses toggle is not shown.

3. Billable on Rules — new toggle (#94968)

  1. Go to Workspace > Rules > General.
  2. Click Billable expenses.
  3. Confirm the subtitle/description appears first.
  4. Confirm Track billable expenses toggle appears below the subtitle.
  5. Confirm Billable and Non-billable options appear below the toggle (when tracking is on).

4. Billable toggle off

  1. On Billable expenses, turn Track billable expenses off.
  2. Confirm Billable / Non-billable options disappear.
  3. Go back to Rules > General.
  4. Confirm the Billable expenses card has no description.

5. Beta off — regression

  1. Disable the rulesRevamp beta and reload the app.
  2. Go to Workspace > Categories → confirm Settings is back.
  3. Go to Tags > Settings → confirm Require tags and Track billable toggles are back.
  • Verify that no errors appear in the JS console

Offline tests

Track billable toggle (#94968)

  1. Enable rulesRevamp beta and go to Rules > General > Billable expenses.
  2. Turn network off (or use DevTools offline mode).
  3. Toggle Track billable expenses off.
  4. Confirm the toggle updates immediately and Billable / Non-billable options disappear.
  5. Confirm a pending/greyed state shows on the toggle (or row).
  6. Go back to Rules > General and confirm the Billable expenses card has no description.
  7. Turn network back on and wait for sync.
  8. Reopen Billable expenses and confirm the toggle is still off and options stay hidden.

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>
…ange

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

codecov Bot commented Jul 3, 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 Δ
...s/workspace/categories/WorkspaceCategoriesPage.tsx 77.94% <100.00%> (-1.27%) ⬇️
src/pages/workspace/tags/WorkspaceTagsPage.tsx 49.30% <100.00%> (+0.42%) ⬆️
...pace/rules/IndividualExpenseRulesSectionRevamp.tsx 0.00% <0.00%> (ø)
...pages/workspace/rules/RulesBillableDefaultPage.tsx 0.00% <0.00%> (ø)
...pages/workspace/tags/WorkspaceTagsSettingsPage.tsx 0.00% <0.00%> (ø)
src/libs/actions/Policy/Policy.ts 70.70% <0.00%> (-0.57%) ⬇️
... and 61 files with indirect coverage changes

@Krishna2323 Krishna2323 changed the title Krishna2323/issue 94964 pr1 Part 1 - [Rules Revamp] Clean-up and Polish Jul 3, 2026
@Krishna2323 Krishna2323 marked this pull request as ready for review July 3, 2026 15:11
@Krishna2323 Krishna2323 requested review from a team as code owners July 3, 2026 15:11
@melvin-bot melvin-bot Bot requested review from situchan and trjExpensify and removed request for situchan July 3, 2026 15:12
@melvin-bot

melvin-bot Bot commented Jul 3, 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]

@Krishna2323

Copy link
Copy Markdown
Contributor Author

Recordings will be added in 15m

@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: e4d50e566a

ℹ️ 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/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
Comment thread src/pages/workspace/rules/RulesBillableDefaultPage.tsx Outdated
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@situchan

situchan commented Jul 3, 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 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.mov
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
non-beta.mov
web.mov

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Code review

Overall this is a clean, well-scoped change. It gates the old Categories/Tags "Settings" affordances behind the rulesRevamp beta and moves the "Track billable expenses" toggle onto the Rules → Billable expenses page, while preserving the pre-beta behavior. All CI checks pass (the only failing check is the author/reviewer checklist, which is expected). A few notes below — nothing blocking.

Details

Refactor looks correct. billableExpensesPendinggetBillableExpensesPendingAction and toggleBillableExpenses were moved out of WorkspaceTagsSettingsPage into Policy.ts (renamed + explicit PendingAction | undefined return type) and are now reused by both the tags settings page and the new Rules billable toggle. The logic is identical to the previous inline implementation — good DRY win.

Beta gating is consistent. Categories hides Settings (!isRulesRevampEnabled), Tags hides Settings only for multi-level tags (!(isRulesRevampEnabled && isMultiLevelTags)), WorkspaceTagsSettingsPage hides the Require-tags / Track-billable toggles, and the Rules billable page renders the new toggle. The beta-off regression path is preserved in every spot.

Minor (clarity, non-blocking): the General-tab billable row still computes its pending action inline as pendingFields.defaultBillable ?? pendingFields.disabledFields rather than calling getBillableExpensesPendingAction. This appears intentional and correct — the helper returns only pendingFields.disabledFields when tracking is enabled, so it would miss a pending default-value change made via the selection list — but having two different pending-action formulas for the same feature is easy to trip over later. Consider a short comment (or a shared helper covering both cases) to make the distinction explicit.

Coverage: Codecov flags a small drop with no new tests, which is expected for feature-flagged UI wiring; not a blocker, but worth a note if unit coverage is desired for the toggle branch.

Recommend the human reviewer confirm the on-device screenshots/recordings for the offline toggle behavior (test steps in the PR body), since that path isn't covered by automated tests.

@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: 4b6e35de10

ℹ️ 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/pages/workspace/rules/IndividualExpenseRulesSectionRevamp.tsx Outdated
@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Regression scan

One likely regression and one edge-case, both gated behind the rulesRevamp beta (so non-beta users are unaffected). CI is green.


1. ⚠️ "Default spend categories" becomes unreachable when rulesRevamp is on

Hiding the Categories Settings menu item (WorkspaceCategoriesPage.tsx:359) removes the only UI entry point to the categories settings page (WorkspaceCategoriesPage.tsx:305-307 is the sole Navigation.navigate to it). That page hosts two things:

  • Members must categorize expenses (requiresCategory) — ✅ relocated to the Rules revamp (RulesRequireFieldsPage.tsx / General tab).
  • Default spend categories (DynamicWorkspaceCategoriesSettingsPage.tsx:93) — ❌ no new home. A grep across the rules revamp pages finds no reference to spend categories, so with the beta on there is no way to reach this configuration.

Suggested action: confirm with the design/issue whether "Default spend categories" is intentionally being dropped from the revamp. If not, it needs a relocated entry point before this ships to beta users.

2. Blank Tags Settings page for multi-level tags + revamp (edge case)

For a multi-level-tags workspace with the beta on, getTagsSettings renders an empty <View>: the "Custom tag name" row is gated by !isMultiLevelTags (L64) and both toggles by !isRulesRevampEnabled (L85). Normal navigation hides the entry (shouldShowTagsSettings), but the route is still reachable via deep link / the quick-settings flow / browser back-forward, where it would show only a header over blank space. Low severity; worth a guard or redirect if easy.

Areas checked and cleared (no regression)
  • Empty dropdown menus: both the Categories and Tags "More" dropdowns are guarded by secondaryActions.length > 0, so removing the Settings item can't produce an empty menu.
  • Single-level tags + revamp: the settings page still renders "Custom tag name", so it isn't blank.
  • Require tags / Track billable: removed from tags settings but relocated to the Rules revamp (requiresTag → Require fields; billable → RulesBillableDefaultPage).
  • Non-beta path: RulesBillableDefaultPage only renders the new toggle when isRevamp; the old SelectionList-only behavior is preserved.
  • Moved helpers: getBillableExpensesPendingAction / toggleBillableExpenses are a pure move from the tags settings page into Policy.ts with identical logic.
  • General-tab billable pending action (IndividualExpenseRulesSectionRevamp.tsx:159) intentionally differs from the helper (it must also catch a pending default-value change) — correct, not a regression.

Comment thread src/pages/workspace/rules/RulesBillableDefaultPage.tsx
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@melvin-bot melvin-bot Bot requested review from JS00001 and cead22 July 3, 2026 19:47

@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: f9addb879c

ℹ️ 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/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Regression scan — 1 real regression found

Regression: workspaces where the Rules feature isn't available lose access to "Require category", "Require tags", and "Track billable expenses" when the rulesRevamp beta is on.

The old toggles are hidden based only on the beta flag, but their new home is under the Rules feature. So if the beta is on and a workspace can't reach Rules, those settings become orphaned — hidden in their old location and unreachable in the new one.

Repro: Control workspace with Categories + Tags enabled but the Rules feature toggled OFF (More features → Rules off), account on the rulesRevamp beta →

The PR's test steps only cover a Control workspace with Rules enabled, so this path wasn't exercised.

Suggested fix: gate the old-toggle hiding on Rules availability too, not just the beta — e.g. hide only when isRulesRevampEnabled && arePolicyRulesEnabled(policy). That keeps the toggles in place wherever the Rules home isn't reachable.

Why this triggers, and the broader (non-Control) case

ARE_RULES_ENABLED resolves through arePolicyRulesEnabled (PolicyUtils.ts:1585-1596):

  • returns false when areRulesEnabled === false (the explicit "Rules off" repro above), and
  • returns false for any non-Control policy (!isControlPolicy).

The Categories/Tags settings toggles are not Control-gated, so a Collect workspace with Tags enabled + the beta on is the same bug at larger scale — the toggles disappear and there is no Rules section on Collect to relocate them to. Worth confirming whether these settings are meant to be reachable on Collect; if so, the arePolicyRulesEnabled guard above covers both cases in one shot. Only the migrated-legacy edge (areRulesEnabled === undefined with Classic category rules) stays reachable, since that returns true.


Areas checked and cleared (no regression):

Details
  • Beta OFF: all four touched pages fall back to the exact prior behavior — every gate is !isRulesRevampEnabled / !(isRulesRevampEnabled && …), so the default path is unchanged.
  • Multi-level tags (beta on): the ⋯ → Settings entry is removed and direct navigation is blocked via shouldBlockEmptySettings → NotFound. Safe, because the multi-level settings page renders nothing under the beta (custom-tag-name is !isMultiLevelTags-gated; both toggles are beta-gated). Provided the Rules feature is available (see the regression above).
  • Single-level tags (beta on): Settings entry correctly stays; the page still shows "Custom tag name", so it isn't empty. ✅
  • Categories/tags default settings relocation: "Require category" → Rules "Require fields"; "Default spend categories" → Rules Expense Defaults tab; both write the same policy data via the same actions. Reachable when Rules is available.
  • Moved Policy.ts helpers: toggleBillableExpenses is an unchanged move. getBillableExpensesPendingAction was rewritten (not the pure move the earlier description implied) at Policy.ts:6600-6610 — but it's behavior-preserving for the Tags toggle and a strict superset for the General-tab billable row (IndividualExpenseRulesSectionRevamp.tsx:159): it shows the pending/offline indicator in more cases (e.g. tracking turned off via disableWorkspaceBillableExpenses), never fewer. No lost pending state. Removed imports (disableWorkspaceBillableExpenses, setPolicyBillableMode) are unused in the tags page; no stray billableExpensesPending references remain.
  • Minor (not a regression): unlike the tags settings page, the Categories settings page has no shouldBlockEmptySettings guard, so a stale deep link still opens the old two-setting page when the beta is on. Harmless (that page never becomes empty), but adding a guard would be consistent.

CC the PR author to confirm the intended behavior for Rules-disabled / non-Control workspaces.

@Krishna2323

Copy link
Copy Markdown
Contributor Author

Regression: workspaces where the Rules feature isn't available lose access to "Require category", "Require tags", and "Track billable expenses" when the rulesRevamp beta is on.

Intentional: rulesRevamp beta users are expected to have Rules enabled. Old entry points are removed once the beta is on; new homes are under Rules (General / Require fields / Billable, and Expense defaults for spend categories).

@Krishna2323

Copy link
Copy Markdown
Contributor Author

cc: @luacmartins

@JS00001

JS00001 commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

@luacmartins over to you

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

LGTM

@luacmartins luacmartins merged commit 7cfd6ad into Expensify:main Jul 6, 2026
39 of 41 checks passed
@OSBotify

OSBotify commented Jul 6, 2026

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.

@github-actions

github-actions Bot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.4.29-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Help site review — changes required ✅

I reviewed the changes in this PR against App/docs/articles and found one help article that needs updating.

Draft PR: #95529 (labeled HelpDot, assigned to you)

Why

This PR moves the Track billable expenses toggle and the billable default out of Tags > Settings into the new Billable expenses page under Rules. The article Workspace-Rules.md still told users to set billable expenses under Tags > Settings, so I updated that line to point to Rules > Billable expenses.

⚠️ Beta note

Every UI change here is gated behind the rulesRevamp beta and isn't GA yet, so the help site still describes the current (pre-revamp) behavior for most users. The draft PR should stay in draft and only be merged once Rules Revamp ships to all users.

Deferred on purpose

This is "Part 1", and it also (behind the beta) removes the Settings option from the Categories/Tags menus and the Require tags toggle from Tags settings — but where those settings ultimately land isn't established in this PR. I did not update Require-tags-and-categories-for-expenses.md, Create-expense-categories.md, or Create-and-manage-expense-tags.md to avoid documenting an unfinalized destination. Those should be revisited when the later parts land.


@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

@OSBotify

OSBotify commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.4.31-0 🚀

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

@OSBotify

OSBotify commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.4.31-0 🚀

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.

7 participants