Spend rule section by luacmartins · Pull Request #86572 · Expensify/App

luacmartins · 2026-03-27T18:30:40Z

Explanation of Change

Adds the new Spend section to rules. For now this section only shows the default rules that apply to all Expensify cards. Clicking the rule opens a modal with further clarification.

Fixed Issues

$ #86520

Tests

Pre-requisite:

Workspace with Rules and Expensify cards enabled

Navigate to Workspace > Rules
Verify that you see a new section Spend at the bottom of the page
Verify that clicking the All cards rule shows a modal
Verify that you can dismiss the modal by clicking Got it

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
If new assets were added or existing ones were modified, I verified that:
- The assets are optimized and compressed (for SVG files, run npm run compress-svg)
- The assets load correctly across all supported platforms.
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I verified that similar component doesn't exist in the codebase
I verified that all props are defined accurately and each prop has a /** comment above it */
I verified that each file is named correctly
I verified that each component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
I verified that the only data being stored in component state is data necessary for rendering and nothing else
In component if we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
I verified that component internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
I verified that all JSX used for rendering exists in the render method
I verified that each component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions

Screenshots/Videos

Screen.Recording.2026-03-27.at.2.15.46.PM.mov

Screen.Recording.2026-03-27.at.2.16.40.PM.mov

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

codecov · 2026-03-27T20:02:46Z

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	`93.65% <ø> (ø)`
src/components/ConfirmModal.tsx	`100.00% <100.00%> (ø)`
src/components/Icon/chunks/illustrations.chunk.ts	`0.00% <ø> (ø)`
src/styles/variables.ts	`100.00% <ø> (ø)`
src/pages/workspace/rules/MerchantRulesSection.tsx	`0.00% <0.00%> (ø)`
src/pages/workspace/rules/PolicyRulesPage.tsx	`0.00% <0.00%> (ø)`
src/components/ConfirmContent.tsx	`86.95% <25.00%> (-5.91%)`	⬇️
...s/workspace/rules/SpendRules/SpendRulesSection.tsx	`0.00% <0.00%> (ø)`
... and 20 files with indirect coverage changes

luacmartins · 2026-03-27T20:22:42Z

@codex review

chatgpt-codex-connector · 2026-03-27T20:36:51Z

Codex Review: Didn't find any major issues. Delightful!

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

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

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

src/languages/es.ts

cead22 · 2026-04-01T21:43:34Z

src/pages/workspace/rules/PolicyRulesPage.tsx

                <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                    <IndividualExpenseRulesSection policyID={policyID} />
                    <MerchantRulesSection policyID={policyID} />
+                    {!!policy?.areExpensifyCardsEnabled && <SpendRulesSection />}


Let's hide this in prod for now, so we can test before we release this?

I was gonna leave this one in, since it's just the default rule and the modal. I was gonna hide the ability to add new rules in my 2nd PR. What do you think?

I thought about that but I seemed to me like that's going to be confusing, specially since we have the new feature badge, but you can't do anything

I'm cool with that. That said, advertising the default rule was the point of R1. So we're effectively not shipping anything until the later releases are done.

Don't block on this then. It seems weird to me, but I don't feel that strongly

Co-authored-by: Carlos Alvarez <carlos@expensify.com>

jayeshmangwani · 2026-04-02T05:50:50Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Android.mov

Android: mWeb Chrome

mweb-chrome.mov

iOS: HybridApp

ios.mov

iOS: mWeb Safari

mweb-safari.mov

MacOS: Chrome / Safari

web.mov

jayeshmangwani · 2026-04-02T05:51:22Z

PR looks good and is working as expected.

jayeshmangwani

LGTM 🚀

melvin-bot · 2026-04-02T05:52:09Z

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

shawnborton · 2026-04-02T06:24:55Z

cc @Expensify/marketing in case anyone wants to suggest slightly different copy to make sure we don't get the orphan here:

Can handle that in a follow up if needed though.

JS00001 · 2026-04-02T12:30:47Z

@cead22 over to you!

jamesdeanexpensify · 2026-04-02T15:13:35Z

@shawnborton you got a Fig mock of that modal I can play around with? happy to suggest some alts!

dannymcclain · 2026-04-02T15:14:39Z

@jamesdeanexpensify https://www.figma.com/design/HF8ZE8O28IvHKnCfcQoTgP/-wave-control--Rules-and-Workflows-v1?node-id=11448-85551&t=DFoRcjKKEb9vbmRq-11

dannymcclain · 2026-04-02T15:15:59Z

Also how wide is that modal in the PR? It looks a little skinnier here than in Figma, but we should just be using whatever size these modals typically are (I'm unsure of the value though). Let's align!

shawnborton · 2026-04-02T15:16:34Z

Actually I wonder if the modal is the correct width? @luacmartins can you confirm? I see 400px wide in Figma.

jamesdeanexpensify · 2026-04-02T15:51:50Z

LMK which modal width is right in case it can help this modal header that I'm liking (but not liking the orphan):

luacmartins · 2026-04-02T16:18:46Z

@shawnborton yea, modal is 400px wide

luacmartins · 2026-04-02T16:19:49Z

I'm gonna get this merged since it's blocking all FE work. The copy/width would be quick to edit if needed.

github-actions · 2026-04-02T16:24:58Z

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

OSBotify · 2026-04-02T16:28:35Z

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

github-actions · 2026-04-02T16:29:36Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-5b1ce90-9f1b0ad-0a79936beae2168a2513c412dee66ed2dd58adf2/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-5b1ce90-9f1b0ad-268bd62f525d16118b50b44206db6f5a28da862d/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-02T20:20:38Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.3.52-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-02T20:24:13Z

Yes, help site changes are required. The existing Workspace-Rules.md article doesn't mention the new Spend section.

I created a draft PR to update the help article: #86994

Changes made:

Added a new "How Expensify Card spend rules work" section documenting the built-in card protection (blocks adult services, ATMs, gambling, money transfers)
Includes navigation steps for viewing the default spend rules
Updated metadata keywords and internalScope to cover spend rules

Please mark it as "Ready for review" when it looks good.

luacmartins added 6 commits March 27, 2026 11:01

create spend rules component

982ffe5

update copy

cfea7b8

clean up component

d03e062

update props

db5b4e2

update styles

e8413b0

update styles

2969fd4

luacmartins self-assigned this Mar 27, 2026