Skip to content

[Payment due @marufsharifi] Add currency selection to card rules#93063

Merged
luacmartins merged 46 commits into
mainfrom
jsenyitko-currency-in-rules
Jun 18, 2026
Merged

[Payment due @marufsharifi] Add currency selection to card rules#93063
luacmartins merged 46 commits into
mainfrom
jsenyitko-currency-in-rules

Conversation

@JS00001

@JS00001 JS00001 commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Adds support for blocking currencies with expensify card rules

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/636619
$ https://github.com/Expensify/Expensify/issues/643729

Tests

  1. Enable expensify cards & rules
  2. Start adding a new card rule for a card
  3. The default for 'permitted currencies' should be 'All currencies'
  4. You should not be able to select a permitted currency without first selecting a card (or multiple)
  5. Once youve selected a card, open 'permitted currencies'
  6. All currencies should start out selected
  7. If you remove one and save the changes, you should see the list of allowed currencies under 'permitted currencies'
  8. If you add it back and all currencies are selected again & you save the changes, the permitted currencies should be 'all currencies' again
  9. Save the rule
  10. Ensure that the card rule shows up with permitted currencies listed
  11. Test the same flow when issuing an expensify card with a spend rule
  • 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
    • MacOS: Desktop
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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-06-12.at.10.06.59.AM.mov

@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.

@JS00001 JS00001 changed the title add the new routes Add currency selection to card rules Jun 12, 2026
@luacmartins

Copy link
Copy Markdown
Contributor

@marufsharifi please prioritize this review when you're online

@JmillsExpensify

Copy link
Copy Markdown
Contributor

@marufsharifi if you're unable to get to this in the next 12 hours or so, let us know. We're coming up against a deadline.

@melvin-bot melvin-bot Bot changed the title Add currency selection to card rules [Payment due @marufsharifi] Add currency selection to card rules Jun 18, 2026
@melvin-bot

melvin-bot Bot commented Jun 18, 2026

Copy link
Copy Markdown

🎯 @marufsharifi, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/636619.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

@marufsharifi

Copy link
Copy Markdown
Contributor

LGTM!

@JmillsExpensify

Copy link
Copy Markdown
Contributor

Nice, @luacmartins look good to you too?

cead22
cead22 previously approved these changes Jun 18, 2026
Comment thread src/pages/workspace/expensifyCard/issueNew/spendRules/SetSpendRulesStep.tsx Outdated
Comment thread src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx
Comment thread src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx
Comment thread src/libs/SpendRulesUtils.ts Outdated
Comment thread src/components/SpendRules/configuration/SpendRulesCurrencyBase.tsx

@luacmartins luacmartins left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@luacmartins

luacmartins commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

Gonna merge since it was previously approved by @cead22 too

@luacmartins luacmartins merged commit 4fd9c91 into main Jun 18, 2026
39 checks passed
@luacmartins luacmartins deleted the jsenyitko-currency-in-rules branch June 18, 2026 18:55
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.4.16-1 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

📝 Help site docs review — changes required

This PR restructured the Expensify Card Spend rules UI, and the Expensify Card Spend Rules help article is now out of date. The notable user-facing changes:

  • Restriction type (Allow / Block) → Restrict merchants with three options: Off, Allow, Block.
  • New Permitted currencies setting (default All currencies, or select specific currencies). The card's settlement currency is always permitted; selecting specific currencies or a max amount requires the cards to settle in the same currency.
  • Spend category is now surfaced as merchant types — Allowed merchant types / Blocked merchant types — alongside Allowed merchants / Blocked merchants.
  • Section renamed to Spend rules; save action is Save rule.

I created a draft help site PR with the updates: #94066

All labels were taken verbatim from src/languages/en.ts in this PR and applied per HELPSITE_NAMING_CONVENTIONS.md, HELP_AUTHORING_GUIDELINES.md, and TEMPLATE.md.

@JS00001, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

@lanitochka17

Copy link
Copy Markdown

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

@nlemma

nlemma commented Jun 19, 2026

Copy link
Copy Markdown

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

@nlemma

nlemma commented Jun 19, 2026

Copy link
Copy Markdown

Deploy Blocker #94092 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.