Show the More option on every Rules tab

[Krishna2323]

Explanation of Change

Fixed Issues

$ #98040
PROPOSAL:

Tests

Precondition: Enable rulesRevamp, use a Control workspace with Rules enabled, and have at least one category and tag.

1. Go to Workspace settings → Rules.
2. Verify New rule and More are visible.
3. Switch through all tabs (General, Card restrictions, Expense defaults, Field requirements, Flag for review, Agents) and verify both buttons remain visible.
4. From Field requirements → More → Import spreadsheet, verify the import page opens.
5. Upload a CSV, map the required columns, import it, dismiss the confirmation modal, and verify you return to Rules → Expense defaults with the imported rules.
6. On Card restrictions, select a rule and verify New rule/More are replaced by the bulk actions header. Deselect it and verify the buttons return.

Collect workspace

1. On a Collect workspace with rulesRevamp enabled, go to Rules → More → Import spreadsheet
2. Verify the Rules upgrade page opens
3. Press the header back arrow without upgrading and verify you return to the Rules page, not a Not Here page
4. Repeat steps 15–16, complete the upgrade, then press Got it, thanks
5. Verify you land directly on the merchant rules import page and can proceed with the import

Read-only member

1. As a read-only member, go to Rules → More → Import spreadsheet.
2. Verify the read-only modal is shown and the import page doesn't open.

Narrow layout

1. Repeat steps 1–3 on a narrow screen and verify New rule and More display correctly.
2. Enter and exit selection mode (long press on native) and verify the bulk actions header appears, then New rule and More return after exiting.

• 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_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

[codecov]

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 Δ
...rc/pages/workspace/rules/PolicyRulesPageRevamp.tsx	2.25% <0.00%> (+0.03%)	⬆️
...es/workspace/rules/getImportMerchantRulesOption.ts	22.22% <0.00%> (-6.35%)	⬇️
.../rules/MerchantRules/ImportedMerchantRulesPage.tsx	10.41% <0.00%> (-0.23%)	⬇️
... and 37 files with indirect coverage changes

[melvin-bot]

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

[situchan]

Conflicts

[Krishna2323]

Conflicts

Resolved

[Krishna2323]

@situchan could you please review this one?

[situchan]

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

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

[situchan]

It's no-op when isRulesRevampEnabled is off but let's guard

[JS00001]

@Krishna2323 lets update this rq please

[Krishna2323]

guard added.

[chatgpt-codex-connector]

Codex Review: Didn't find any major issues. Can't wait for the next one!

Reviewed commit: 3be95a9ba9

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

[MelvinBot]

🤖 Code review — the change is small, focused, and correctly delivers the issue's ask (make New rule + More global across every Rules tab). No blocking issues found.

What changed

• PolicyRulesPageRevamp.tsx:290-326 — dropped the activeTab !== EXPENSE_DEFAULTS branch so both buttons now render on all tabs, and gated the import option behind the upgrade flow via tryNavigateToUpgrade.
• getImportMerchantRulesOption.ts:47-56 — new optional tryNavigateToUpgrade that short-circuits navigation when it returns true.
• ImportedMerchantRulesPage.tsx:194-200 — lands the user on Expense defaults after a successful import, regardless of the tab it started from.

Things I checked that are fine

• The legacy PolicyRulesPage.tsx caller intentionally omits tryNavigateToUpgrade. That's correct — the legacy page only renders when rulesRevamp is off, and in that path Rules is a Control-only feature, so there's no upgrade to gate. tryNavigateToUpgrade being optional preserves that.
• Tab.setSelectedTab(...EXPENSE_DEFAULTS) is only reached on the successful-import path (via closeImportPageAndModal, called at ImportedMerchantRulesPage.tsx:307), not on cancel — so it won't yank users off a tab when they back out.
• The asymmetric backTo (New rule → WORKSPACE_RULES, import → RULES_MERCHANT_IMPORT) is intentional per the Collect test plan (land directly on the import page after upgrade), and the inline comment explains it.

One thing worth a manual check (couldn't cover it in code): on the Card restrictions / Field requirements / Flag for review tabs, confirm the new More button doesn't crowd the New rule button on a narrow layout when bulk-selection isn't active — the header now renders two buttons where those tabs previously showed one.

Testing note

I couldn't exercise the flow with an automated web session: the rulesRevamp beta is a server-controlled account beta and isn't enabled for the Melvin test account, so only the legacy single-page Rules UI renders. The author's cross-platform videos in the PR body cover the actual behavior.

[JmillsExpensify]

LGTM

[github-actions]

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

[github-actions]

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-7ca98c925de-7d586de-0d7ec3a17c27bd752f5d3eae4a35cfaed16ad8c7/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed

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

---

👀 View the workflow run that generated this build 👀

[OSBotify]

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

[OSBotify]

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

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

[MelvinBot]

🤖 Docs review — changes required. This PR makes the More option (containing Import merchant rules) global across every tab on the revamped Rules page, rather than only appearing on Expense defaults, and returns you to the Expense defaults tab after an import completes.

That affects the help article Import Merchant Rules using a spreadsheet, whose steps still told admins to select the Expense defaults tab before clicking More.

I opened a draft help-site PR: #98480

What changed:

• Removed the step to select the Expense defaults tab before More (it's now on any tab); renumbered the remaining steps.
• Added a note that after import you're returned to the Expense defaults tab, where the imported rules appear.

Verification notes

• Labels (Rules, More, Import merchant rules, Expense defaults) verified against this PR's source (common.more, workspace.rules.merchantRules.importRulesTitle, and the CONST.TAB.RULES.EXPENSE_DEFAULTS landing behavior).
• No other article in docs/articles documents the tab-specific More behavior, so only Import-Merchant-Rules.md needed updating.
• Live UI verification couldn't complete — the feature is behind the rulesRevamp beta and the automated test session lost authentication during this run.

@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