Skip to content

Fix Collect Rules regressions in More features, Require fields, and the upgrade paths - #97751

Open
Krishna2323 wants to merge 1 commit into
Expensify:mainfrom
Krishna2323:krishna2323/collect-rules-regressions-97640-97639-97638-97625
Open

Fix Collect Rules regressions in More features, Require fields, and the upgrade paths#97751
Krishna2323 wants to merge 1 commit into
Expensify:mainfrom
Krishna2323:krishna2323/collect-rules-regressions-97640-97639-97638-97625

Conversation

@Krishna2323

@Krishna2323 Krishna2323 commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

This PR fixes four follow-ups from Rules for Collect.

1. Rules toggle on Submit workspaces

With the Rules revamp beta enabled, the Rules toggle on a Submit workspace appeared to do nothing.

The upgrade redirect was gated only on the beta, so every non-Control workspace went down the enable path. However, arePolicyRulesEnabled only recognizes Collect and Control, so the flag was written but always read back as disabled.

Submit workspaces now continue to go through the upgrade flow, matching the existing behavior when the beta is off.

2. Tags bypassed the accounting integration guard

Require fields for all expenses → Tags could enable Tags even when they were managed by an accounting integration, bypassing the "Not so fast" modal shown elsewhere.

Tags now follow the same behavior as Categories:

  • The row is locked.
  • The Accounting modal is shown.
  • The feature is no longer force-enabled.

3. Agents promo banner on Collect

The Agents promo banner switched directly to the Agents tab. On Collect workspaces, the page immediately switched back to General because of the existing redirect effect.

The CTA now goes through the normal tab handler, which routes Collect workspaces to the Control upgrade page.

4. Return to the correct page after upgrading

Upgrading from a row in General returned users to the Rules page instead of the row they originally opened.

Rows now carry their route instead of a navigation callback, and that route is passed as the upgrade backTo, matching the GL settings flow for tag settings.

Tabs continue to return to Rules → General since the selected tab is stored in Onyx rather than the route. Supporting that will require a separate change.

Fixed Issues

$ #97640
$ #97639
$ #97638
$ #97625
PROPOSAL:

Tests

  • Precondition:
    • Log in with Expensifail account.
    • Create a Collect workspace.

#97640 Rules - Nothing happens after clicking on Rules toggle for Submit workspace

  1. Create a Submit workspace on OD.
  2. Go to staging.new.expensify.com
  3. Go to Submit workspace settings > More features.
  4. Enable Rules.
  5. Verify upgrade page is shown

#97639 Rules- Tags can be enabled in Require fields for all expenses RHP when accounting is connected

  • Precondition:
    • Log in with Expensifail account.
    • Workspace is connected to Sage Intacct.
    • Disable tag import in Accounting > Import > Projects (Jobs) or any other import settings.
    • Enable Rules.
  1. Go to Rules > General.
  2. Click Require fields for all expenses.
  3. Verify tags row is locked, tapping shows "Not so fast"

#97638 Rules - App returns to Rules > General after clicking Try it out on agent banner

  1. Go to staging.new.expensify.com
  2. Go to workspace settings > Rules > General.
  3. Scroll down to agent banner.
  4. Click Try it out.
  5. → Agents page opens.
  6. Go to workspace settings > Overview > Plan type.
  7. Downgrade to Collect plan.
  8. Go to workspace settings > Rules > General.
  9. Scroll down to agent banner.
  10. Click Try it out.
  11. Verify upgrade RHP is shown.

#97625 Rules - RHP does not open after workspace upgrade

  1. Go to staging.new.expensify.com
  2. Go to Collect workspace settings > More features.
  3. Enable Rules.
  4. Go to Rules.
  5. Enable Flag expenses older than.
  6. Click Upgrade > Got it, thanks.
  7. Verify Flag expenses older than RHP is shown
  • 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

  • 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: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
web_chrome.mp4
web_chrome_2.mp4

…he upgrade paths

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

melvin-bot Bot commented Aug 4, 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 removed the request for review from a team August 4, 2026 03:19
@codecov

codecov Bot commented Aug 4, 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 Δ
...ages/workspace/WorkspaceMoreFeaturesPage/index.tsx 69.61% <0.00%> (ø)
...pace/rules/IndividualExpenseRulesSectionRevamp.tsx 2.35% <0.00%> (+0.17%) ⬆️
...rc/pages/workspace/rules/PolicyRulesPageRevamp.tsx 2.22% <0.00%> (-0.02%) ⬇️
src/pages/workspace/rules/tabs/RulesGeneralTab.tsx 0.00% <0.00%> (ø)
...c/pages/workspace/rules/RulesRequireFieldsPage.tsx 67.36% <38.46%> (-5.58%) ⬇️
... and 6 files with indirect coverage changes

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.

1 participant