Skip to content

Add spend rule base page#86684

Merged
luacmartins merged 76 commits intomainfrom
cmartins-spendRuleCreate
Apr 8, 2026
Merged

Add spend rule base page#86684
luacmartins merged 76 commits intomainfrom
cmartins-spendRuleCreate

Conversation

@luacmartins
Copy link
Copy Markdown
Contributor

@luacmartins luacmartins commented Mar 30, 2026

Explanation of Change

Adds the ability to create spend rules for Expensify cards.

Fixed Issues

$ #86521

Tests

Pre-condition:

  • An account with issued expensify cards
  • A workspace with Rules enabled
  1. Navigate to Workspaces > Rules
  2. Verify that you see the Add spend rule item
  3. Press Add spend rule and create a new rule
  4. Verify that the rule is created
  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests.

Note: this feature is only available in Staging, so any issues coming from it are not deploy blockers.

  • 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-04-06.at.2.02.51.PM.mov
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@luacmartins luacmartins self-assigned this Mar 30, 2026
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 30, 2026

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/CONST/index.ts 93.65% <ø> (ø)
src/ONYXKEYS.ts 100.00% <ø> (ø)
src/SCREENS.ts 100.00% <ø> (ø)
src/components/Icon/chunks/illustrations.chunk.ts 0.00% <ø> (ø)
src/components/SelectionList/BaseSelectionList.tsx 65.45% <ø> (ø)
...components/SelectionList/components/ListHeader.tsx 90.00% <ø> (ø)
src/libs/API/types.ts 100.00% <ø> (ø)
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 76.92% <ø> (ø)
src/pages/workspace/rules/PolicyRulesPage.tsx 0.00% <0.00%> (ø)
... and 16 more
... and 61 files with indirect coverage changes

@OSBotify

This comment has been minimized.

@OSBotify

This comment has been minimized.

@OSBotify

This comment has been minimized.

@OSBotify

This comment has been minimized.

@OSBotify

This comment has been minimized.

@OSBotify

This comment has been minimized.

@luacmartins
Copy link
Copy Markdown
Contributor Author

luacmartins commented Apr 8, 2026

Still reviewing, but leaving comments as I go. Maybe I missed the convo, but did we flip the subtitle position? From the doc:

Yes, we decided to invert that here.

Also, it doesn't look like we implemented the cutoff to keep the card names short: x, y, + 3 more. In the current implementation, selecting all cards would prob take up the screen w/ a wall of text

Ah yea. Fixed.
Screenshot 2026-04-08 at 9 26 59 AM

Bug: selecting Contains on the merchant page w/ no merchant doesnt show an error when clicking 'Save'. IDK if this is intentional or not

This is intentional since users should be able to clear a saved merchant by removing the text and saving it.

In this case, I do have cards on the feed, but all of them already have rules. Should we tell the user they only get one rule per card?

Waiting on new copy. We can also address this in a follow up.

IDK if this is a bug/intentional, but when no cards are selected, we show the popup for amount saying that two cards have different currencies

I'm not sure either tbh. Users should only be able to set an amount when the currencies on all selected cards are the same. Not sure how we want to handle the empty state there since we don't have a currency to use. Maybe we can just update the copy to something more descriptive?

When adding new rules, they are put at the end, but then jump around, can we sort them consistently by createdAt?

Nice catch. Fixed.

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 8, 2026

🦜 Polyglot Parrot! 🦜

Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues:

The diff is too large to include in this comment (97KB), so I've created a gist for you:

📋 View the translation diff here 📋

Note

You can apply these changes to your branch by copying the patch to your clipboard, then running pbpaste | git apply, or directly by running gh gist view --raw 7d5232d9b9b6ad15daa6282ff6126017 | git apply 😉

View workflow run

@luacmartins luacmartins requested a review from JS00001 April 8, 2026 15:55
Copy link
Copy Markdown
Contributor

@JS00001 JS00001 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@luacmartins
Copy link
Copy Markdown
Contributor Author

Gonna merge to unblock upstream work. These changes will only be available in staging for now.

@luacmartins luacmartins merged commit 331e699 into main Apr 8, 2026
40 checks passed
@luacmartins luacmartins deleted the cmartins-spendRuleCreate branch April 8, 2026 16:14
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 8, 2026

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

@JmillsExpensify
Copy link
Copy Markdown
Contributor

@Expensify/design @JmillsExpensify should we show a more descriptive error here? image

In this case, I do have cards on the feed, but all of them already have rules. Should we tell the user they only get one rule per card?

Good call. Yes, I think we need a more descriptive error. I don't feel too passionate about the illustration, though maybe for the error we do: "All cards already have a rule."

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 8, 2026

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

@shawnborton
Copy link
Copy Markdown
Contributor

Yeah, down to update the illustration while we're at it. If you are doing this in a separate PR, feel free to tag us there!

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 9, 2026

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

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

Yes, help site changes are required. I've created a PR with the needed updates:

PR: #87439

Changes made:

  1. Workspace-Rules.md — Added a new "How to configure Spend Rules for Expensify Cards" section covering:

    • Built-in protection (always-on blocking of Adult services, ATMs, Gambling, Money transfers)
    • How to create custom Spend Rules with Allow/Block restriction types, merchant matching, spend categories, and max amounts
    • Updated metadata keywords for search discoverability
  2. Set-Up-and-Manage-the-Expensify-Card.md — Updated the "Spend restrictions" bullet to cross-reference the new Spend Rules documentation

@mitarachim
Copy link
Copy Markdown

Deploy Blocker #87442 was identified to be related to this PR.

@mitarachim
Copy link
Copy Markdown

Deploy Blocker #87450 was identified to be related to this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants