Skip to content

Remove supporting text from the Restrict card spend rule form - #102314

Merged
rlinoz merged 1 commit into
mainfrom
vit/remove-spend-rule-supporting-text
Sep 28, 2026
Merged

rlinoz merged 1 commit into
mainfrom
vit/remove-spend-rule-supporting-text

Conversation

@mountiny

@mountiny mountiny commented Sep 25, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

The helper text under the Restrict merchants toggle was wrong for the Block option. It read "Charges are approved for permitted currencies that don't exceed a max amount, or the merchant or merchant type matches", which says a blocked merchant gets approved. The Allow copy had been reused with "and" swapped to "or".

Rather than reword it, this PR removes the supporting text from the Restrict card spend flow, as agreed in Slack. The field labels already say what each control does, and the two section headings ("If any card matches:" and "Then do this at the point of sale:") did not lead into action based labels.

Eight strings are removed from all 11 locale files under workspace.rules.spendRules, along with their render sites:

Key Copy Rendered in
restrictCardSpendSubtitle Block or limit spend at the point of sale. SpendRulePageBase
ifAnyCardMatches If any card matches: SpendRulePageBase
thenDoThisAtPointOfSale Then do this at the point of sale: SpendRulePageBase
maxAmountHelp Any charge over this amount will be declined... SpendRuleMaxAmountBase
permittedCurrenciesSubtitle Choose to allow all or specific currencies SpendRulesCurrencyBase
restrictMerchantsOffSubtitle Charges are approved for permitted currencies... both restriction toggles
restrictMerchantsAllowSubtitle ...and the merchant or merchant type matches. both restriction toggles
restrictMerchantsBlockSubtitle ...or the merchant or merchant type matches. both restriction toggles

settlementCurrencyPermittedSubtitle ("The card settlement currency is always permitted") stays. It sits under a locked row on the Permitted currencies page and is the only thing explaining why that currency cannot be deselected.

The diff on the two restriction toggle components is larger than the change itself because removing the trailing helper <Text> leaves a single root element, so the wrapping fragment is gone and the JSX is reindented.

No behaviour changes. The help article docs/articles/new-expensify/expensify-card/Expensify-Card-Spend-Rules.md already documents the restriction logic correctly, so it is unchanged.

Fixed Issues

$ #102313
PROPOSAL:

Tests

  1. Sign in as an admin of a Control workspace that has Expensify Cards enabled.
  2. Go to Workspaces > [Workspace] > Rules and open the Card restrictions tab.
  3. Click Add spend rule.
  4. Verify the form shows only: the Cards row, a divider, Permitted currencies, Max amount, and the Restrict merchants toggle.
  5. Verify there is no paragraph of text above the Cards row, and no "If any card matches:" or "Then do this at the point of sale:" heading.
  6. Set the Restrict merchants toggle to Off, then Allow, then Block.
  7. Verify no helper sentence appears under the toggle in any of the three states.
  8. Verify that with Allow selected the rows read Allowed merchants and Allowed merchant types, and with Block selected they read Blocked merchants and Blocked merchant types.
  9. Open Permitted currencies. Verify there is no subtitle under the page header, and the settlement currency row still shows the padlock with "The card settlement currency is always permitted".
  10. Open Max amount. Verify there is no help sentence under the amount input.
  11. Enter a max amount, select some merchants, and click Save rule. Verify the rule saves and appears in the Card restrictions table.
  12. Go to Workspaces > [Workspace] > Expensify Card > Issue new card, complete the steps to the Set card rules step, enable Add spend rule, and choose Create new. Verify the Restrict merchants toggle shows no helper sentence in any state.
  • Verify that no errors appear in the JS console

Offline tests

  1. Turn off your network connection.
  2. Open Workspaces > [Workspace] > Rules > Card restrictions > Add spend rule.
  3. Verify the form renders with the same labels and no supporting text.
  4. Configure a rule and click Save rule. Verify the rule appears greyed out as a pending action.
  5. Turn your network connection back on. Verify the rule finishes saving with no errors.

QA Steps

  1. Sign in as an admin of a Control workspace that has Expensify Cards enabled.
  2. Go to Workspaces > [Workspace] > Rules and open the Card restrictions tab.
  3. Click Add spend rule.
  4. Verify the form shows only: the Cards row, a divider, Permitted currencies, Max amount, and the Restrict merchants toggle, with no paragraph text and no section headings.
  5. Set the Restrict merchants toggle to Off, then Allow, then Block, and verify no helper sentence appears under it in any state.
  6. Verify the merchant rows switch between Allowed merchants / Allowed merchant types and Blocked merchants / Blocked merchant types as the toggle changes.
  7. Open Permitted currencies and verify there is no subtitle under the header, while the settlement currency row still shows the padlock and its "always permitted" line.
  8. Open Max amount and verify there is no help sentence under the amount input.
  9. Save a rule and verify it appears in the Card restrictions table.
  • 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 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)
  • 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)
  • 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.
  • 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.

Screenshots/Videos

Android: Native

Not yet tested — needs manual QA.

Android: mWeb Chrome

Not yet tested — needs manual QA.

iOS: Native

Not yet tested — needs manual QA.

iOS: mWeb Safari

Not yet tested — needs manual QA.

MacOS: Chrome / Safari

Not yet tested — needs manual QA.

@codecov

codecov Bot commented Sep 25, 2026 •

Copy link
Copy Markdown

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 Δ
...pendRules/configuration/SpendRuleMaxAmountBase.tsx 0.00% <ø> (ø)
...pendRules/configuration/SpendRulesCurrencyBase.tsx 83.78% <ø> (-0.22%) ⬇️
...s/workspace/rules/SpendRules/SpendRulePageBase.tsx 0.00% <ø> (ø)
...ents/SpendRules/SpendRuleRestrictionTypeToggle.tsx 0.00% <0.00%> (ø)
...pendRules/SpendRuleRestrictionTypeToggleRevamp.tsx 0.00% <0.00%> (ø)
... and 11 files with indirect coverage changes

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@mountiny

Copy link
Copy Markdown
Contributor Author
image image image image image image

@mountiny

Copy link
Copy Markdown
Contributor Author

Did some testing on the adhoc and looks good to me

@mountiny
mountiny marked this pull request as ready for review September 25, 2026 15:54
@mountiny
mountiny requested review from a team as code owners September 25, 2026 15:54
@melvin-bot
melvin-bot Bot requested review from cretadn22 and garrettmknight and removed request for a team September 25, 2026 15:55
@melvin-bot

melvin-bot Bot commented Sep 25, 2026

Copy link
Copy Markdown

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

@melvin-bot
melvin-bot Bot removed the request for review from a team September 25, 2026 15:55
@mountiny

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Chef's kiss.

Reviewed commit: db5d38a0d9

ℹ️ 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".

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

Looks clean from a product perspective.

@cretadn22

cretadn22 commented Sep 27, 2026 •

Copy link
Copy Markdown
Contributor

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 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)
  • 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)
  • 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.
  • 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
Screen.Recording.2026-09-27.at.14.43.38.mov
Android: mWeb Chrome
Screen.Recording.2026-09-27.at.14.39.21.mov
iOS: HybridApp
Screen.Recording.2026-09-27.at.14.44.03.mov
iOS: mWeb Safari
Screen.Recording.2026-09-27.at.14.46.51.mov
MacOS: Chrome / Safari
Screen.Recording.2026-09-27.at.14.37.07.mov

@melvin-bot
melvin-bot Bot requested a review from rlinoz September 27, 2026 07:46
@melvin-bot

melvin-bot Bot commented Sep 27, 2026

Copy link
Copy Markdown

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

@rlinoz
rlinoz merged commit d84c3cf into main Sep 28, 2026
50 of 52 checks passed
@rlinoz
rlinoz deleted the vit/remove-spend-rule-supporting-text branch September 28, 2026 14:33
@github-actions

Copy link
Copy Markdown
Contributor

🚧 rlinoz 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/rlinoz in version: 9.4.95-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site text changes are needed, so I didn't create a docs PR. One screenshot is now out of date and needs a new image.

  • Article text is still accurate. The help articles describe how Spend rules behave. They don't quote any of the 8 strings this PR removed.
  • The "New rule" line is unaffected. Workspace-Rules.md:143 says "Block or limit spend at the point of sale." That comes from newRule.restrictCardSpendDescription on the New rule page, and this PR kept it.
  • The screenshot is out of date. Expensify-Card-Spend-Rules.md:99 embeds Rules_Card-Restrictions_Add-rule.png. That image still shows the removed subtitle, both section headings, and the Restrict merchants helper sentence. It needs a new branded capture from whoever makes help site images. I didn't replace it with a raw test screenshot.

@mountiny, I didn't create a help site PR because no text changes are needed. Please confirm this matches the current behavior, and decide who should update the Rules_Card-Restrictions_Add-rule.png screenshot.


view run

@tgolen tgolen mentioned this pull request Sep 29, 2026
40 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.95-4 🚀

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

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.

6 participants