From e504053a67a66587716906b71077078d0436f238 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 01:51:00 +0200
Subject: [PATCH 01/22] Fit the Describe rule modal above the keyboard on small
 screens

---
 src/pages/workspace/rules/DescribeRuleModal.tsx | 11 +++++++++--
 src/styles/index.ts                             |  4 ++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/rules/DescribeRuleModal.tsx b/src/pages/workspace/rules/DescribeRuleModal.tsx
index 8df9647d37be..6b65b0580df3 100644
--- a/src/pages/workspace/rules/DescribeRuleModal.tsx
+++ b/src/pages/workspace/rules/DescribeRuleModal.tsx
@@ -12,7 +12,10 @@ import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useViewportOffsetTop from '@hooks/useViewportOffsetTop';
+import useWindowDimensions from '@hooks/useWindowDimensions';
 
 import {getDecodedCategoryName} from '@libs/CategoryUtils';
 
@@ -60,6 +63,9 @@ function withPolicyCategory(values: GeneratedRuleValues, policyCategories: OnyxE
 function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenerated}: DescribeRuleModalProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+    const {windowHeight} = useWindowDimensions();
+    const viewportOffsetTop = useViewportOffsetTop();
     // We need to use isSmallScreenWidth here because the Modal breaks in RHP with shouldUseNarrowLayout.
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
     const {isSmallScreenWidth} = useResponsiveLayout();
@@ -144,6 +150,7 @@ function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenera
             onClose={close}
             type={isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CONFIRM}
             innerContainerStyle={styles.pv0}
+            outerStyle={isSmallScreenWidth ? StyleUtils.getOuterModalStyle(windowHeight, viewportOffsetTop) : undefined}
             avoidKeyboard
             shouldHandleNavigationBack
             enableEdgeToEdgeBottomSafeAreaPadding
@@ -156,13 +163,13 @@ function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenera
                 submitButtonText={translate('common.next')}
                 style={[styles.mt5, styles.mh5]}
                 addBottomSafeAreaPadding={isSmallScreenWidth}
-                shouldUseScrollView={false}
+                shouldUseScrollView={isSmallScreenWidth}
                 submitFlexEnabled={false}
                 shouldHideFixErrorsAlert
                 keyboardSubmitBehavior={CONST.KEYBOARD_SUBMIT_BEHAVIOR.SUBMIT_ONLY}
             >
                 <Text style={[styles.textNormal, styles.textSupporting, styles.mb5]}>{translate('workspace.rules.newRule.describeRule')}</Text>
-                <View style={styles.describeRulePromptInput}>
+                <View style={isSmallScreenWidth ? styles.describeRulePromptInputNarrow : styles.describeRulePromptInput}>
                     <InputWrapper
                         InputComponent={TextInput}
                         ref={inputRef}
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 447f31c0a549..b23311785a66 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -6248,6 +6248,10 @@ const staticStyles = (theme: ThemeColors) =>
             height: variables.describeRulePromptInputHeight,
         },
 
+        describeRulePromptInputNarrow: {
+            height: variables.textInputAutoGrowMaxHeight,
+        },
+
         emptyStateSamlIllustration: {
             width: 183,
             height: 160,

From 303dc26a9b850701b7532df9e11ed0e336510a3d Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 01:51:31 +0200
Subject: [PATCH 02/22] Clear the last Describe prompt and error each time the
 modal opens

---
 src/pages/workspace/rules/DescribeRuleButton.tsx | 13 ++++++++++++-
 src/pages/workspace/rules/DescribeRuleModal.tsx  |  8 --------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/pages/workspace/rules/DescribeRuleButton.tsx b/src/pages/workspace/rules/DescribeRuleButton.tsx
index 3cc111931343..6bfadbed4f5d 100644
--- a/src/pages/workspace/rules/DescribeRuleButton.tsx
+++ b/src/pages/workspace/rules/DescribeRuleButton.tsx
@@ -7,6 +7,8 @@ import useLocalize from '@hooks/useLocalize';
 import usePermissions from '@hooks/usePermissions';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {clearNewRulePrompt} from '@userActions/Policy/Rules';
+
 import CONST from '@src/CONST';
 import type {GeneratedRuleType, GeneratedRuleValues} from '@src/types/onyx/GeneratedRule';
 
@@ -46,12 +48,21 @@ function DescribeRuleButton(props: DescribeRuleButtonProps) {
         return null;
     }
 
+    const openModal = () => {
+        clearNewRulePrompt();
+        if (props.onPress) {
+            props.onPress();
+            return;
+        }
+        setIsModalVisible(true);
+    };
+
     return (
         <>
             <Button
                 size={CONST.BUTTON_SIZE.LARGE}
                 style={styles.flex1}
-                onPress={props.onPress ?? (() => setIsModalVisible(true))}
+                onPress={openModal}
                 sentryLabel={props.sentryLabel}
             >
                 <Button.Text>{translate('workspace.rules.newRule.describe')}</Button.Text>
diff --git a/src/pages/workspace/rules/DescribeRuleModal.tsx b/src/pages/workspace/rules/DescribeRuleModal.tsx
index 6b65b0580df3..1614f4d74a8c 100644
--- a/src/pages/workspace/rules/DescribeRuleModal.tsx
+++ b/src/pages/workspace/rules/DescribeRuleModal.tsx
@@ -73,7 +73,6 @@ function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenera
     const inputRef = useRef<AnimatedTextInputRef>(null);
     const pendingGenerationIDRef = useRef<string>(undefined);
     const [generatedRule] = useOnyx(ONYXKEYS.GENERATED_RULE);
-    const [newRulePromptForm] = useOnyx(ONYXKEYS.FORMS.NEW_RULE_PROMPT_FORM);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
     const generatedRuleID = generatedRule?.generationID;
     const generatedRuleState = generatedRule?.state;
@@ -106,13 +105,6 @@ function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenera
         close();
     }, [close, generatedRuleID, generatedRuleState, generatedRuleType, generatedRuleValues, onRuleGenerated, policyCategories, ruleType]);
 
-    useEffect(() => {
-        if (!isVisible || !newRulePromptForm?.isLoading || pendingGenerationIDRef.current) {
-            return;
-        }
-        clearNewRulePrompt();
-    }, [isVisible, newRulePromptForm?.isLoading]);
-
     // Focus only after the open animation, because focusing mid-animation blurs the input on mWeb and native
     useFocusEffect(() => {
         if (!isVisible) {

From 7e6bebbdfb62d39538d06fcd8afef4d5a1b359d3 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 01:52:25 +0200
Subject: [PATCH 03/22] Pair receipt and itemized receipt settings in a
 described Require fields rule

---
 .../RequireFieldsRulePageBase.tsx               | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/rules/RequireFieldsRules/RequireFieldsRulePageBase.tsx b/src/pages/workspace/rules/RequireFieldsRules/RequireFieldsRulePageBase.tsx
index b4dbf4882a3d..b14e285ff0fc 100644
--- a/src/pages/workspace/rules/RequireFieldsRules/RequireFieldsRulePageBase.tsx
+++ b/src/pages/workspace/rules/RequireFieldsRules/RequireFieldsRulePageBase.tsx
@@ -432,9 +432,22 @@ function RequireFieldsRulePageBase({policyID, categoryName, initialCategoryName,
     }
 
     const applyGeneratedRule = (values: GeneratedRuleValues) => {
-        setDraftRequireFieldsRule(values);
+        let generatedForm: GeneratedRuleValues = values;
+        const generatedFieldKeys = new Set<RequireFieldsRuleSettingFieldKey>();
+        for (const fieldKey of SETTING_FIELD_KEYS) {
+            const setting = values[fieldKey];
+            if (setting === undefined) {
+                continue;
+            }
+            const {formUpdate, touchedFieldKeys} = getRequireFieldsFieldSettingUpdate(fieldKey, setting);
+            generatedForm = {...generatedForm, ...formUpdate};
+            for (const touchedFieldKey of touchedFieldKeys) {
+                generatedFieldKeys.add(touchedFieldKey);
+            }
+        }
+        setDraftRequireFieldsRule(generatedForm);
         setGeneratedCategoryName(values.category);
-        setTouchedFields(new Set(SETTING_FIELD_KEYS.filter((fieldKey) => values[fieldKey] !== undefined)));
+        setTouchedFields(generatedFieldKeys);
     };
 
     const footer = canWriteRules ? (

From 67a07be4dea03865ac8f6e13e070f17472ec7dbc Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 01:53:05 +0200
Subject: [PATCH 04/22] Reject a described rule for a category that already has
 one

---
 src/languages/de.ts                           |  1 +
 src/languages/el.ts                           |  1 +
 src/languages/en.ts                           |  1 +
 src/languages/es.ts                           |  1 +
 src/languages/fr.ts                           |  1 +
 src/languages/it.ts                           |  1 +
 src/languages/ja.ts                           |  1 +
 src/languages/nl.ts                           |  1 +
 src/languages/pl.ts                           |  1 +
 src/languages/pt-BR.ts                        |  1 +
 src/languages/zh-hans.ts                      |  1 +
 src/libs/actions/Policy/Rules.ts              |  7 ++++++-
 .../workspace/rules/DescribeRuleButton.tsx    |  5 +++++
 .../workspace/rules/DescribeRuleModal.tsx     | 20 ++++++++++++++-----
 .../FlagForReviewRulePageBase.tsx             |  1 +
 .../RequireFieldsRulePageBase.tsx             |  1 +
 16 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 2d38e1697274..216f175d916c 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8826,6 +8826,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                     unsupported: 'Diese Regel wird noch nicht unterstützt – wir arbeiten daran. Bitte versuche vorerst eine andere Regel.',
                     unintelligible: 'Formuliere deine Regel etwa so: Wenn Ausgaben über 100 $ liegen, ist ein Beleg erforderlich.',
                     multipleRules: 'Bitte eine Regel nach der anderen – beschreibe eine einzelne Regel, z. B.: Einzelhandelskäufe auf allen Karten blockieren.',
+                    categoryHasRule: 'Für diese Kategorie gibt es bereits eine Regel. Bearbeite die bestehende Regel oder beschreibe eine Regel für eine andere Kategorie.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 1840bc521100..edf21c38f777 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -8918,6 +8918,7 @@ ${reportName}`,
                     unsupported: 'Αυτός ο κανόνας δεν υποστηρίζεται ακόμη — το δουλεύουμε. Δοκιμάστε προς το παρόν έναν διαφορετικό κανόνα.',
                     unintelligible: 'Δοκιμάστε να διατυπώσετε τον κανόνα σας έτσι: αν οι δαπάνες ξεπερνούν τα 100 $, να απαιτείται απόδειξη.',
                     multipleRules: 'Έναν κανόνα τη φορά — δοκιμάστε να περιγράψετε έναν μόνο κανόνα, π.χ.: αποκλεισμός αγορών λιανικής σε όλες τις κάρτες.',
+                    categoryHasRule: 'Αυτή η κατηγορία έχει ήδη κανόνα. Επεξεργαστείτε τον υπάρχοντα κανόνα ή περιγράψτε έναν κανόνα για άλλη κατηγορία.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index c474c0da131a..71e1b46405c0 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9103,6 +9103,7 @@ const translations = {
                     unsupported: "That rule isn't supported yet — we're working on it. Please try a different rule for now.",
                     unintelligible: 'Try phrasing your rule like: if expenses have a value over $100, then require a receipt.',
                     multipleRules: 'One rule at a time, please — try describing a single rule, like: block retail purchases on all cards.',
+                    categoryHasRule: 'That category already has a rule. Edit the existing rule or describe a rule for another category.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 946fe286656f..27ed5fd328e4 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -8831,6 +8831,7 @@ ${reportName}`,
                     unsupported: 'Esa regla aún no es compatible: estamos trabajando en ello. Prueba con otra regla por ahora.',
                     unintelligible: 'Prueba a formular tu regla así: si los gastos superan los $100, exige un recibo.',
                     multipleRules: 'Una regla a la vez, por favor. Prueba a describir una sola regla, como: bloquear compras en comercios minoristas en todas las tarjetas.',
+                    categoryHasRule: 'Esa categoría ya tiene una regla. Edita la regla existente o describe una regla para otra categoría.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index bd5f737a15ee..08e747c04adf 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8849,6 +8849,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                     unsupported: 'Cette règle n’est pas encore prise en charge — nous y travaillons. Essayez une autre règle pour le moment.',
                     unintelligible: 'Essayez de formuler votre règle ainsi : si les dépenses dépassent 100 $, exigez un reçu.',
                     multipleRules: 'Une règle à la fois, s’il vous plaît — essayez de décrire une seule règle, comme : bloquer les achats en magasin sur toutes les cartes.',
+                    categoryHasRule: 'Cette catégorie a déjà une règle. Modifiez la règle existante ou décrivez une règle pour une autre catégorie.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 831c17252a0b..88f5ea9afbb6 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8777,6 +8777,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                     unsupported: 'Questa regola non è ancora supportata: ci stiamo lavorando. Per ora prova una regola diversa.',
                     unintelligible: 'Prova a formulare la regola così: se le spese superano i 100 $, richiedi una ricevuta.',
                     multipleRules: 'Una regola alla volta, per favore: prova a descrivere una singola regola, ad esempio bloccare gli acquisti al dettaglio su tutte le carte.',
+                    categoryHasRule: "Questa categoria ha già una regola. Modifica la regola esistente o descrivi una regola per un'altra categoria.",
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 61d5837a2a6f..4a1c50383bcd 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8666,6 +8666,7 @@ ${reportName}`,
                     unsupported: 'そのルールはまだ対応していません。現在対応を進めています。ほかのルールをお試しください。',
                     unintelligible: '「経費が100ドルを超える場合は領収書を必須にする」のように書いてみてください。',
                     multipleRules: '一度に1つのルールのみです。「すべてのカードで小売店での購入をブロックする」のように、1つのルールを説明してください。',
+                    categoryHasRule: 'このカテゴリにはすでにルールがあります。既存のルールを編集するか、別のカテゴリのルールを説明してください。',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index b841afb75339..43768273ac7c 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8751,6 +8751,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                     unsupported: 'Die regel wordt nog niet ondersteund — we werken eraan. Probeer voorlopig een andere regel.',
                     unintelligible: 'Formuleer je regel bijvoorbeeld zo: als uitgaven hoger zijn dan $100, vraag dan een bon.',
                     multipleRules: 'Eén regel per keer graag — beschrijf één enkele regel, bijvoorbeeld: retailaankopen op alle kaarten blokkeren.',
+                    categoryHasRule: 'Deze categorie heeft al een regel. Bewerk de bestaande regel of beschrijf een regel voor een andere categorie.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 46bd462d370a..f4dabeedc5bf 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8776,6 +8776,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                     unsupported: 'Ta reguła nie jest jeszcze obsługiwana — pracujemy nad tym. Na razie spróbuj innej reguły.',
                     unintelligible: 'Spróbuj sformułować regułę tak: jeśli wydatek przekracza 100 $, wymagaj paragonu.',
                     multipleRules: 'Jedna reguła naraz — opisz pojedynczą regułę, na przykład: zablokuj zakupy detaliczne na wszystkich kartach.',
+                    categoryHasRule: 'Ta kategoria ma już regułę. Edytuj istniejącą regułę lub opisz regułę dla innej kategorii.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 2bde7709c14b..bbe29e9cc7c0 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8758,6 +8758,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                     unsupported: 'Essa regra ainda não tem suporte — estamos trabalhando nisso. Tente uma regra diferente por enquanto.',
                     unintelligible: 'Tente formular sua regra assim: se a despesa for maior que $100, exija um recibo.',
                     multipleRules: 'Uma regra por vez, por favor — tente descrever uma única regra, como: bloquear compras no varejo em todos os cartões.',
+                    categoryHasRule: 'Essa categoria já tem uma regra. Edite a regra existente ou descreva uma regra para outra categoria.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 221d208c9911..04fda9076ee6 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8448,6 +8448,7 @@ ${reportName}`,
                     unsupported: '该规则暂不支持，我们正在开发中。请先尝试其他规则。',
                     unintelligible: '可以这样描述规则：如果支出超过 100 美元，则需要收据。',
                     multipleRules: '请一次描述一条规则，例如：在所有卡上阻止零售消费。',
+                    categoryHasRule: '该类别已有规则。请编辑现有规则，或为其他类别描述规则。',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/libs/actions/Policy/Rules.ts b/src/libs/actions/Policy/Rules.ts
index f8d94fc18ae5..d19a5309cf97 100644
--- a/src/libs/actions/Policy/Rules.ts
+++ b/src/libs/actions/Policy/Rules.ts
@@ -447,9 +447,13 @@ function generateRule(policyID: string, ruleType: GeneratedRuleType, prompt: str
 
 /** Shows on the prompt form why a description did not become a rule */
 function setNewRulePromptError(state: GeneratedRuleState) {
+    setNewRulePromptErrorMessage(PROMPT_ERROR_BY_STATE[state] ?? 'common.genericErrorMessage');
+}
+
+function setNewRulePromptErrorMessage(translationKey: TranslationPaths) {
     Onyx.merge(ONYXKEYS.FORMS.NEW_RULE_PROMPT_FORM, {
         isLoading: false,
-        errors: getMicroSecondOnyxErrorWithTranslationKey(PROMPT_ERROR_BY_STATE[state] ?? 'common.genericErrorMessage'),
+        errors: getMicroSecondOnyxErrorWithTranslationKey(translationKey),
     });
 }
 
@@ -728,6 +732,7 @@ export {
     addPolicyAgentRule,
     generateRule,
     setNewRulePromptError,
+    setNewRulePromptErrorMessage,
     clearGeneratedRule,
     clearNewRulePrompt,
     updatePolicyAgentRule,
diff --git a/src/pages/workspace/rules/DescribeRuleButton.tsx b/src/pages/workspace/rules/DescribeRuleButton.tsx
index 6bfadbed4f5d..4d00c936040c 100644
--- a/src/pages/workspace/rules/DescribeRuleButton.tsx
+++ b/src/pages/workspace/rules/DescribeRuleButton.tsx
@@ -10,6 +10,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {clearNewRulePrompt} from '@userActions/Policy/Rules';
 
 import CONST from '@src/CONST';
+import type {PolicyCategory} from '@src/types/onyx';
 import type {GeneratedRuleType, GeneratedRuleValues} from '@src/types/onyx/GeneratedRule';
 
 import React, {useState} from 'react';
@@ -29,6 +30,9 @@ type DescribeRuleButtonProps = {
           /** Called with the generated form values once Concierge has built the rule */
           onRuleGenerated: (values: GeneratedRuleValues) => void;
 
+          /** Whether a new rule can use the category, so a generated category that already has this kind of rule is rejected */
+          isCategoryEligible?: (category: PolicyCategory) => boolean;
+
           onPress?: never;
       }
     | {
@@ -74,6 +78,7 @@ function DescribeRuleButton(props: DescribeRuleButtonProps) {
                     policyID={props.policyID}
                     ruleType={props.ruleType}
                     onRuleGenerated={props.onRuleGenerated}
+                    isCategoryEligible={props.isCategoryEligible}
                 />
             )}
         </>
diff --git a/src/pages/workspace/rules/DescribeRuleModal.tsx b/src/pages/workspace/rules/DescribeRuleModal.tsx
index 1614f4d74a8c..19ba948fe657 100644
--- a/src/pages/workspace/rules/DescribeRuleModal.tsx
+++ b/src/pages/workspace/rules/DescribeRuleModal.tsx
@@ -19,12 +19,12 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 
 import {getDecodedCategoryName} from '@libs/CategoryUtils';
 
-import {clearGeneratedRule, clearNewRulePrompt, generateRule, setNewRulePromptError} from '@userActions/Policy/Rules';
+import {clearGeneratedRule, clearNewRulePrompt, generateRule, setNewRulePromptError, setNewRulePromptErrorMessage} from '@userActions/Policy/Rules';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/NewRulePromptForm';
-import type {PolicyCategories} from '@src/types/onyx';
+import type {PolicyCategories, PolicyCategory} from '@src/types/onyx';
 import type {GeneratedRuleType, GeneratedRuleValues} from '@src/types/onyx/GeneratedRule';
 
 import type {TextInputKeyPressEvent} from 'react-native';
@@ -48,6 +48,9 @@ type DescribeRuleModalProps = {
 
     /** Called with the generated form values once Concierge has built the rule */
     onRuleGenerated: (values: GeneratedRuleValues) => void;
+
+    /** Whether a new rule can use the category, so a generated category that already has this kind of rule is rejected */
+    isCategoryEligible?: (category: PolicyCategory) => boolean;
 };
 
 /** Replaces the generated category with the workspace's own spelling of it, or drops it when the workspace has no such category */
@@ -60,7 +63,7 @@ function withPolicyCategory(values: GeneratedRuleValues, policyCategories: OnyxE
     return policyCategory ? {...rest, category: policyCategory.name} : rest;
 }
 
-function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenerated}: DescribeRuleModalProps) {
+function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenerated, isCategoryEligible}: DescribeRuleModalProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -101,9 +104,16 @@ function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenera
             clearGeneratedRule();
             return;
         }
-        onRuleGenerated(withPolicyCategory(generatedRuleValues ?? {}, policyCategories));
+        const values = withPolicyCategory(generatedRuleValues ?? {}, policyCategories);
+        const generatedCategory = values.category ? policyCategories?.[values.category] : undefined;
+        if (generatedCategory && isCategoryEligible && !isCategoryEligible(generatedCategory)) {
+            setNewRulePromptErrorMessage('workspace.rules.newRule.promptErrors.categoryHasRule');
+            clearGeneratedRule();
+            return;
+        }
+        onRuleGenerated(values);
         close();
-    }, [close, generatedRuleID, generatedRuleState, generatedRuleType, generatedRuleValues, onRuleGenerated, policyCategories, ruleType]);
+    }, [close, generatedRuleID, generatedRuleState, generatedRuleType, generatedRuleValues, isCategoryEligible, onRuleGenerated, policyCategories, ruleType]);
 
     // Focus only after the open animation, because focusing mid-animation blurs the input on mWeb and native
     useFocusEffect(() => {
diff --git a/src/pages/workspace/rules/FlagForReviewRules/FlagForReviewRulePageBase.tsx b/src/pages/workspace/rules/FlagForReviewRules/FlagForReviewRulePageBase.tsx
index 2ecce17a3397..236a1f1e49be 100644
--- a/src/pages/workspace/rules/FlagForReviewRules/FlagForReviewRulePageBase.tsx
+++ b/src/pages/workspace/rules/FlagForReviewRules/FlagForReviewRulePageBase.tsx
@@ -227,6 +227,7 @@ function FlagForReviewRulePageBase({
                         ruleType={CONST.GENERATED_RULE.RULE_TYPE.FLAG_FOR_REVIEW}
                         sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.RULES.FLAG_FOR_REVIEW_RULE_DESCRIBE}
                         onRuleGenerated={setDraftFlagForReviewRule}
+                        isCategoryEligible={(generatedCategory) => !hasExplicitFlagAmount(generatedCategory.maxExpenseAmount)}
                     />
                 )
             }
diff --git a/src/pages/workspace/rules/RequireFieldsRules/RequireFieldsRulePageBase.tsx b/src/pages/workspace/rules/RequireFieldsRules/RequireFieldsRulePageBase.tsx
index b14e285ff0fc..793f766eac85 100644
--- a/src/pages/workspace/rules/RequireFieldsRules/RequireFieldsRulePageBase.tsx
+++ b/src/pages/workspace/rules/RequireFieldsRules/RequireFieldsRulePageBase.tsx
@@ -470,6 +470,7 @@ function RequireFieldsRulePageBase({policyID, categoryName, initialCategoryName,
                         ruleType={CONST.GENERATED_RULE.RULE_TYPE.REQUIRE_FIELDS}
                         sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.RULES.REQUIRE_FIELDS_RULE_DESCRIBE}
                         onRuleGenerated={applyGeneratedRule}
+                        isCategoryEligible={(generatedCategory) => !categoryHasAnyRequireFieldsRule(generatedCategory)}
                     />
                 )
             }

From 77aa80bc98b10a8b732f2fcd5c4eda93b580bfd0 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 01:53:43 +0200
Subject: [PATCH 05/22] Move the spend rule eligible-card lookup into
 SpendRulesUtils

---
 src/libs/SpendRulesUtils.ts                   | 43 +++++++++++++++++--
 .../rules/SpendRules/SpendRuleCardPage.tsx    | 37 ++--------------
 2 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/src/libs/SpendRulesUtils.ts b/src/libs/SpendRulesUtils.ts
index 994062fe36da..37bc6d62faab 100644
--- a/src/libs/SpendRulesUtils.ts
+++ b/src/libs/SpendRulesUtils.ts
@@ -4,10 +4,10 @@ import type {LocalizedTranslate} from '@components/LocaleContextProvider';
 import CONST from '@src/CONST';
 import type {SpendRuleForm} from '@src/types/form';
 import {isSpendRuleCategory} from '@src/types/form/SpendRuleForm';
-import type {ExpensifyCardSettings} from '@src/types/onyx';
+import type {Card, ExpensifyCardSettings, WorkspaceCardsList} from '@src/types/onyx';
 import type {ExpensifyCardRule, ExpensifyCardRuleFilter} from '@src/types/onyx/ExpensifyCardSettings';
 
-import type {OnyxCollection} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 
 import {convertToBackendAmount} from './CurrencyUtils';
@@ -194,6 +194,35 @@ type SpendRuleByCardID = {
     formValues: SpendRuleForm;
 };
 
+function getCardIDsWithSpendRules(cardRules: Record<string, ExpensifyCardRule> | undefined, currentRuleID?: string): Set<number> {
+    const cardIDs = new Set<number>();
+    if (!cardRules) {
+        return cardIDs;
+    }
+
+    for (const [ruleID, rule] of Object.entries(cardRules)) {
+        if (ruleID === currentRuleID) {
+            continue;
+        }
+        const formValues = getSpendRuleFormValuesFromCardRule(rule);
+        for (const cardID of formValues?.cardIDs ?? []) {
+            const numericCardID = Number(cardID);
+            if (Number.isFinite(numericCardID)) {
+                cardIDs.add(numericCardID);
+            }
+        }
+    }
+
+    return cardIDs;
+}
+
+/** Returns the cards a spend rule can cover, which are the cards no other spend rule covers */
+function getEligibleSpendRuleCards(cardsList: OnyxEntry<WorkspaceCardsList>, expensifyCardSettings: OnyxEntry<ExpensifyCardSettings>, currentRuleID?: string): Card[] {
+    const {cardList, ...cards} = cardsList ?? {};
+    const cardIDsWithSpendRules = getCardIDsWithSpendRules(expensifyCardSettings?.cardRules, currentRuleID);
+    return Object.values(cards).filter((card: Card) => !cardIDsWithSpendRules.has(card.cardID));
+}
+
 /** At most one custom spend rule should reference a card; returns rule id + form values, or undefined. */
 function getSpendRuleByCardID(expensifyCardSettingsCollection: OnyxCollection<ExpensifyCardSettings> | undefined, cardID: string): SpendRuleByCardID | undefined {
     for (const settings of Object.values(expensifyCardSettingsCollection ?? {})) {
@@ -356,4 +385,12 @@ function getSpendRuleSummaryText(
 }
 
 export type {SpendRuleSummaryPart};
-export {buildSpendRuleAST, getSpendRuleByCardID, getSpendRuleFormValuesFromCardRule, getSpendRuleSummaryParts, getSpendRuleSummaryText, getTruncatedSpendRuleSummary};
+export {
+    buildSpendRuleAST,
+    getEligibleSpendRuleCards,
+    getSpendRuleByCardID,
+    getSpendRuleFormValuesFromCardRule,
+    getSpendRuleSummaryParts,
+    getSpendRuleSummaryText,
+    getTruncatedSpendRuleSummary,
+};
diff --git a/src/pages/workspace/rules/SpendRules/SpendRuleCardPage.tsx b/src/pages/workspace/rules/SpendRules/SpendRuleCardPage.tsx
index b75b5182e22a..956b83acd709 100644
--- a/src/pages/workspace/rules/SpendRules/SpendRuleCardPage.tsx
+++ b/src/pages/workspace/rules/SpendRules/SpendRuleCardPage.tsx
@@ -33,7 +33,7 @@ import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import {getHeaderMessage} from '@libs/OptionsListUtils';
 import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
 import moveInitialSelectionToTop from '@libs/SelectionListOrderUtils';
-import {getSpendRuleFormValuesFromCardRule} from '@libs/SpendRulesUtils';
+import {getEligibleSpendRuleCards} from '@libs/SpendRulesUtils';
 
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 
@@ -45,10 +45,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {Card, ExpensifyCardSettings, WorkspaceCardsList} from '@src/types/onyx';
-import type {ExpensifyCardRule} from '@src/types/onyx/ExpensifyCardSettings';
-
-import type {OnyxEntry} from 'react-native-onyx';
+import type {Card} from '@src/types/onyx';
 
 import {useFocusEffect} from '@react-navigation/native';
 import React, {useCallback, useEffect, useState} from 'react';
@@ -60,34 +57,6 @@ type ExpensifyCardListItem = ListItem &
 
 type SpendRuleCardPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.RULES_SPEND_CARD>;
 
-function getCardIDsWithSpendRules(cardRules: Record<string, ExpensifyCardRule> | undefined, currentRuleID?: string): Set<number> {
-    const cardIDs = new Set<number>();
-    if (!cardRules) {
-        return cardIDs;
-    }
-
-    for (const [ruleID, rule] of Object.entries(cardRules)) {
-        if (ruleID === currentRuleID) {
-            continue;
-        }
-        const formValues = getSpendRuleFormValuesFromCardRule(rule);
-        for (const cardID of formValues?.cardIDs ?? []) {
-            const numericCardID = Number(cardID);
-            if (Number.isFinite(numericCardID)) {
-                cardIDs.add(numericCardID);
-            }
-        }
-    }
-
-    return cardIDs;
-}
-
-function getEligibleCards(cardsList: OnyxEntry<WorkspaceCardsList>, expensifyCardSettings: ExpensifyCardSettings, currentRuleID?: string) {
-    const {cardList, ...cards} = cardsList ?? {};
-    const cardIDsWithSpendRules = getCardIDsWithSpendRules(expensifyCardSettings?.cardRules, currentRuleID);
-    return Object.values(cards).filter((card: Card) => !cardIDsWithSpendRules.has(card.cardID));
-}
-
 function SpendRuleCardPage({route}: SpendRuleCardPageProps) {
     const {policyID, ruleID} = route.params;
     const styles = useThemeStyles();
@@ -130,7 +99,7 @@ function SpendRuleCardPage({route}: SpendRuleCardPageProps) {
     });
 
     const isCardSettingsLoading = !isOffline && (!expensifyCardSettings || expensifyCardSettings.isLoading) && !expensifyCardSettings?.hasOnceLoaded;
-    const eligibleCards = expensifyCardSettings ? getEligibleCards(cardsList, expensifyCardSettings, ruleID === ROUTES.NEW ? undefined : ruleID) : [];
+    const eligibleCards = expensifyCardSettings ? getEligibleSpendRuleCards(cardsList, expensifyCardSettings, ruleID === ROUTES.NEW ? undefined : ruleID) : [];
 
     const sortCards = (cards: Card[]) => sortCardsByCardholderName(cards, personalDetails, localeCompare, translate, formatPhoneNumber);
 

From c1aabf059dc505848fc9a40ef025d19227c3287c Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 01:54:06 +0200
Subject: [PATCH 06/22] Select every eligible card when a described card rule
 covers all cards

---
 .../workspace/rules/SpendRules/SpendRulePageBase.tsx      | 7 ++++---
 src/types/onyx/GeneratedRule.ts                           | 8 +++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx b/src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx
index 4fce96f34e6c..091e13f7e506 100644
--- a/src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx
+++ b/src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx
@@ -29,7 +29,7 @@ import {convertToBackendAmount} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {rand64} from '@libs/NumberUtils';
 import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
-import {getSpendRuleFormValuesFromCardRule, getTruncatedSpendRuleSummary} from '@libs/SpendRulesUtils';
+import {getEligibleSpendRuleCards, getSpendRuleFormValuesFromCardRule, getTruncatedSpendRuleSummary} from '@libs/SpendRulesUtils';
 
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
@@ -107,9 +107,10 @@ function SpendRulePageBase({policyID, ruleID, testID, upgradeBackTo}: SpendRuleP
 
     useEffect(() => () => clearDraftSpendRule(), []);
 
-    const applyGeneratedRule = (values: GeneratedRuleValues) => {
+    const applyGeneratedRule = ({isAllCards, ...values}: GeneratedRuleValues) => {
         const generatedCategories = values.categories?.filter(isSpendRuleCategory);
-        setDraftSpendRule(generatedCategories ? {...values, categories: generatedCategories} : values);
+        const generatedCardIDs = isAllCards ? getEligibleSpendRuleCards(cardsList, expensifyCardSettings).map((card) => String(card.cardID)) : spendRuleForm?.cardIDs;
+        setDraftSpendRule({...values, cardIDs: generatedCardIDs, categories: generatedCategories});
         setIsRestrictMerchantsOff(!generatedCategories?.length && !values.merchantNames?.length);
     };
 
diff --git a/src/types/onyx/GeneratedRule.ts b/src/types/onyx/GeneratedRule.ts
index fd156e2388a0..8a4dbf443ea9 100644
--- a/src/types/onyx/GeneratedRule.ts
+++ b/src/types/onyx/GeneratedRule.ts
@@ -10,7 +10,13 @@ type GeneratedRuleState = ValueOf<typeof CONST.GENERATED_RULE.STATE>;
 type GeneratedRuleType = ValueOf<typeof CONST.GENERATED_RULE.RULE_TYPE>;
 
 /** The generated form values, seeding whichever draft ruleType names */
-type GeneratedRuleValues = Partial<RequireFieldsRuleForm> & Partial<FlagForReviewRuleForm> & Partial<SpendRuleForm> & Partial<MerchantRuleForm>;
+type GeneratedRuleValues = Partial<RequireFieldsRuleForm> &
+    Partial<FlagForReviewRuleForm> &
+    Partial<SpendRuleForm> &
+    Partial<MerchantRuleForm> & {
+        /** Whether a card spend rule covers every card a new rule can cover */
+        isAllCards?: boolean;
+    };
 
 /** Model of a rule generated from an admin's description */
 type GeneratedRule = {

From 4c3e86d66b34cf9233571bf2e167697f920cf115 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 01:55:18 +0200
Subject: [PATCH 07/22] Close only the modal when browser Back pops a modal
 history entry

---
 ...ative+7.4.1+003+modal-history-entry-back.patch | 15 +++++++++++++++
 patches/react-navigation/details.md               |  8 ++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 patches/react-navigation/@react-navigation+native+7.4.1+003+modal-history-entry-back.patch

diff --git a/patches/react-navigation/@react-navigation+native+7.4.1+003+modal-history-entry-back.patch b/patches/react-navigation/@react-navigation+native+7.4.1+003+modal-history-entry-back.patch
new file mode 100644
index 000000000000..6d9e611f6f96
--- /dev/null
+++ b/patches/react-navigation/@react-navigation+native+7.4.1+003+modal-history-entry-back.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/@react-navigation/native/lib/module/useLinking.js b/node_modules/@react-navigation/native/lib/module/useLinking.js
+index 2b189a5..bdef749 100644
+--- a/node_modules/@react-navigation/native/lib/module/useLinking.js
++++ b/node_modules/@react-navigation/native/lib/module/useLinking.js
+@@ -304,7 +304,9 @@ export function useLinking(ref, {
+       if (record?.path === path && record?.state) {
+         const currentState = navigation.getRootState();
+         const [currentFocused, recordFocused] = findMatchingState(currentState, record.state);
+-        if (previousIndex - index === 1 && currentFocused && recordFocused && isPoppingLastEntry(currentFocused, recordFocused)) {
++        // A string history entry is a modal placeholder, and resetting to the record closes only the modal
++        const isPoppingModalHistoryEntry = typeof currentFocused?.history?.at(-1) === 'string';
++        if (previousIndex - index === 1 && currentFocused && recordFocused && !isPoppingModalHistoryEntry && isPoppingLastEntry(currentFocused, recordFocused)) {
+           const pending = pendingPopStateDeltaRef.current;
+ 
+           // If we detect that the state change is popping the last entry
diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index 542721926812..f538a1f73825 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -43,6 +43,14 @@
 - PR Updating Patch: [#32087](https://github.com/Expensify/App/pull/32087) [#42465](https://github.com/Expensify/App/pull/42465) [#64155](https://github.com/Expensify/App/pull/64155) [#103346](https://github.com/Expensify/App/pull/103346) [#101715](https://github.com/Expensify/App/issues/101715)
 - Note: Re-ported onto 7.4.1. `createMemoryHistory` and `useLinking` were refactored upstream (`getPathWithoutHash`, `getHistoryLength`, `pendingPopStateDelta`, `isPoppingLastEntry`), so the hunks were re-anchored instead of applied verbatim: `backIndex` keeps upstream's hash handling and adds the focused-route-key match, and `useLinking` keeps upstream's `pendingPopStateDelta` guard and `getHistoryLength` delta while re-adding `historyDeltaByKeys`/`getStaleHistoryDiff`. Two parts of the old patch became redundant and were dropped: the `findFocusedRouteKey` helper file now matches upstream's own module, and the extra `history.replace` right after `history.go(nextIndex - currentIndex)` duplicated the replace that upstream already runs at the end of the same `try` block.
 
+### [@react-navigation+native+7.4.1+003+modal-history-entry-back.patch](@react-navigation+native+7.4.1+003+modal-history-entry-back.patch)
+
+- Reason: Browser Back on an open modal should close only the modal. A modal adds a string entry to the root history. When Back pops that entry, `useLinking` dispatched `goBack()`, which the focused right panel stack handled by popping its page. The patch resets to the saved state for that entry instead, so only the modal closes.
+- Upstream PR/issue: N/A
+- E/App issue: [#103878](https://github.com/Expensify/App/issues/103878)
+- PR Introducing Patch: TBD
+- PR Updating Patch: N/A
+
 ### [@react-navigation+stack+7.11.2+001+edge-drag-gesture.patch](@react-navigation+stack+7.11.2+001+edge-drag-gesture.patch)
 
 - Reason: Adds `edgeDragGestureMonitor` implementation

From 4dc31e8f92258e0234fc09a935c8f431d26bfd62 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 01:56:07 +0200
Subject: [PATCH 08/22] Link the PR that adds the modal history entry patch

---
 patches/react-navigation/details.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index f538a1f73825..6e80fb461133 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -48,7 +48,7 @@
 - Reason: Browser Back on an open modal should close only the modal. A modal adds a string entry to the root history. When Back pops that entry, `useLinking` dispatched `goBack()`, which the focused right panel stack handled by popping its page. The patch resets to the saved state for that entry instead, so only the modal closes.
 - Upstream PR/issue: N/A
 - E/App issue: [#103878](https://github.com/Expensify/App/issues/103878)
-- PR Introducing Patch: TBD
+- PR Introducing Patch: [#104055](https://github.com/Expensify/App/pull/104055)
 - PR Updating Patch: N/A
 
 ### [@react-navigation+stack+7.11.2+001+edge-drag-gesture.patch](@react-navigation+stack+7.11.2+001+edge-drag-gesture.patch)

From 5528494d28e6dfa2b1025888e9469cbec6136817 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 01:58:30 +0200
Subject: [PATCH 09/22] Describe a category tax rule from the Category expense
 default editor

---
 src/CONST/index.ts                                            | 1 +
 .../workspace/rules/MerchantRules/MerchantRulePageBase.tsx    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index a35bbd7dfe8d..e482535b500e 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -628,6 +628,7 @@ const CONST = {
             FLAG_FOR_REVIEW: 'flagForReview',
             RESTRICT_CARD_SPEND: 'restrictCardSpend',
             EXPENSE_DEFAULTS: 'expenseDefaults',
+            CATEGORY_TAX_RATE: 'categoryTaxRate',
         },
     },
 
diff --git a/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx b/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx
index 10cfd1c1a20e..0b3a47a6d59f 100644
--- a/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx
+++ b/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx
@@ -679,7 +679,7 @@ function MerchantRulePageBase({
 
     const shouldShowDescribeRule = !isEditingSavedRule && !isCategoryLocked;
     const applyGeneratedRule = (values: GeneratedRuleValues) => {
-        setDraftMerchantRule({...values, ruleType: CONST.POLICY.EXPENSE_DEFAULT_RULE_TYPE.MERCHANT});
+        setDraftMerchantRule({...values, ruleType: isScopedToCategory ? CONST.POLICY.EXPENSE_DEFAULT_RULE_TYPE.CATEGORY : CONST.POLICY.EXPENSE_DEFAULT_RULE_TYPE.MERCHANT});
     };
 
     const footer = canWriteRules ? (
@@ -816,7 +816,7 @@ function MerchantRulePageBase({
                         isVisible={isDescribeRuleModalVisible}
                         onClose={() => setIsDescribeRuleModalVisible(false)}
                         policyID={policyID}
-                        ruleType={CONST.GENERATED_RULE.RULE_TYPE.EXPENSE_DEFAULTS}
+                        ruleType={isScopedToCategory ? CONST.GENERATED_RULE.RULE_TYPE.CATEGORY_TAX_RATE : CONST.GENERATED_RULE.RULE_TYPE.EXPENSE_DEFAULTS}
                         onRuleGenerated={applyGeneratedRule}
                     />
                 )}

From e0ad73eae890f1498b11383055559347af056dc6 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 01:58:59 +0200
Subject: [PATCH 10/22] Drop described categories that are missing or already
 have a tax rule

---
 .../workspace/rules/DescribeRuleModal.tsx     | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/pages/workspace/rules/DescribeRuleModal.tsx b/src/pages/workspace/rules/DescribeRuleModal.tsx
index 19ba948fe657..20778be010d1 100644
--- a/src/pages/workspace/rules/DescribeRuleModal.tsx
+++ b/src/pages/workspace/rules/DescribeRuleModal.tsx
@@ -49,18 +49,26 @@ type DescribeRuleModalProps = {
     /** Called with the generated form values once Concierge has built the rule */
     onRuleGenerated: (values: GeneratedRuleValues) => void;
 
-    /** Whether a new rule can use the category, so a generated category that already has this kind of rule is rejected */
+    /** Whether a new rule can use the category, so a generated category that already has this kind of rule is dropped or rejected */
     isCategoryEligible?: (category: PolicyCategory) => boolean;
 };
 
-/** Replaces the generated category with the workspace's own spelling of it, or drops it when the workspace has no such category */
-function withPolicyCategory(values: GeneratedRuleValues, policyCategories: OnyxEntry<PolicyCategories>): GeneratedRuleValues {
-    const {category, ...rest} = values;
-    if (!category) {
-        return values;
+function findPolicyCategory(categoryName: string, policyCategories: OnyxEntry<PolicyCategories>): PolicyCategory | undefined {
+    return Object.values(policyCategories ?? {}).find((candidate) => candidate.enabled && getDecodedCategoryName(candidate.name) === getDecodedCategoryName(categoryName));
+}
+
+/** Replaces the generated categories with the workspace's own spelling of them, and drops any the workspace has no enabled category for */
+function withPolicyCategories(values: GeneratedRuleValues, policyCategories: OnyxEntry<PolicyCategories>): GeneratedRuleValues {
+    const {category, categoriesToMatch, ...rest} = values;
+    const policyValues: GeneratedRuleValues = rest;
+    const policyCategory = category ? findPolicyCategory(category, policyCategories) : undefined;
+    if (policyCategory) {
+        policyValues.category = policyCategory.name;
+    }
+    if (categoriesToMatch) {
+        policyValues.categoriesToMatch = categoriesToMatch.flatMap((categoryName) => findPolicyCategory(categoryName, policyCategories)?.name ?? []);
     }
-    const policyCategory = Object.values(policyCategories ?? {}).find((candidate) => candidate.enabled && getDecodedCategoryName(candidate.name) === getDecodedCategoryName(category));
-    return policyCategory ? {...rest, category: policyCategory.name} : rest;
+    return policyValues;
 }
 
 function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenerated, isCategoryEligible}: DescribeRuleModalProps) {
@@ -104,14 +112,18 @@ function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenera
             clearGeneratedRule();
             return;
         }
-        const values = withPolicyCategory(generatedRuleValues ?? {}, policyCategories);
-        const generatedCategory = values.category ? policyCategories?.[values.category] : undefined;
-        if (generatedCategory && isCategoryEligible && !isCategoryEligible(generatedCategory)) {
+        const values = withPolicyCategories(generatedRuleValues ?? {}, policyCategories);
+        const isCategoryTaken = (categoryName: string) => {
+            const policyCategory = policyCategories?.[categoryName];
+            return !!policyCategory && !!isCategoryEligible && !isCategoryEligible(policyCategory);
+        };
+        const eligibleCategoriesToMatch = values.categoriesToMatch?.filter((categoryName) => !isCategoryTaken(categoryName));
+        if ((values.category && isCategoryTaken(values.category)) || (values.categoriesToMatch?.length && !eligibleCategoriesToMatch?.length)) {
             setNewRulePromptErrorMessage('workspace.rules.newRule.promptErrors.categoryHasRule');
             clearGeneratedRule();
             return;
         }
-        onRuleGenerated(values);
+        onRuleGenerated(eligibleCategoriesToMatch ? {...values, categoriesToMatch: eligibleCategoriesToMatch} : values);
         close();
     }, [close, generatedRuleID, generatedRuleState, generatedRuleType, generatedRuleValues, isCategoryEligible, onRuleGenerated, policyCategories, ruleType]);
 

From 83e66d783dbf40c3ddf8a409f6ff65a005c976ec Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 01:59:00 +0200
Subject: [PATCH 11/22] Keep a described category tax rate only when the
 workspace can use it

---
 .../rules/MerchantRules/MerchantRulePageBase.tsx     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx b/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx
index 0b3a47a6d59f..8e19c2edeeb9 100644
--- a/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx
+++ b/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx
@@ -31,7 +31,7 @@ import {deleteMerchantRule, setMerchantRule} from '@libs/actions/Policy/Rules';
 import {openPolicyTagsPage} from '@libs/actions/Policy/Tag';
 import Tab from '@libs/actions/Tab';
 import {clearDraftMerchantRule, setDraftMerchantRule} from '@libs/actions/User';
-import {getCategoryTaxRuleTaxID, getTaxRateDisplayName, hasUsableTaxRates, isCategoryRuleDraft} from '@libs/CategoryTaxRulesUtils';
+import {categoryHasTaxRule, getCategoryTaxRuleTaxID, getTaxRateDisplayName, hasUsableTaxRates, isCategoryRuleDraft, isSelectableTaxRate} from '@libs/CategoryTaxRulesUtils';
 import {getDecodedCategoryName} from '@libs/CategoryUtils';
 import {canEditMerchantRule, getMerchantRuleFormValues, getPolicyExpenseDefaultRules} from '@libs/ExpenseDefaultRuleUtils';
 import Navigation from '@libs/Navigation/Navigation';
@@ -679,7 +679,14 @@ function MerchantRulePageBase({
 
     const shouldShowDescribeRule = !isEditingSavedRule && !isCategoryLocked;
     const applyGeneratedRule = (values: GeneratedRuleValues) => {
-        setDraftMerchantRule({...values, ruleType: isScopedToCategory ? CONST.POLICY.EXPENSE_DEFAULT_RULE_TYPE.CATEGORY : CONST.POLICY.EXPENSE_DEFAULT_RULE_TYPE.MERCHANT});
+        if (!isScopedToCategory) {
+            setDraftMerchantRule({...values, ruleType: CONST.POLICY.EXPENSE_DEFAULT_RULE_TYPE.MERCHANT});
+            return;
+        }
+        const {tax, ...categoryValues} = values;
+        const generatedTaxRate = tax ? policy?.taxRates?.taxes?.[tax] : undefined;
+        const isGeneratedTaxSelectable = !!tax && !!generatedTaxRate && isSelectableTaxRate(policy, tax, generatedTaxRate, true);
+        setDraftMerchantRule({...categoryValues, ...(isGeneratedTaxSelectable ? {tax} : {}), ruleType: CONST.POLICY.EXPENSE_DEFAULT_RULE_TYPE.CATEGORY});
     };
 
     const footer = canWriteRules ? (
@@ -818,6 +825,7 @@ function MerchantRulePageBase({
                         policyID={policyID}
                         ruleType={isScopedToCategory ? CONST.GENERATED_RULE.RULE_TYPE.CATEGORY_TAX_RATE : CONST.GENERATED_RULE.RULE_TYPE.EXPENSE_DEFAULTS}
                         onRuleGenerated={applyGeneratedRule}
+                        isCategoryEligible={isScopedToCategory ? (generatedCategory) => !categoryHasTaxRule(policy?.rules?.expenseRules, generatedCategory.name) : undefined}
                     />
                 )}
             </ScreenWrapper>

From 625a2b10e0b5a326b9039330ce4d06d351fbbc4a Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 02:00:44 +0200
Subject: [PATCH 12/22] Revert "Link the PR that adds the modal history entry
 patch"

This reverts commit 4dc31e8f92258e0234fc09a935c8f431d26bfd62.
---
 patches/react-navigation/details.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index 6e80fb461133..f538a1f73825 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -48,7 +48,7 @@
 - Reason: Browser Back on an open modal should close only the modal. A modal adds a string entry to the root history. When Back pops that entry, `useLinking` dispatched `goBack()`, which the focused right panel stack handled by popping its page. The patch resets to the saved state for that entry instead, so only the modal closes.
 - Upstream PR/issue: N/A
 - E/App issue: [#103878](https://github.com/Expensify/App/issues/103878)
-- PR Introducing Patch: [#104055](https://github.com/Expensify/App/pull/104055)
+- PR Introducing Patch: TBD
 - PR Updating Patch: N/A
 
 ### [@react-navigation+stack+7.11.2+001+edge-drag-gesture.patch](@react-navigation+stack+7.11.2+001+edge-drag-gesture.patch)

From 605e61886978b84840ce1e339c1349168f2606f0 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 02:00:45 +0200
Subject: [PATCH 13/22] Revert "Close only the modal when browser Back pops a
 modal history entry"

This reverts commit 4c3e86d66b34cf9233571bf2e167697f920cf115.
---
 ...ative+7.4.1+003+modal-history-entry-back.patch | 15 ---------------
 patches/react-navigation/details.md               |  8 --------
 2 files changed, 23 deletions(-)
 delete mode 100644 patches/react-navigation/@react-navigation+native+7.4.1+003+modal-history-entry-back.patch

diff --git a/patches/react-navigation/@react-navigation+native+7.4.1+003+modal-history-entry-back.patch b/patches/react-navigation/@react-navigation+native+7.4.1+003+modal-history-entry-back.patch
deleted file mode 100644
index 6d9e611f6f96..000000000000
--- a/patches/react-navigation/@react-navigation+native+7.4.1+003+modal-history-entry-back.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/node_modules/@react-navigation/native/lib/module/useLinking.js b/node_modules/@react-navigation/native/lib/module/useLinking.js
-index 2b189a5..bdef749 100644
---- a/node_modules/@react-navigation/native/lib/module/useLinking.js
-+++ b/node_modules/@react-navigation/native/lib/module/useLinking.js
-@@ -304,7 +304,9 @@ export function useLinking(ref, {
-       if (record?.path === path && record?.state) {
-         const currentState = navigation.getRootState();
-         const [currentFocused, recordFocused] = findMatchingState(currentState, record.state);
--        if (previousIndex - index === 1 && currentFocused && recordFocused && isPoppingLastEntry(currentFocused, recordFocused)) {
-+        // A string history entry is a modal placeholder, and resetting to the record closes only the modal
-+        const isPoppingModalHistoryEntry = typeof currentFocused?.history?.at(-1) === 'string';
-+        if (previousIndex - index === 1 && currentFocused && recordFocused && !isPoppingModalHistoryEntry && isPoppingLastEntry(currentFocused, recordFocused)) {
-           const pending = pendingPopStateDeltaRef.current;
- 
-           // If we detect that the state change is popping the last entry
diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index f538a1f73825..542721926812 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -43,14 +43,6 @@
 - PR Updating Patch: [#32087](https://github.com/Expensify/App/pull/32087) [#42465](https://github.com/Expensify/App/pull/42465) [#64155](https://github.com/Expensify/App/pull/64155) [#103346](https://github.com/Expensify/App/pull/103346) [#101715](https://github.com/Expensify/App/issues/101715)
 - Note: Re-ported onto 7.4.1. `createMemoryHistory` and `useLinking` were refactored upstream (`getPathWithoutHash`, `getHistoryLength`, `pendingPopStateDelta`, `isPoppingLastEntry`), so the hunks were re-anchored instead of applied verbatim: `backIndex` keeps upstream's hash handling and adds the focused-route-key match, and `useLinking` keeps upstream's `pendingPopStateDelta` guard and `getHistoryLength` delta while re-adding `historyDeltaByKeys`/`getStaleHistoryDiff`. Two parts of the old patch became redundant and were dropped: the `findFocusedRouteKey` helper file now matches upstream's own module, and the extra `history.replace` right after `history.go(nextIndex - currentIndex)` duplicated the replace that upstream already runs at the end of the same `try` block.
 
-### [@react-navigation+native+7.4.1+003+modal-history-entry-back.patch](@react-navigation+native+7.4.1+003+modal-history-entry-back.patch)
-
-- Reason: Browser Back on an open modal should close only the modal. A modal adds a string entry to the root history. When Back pops that entry, `useLinking` dispatched `goBack()`, which the focused right panel stack handled by popping its page. The patch resets to the saved state for that entry instead, so only the modal closes.
-- Upstream PR/issue: N/A
-- E/App issue: [#103878](https://github.com/Expensify/App/issues/103878)
-- PR Introducing Patch: TBD
-- PR Updating Patch: N/A
-
 ### [@react-navigation+stack+7.11.2+001+edge-drag-gesture.patch](@react-navigation+stack+7.11.2+001+edge-drag-gesture.patch)
 
 - Reason: Adds `edgeDragGestureMonitor` implementation

From 9bd0b9664fa23f0eced86eefb02f0d0815f72608 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 02:43:27 +0200
Subject: [PATCH 14/22] Keep the real SpendRulesUtils in SpendRuleCardPageTest

---
 tests/ui/SpendRuleCardPageTest.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/ui/SpendRuleCardPageTest.tsx b/tests/ui/SpendRuleCardPageTest.tsx
index 9c977438a523..ac3986db38a3 100644
--- a/tests/ui/SpendRuleCardPageTest.tsx
+++ b/tests/ui/SpendRuleCardPageTest.tsx
@@ -2,6 +2,8 @@ import {act, render} from '@testing-library/react-native';
 
 import SelectionList from '@components/SelectionList';
 
+import type * as SpendRulesUtils from '@libs/SpendRulesUtils';
+
 import SpendRuleCardPage from '@pages/workspace/rules/SpendRules/SpendRuleCardPage';
 
 import CONST from '@src/CONST';
@@ -103,7 +105,10 @@ jest.mock('@libs/CardUtils', () => ({
 }));
 jest.mock('@libs/OptionsListUtils', () => ({getHeaderMessage: () => ''}));
 jest.mock('@libs/PersonalDetailsUtils', () => ({temporaryGetDisplayNameOrDefault: () => ''}));
-jest.mock('@libs/SpendRulesUtils', () => ({getSpendRuleFormValuesFromCardRule: () => ({cardIDs: []})}));
+jest.mock('@libs/SpendRulesUtils', () => ({
+    ...jest.requireActual<typeof SpendRulesUtils>('@libs/SpendRulesUtils'),
+    getSpendRuleFormValuesFromCardRule: () => ({cardIDs: []}),
+}));
 jest.mock('@libs/Navigation/Navigation', () => ({goBack: jest.fn()}));
 jest.mock('@libs/actions/User', () => ({updateDraftSpendRule: jest.fn()}));
 jest.mock('@userActions/Policy/Policy', () => ({openPolicyExpensifyCardsPage: jest.fn()}));

From 63fae439cbd277ec3367fb6f7324a0de1c690e0b Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 02:50:20 +0200
Subject: [PATCH 15/22] Drop a described category that already has a rule
 instead of showing an error

---
 src/languages/de.ts                           |  1 -
 src/languages/el.ts                           |  1 -
 src/languages/en.ts                           |  1 -
 src/languages/es.ts                           |  1 -
 src/languages/fr.ts                           |  1 -
 src/languages/it.ts                           |  1 -
 src/languages/ja.ts                           |  1 -
 src/languages/nl.ts                           |  1 -
 src/languages/pl.ts                           |  1 -
 src/languages/pt-BR.ts                        |  1 -
 src/languages/zh-hans.ts                      |  1 -
 src/libs/actions/Policy/Rules.ts              |  7 +--
 .../workspace/rules/DescribeRuleButton.tsx    |  2 +-
 .../workspace/rules/DescribeRuleModal.tsx     | 44 +++++++------------
 14 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 216f175d916c..2d38e1697274 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8826,7 +8826,6 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                     unsupported: 'Diese Regel wird noch nicht unterstützt – wir arbeiten daran. Bitte versuche vorerst eine andere Regel.',
                     unintelligible: 'Formuliere deine Regel etwa so: Wenn Ausgaben über 100 $ liegen, ist ein Beleg erforderlich.',
                     multipleRules: 'Bitte eine Regel nach der anderen – beschreibe eine einzelne Regel, z. B.: Einzelhandelskäufe auf allen Karten blockieren.',
-                    categoryHasRule: 'Für diese Kategorie gibt es bereits eine Regel. Bearbeite die bestehende Regel oder beschreibe eine Regel für eine andere Kategorie.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/el.ts b/src/languages/el.ts
index edf21c38f777..1840bc521100 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -8918,7 +8918,6 @@ ${reportName}`,
                     unsupported: 'Αυτός ο κανόνας δεν υποστηρίζεται ακόμη — το δουλεύουμε. Δοκιμάστε προς το παρόν έναν διαφορετικό κανόνα.',
                     unintelligible: 'Δοκιμάστε να διατυπώσετε τον κανόνα σας έτσι: αν οι δαπάνες ξεπερνούν τα 100 $, να απαιτείται απόδειξη.',
                     multipleRules: 'Έναν κανόνα τη φορά — δοκιμάστε να περιγράψετε έναν μόνο κανόνα, π.χ.: αποκλεισμός αγορών λιανικής σε όλες τις κάρτες.',
-                    categoryHasRule: 'Αυτή η κατηγορία έχει ήδη κανόνα. Επεξεργαστείτε τον υπάρχοντα κανόνα ή περιγράψτε έναν κανόνα για άλλη κατηγορία.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 71e1b46405c0..c474c0da131a 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9103,7 +9103,6 @@ const translations = {
                     unsupported: "That rule isn't supported yet — we're working on it. Please try a different rule for now.",
                     unintelligible: 'Try phrasing your rule like: if expenses have a value over $100, then require a receipt.',
                     multipleRules: 'One rule at a time, please — try describing a single rule, like: block retail purchases on all cards.',
-                    categoryHasRule: 'That category already has a rule. Edit the existing rule or describe a rule for another category.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 27ed5fd328e4..946fe286656f 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -8831,7 +8831,6 @@ ${reportName}`,
                     unsupported: 'Esa regla aún no es compatible: estamos trabajando en ello. Prueba con otra regla por ahora.',
                     unintelligible: 'Prueba a formular tu regla así: si los gastos superan los $100, exige un recibo.',
                     multipleRules: 'Una regla a la vez, por favor. Prueba a describir una sola regla, como: bloquear compras en comercios minoristas en todas las tarjetas.',
-                    categoryHasRule: 'Esa categoría ya tiene una regla. Edita la regla existente o describe una regla para otra categoría.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 08e747c04adf..bd5f737a15ee 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8849,7 +8849,6 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                     unsupported: 'Cette règle n’est pas encore prise en charge — nous y travaillons. Essayez une autre règle pour le moment.',
                     unintelligible: 'Essayez de formuler votre règle ainsi : si les dépenses dépassent 100 $, exigez un reçu.',
                     multipleRules: 'Une règle à la fois, s’il vous plaît — essayez de décrire une seule règle, comme : bloquer les achats en magasin sur toutes les cartes.',
-                    categoryHasRule: 'Cette catégorie a déjà une règle. Modifiez la règle existante ou décrivez une règle pour une autre catégorie.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 88f5ea9afbb6..831c17252a0b 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8777,7 +8777,6 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                     unsupported: 'Questa regola non è ancora supportata: ci stiamo lavorando. Per ora prova una regola diversa.',
                     unintelligible: 'Prova a formulare la regola così: se le spese superano i 100 $, richiedi una ricevuta.',
                     multipleRules: 'Una regola alla volta, per favore: prova a descrivere una singola regola, ad esempio bloccare gli acquisti al dettaglio su tutte le carte.',
-                    categoryHasRule: "Questa categoria ha già una regola. Modifica la regola esistente o descrivi una regola per un'altra categoria.",
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 4a1c50383bcd..61d5837a2a6f 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8666,7 +8666,6 @@ ${reportName}`,
                     unsupported: 'そのルールはまだ対応していません。現在対応を進めています。ほかのルールをお試しください。',
                     unintelligible: '「経費が100ドルを超える場合は領収書を必須にする」のように書いてみてください。',
                     multipleRules: '一度に1つのルールのみです。「すべてのカードで小売店での購入をブロックする」のように、1つのルールを説明してください。',
-                    categoryHasRule: 'このカテゴリにはすでにルールがあります。既存のルールを編集するか、別のカテゴリのルールを説明してください。',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 43768273ac7c..b841afb75339 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8751,7 +8751,6 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                     unsupported: 'Die regel wordt nog niet ondersteund — we werken eraan. Probeer voorlopig een andere regel.',
                     unintelligible: 'Formuleer je regel bijvoorbeeld zo: als uitgaven hoger zijn dan $100, vraag dan een bon.',
                     multipleRules: 'Eén regel per keer graag — beschrijf één enkele regel, bijvoorbeeld: retailaankopen op alle kaarten blokkeren.',
-                    categoryHasRule: 'Deze categorie heeft al een regel. Bewerk de bestaande regel of beschrijf een regel voor een andere categorie.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index f4dabeedc5bf..46bd462d370a 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8776,7 +8776,6 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                     unsupported: 'Ta reguła nie jest jeszcze obsługiwana — pracujemy nad tym. Na razie spróbuj innej reguły.',
                     unintelligible: 'Spróbuj sformułować regułę tak: jeśli wydatek przekracza 100 $, wymagaj paragonu.',
                     multipleRules: 'Jedna reguła naraz — opisz pojedynczą regułę, na przykład: zablokuj zakupy detaliczne na wszystkich kartach.',
-                    categoryHasRule: 'Ta kategoria ma już regułę. Edytuj istniejącą regułę lub opisz regułę dla innej kategorii.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index bbe29e9cc7c0..2bde7709c14b 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8758,7 +8758,6 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                     unsupported: 'Essa regra ainda não tem suporte — estamos trabalhando nisso. Tente uma regra diferente por enquanto.',
                     unintelligible: 'Tente formular sua regra assim: se a despesa for maior que $100, exija um recibo.',
                     multipleRules: 'Uma regra por vez, por favor — tente descrever uma única regra, como: bloquear compras no varejo em todos os cartões.',
-                    categoryHasRule: 'Essa categoria já tem uma regra. Edite a regra existente ou descreva uma regra para outra categoria.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 04fda9076ee6..221d208c9911 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8448,7 +8448,6 @@ ${reportName}`,
                     unsupported: '该规则暂不支持，我们正在开发中。请先尝试其他规则。',
                     unintelligible: '可以这样描述规则：如果支出超过 100 美元，则需要收据。',
                     multipleRules: '请一次描述一条规则，例如：在所有卡上阻止零售消费。',
-                    categoryHasRule: '该类别已有规则。请编辑现有规则，或为其他类别描述规则。',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/libs/actions/Policy/Rules.ts b/src/libs/actions/Policy/Rules.ts
index d19a5309cf97..f8d94fc18ae5 100644
--- a/src/libs/actions/Policy/Rules.ts
+++ b/src/libs/actions/Policy/Rules.ts
@@ -447,13 +447,9 @@ function generateRule(policyID: string, ruleType: GeneratedRuleType, prompt: str
 
 /** Shows on the prompt form why a description did not become a rule */
 function setNewRulePromptError(state: GeneratedRuleState) {
-    setNewRulePromptErrorMessage(PROMPT_ERROR_BY_STATE[state] ?? 'common.genericErrorMessage');
-}
-
-function setNewRulePromptErrorMessage(translationKey: TranslationPaths) {
     Onyx.merge(ONYXKEYS.FORMS.NEW_RULE_PROMPT_FORM, {
         isLoading: false,
-        errors: getMicroSecondOnyxErrorWithTranslationKey(translationKey),
+        errors: getMicroSecondOnyxErrorWithTranslationKey(PROMPT_ERROR_BY_STATE[state] ?? 'common.genericErrorMessage'),
     });
 }
 
@@ -732,7 +728,6 @@ export {
     addPolicyAgentRule,
     generateRule,
     setNewRulePromptError,
-    setNewRulePromptErrorMessage,
     clearGeneratedRule,
     clearNewRulePrompt,
     updatePolicyAgentRule,
diff --git a/src/pages/workspace/rules/DescribeRuleButton.tsx b/src/pages/workspace/rules/DescribeRuleButton.tsx
index 4d00c936040c..62a103584e67 100644
--- a/src/pages/workspace/rules/DescribeRuleButton.tsx
+++ b/src/pages/workspace/rules/DescribeRuleButton.tsx
@@ -30,7 +30,7 @@ type DescribeRuleButtonProps = {
           /** Called with the generated form values once Concierge has built the rule */
           onRuleGenerated: (values: GeneratedRuleValues) => void;
 
-          /** Whether a new rule can use the category, so a generated category that already has this kind of rule is rejected */
+          /** Whether a new rule can use the category, so a generated category that already has this kind of rule is dropped */
           isCategoryEligible?: (category: PolicyCategory) => boolean;
 
           onPress?: never;
diff --git a/src/pages/workspace/rules/DescribeRuleModal.tsx b/src/pages/workspace/rules/DescribeRuleModal.tsx
index 20778be010d1..bb2a42ada48b 100644
--- a/src/pages/workspace/rules/DescribeRuleModal.tsx
+++ b/src/pages/workspace/rules/DescribeRuleModal.tsx
@@ -19,7 +19,7 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 
 import {getDecodedCategoryName} from '@libs/CategoryUtils';
 
-import {clearGeneratedRule, clearNewRulePrompt, generateRule, setNewRulePromptError, setNewRulePromptErrorMessage} from '@userActions/Policy/Rules';
+import {clearGeneratedRule, clearNewRulePrompt, generateRule, setNewRulePromptError} from '@userActions/Policy/Rules';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -49,26 +49,23 @@ type DescribeRuleModalProps = {
     /** Called with the generated form values once Concierge has built the rule */
     onRuleGenerated: (values: GeneratedRuleValues) => void;
 
-    /** Whether a new rule can use the category, so a generated category that already has this kind of rule is dropped or rejected */
+    /** Whether a new rule can use the category, so a generated category that already has this kind of rule is dropped */
     isCategoryEligible?: (category: PolicyCategory) => boolean;
 };
 
-function findPolicyCategory(categoryName: string, policyCategories: OnyxEntry<PolicyCategories>): PolicyCategory | undefined {
-    return Object.values(policyCategories ?? {}).find((candidate) => candidate.enabled && getDecodedCategoryName(candidate.name) === getDecodedCategoryName(categoryName));
-}
-
-/** Replaces the generated categories with the workspace's own spelling of them, and drops any the workspace has no enabled category for */
-function withPolicyCategories(values: GeneratedRuleValues, policyCategories: OnyxEntry<PolicyCategories>): GeneratedRuleValues {
+/** Replaces the generated categories with the workspace's own spelling of them, and drops any the workspace has no enabled, eligible category for */
+function withPolicyCategories(values: GeneratedRuleValues, policyCategories: OnyxEntry<PolicyCategories>, isCategoryEligible?: (category: PolicyCategory) => boolean): GeneratedRuleValues {
     const {category, categoriesToMatch, ...rest} = values;
-    const policyValues: GeneratedRuleValues = rest;
-    const policyCategory = category ? findPolicyCategory(category, policyCategories) : undefined;
-    if (policyCategory) {
-        policyValues.category = policyCategory.name;
-    }
-    if (categoriesToMatch) {
-        policyValues.categoriesToMatch = categoriesToMatch.flatMap((categoryName) => findPolicyCategory(categoryName, policyCategories)?.name ?? []);
-    }
-    return policyValues;
+    const findPolicyCategoryName = (categoryName: string) =>
+        Object.values(policyCategories ?? {}).find(
+            (candidate) => candidate.enabled && (isCategoryEligible?.(candidate) ?? true) && getDecodedCategoryName(candidate.name) === getDecodedCategoryName(categoryName),
+        )?.name;
+    const policyCategoryName = category ? findPolicyCategoryName(category) : undefined;
+    return {
+        ...rest,
+        ...(policyCategoryName ? {category: policyCategoryName} : {}),
+        ...(categoriesToMatch ? {categoriesToMatch: categoriesToMatch.flatMap((categoryName) => findPolicyCategoryName(categoryName) ?? [])} : {}),
+    };
 }
 
 function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenerated, isCategoryEligible}: DescribeRuleModalProps) {
@@ -112,18 +109,7 @@ function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenera
             clearGeneratedRule();
             return;
         }
-        const values = withPolicyCategories(generatedRuleValues ?? {}, policyCategories);
-        const isCategoryTaken = (categoryName: string) => {
-            const policyCategory = policyCategories?.[categoryName];
-            return !!policyCategory && !!isCategoryEligible && !isCategoryEligible(policyCategory);
-        };
-        const eligibleCategoriesToMatch = values.categoriesToMatch?.filter((categoryName) => !isCategoryTaken(categoryName));
-        if ((values.category && isCategoryTaken(values.category)) || (values.categoriesToMatch?.length && !eligibleCategoriesToMatch?.length)) {
-            setNewRulePromptErrorMessage('workspace.rules.newRule.promptErrors.categoryHasRule');
-            clearGeneratedRule();
-            return;
-        }
-        onRuleGenerated(eligibleCategoriesToMatch ? {...values, categoriesToMatch: eligibleCategoriesToMatch} : values);
+        onRuleGenerated(withPolicyCategories(generatedRuleValues ?? {}, policyCategories, isCategoryEligible));
         close();
     }, [close, generatedRuleID, generatedRuleState, generatedRuleType, generatedRuleValues, isCategoryEligible, onRuleGenerated, policyCategories, ruleType]);
 

From 65702f1766e2bea1fcc12bc9a9e9813f619062a1 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 02:50:21 +0200
Subject: [PATCH 16/22] Simplify applying a described category tax rule

---
 .../rules/MerchantRules/MerchantRulePageBase.tsx         | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx b/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx
index 8e19c2edeeb9..a555654151a7 100644
--- a/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx
+++ b/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx
@@ -678,15 +678,14 @@ function MerchantRulePageBase({
     }
 
     const shouldShowDescribeRule = !isEditingSavedRule && !isCategoryLocked;
-    const applyGeneratedRule = (values: GeneratedRuleValues) => {
+    const applyGeneratedRule = ({tax, ...values}: GeneratedRuleValues) => {
         if (!isScopedToCategory) {
             setDraftMerchantRule({...values, ruleType: CONST.POLICY.EXPENSE_DEFAULT_RULE_TYPE.MERCHANT});
             return;
         }
-        const {tax, ...categoryValues} = values;
-        const generatedTaxRate = tax ? policy?.taxRates?.taxes?.[tax] : undefined;
-        const isGeneratedTaxSelectable = !!tax && !!generatedTaxRate && isSelectableTaxRate(policy, tax, generatedTaxRate, true);
-        setDraftMerchantRule({...categoryValues, ...(isGeneratedTaxSelectable ? {tax} : {}), ruleType: CONST.POLICY.EXPENSE_DEFAULT_RULE_TYPE.CATEGORY});
+        const taxRate = tax ? policy?.taxRates?.taxes?.[tax] : undefined;
+        const selectableTax = tax && taxRate && isSelectableTaxRate(policy, tax, taxRate, true) ? tax : undefined;
+        setDraftMerchantRule({...values, tax: selectableTax, ruleType: CONST.POLICY.EXPENSE_DEFAULT_RULE_TYPE.CATEGORY});
     };
 
     const footer = canWriteRules ? (

From 094c77a082f4801d34e105949299c2f2ca722b5e Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 02:54:10 +0200
Subject: [PATCH 17/22] Show an error when a described category already has a
 rule

---
 src/languages/de.ts                           |  1 +
 src/languages/el.ts                           |  1 +
 src/languages/en.ts                           |  1 +
 src/languages/es.ts                           |  1 +
 src/languages/fr.ts                           |  1 +
 src/languages/it.ts                           |  1 +
 src/languages/ja.ts                           |  1 +
 src/languages/nl.ts                           |  1 +
 src/languages/pl.ts                           |  1 +
 src/languages/pt-BR.ts                        |  1 +
 src/languages/zh-hans.ts                      |  1 +
 src/libs/actions/Policy/Rules.ts              |  7 +++++-
 .../workspace/rules/DescribeRuleButton.tsx    |  2 +-
 .../workspace/rules/DescribeRuleModal.tsx     | 24 ++++++++++++-------
 14 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 2d38e1697274..216f175d916c 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8826,6 +8826,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                     unsupported: 'Diese Regel wird noch nicht unterstützt – wir arbeiten daran. Bitte versuche vorerst eine andere Regel.',
                     unintelligible: 'Formuliere deine Regel etwa so: Wenn Ausgaben über 100 $ liegen, ist ein Beleg erforderlich.',
                     multipleRules: 'Bitte eine Regel nach der anderen – beschreibe eine einzelne Regel, z. B.: Einzelhandelskäufe auf allen Karten blockieren.',
+                    categoryHasRule: 'Für diese Kategorie gibt es bereits eine Regel. Bearbeite die bestehende Regel oder beschreibe eine Regel für eine andere Kategorie.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 1840bc521100..edf21c38f777 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -8918,6 +8918,7 @@ ${reportName}`,
                     unsupported: 'Αυτός ο κανόνας δεν υποστηρίζεται ακόμη — το δουλεύουμε. Δοκιμάστε προς το παρόν έναν διαφορετικό κανόνα.',
                     unintelligible: 'Δοκιμάστε να διατυπώσετε τον κανόνα σας έτσι: αν οι δαπάνες ξεπερνούν τα 100 $, να απαιτείται απόδειξη.',
                     multipleRules: 'Έναν κανόνα τη φορά — δοκιμάστε να περιγράψετε έναν μόνο κανόνα, π.χ.: αποκλεισμός αγορών λιανικής σε όλες τις κάρτες.',
+                    categoryHasRule: 'Αυτή η κατηγορία έχει ήδη κανόνα. Επεξεργαστείτε τον υπάρχοντα κανόνα ή περιγράψτε έναν κανόνα για άλλη κατηγορία.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index c474c0da131a..71e1b46405c0 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9103,6 +9103,7 @@ const translations = {
                     unsupported: "That rule isn't supported yet — we're working on it. Please try a different rule for now.",
                     unintelligible: 'Try phrasing your rule like: if expenses have a value over $100, then require a receipt.',
                     multipleRules: 'One rule at a time, please — try describing a single rule, like: block retail purchases on all cards.',
+                    categoryHasRule: 'That category already has a rule. Edit the existing rule or describe a rule for another category.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 946fe286656f..27ed5fd328e4 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -8831,6 +8831,7 @@ ${reportName}`,
                     unsupported: 'Esa regla aún no es compatible: estamos trabajando en ello. Prueba con otra regla por ahora.',
                     unintelligible: 'Prueba a formular tu regla así: si los gastos superan los $100, exige un recibo.',
                     multipleRules: 'Una regla a la vez, por favor. Prueba a describir una sola regla, como: bloquear compras en comercios minoristas en todas las tarjetas.',
+                    categoryHasRule: 'Esa categoría ya tiene una regla. Edita la regla existente o describe una regla para otra categoría.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index bd5f737a15ee..08e747c04adf 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8849,6 +8849,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                     unsupported: 'Cette règle n’est pas encore prise en charge — nous y travaillons. Essayez une autre règle pour le moment.',
                     unintelligible: 'Essayez de formuler votre règle ainsi : si les dépenses dépassent 100 $, exigez un reçu.',
                     multipleRules: 'Une règle à la fois, s’il vous plaît — essayez de décrire une seule règle, comme : bloquer les achats en magasin sur toutes les cartes.',
+                    categoryHasRule: 'Cette catégorie a déjà une règle. Modifiez la règle existante ou décrivez une règle pour une autre catégorie.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 831c17252a0b..88f5ea9afbb6 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8777,6 +8777,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                     unsupported: 'Questa regola non è ancora supportata: ci stiamo lavorando. Per ora prova una regola diversa.',
                     unintelligible: 'Prova a formulare la regola così: se le spese superano i 100 $, richiedi una ricevuta.',
                     multipleRules: 'Una regola alla volta, per favore: prova a descrivere una singola regola, ad esempio bloccare gli acquisti al dettaglio su tutte le carte.',
+                    categoryHasRule: "Questa categoria ha già una regola. Modifica la regola esistente o descrivi una regola per un'altra categoria.",
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 61d5837a2a6f..4a1c50383bcd 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8666,6 +8666,7 @@ ${reportName}`,
                     unsupported: 'そのルールはまだ対応していません。現在対応を進めています。ほかのルールをお試しください。',
                     unintelligible: '「経費が100ドルを超える場合は領収書を必須にする」のように書いてみてください。',
                     multipleRules: '一度に1つのルールのみです。「すべてのカードで小売店での購入をブロックする」のように、1つのルールを説明してください。',
+                    categoryHasRule: 'このカテゴリにはすでにルールがあります。既存のルールを編集するか、別のカテゴリのルールを説明してください。',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index b841afb75339..43768273ac7c 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8751,6 +8751,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                     unsupported: 'Die regel wordt nog niet ondersteund — we werken eraan. Probeer voorlopig een andere regel.',
                     unintelligible: 'Formuleer je regel bijvoorbeeld zo: als uitgaven hoger zijn dan $100, vraag dan een bon.',
                     multipleRules: 'Eén regel per keer graag — beschrijf één enkele regel, bijvoorbeeld: retailaankopen op alle kaarten blokkeren.',
+                    categoryHasRule: 'Deze categorie heeft al een regel. Bewerk de bestaande regel of beschrijf een regel voor een andere categorie.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 46bd462d370a..f4dabeedc5bf 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8776,6 +8776,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                     unsupported: 'Ta reguła nie jest jeszcze obsługiwana — pracujemy nad tym. Na razie spróbuj innej reguły.',
                     unintelligible: 'Spróbuj sformułować regułę tak: jeśli wydatek przekracza 100 $, wymagaj paragonu.',
                     multipleRules: 'Jedna reguła naraz — opisz pojedynczą regułę, na przykład: zablokuj zakupy detaliczne na wszystkich kartach.',
+                    categoryHasRule: 'Ta kategoria ma już regułę. Edytuj istniejącą regułę lub opisz regułę dla innej kategorii.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 2bde7709c14b..bbe29e9cc7c0 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8758,6 +8758,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                     unsupported: 'Essa regra ainda não tem suporte — estamos trabalhando nisso. Tente uma regra diferente por enquanto.',
                     unintelligible: 'Tente formular sua regra assim: se a despesa for maior que $100, exija um recibo.',
                     multipleRules: 'Uma regra por vez, por favor — tente descrever uma única regra, como: bloquear compras no varejo em todos os cartões.',
+                    categoryHasRule: 'Essa categoria já tem uma regra. Edite a regra existente ou descreva uma regra para outra categoria.',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 221d208c9911..04fda9076ee6 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8448,6 +8448,7 @@ ${reportName}`,
                     unsupported: '该规则暂不支持，我们正在开发中。请先尝试其他规则。',
                     unintelligible: '可以这样描述规则：如果支出超过 100 美元，则需要收据。',
                     multipleRules: '请一次描述一条规则，例如：在所有卡上阻止零售消费。',
+                    categoryHasRule: '该类别已有规则。请编辑现有规则，或为其他类别描述规则。',
                 },
             },
             expenseDefaultsTable: {
diff --git a/src/libs/actions/Policy/Rules.ts b/src/libs/actions/Policy/Rules.ts
index f8d94fc18ae5..d19a5309cf97 100644
--- a/src/libs/actions/Policy/Rules.ts
+++ b/src/libs/actions/Policy/Rules.ts
@@ -447,9 +447,13 @@ function generateRule(policyID: string, ruleType: GeneratedRuleType, prompt: str
 
 /** Shows on the prompt form why a description did not become a rule */
 function setNewRulePromptError(state: GeneratedRuleState) {
+    setNewRulePromptErrorMessage(PROMPT_ERROR_BY_STATE[state] ?? 'common.genericErrorMessage');
+}
+
+function setNewRulePromptErrorMessage(translationKey: TranslationPaths) {
     Onyx.merge(ONYXKEYS.FORMS.NEW_RULE_PROMPT_FORM, {
         isLoading: false,
-        errors: getMicroSecondOnyxErrorWithTranslationKey(PROMPT_ERROR_BY_STATE[state] ?? 'common.genericErrorMessage'),
+        errors: getMicroSecondOnyxErrorWithTranslationKey(translationKey),
     });
 }
 
@@ -728,6 +732,7 @@ export {
     addPolicyAgentRule,
     generateRule,
     setNewRulePromptError,
+    setNewRulePromptErrorMessage,
     clearGeneratedRule,
     clearNewRulePrompt,
     updatePolicyAgentRule,
diff --git a/src/pages/workspace/rules/DescribeRuleButton.tsx b/src/pages/workspace/rules/DescribeRuleButton.tsx
index 62a103584e67..4aee47c5d369 100644
--- a/src/pages/workspace/rules/DescribeRuleButton.tsx
+++ b/src/pages/workspace/rules/DescribeRuleButton.tsx
@@ -30,7 +30,7 @@ type DescribeRuleButtonProps = {
           /** Called with the generated form values once Concierge has built the rule */
           onRuleGenerated: (values: GeneratedRuleValues) => void;
 
-          /** Whether a new rule can use the category, so a generated category that already has this kind of rule is dropped */
+          /** Whether a new rule can use the category, so a generated category that already has this kind of rule shows an error */
           isCategoryEligible?: (category: PolicyCategory) => boolean;
 
           onPress?: never;
diff --git a/src/pages/workspace/rules/DescribeRuleModal.tsx b/src/pages/workspace/rules/DescribeRuleModal.tsx
index bb2a42ada48b..de455f530295 100644
--- a/src/pages/workspace/rules/DescribeRuleModal.tsx
+++ b/src/pages/workspace/rules/DescribeRuleModal.tsx
@@ -19,7 +19,7 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 
 import {getDecodedCategoryName} from '@libs/CategoryUtils';
 
-import {clearGeneratedRule, clearNewRulePrompt, generateRule, setNewRulePromptError} from '@userActions/Policy/Rules';
+import {clearGeneratedRule, clearNewRulePrompt, generateRule, setNewRulePromptError, setNewRulePromptErrorMessage} from '@userActions/Policy/Rules';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -49,17 +49,15 @@ type DescribeRuleModalProps = {
     /** Called with the generated form values once Concierge has built the rule */
     onRuleGenerated: (values: GeneratedRuleValues) => void;
 
-    /** Whether a new rule can use the category, so a generated category that already has this kind of rule is dropped */
+    /** Whether a new rule can use the category, so a generated category that already has this kind of rule shows an error */
     isCategoryEligible?: (category: PolicyCategory) => boolean;
 };
 
-/** Replaces the generated categories with the workspace's own spelling of them, and drops any the workspace has no enabled, eligible category for */
-function withPolicyCategories(values: GeneratedRuleValues, policyCategories: OnyxEntry<PolicyCategories>, isCategoryEligible?: (category: PolicyCategory) => boolean): GeneratedRuleValues {
+/** Replaces the generated categories with the workspace's own spelling of them, and drops any the workspace has no enabled category for */
+function withPolicyCategories(values: GeneratedRuleValues, policyCategories: OnyxEntry<PolicyCategories>): GeneratedRuleValues {
     const {category, categoriesToMatch, ...rest} = values;
     const findPolicyCategoryName = (categoryName: string) =>
-        Object.values(policyCategories ?? {}).find(
-            (candidate) => candidate.enabled && (isCategoryEligible?.(candidate) ?? true) && getDecodedCategoryName(candidate.name) === getDecodedCategoryName(categoryName),
-        )?.name;
+        Object.values(policyCategories ?? {}).find((candidate) => candidate.enabled && getDecodedCategoryName(candidate.name) === getDecodedCategoryName(categoryName))?.name;
     const policyCategoryName = category ? findPolicyCategoryName(category) : undefined;
     return {
         ...rest,
@@ -109,7 +107,17 @@ function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenera
             clearGeneratedRule();
             return;
         }
-        onRuleGenerated(withPolicyCategories(generatedRuleValues ?? {}, policyCategories, isCategoryEligible));
+        const values = withPolicyCategories(generatedRuleValues ?? {}, policyCategories);
+        const hasCategoryWithRule = [values.category, ...(values.categoriesToMatch ?? [])].some((categoryName) => {
+            const policyCategory = categoryName ? policyCategories?.[categoryName] : undefined;
+            return !!policyCategory && !!isCategoryEligible && !isCategoryEligible(policyCategory);
+        });
+        if (hasCategoryWithRule) {
+            setNewRulePromptErrorMessage('workspace.rules.newRule.promptErrors.categoryHasRule');
+            clearGeneratedRule();
+            return;
+        }
+        onRuleGenerated(values);
         close();
     }, [close, generatedRuleID, generatedRuleState, generatedRuleType, generatedRuleValues, isCategoryEligible, onRuleGenerated, policyCategories, ruleType]);
 

From 1f508090c8a98a9327ecb83fe2034b3ae7567871 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Thu, 15 Oct 2026 11:36:01 +0200
Subject: [PATCH 18/22] Wait for card settings before selecting all eligible
 cards

---
 src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx b/src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx
index 091e13f7e506..b81380860d1e 100644
--- a/src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx
+++ b/src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx
@@ -109,7 +109,8 @@ function SpendRulePageBase({policyID, ruleID, testID, upgradeBackTo}: SpendRuleP
 
     const applyGeneratedRule = ({isAllCards, ...values}: GeneratedRuleValues) => {
         const generatedCategories = values.categories?.filter(isSpendRuleCategory);
-        const generatedCardIDs = isAllCards ? getEligibleSpendRuleCards(cardsList, expensifyCardSettings).map((card) => String(card.cardID)) : spendRuleForm?.cardIDs;
+        const generatedCardIDs =
+            isAllCards && expensifyCardSettings ? getEligibleSpendRuleCards(cardsList, expensifyCardSettings).map((card) => String(card.cardID)) : spendRuleForm?.cardIDs;
         setDraftSpendRule({...values, cardIDs: generatedCardIDs, categories: generatedCategories});
         setIsRestrictMerchantsOff(!generatedCategories?.length && !values.merchantNames?.length);
     };

From a6a3a824aab8d3748a476fec2bc79513fefb40db Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Mon, 19 Oct 2026 20:59:32 +0200
Subject: [PATCH 19/22] Remove unused SpendRulesUtils mock

---
 tests/ui/SpendRuleCardPageTest.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/ui/SpendRuleCardPageTest.tsx b/tests/ui/SpendRuleCardPageTest.tsx
index ac3986db38a3..a6956b8af4b0 100644
--- a/tests/ui/SpendRuleCardPageTest.tsx
+++ b/tests/ui/SpendRuleCardPageTest.tsx
@@ -2,8 +2,6 @@ import {act, render} from '@testing-library/react-native';
 
 import SelectionList from '@components/SelectionList';
 
-import type * as SpendRulesUtils from '@libs/SpendRulesUtils';
-
 import SpendRuleCardPage from '@pages/workspace/rules/SpendRules/SpendRuleCardPage';
 
 import CONST from '@src/CONST';
@@ -105,10 +103,6 @@ jest.mock('@libs/CardUtils', () => ({
 }));
 jest.mock('@libs/OptionsListUtils', () => ({getHeaderMessage: () => ''}));
 jest.mock('@libs/PersonalDetailsUtils', () => ({temporaryGetDisplayNameOrDefault: () => ''}));
-jest.mock('@libs/SpendRulesUtils', () => ({
-    ...jest.requireActual<typeof SpendRulesUtils>('@libs/SpendRulesUtils'),
-    getSpendRuleFormValuesFromCardRule: () => ({cardIDs: []}),
-}));
 jest.mock('@libs/Navigation/Navigation', () => ({goBack: jest.fn()}));
 jest.mock('@libs/actions/User', () => ({updateDraftSpendRule: jest.fn()}));
 jest.mock('@userActions/Policy/Policy', () => ({openPolicyExpensifyCardsPage: jest.fn()}));

From d3f53f6b7d51d2946d10d7afac2acf7e08e9b168 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Mon, 19 Oct 2026 20:59:33 +0200
Subject: [PATCH 20/22] Add docblock to setNewRulePromptErrorMessage

---
 src/libs/actions/Policy/Rules.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/actions/Policy/Rules.ts b/src/libs/actions/Policy/Rules.ts
index d19a5309cf97..97037adde083 100644
--- a/src/libs/actions/Policy/Rules.ts
+++ b/src/libs/actions/Policy/Rules.ts
@@ -450,6 +450,7 @@ function setNewRulePromptError(state: GeneratedRuleState) {
     setNewRulePromptErrorMessage(PROMPT_ERROR_BY_STATE[state] ?? 'common.genericErrorMessage');
 }
 
+/** Shows an error on the prompt form */
 function setNewRulePromptErrorMessage(translationKey: TranslationPaths) {
     Onyx.merge(ONYXKEYS.FORMS.NEW_RULE_PROMPT_FORM, {
         isLoading: false,

From 88772985c21aaf6ff86f8f111771e55bbfdea052 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Mon, 19 Oct 2026 23:07:07 +0200
Subject: [PATCH 21/22] Show the Describe rule modal on native by scrolling the
 form only on mobile web

---
 src/pages/workspace/rules/DescribeRuleModal.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/rules/DescribeRuleModal.tsx b/src/pages/workspace/rules/DescribeRuleModal.tsx
index de455f530295..1b358a2d1b99 100644
--- a/src/pages/workspace/rules/DescribeRuleModal.tsx
+++ b/src/pages/workspace/rules/DescribeRuleModal.tsx
@@ -17,6 +17,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useViewportOffsetTop from '@hooks/useViewportOffsetTop';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 
+import {isMobile} from '@libs/Browser';
 import {getDecodedCategoryName} from '@libs/CategoryUtils';
 
 import {clearGeneratedRule, clearNewRulePrompt, generateRule, setNewRulePromptError, setNewRulePromptErrorMessage} from '@userActions/Policy/Rules';
@@ -171,7 +172,7 @@ function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenera
                 submitButtonText={translate('common.next')}
                 style={[styles.mt5, styles.mh5]}
                 addBottomSafeAreaPadding={isSmallScreenWidth}
-                shouldUseScrollView={isSmallScreenWidth}
+                shouldUseScrollView={isSmallScreenWidth && isMobile()}
                 submitFlexEnabled={false}
                 shouldHideFixErrorsAlert
                 keyboardSubmitBehavior={CONST.KEYBOARD_SUBMIT_BEHAVIOR.SUBMIT_ONLY}

From 0ab26b8ba4f0f36c271957661d93170d302a6d80 Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Mon, 19 Oct 2026 23:10:42 +0200
Subject: [PATCH 22/22] Keep the Describe rule form out of a scroll view

---
 src/pages/workspace/rules/DescribeRuleModal.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/workspace/rules/DescribeRuleModal.tsx b/src/pages/workspace/rules/DescribeRuleModal.tsx
index 1b358a2d1b99..276eb7314c41 100644
--- a/src/pages/workspace/rules/DescribeRuleModal.tsx
+++ b/src/pages/workspace/rules/DescribeRuleModal.tsx
@@ -17,7 +17,6 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useViewportOffsetTop from '@hooks/useViewportOffsetTop';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 
-import {isMobile} from '@libs/Browser';
 import {getDecodedCategoryName} from '@libs/CategoryUtils';
 
 import {clearGeneratedRule, clearNewRulePrompt, generateRule, setNewRulePromptError, setNewRulePromptErrorMessage} from '@userActions/Policy/Rules';
@@ -172,7 +171,7 @@ function DescribeRuleModal({isVisible, onClose, policyID, ruleType, onRuleGenera
                 submitButtonText={translate('common.next')}
                 style={[styles.mt5, styles.mh5]}
                 addBottomSafeAreaPadding={isSmallScreenWidth}
-                shouldUseScrollView={isSmallScreenWidth && isMobile()}
+                shouldUseScrollView={false}
                 submitFlexEnabled={false}
                 shouldHideFixErrorsAlert
                 keyboardSubmitBehavior={CONST.KEYBOARD_SUBMIT_BEHAVIOR.SUBMIT_ONLY}