From d29b79398797243e36c5bd0a346132458f873e62 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Fri, 7 Aug 2026 23:27:59 +0530
Subject: [PATCH 1/4] Show the More option on every Rules tab

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 .../ImportedMerchantRulesPage.tsx             |  4 ++++
 .../workspace/rules/PolicyRulesPageRevamp.tsx | 22 ++++++++-----------
 .../rules/getImportMerchantRulesOption.ts     | 10 +++++++++
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx b/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx
index 0413700c0b37..9a28ca5606c2 100644
--- a/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx
+++ b/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx
@@ -13,6 +13,7 @@ import usePolicy from '@hooks/usePolicy';
 import {openPolicyCategoriesPage} from '@libs/actions/Policy/Category';
 import type {ImportedMerchantRule} from '@libs/actions/Policy/Rules';
 import {importMerchantRulesSpreadsheet} from '@libs/actions/Policy/Rules';
+import Tab from '@libs/actions/Tab';
 import {getDecodedCategoryName} from '@libs/CategoryUtils';
 import {findDuplicate, generateColumnNames} from '@libs/importSpreadsheetUtils';
 import Navigation from '@libs/Navigation/Navigation';
@@ -193,6 +194,9 @@ function ImportedMerchantRulesPage({route}: ImportedMerchantRulesPageProps) {
     const closeImportPageAndModal = () => {
         setIsClosing(true);
         setIsImportingRules(false);
+        // Imported merchant rules live on the Expense defaults tab, and the Rules page restores whichever tab was
+        // last active. Import can now be started from any tab, so point it at the tab holding the new rules.
+        Tab.setSelectedTab(CONST.TAB.RULES_TAB_TYPE, CONST.TAB.RULES.EXPENSE_DEFAULTS);
         Navigation.goBack(ROUTES.WORKSPACE_RULES.getRoute(policyID));
     };
 
diff --git a/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx b/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx
index 6b1029a696ad..992b69ae8e58 100644
--- a/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx
+++ b/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx
@@ -291,20 +291,16 @@ function PolicyRulesPageRevamp({route}: PolicyRulesPageRevampProps) {
             return null;
         }
 
-        if (activeTab !== RULES_TAB.EXPENSE_DEFAULTS) {
-            return (
-                <Button
-                    success
-                    onPress={handleNewRule}
-                    text={translate('workspace.rules.merchantRules.addRuleTitle')}
-                    icon={icons.Plus}
-                    style={[shouldDisplayButtonsInSeparateLine && styles.w100]}
-                />
-            );
-        }
-
         const moreOptions: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.SECONDARY_ACTIONS>>> = [
-            getImportMerchantRulesOption({policyID, canWriteRules, showReadOnlyModal, translate, icon: icons.Table}),
+            getImportMerchantRulesOption({
+                policyID,
+                canWriteRules,
+                showReadOnlyModal,
+                translate,
+                icon: icons.Table,
+                // More is visible on General, the only tab Collect can open, so this needs the same upgrade gate as New rule.
+                tryNavigateToUpgrade: () => tryNavigateToControlPolicyUpgrade(policy, rulesUpgradeAlias, rulesUpgradeBackTo),
+            }),
         ];
 
         return (
diff --git a/src/pages/workspace/rules/getImportMerchantRulesOption.ts b/src/pages/workspace/rules/getImportMerchantRulesOption.ts
index 1465e16508e8..09f5838d6560 100644
--- a/src/pages/workspace/rules/getImportMerchantRulesOption.ts
+++ b/src/pages/workspace/rules/getImportMerchantRulesOption.ts
@@ -23,6 +23,12 @@ type ImportMerchantRulesOptionParams = {
 
     /** Icon shown next to the option */
     icon: IconAsset;
+
+    /**
+     * Sends plans that can't hold merchant rules to the upgrade flow. Returns true when it navigated, so the
+     * import page is skipped. Defaults to a no-op for callers that are already plan-gated.
+     */
+    tryNavigateToUpgrade?: () => boolean;
 };
 
 /**
@@ -35,6 +41,7 @@ function getImportMerchantRulesOption({
     showReadOnlyModal,
     translate,
     icon,
+    tryNavigateToUpgrade,
 }: ImportMerchantRulesOptionParams): DropdownOption<DeepValueOf<typeof CONST.POLICY.SECONDARY_ACTIONS>> {
     return {
         icon,
@@ -45,6 +52,9 @@ function getImportMerchantRulesOption({
                 showReadOnlyModal();
                 return;
             }
+            if (tryNavigateToUpgrade?.()) {
+                return;
+            }
             Navigation.navigate(ROUTES.RULES_MERCHANT_IMPORT.getRoute(policyID));
         },
     };

From 701e8076300f1ad425532762ff3e36769a37803d Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Sat, 8 Aug 2026 00:32:17 +0530
Subject: [PATCH 2/4] Return to the import page after upgrading from More

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/pages/workspace/rules/PolicyRulesPageRevamp.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx b/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx
index 992b69ae8e58..c2e89463033d 100644
--- a/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx
+++ b/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx
@@ -298,8 +298,11 @@ function PolicyRulesPageRevamp({route}: PolicyRulesPageRevampProps) {
                 showReadOnlyModal,
                 translate,
                 icon: icons.Table,
-                // More is visible on General, the only tab Collect can open, so this needs the same upgrade gate as New rule.
-                tryNavigateToUpgrade: () => tryNavigateToControlPolicyUpgrade(policy, rulesUpgradeAlias, rulesUpgradeBackTo),
+                // More is visible on General, the only tab Collect can open, so this needs the same upgrade gate as New
+                // rule. Return to the import page rather than the Rules list, so upgrading resumes what the user
+                // started. Safe even though the import page is Control-only: the upgrade page honours backTo only
+                // after a successful upgrade, and backing out without upgrading falls back to a plain goBack.
+                tryNavigateToUpgrade: () => tryNavigateToControlPolicyUpgrade(policy, rulesUpgradeAlias, ROUTES.RULES_MERCHANT_IMPORT.getRoute(policyID)),
             }),
         ];
 

From 494019c100fbba7e6eed654b55b1c3fef852801d Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Sat, 8 Aug 2026 00:40:31 +0530
Subject: [PATCH 3/4] update comments.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 .../rules/MerchantRules/ImportedMerchantRulesPage.tsx       | 3 +--
 src/pages/workspace/rules/PolicyRulesPageRevamp.tsx         | 6 +-----
 src/pages/workspace/rules/getImportMerchantRulesOption.ts   | 5 +----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx b/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx
index 9a28ca5606c2..fc2c813e17ac 100644
--- a/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx
+++ b/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx
@@ -194,8 +194,7 @@ function ImportedMerchantRulesPage({route}: ImportedMerchantRulesPageProps) {
     const closeImportPageAndModal = () => {
         setIsClosing(true);
         setIsImportingRules(false);
-        // Imported merchant rules live on the Expense defaults tab, and the Rules page restores whichever tab was
-        // last active. Import can now be started from any tab, so point it at the tab holding the new rules.
+        // Import can start from any tab, so land on the one holding the imported rules.
         Tab.setSelectedTab(CONST.TAB.RULES_TAB_TYPE, CONST.TAB.RULES.EXPENSE_DEFAULTS);
         Navigation.goBack(ROUTES.WORKSPACE_RULES.getRoute(policyID));
     };
diff --git a/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx b/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx
index d6bf22c26a1a..ddd7ecd6e080 100644
--- a/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx
+++ b/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx
@@ -291,7 +291,6 @@ function PolicyRulesPageRevamp({route}: PolicyRulesPageRevampProps) {
             return null;
         }
 
-        // More is global like New rule, so it shows on every tab rather than only Expense defaults.
         const moreOptions: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.SECONDARY_ACTIONS>>> = [
             getImportMerchantRulesOption({
                 policyID,
@@ -299,10 +298,7 @@ function PolicyRulesPageRevamp({route}: PolicyRulesPageRevampProps) {
                 showReadOnlyModal,
                 translate,
                 icon: icons.Table,
-                // More is visible on General, the only tab Collect can open, so this needs the same upgrade gate as New
-                // rule. Return to the import page rather than the Rules list, so upgrading resumes what the user
-                // started. Safe even though the import page is Control-only: the upgrade page honours backTo only
-                // after a successful upgrade, and backing out without upgrading falls back to a plain goBack.
+                // Collect sees More on General, so gate it like New rule. backTo only applies after a successful upgrade.
                 tryNavigateToUpgrade: () => tryNavigateToControlPolicyUpgrade(policy, rulesUpgradeAlias, ROUTES.RULES_MERCHANT_IMPORT.getRoute(policyID)),
             }),
         ];
diff --git a/src/pages/workspace/rules/getImportMerchantRulesOption.ts b/src/pages/workspace/rules/getImportMerchantRulesOption.ts
index 09f5838d6560..5bd1855fbda3 100644
--- a/src/pages/workspace/rules/getImportMerchantRulesOption.ts
+++ b/src/pages/workspace/rules/getImportMerchantRulesOption.ts
@@ -24,10 +24,7 @@ type ImportMerchantRulesOptionParams = {
     /** Icon shown next to the option */
     icon: IconAsset;
 
-    /**
-     * Sends plans that can't hold merchant rules to the upgrade flow. Returns true when it navigated, so the
-     * import page is skipped. Defaults to a no-op for callers that are already plan-gated.
-     */
+    /** Sends plans without merchant rules to the upgrade flow. Returns true when it navigated. */
     tryNavigateToUpgrade?: () => boolean;
 };
 

From 65e1ba217be0c82829db1726d626b18d9236301b Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Tue, 11 Aug 2026 17:22:09 +0530
Subject: [PATCH 4/4] add rules revamp guard.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 .../rules/MerchantRules/ImportedMerchantRulesPage.tsx    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx b/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx
index fc2c813e17ac..1e479da9e8d8 100644
--- a/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx
+++ b/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx
@@ -8,6 +8,7 @@ import useImportSpreadsheetConfirmModal from '@hooks/useImportSpreadsheetConfirm
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
+import usePermissions from '@hooks/usePermissions';
 import usePolicy from '@hooks/usePolicy';
 
 import {openPolicyCategoriesPage} from '@libs/actions/Policy/Category';
@@ -134,6 +135,8 @@ function ImportedMerchantRulesPage({route}: ImportedMerchantRulesPageProps) {
     const policyID = route.params.policyID;
     const policy = usePolicy(policyID);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
+    const {isBetaEnabled} = usePermissions();
+    const isRulesRevampEnabled = isBetaEnabled(CONST.BETAS.RULES_REVAMP);
 
     // Fetch categories if they're not loaded (e.g. after a cache clear) so imported category cells are
     // validated against the policy's real category list instead of an empty one
@@ -194,8 +197,10 @@ function ImportedMerchantRulesPage({route}: ImportedMerchantRulesPageProps) {
     const closeImportPageAndModal = () => {
         setIsClosing(true);
         setIsImportingRules(false);
-        // Import can start from any tab, so land on the one holding the imported rules.
-        Tab.setSelectedTab(CONST.TAB.RULES_TAB_TYPE, CONST.TAB.RULES.EXPENSE_DEFAULTS);
+        if (isRulesRevampEnabled) {
+            // Import can start from any tab, so land on the one holding the imported rules.
+            Tab.setSelectedTab(CONST.TAB.RULES_TAB_TYPE, CONST.TAB.RULES.EXPENSE_DEFAULTS);
+        }
         Navigation.goBack(ROUTES.WORKSPACE_RULES.getRoute(policyID));
     };