Fix Describe rule bugs by rushatgabhane · Pull Request #104055 · Expensify/App

rushatgabhane · 2026-10-14T23:56:01Z

Explanation of Change

Fixes the Describe bugs from QA, listed below.

Also adds Describe to the category tax rate editor.

Backend PRs:

Fixed Issues

$ #103859
$ #103872
$ #103930
$ #103928
$ #103863
$ #103869
PROPOSAL: #92743 (comment)

Tests

~~Steps 6 and 8 can only be tested after the backend PRs are deployed.~~

Create a Control workspace with Rules enabled, the describeRule beta on, an Expensify Card with two cards, and a field requirement rule on the Advertising category.
Go to Rules > Add rule > Set field requirements > Describe, enter "When category is Advertising, require a description", and tap Next.
Verify the modal shows "That category already has a rule" and the form is not filled.
Close the modal, tap Describe again, and verify the prompt is empty.
Enter "Do not require receipt and require itemized receipt for Meals" and tap Next. Verify Receipt and Itemized receipt are both set to Require.
Go back to Add rule > Restrict card spend > Describe, enter "Block retail purchases on all cards", and tap Next. Verify both cards are selected.
On mWeb, tap Describe. Verify the Next button can be reached with the keyboard open.
Go to Add rule > Apply expense defaults > Category > Describe, enter "Use the GST tax rate for Meals", and tap Next. Verify the category tax rule shows Meals and GST, not merchant fields.

Verify that no errors appear in the JS console

Offline tests

Same as tests. Describe needs a connection, but the modal still opens empty while offline.

QA Steps

Same as tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-10-15.at.02.39.39.mov

Screen.Recording.2026-10-15.at.02.30.21.mov

Screen.Recording.2026-10-15.at.02.29.42.mov

Screen.Recording.2026-10-15.at.02.29.01.mov

Screen.Recording.2026-10-15.at.02.28.19.mov

Screen.Recording.2026-10-15.at.02.27.16.mov

…lds rule

github-actions · 2026-10-14T23:56:16Z

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

melvin-bot · 2026-10-14T23:56:28Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx bun ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx bun ./scripts/generateTranslations.ts --compare-ref main

This reverts commit 4dc31e8.

…ntry" This reverts commit 4c3e86d.

melvin-bot · 2026-10-15T00:46:31Z

@Krishna2323 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

chatgpt-codex-connector · 2026-10-15T00:46:31Z

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-10-15T01:05:36.918370Z	`9bd0b96`	Draft marked ready

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

rushatgabhane · 2026-10-15T00:47:48Z

@Krishna2323 Steps 6 and 8 can only be tested after the backend PRs are deployed.

But you can review the rest

codecov · 2026-10-15T00:47:53Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/CONST/index.ts	`95.90% <ø> (ø)`
src/libs/actions/Policy/Rules.ts	`81.81% <100.00%> (+60.47%)`	⬆️
...s/FlagForReviewRules/FlagForReviewRulePageBase.tsx	`0.00% <ø> (ø)`
...s/workspace/rules/SpendRules/SpendRuleCardPage.tsx	`75.64% <100.00%> (+4.06%)`	⬆️
src/styles/index.ts	`66.22% <ø> (+0.88%)`	⬆️
src/pages/workspace/rules/DescribeRuleModal.tsx	`86.95% <95.00%> (+1.24%)`	⬆️
...s/workspace/rules/SpendRules/SpendRulePageBase.tsx	`0.00% <0.00%> (ø)`
src/pages/workspace/rules/DescribeRuleButton.tsx	`5.55% <0.00%> (-0.70%)`	⬇️
...space/rules/MerchantRules/MerchantRulePageBase.tsx	`62.77% <14.28%> (-1.41%)`	⬇️
src/libs/SpendRulesUtils.ts	`7.60% <52.94%> (+5.00%)`	⬆️
... and 1 more
... and 541 files with indirect coverage changes

joekaufmanexpensify

Fixing DBs

yuwenmemon · 2026-10-18T21:42:58Z

        const generatedCategories = values.categories?.filter(isSpendRuleCategory);
-        setDraftSpendRule(generatedCategories ? {...values, categories: generatedCategories} : values);
+        const generatedCardIDs =
+            isAllCards && expensifyCardSettings ? getEligibleSpendRuleCards(cardsList, expensifyCardSettings).map((card) => String(card.cardID)) : spendRuleForm?.cardIDs;


When card settings haven't loaded yet (e.g. a deep link), an "all cards" answer quietly keeps the current selection instead. Do we think it's worth disabling Describe until expensifyCardSettings is loaded? Or the whole modal?

i don't think it is worth disabling.
the admin can choose the cards manually too

Krishna2323 · 2026-10-18T22:45:38Z

-        setDraftMerchantRule({...values, ruleType: CONST.POLICY.EXPENSE_DEFAULT_RULE_TYPE.MERCHANT});
+    const applyGeneratedRule = ({tax, ...values}: GeneratedRuleValues) => {
+        if (!isScopedToCategory) {
+            setDraftMerchantRule({...values, ruleType: CONST.POLICY.EXPENSE_DEFAULT_RULE_TYPE.MERCHANT});


tax is destructured out of the signature but only the category branch puts it back, so merchant rules lose it. Line 354 reads form?.tax for merchant rules. Does an expenseDefaults answer ever carry a tax?

merchant rule doesn't have tax

Merchant rules do have a tax field. Line 590 renders the tax row whenever hasUsableTaxRates(policy), line 639's filter keeps it, and line 354 reads form?.tax for merchant rules. Do you mean the backend never sends tax on an expenseDefaults answer?

The backend doesn't send tax for an expenseDefaults rule. It only sends it for categoryTaxRate.

…Fixes

Krishna2323 · 2026-10-19T20:35:12Z

Go to staging.new.expensify.com

Go to workspace settings > Rules.

Click Add rule > Set field requirements.

Click Describe.

Enter Do not require receipt and do require itemized receipt when Category is Advertising.

Click Next.
→ Receipt is set to Don't require. Itemized receipt is set to Require.

Click Save rule.

Go to Field requirements.
→ Both Receipt and Itemized receipt are set to Require.

#103928 @rushatgabhane this still fails:

Monosnap.screencast.2026-10-20.02-03-46.mp4

Krishna2323 · 2026-10-19T20:50:34Z

#103859 On android, the modal doesn't appear:

modal_doesn.t_appear.mp4

…mobile web

rushatgabhane · 2026-10-19T21:12:09Z

#104055 (comment)

this is not a valid bug. the instruction says "require itemized receipt", for which a receipt is required too.

Krishna2323 · 2026-10-19T21:14:21Z

@rushatgabhane Yeah correct, but it should throw error in that case? Currently it looks like the request was successful.

rushatgabhane · 2026-10-19T21:15:24Z

no why should it err? the intention of this feature is to do best effort for the user's request and transform it to a valid rule.

#103859 On android, the modal doesn't appear:

fixed, thanks!

Krishna2323

LGTM!

github-actions · 2026-10-20T11:00:28Z

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

github-actions · 2026-10-20T11:04:33Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-fa269ba-bbab4b1-8432315c184aa40b79267d0ca033a50f991cd4b1/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-fa269ba-bbab4b1-45e51cb95c563f8e99b6436f5fd094828baf4389/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-10-20T11:04:40Z

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

OSBotify · 2026-10-20T19:42:27Z

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.5.15-1 🚀

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

MelvinBot · 2026-10-20T19:50:57Z

No help site update is needed: every user-facing change in this PR is in the Describe rule flow, which only shows when the describeRule beta is on (DescribeRuleButton.tsx:51). The card filtering code that moved into SpendRulesUtils is a refactor and doesn't change behavior.

rushatgabhane added 8 commits October 15, 2026 01:51

Fit the Describe rule modal above the keyboard on small screens

e504053

Clear the last Describe prompt and error each time the modal opens

303dc26

Pair receipt and itemized receipt settings in a described Require fie…

7e6bebb

…lds rule

Reject a described rule for a category that already has one

67a07be

Move the spend rule eligible-card lookup into SpendRulesUtils

77aa80b

Select every eligible card when a described card rule covers all cards

c1aabf0

Close only the modal when browser Back pops a modal history entry

4c3e86d

Link the PR that adds the modal history entry patch

4dc31e8

melvin-bot Bot assigned rushatgabhane Oct 14, 2026

rushatgabhane added 5 commits October 15, 2026 01:58

Describe a category tax rule from the Category expense default editor

5528494

Drop described categories that are missing or already have a tax rule

e0ad73e

Keep a described category tax rate only when the workspace can use it

83e66d7

Revert "Link the PR that adds the modal history entry patch"

625a2b1

This reverts commit 4dc31e8.

Revert "Close only the modal when browser Back pops a modal history e…

605e618

…ntry" This reverts commit 4c3e86d.

rushatgabhane changed the title ~~Fix Describe rule bugs from QA~~ Fix Describe rule bugs Oct 15, 2026

Keep the real SpendRulesUtils in SpendRuleCardPageTest

9bd0b96

rushatgabhane marked this pull request as ready for review October 15, 2026 00:46

rushatgabhane requested review from a team as code owners October 15, 2026 00:46

melvin-bot Bot requested review from Krishna2323 and removed request for a team October 15, 2026 00:46

melvin-bot Bot requested review from joekaufmanexpensify and removed request for a team October 15, 2026 00:46

Merge branch 'Expensify:main' into rushat-describeRuleFixes

0593f10

yuwenmemon mentioned this pull request Oct 16, 2026

[Payment due @Krishna2323] Describe a rule from New rule and fall back to an agent rule #103810

Merged

2 of 38 tasks

joekaufmanexpensify previously approved these changes Oct 16, 2026

View reviewed changes

yuwenmemon requested a review from JS00001 October 18, 2026 21:27

yuwenmemon reviewed Oct 18, 2026

View reviewed changes

Krishna2323 reviewed Oct 18, 2026

View reviewed changes

JS00001 reviewed Oct 19, 2026

View reviewed changes

Comment thread src/libs/SpendRulesUtils.ts

Comment thread src/libs/SpendRulesUtils.ts

rushatgabhane added 3 commits October 19, 2026 20:56

Merge remote-tracking branch 'upstream/main' into rushat-describeRule…

22db474

…Fixes

Remove unused SpendRulesUtils mock

a6a3a82

Add docblock to setNewRulePromptErrorMessage

d3f53f6

rushatgabhane dismissed joekaufmanexpensify’s stale review via d3f53f6 October 19, 2026 19:01

rushatgabhane requested review from JS00001 and Krishna2323 October 19, 2026 19:16

luacmartins self-requested a review October 19, 2026 19:20

rushatgabhane added 2 commits October 19, 2026 23:07

Show the Describe rule modal on native by scrolling the form only on …

8877298

…mobile web

Keep the Describe rule form out of a scroll view

0ab26b8

Krishna2323 approved these changes Oct 19, 2026

View reviewed changes

JS00001 approved these changes Oct 20, 2026

View reviewed changes

JS00001 merged commit fa269ba into Expensify:main Oct 20, 2026
36 of 38 checks passed

OSBotify mentioned this pull request Oct 20, 2026

Deploy Checklist: New Expensify 2026-10-20 #104495

Open

48 of 79 tasks

Conversation

rushatgabhane commented Oct 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

github-actions Bot commented Oct 14, 2026

Uh oh!

melvin-bot Bot commented Oct 14, 2026

Uh oh!

melvin-bot Bot commented Oct 15, 2026

Uh oh!

chatgpt-codex-connector Bot commented Oct 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codex Review Summary

Uh oh!

rushatgabhane commented Oct 15, 2026

Uh oh!

codecov Bot commented Oct 15, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

yuwenmemon Oct 18, 2026

Choose a reason for hiding this comment

Uh oh!

rushatgabhane Oct 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Krishna2323 Oct 18, 2026

Choose a reason for hiding this comment

Uh oh!

rushatgabhane Oct 19, 2026

Choose a reason for hiding this comment

Uh oh!

Krishna2323 Oct 19, 2026

Choose a reason for hiding this comment

Uh oh!

rushatgabhane Oct 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Krishna2323 commented Oct 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Krishna2323 commented Oct 19, 2026

Uh oh!

rushatgabhane commented Oct 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Krishna2323 commented Oct 19, 2026

Uh oh!

rushatgabhane commented Oct 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Krishna2323 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Oct 20, 2026

Uh oh!

github-actions Bot commented Oct 20, 2026

Uh oh!

OSBotify commented Oct 20, 2026

Uh oh!

rushatgabhane commented Oct 14, 2026 •

edited

Loading

chatgpt-codex-connector Bot commented Oct 15, 2026 •

edited

Loading

codecov Bot commented Oct 15, 2026 •

edited by github-actions Bot

Loading

Krishna2323 commented Oct 19, 2026 •

edited

Loading

rushatgabhane commented Oct 19, 2026 •

edited

Loading

rushatgabhane commented Oct 19, 2026 •

edited

Loading