Skip to content

[Card Rules] Hide deactivated cards from rule summary and selection#87679

Open
MelvinBot wants to merge 4 commits intomainfrom
claude-hideDeactivatedCardsFromSpendRules
Open

[Card Rules] Hide deactivated cards from rule summary and selection#87679
MelvinBot wants to merge 4 commits intomainfrom
claude-hideDeactivatedCardsFromSpendRules

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

@MelvinBot MelvinBot commented Apr 10, 2026 •
edited by luacmartins
Loading

Explanation of Change

When a virtual card is deactivated, spend rules that reference it still show the raw card ID in the rule summary and edit page. This happens because cardsList is fetched with filterInactiveCards (which correctly excludes deactivated cards), but when a card ID isn't found in cardsList, the code falls back to displaying the raw numeric ID instead of hiding it.

This PR filters out deactivated card IDs (those not present in the active cardsList) before building display summaries:

  1. SpendRulesSection.tsx — Filters formValues.cardIDs to only active cards before building the summary. Rules with zero active cards are hidden entirely.
  2. SpendRulePageBase.tsx — Filters out inactive card IDs in getCardsMenuTitle so deactivated cards don't appear as raw IDs.

Fixed Issues

$ #87669
PROPOSAL: #87669 (comment)

Tests

  1. Navigate to a workspace with Expensify Cards and spend rules enabled
  2. Create a spend rule and assign it to one or more virtual cards
  3. Deactivate one of those virtual cards
  4. Navigate back to the spend rules section
  5. Verify the deactivated card no longer appears in the rule summary
  6. If all cards in a rule are deactivated, verify the entire rule is hidden from the list
  7. Open the edit page for a rule that had a deactivated card
  8. Verify the deactivated card does not appear in the "Choose cards" menu title
  • Verify that no errors appear in the JS console

Offline tests

  1. Go offline while viewing the spend rules section
  2. Verify spend rules display correctly with only active cards shown
  3. Go back online and verify the display updates properly

QA Steps

  1. In a workspace with Expensify Cards, create a spend rule assigned to multiple virtual cards
  2. Deactivate one of the assigned cards
  3. Navigate to the spend rules section
  4. Verify the deactivated card is no longer shown in the rule summary
  5. Verify if all cards in a rule are deactivated, the rule is hidden
  6. Open the edit page for a rule and verify the card menu title only shows active cards
  • 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.

Screenshots/Videos

Screen.Recording.2026-04-13.at.2.02.44.PM.mov
Android: Native

N/A - Logic-only change, no UI layout modifications

Android: mWeb Chrome

N/A - Logic-only change, no UI layout modifications

iOS: Native

N/A - Logic-only change, no UI layout modifications

iOS: mWeb Safari

N/A - Logic-only change, no UI layout modifications

MacOS: Chrome / Safari

N/A - Logic-only change, no UI layout modifications

Checks run
Check Result Notes
TypeScript typecheck ✅ Pass npm run typecheck
Prettier ✅ Pass Both files unchanged by prettier
ESLint ⏳ Running Full repo lint in progress, no issues expected from minimal filtering changes

@MelvinBot @luacmartins
Hide deactivated cards from spend rule summaries and selection
e07b862 
Filter out deactivated/inactive card IDs before building display summaries
in SpendRulesSection and SpendRulePageBase. Rules with only deactivated
cards are hidden entirely from the rules list.

Co-authored-by: Carlos Martins <luacmartins@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team April 10, 2026 20:49
@MelvinBot MelvinBot mentioned this pull request Apr 10, 2026
Open
@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented Apr 10, 2026

The failing check build (Debug, true) is unrelated to this PR's changes.

Analysis: The Android build itself completes successfully (APK downloaded from S3 cache), but the subsequent artifact-path detection step fails because the APP_NAME env var is empty, producing an invalid path: .../Android//build/outputs. This is a CI workflow/infrastructure issue.

Evidence: This PR only modifies SpendRulePageBase.tsx and SpendRulesSection.tsx — no build config, no Android native code. The failure is in the GitHub Actions workflow's post-build artifact resolution, not in any code this PR touches.

Re-running the check or waiting for a CI fix should resolve this.

@codecov
Copy link
Copy Markdown

codecov bot commented Apr 10, 2026 •
edited by github-actions bot
Loading

Codecov Report

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

Files with missing lines Coverage Δ
...s/workspace/rules/SpendRules/SpendRulePageBase.tsx 0.00% <0.00%> (ø)
...s/workspace/rules/SpendRules/SpendRulesSection.tsx 0.00% <0.00%> (ø)
... and 22 files with indirect coverage changes

@luacmartins
Copy link
Copy Markdown
Contributor

luacmartins commented Apr 13, 2026

@codex review

@luacmartins luacmartins marked this pull request as ready for review April 13, 2026 20:04
@luacmartins luacmartins requested a review from a team as a code owner April 13, 2026 20:04
@melvin-bot melvin-bot bot requested review from flaviadefaria and suneox and removed request for a team and flaviadefaria April 13, 2026 20:05
@luacmartins luacmartins requested a review from JS00001 April 13, 2026 20:05
@melvin-bot melvin-bot bot requested review from a team and removed request for a team April 13, 2026 20:05
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 13, 2026

@suneox 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 requested review from trjExpensify and removed request for a team April 13, 2026 20:05
chatgpt-codex-connector[bot]
chatgpt-codex-connector bot reviewed Apr 13, 2026
View reviewed changes
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 190580dcae

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

@luacmartins luacmartins requested a review from a team as a code owner April 13, 2026 20:56
@melvin-bot melvin-bot bot requested review from luacmartins and removed request for a team April 13, 2026 20:56
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 13, 2026

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

@suneox
Copy link
Copy Markdown
Contributor

suneox commented Apr 14, 2026

I’ll start checking this one in an hour

@suneox
Copy link
Copy Markdown
Contributor

suneox commented Apr 14, 2026

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
CleanShot.2026-04-14.at.20.16.12.5.mp4
Android: mWeb Chrome
CleanShot.2026-04-14.at.20.21.19.6.mp4
iOS: HybridApp
CleanShot.2026-04-14.at.20.11.25.4.mp4
iOS: mWeb Safari
CleanShot.2026-04-14.at.20.10.17.3.mp4
MacOS: Chrome / Safari
CleanShot.2026-04-14.at.20.07.04.1.mp4

Offline

CleanShot.2026-04-14.at.20.09.13.2.mp4

@suneox
Copy link
Copy Markdown
Contributor

suneox commented Apr 14, 2026

I’m still facing an issue where openPolicyExpensifyCardsPage called every time after adding or editing a spend rule, and I’m still troubleshooting it.

CleanShot.2026-04-14.at.20.26.12.1.mp4

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

Reviewers

@chatgpt-codex-connector chatgpt-codex-connector[bot] chatgpt-codex-connector[bot] left review comments

@JS00001 JS00001 JS00001 approved these changes

@suneox suneox Awaiting requested review from suneox

@trjExpensify trjExpensify Awaiting requested review from trjExpensify

@luacmartins luacmartins Awaiting requested review from luacmartins

Assignees

@luacmartins luacmartins

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@MelvinBot @luacmartins @suneox @JS00001