[No QA] Filter personal cards from Cardlist by rojiphil · Pull Request #76967 · Expensify/App

rojiphil · 2025-12-08T08:03:08Z

Explanation of Change

This PR filters the Cardlist to exclude all personal cards.
Personal cards are identified when fundID is 0.

Fixed Issues

$ #70639
PROPOSAL: #73230 (comment)

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

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

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

76967-web-chrome-001.mp4

github-actions · 2025-12-08T08:03:18Z

All contributors have signed the CLA ✍️ ✅
_{Posted by the CLA Assistant Lite bot.}

rojiphil · 2025-12-08T08:06:34Z

I have read the CLA Document and I hereby sign the CLA

codecov · 2025-12-08T12:10:32Z

Codecov Report

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

Files with missing lines	Coverage Δ
...nents/Search/SearchPageHeader/SearchFiltersBar.tsx	`68.01% <100.00%> (ø)`
.../Search/SearchPageHeader/SearchPageHeaderInput.tsx	`37.36% <100.00%> (ø)`
src/hooks/useAdvancedSearchFilters.ts	`83.33% <100.00%> (ø)`
src/hooks/useCardFeedsForDisplay.ts	`70.96% <100.00%> (ø)`
src/hooks/useSearchTypeMenu.tsx	`70.51% <100.00%> (ø)`
src/libs/CardUtils.ts	`68.57% <100.00%> (+0.31%)`	⬆️
...ExpensifyCardPage/ExpensifyCardContextProvider.tsx	`75.00% <100.00%> (+10.00%)`	⬆️
.../pages/settings/Wallet/ExpensifyCardPage/index.tsx	`66.29% <100.00%> (ø)`
src/components/EReceipt.tsx	`3.50% <0.00%> (ø)`
...c/components/ReportActionItem/IssueCardMessage.tsx	`0.00% <0.00%> (ø)`
... and 13 more
... and 6 files with indirect coverage changes

rojiphil · 2025-12-15T10:58:23Z

+ * Filter out personal (including cash) cards from the card list.
+ */
+function filterPersonalCards(cards: CardList | undefined): CardList {
+    return filterObject(cards ?? {}, (key, card) => !!card?.fundID && card.fundID !== '0');


@iwiznia Coming from here, can we say that the cash card also has fundID set to 0?
If so, there is no need to check for card name to identify cash card.

NAB: I think filterPersonalCards is a bit misleading because it filters personal/cash cards out and returns company cards only (fundID present and not '0'). i would recommend to rename to something like filterCompanyCards / excludePersonalAndCashCards so that we highlight that it excludes both personal + cash?

What do u think @rojiphil

As I understand, cash card is also a type of personal card but additionally having card name as __CASH__. So, the name filterPersonalCards still LGTM as the action is to filter out personal cards from the cardlist.

rojiphil · 2025-12-18T11:00:22Z

@iwiznia Thanks for the clarification.
PR is ready for review.

melvin-bot · 2025-12-18T11:00:38Z

@abzokhattab 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 · 2025-12-18T11:00:44Z

@abzokhattab @iwiznia One of you needs to 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]

abzokhattab · 2025-12-18T11:10:57Z

let me know if i should also review this @iwiznia

abzokhattab · 2025-12-23T20:48:22Z

Reviewing today...

abzokhattab · 2025-12-23T22:51:49Z

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 there are no new alerts related to the canBeMissing param for useOnyx
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: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

abzokhattab · 2025-12-23T22:52:50Z

Left a small comment but overall it looks good to me

Thanks

abzokhattab · 2025-12-24T13:26:54Z

LGTM

iwiznia · 2025-12-26T15:55:05Z


-const areAllCardsShippedSelector = (cardList: OnyxEntry<CardList>) => Object.values(cardList ?? {})?.every((card) => card?.state !== CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED);
+const areAllCardsShippedSelector = (cardList: OnyxEntry<CardList>) =>
+    Object.values(cardList ?? {})?.every((card) => card?.state !== CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED && !!card?.fundID && card.fundID !== '0');


Can you please create a method like isPersonalCard(card) and use it here and in filterPersonalCards so we don't duplicate the logic please?

@iwiznia Yeah. That makes sense. Updated the code.

iwiznia · 2025-12-30T13:34:50Z

Oh, you have conflicts

rojiphil · 2025-12-30T14:19:37Z

@iwiznia Resolved conflicts.

OSBotify · 2025-12-30T15:56:21Z

✋ 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 · 2025-12-31T19:02:25Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.2.90-0 🚀

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

OSBotify · 2026-01-02T10:34:28Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.2.90-2 🚀

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

LukasMod · 2026-01-13T11:08:56Z

+/**
+ * Check if the given card is a personal card.
+ *
+ * @param card the card which needs to be checked
+ * @returns true if the card is a personal card, false otherwise
+ */
+function isPersonalCard(card?: Card) {
+    return !!card?.fundID && card.fundID !== '0';
+}
+
+/**
+ * Filter out personal (including cash) cards from the card list.
+ */
+function filterPersonalCards(cards: CardList | undefined): CardList {
+    return filterObject(cards ?? {}, (key, card) => isPersonalCard(card));
+}


@rojiphil I have follow up question to this code. Based on #73230 (comment)

Personal cards will have fundID set to 0

I assume there is some misleading naming. Based on that comment, I would expect isPersonalCard to check === '0' It should be more like isNotPersonalCard. Could you confirm if I am right?

Oh! That's silly of me. @LukasMod You are right. It should be named isNotPersonalCard.
There is one more follow-up PR coming up for the linked issue here.
If not urgent, can we address this there?

Sure, no problem. I’m working on some optimizations and had a hard time understanding the filtering logic here because of the naming. Thanks for clarifying

I came to this PR from #79562 to ask the same question 😅

@amyevans We are addressing this in #73230 and changes should be merged soon.

jayeshmangwani · 2026-01-23T06:08:03Z

 */
 function ExpensifyCardContextProvider({children}: PropsWithChildren) {
-    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST, {canBeMissing: false});
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST, {selector: filterPersonalCards, canBeMissing: false});


Coming from this issue #78851, Adding the selector here caused a console warning (useOnyx returned no data for key with canBeMissing set to false for key cardList). We fixed it by adding getEmptyObject as the default value #78851 (comment).

melvin-bot Bot assigned rojiphil Dec 8, 2025

rojiphil force-pushed the 73230-filter-personal-cash-cards branch from e8c142f to 8d7e25e Compare December 8, 2025 12:02

“Roji added 2 commits December 8, 2025 19:04

filter personal cards from cardlist

bdaaae9

applied filter where cardlist is accessed

c36180b

rojiphil force-pushed the 73230-filter-personal-cash-cards branch from 8d7e25e to c36180b Compare December 8, 2025 13:36

rojiphil added 3 commits December 8, 2025 21:23

fix tests

c57376b

prettier fix

55b390a

Merge branch 'main' into 73230-filter-personal-cash-cards

f0b0f82

rojiphil commented Dec 15, 2025

View reviewed changes

Merge branch 'main' into 73230-filter-personal-cash-cards

20d3260

rojiphil marked this pull request as ready for review December 18, 2025 11:00

rojiphil requested review from a team as code owners December 18, 2025 11:00

melvin-bot Bot requested review from abzokhattab and trjExpensify and removed request for a team and abzokhattab December 18, 2025 11:00

melvin-bot Bot requested review from a team, abzokhattab and iwiznia and removed request for a team December 18, 2025 11:00

iwiznia previously approved these changes Dec 18, 2025

View reviewed changes

iwiznia approved these changes Dec 23, 2025

View reviewed changes

abzokhattab approved these changes Dec 23, 2025

View reviewed changes

melvin-bot Bot requested a review from iwiznia December 23, 2025 22:53

iwiznia requested changes Dec 26, 2025

View reviewed changes

rojiphil added 2 commits December 27, 2025 19:05

Merge branch 'Expensify:main' into 73230-filter-personal-cash-cards

aea0977

dry the code

e7726b1

rojiphil requested a review from iwiznia December 30, 2025 04:47

iwiznia previously approved these changes Dec 30, 2025

View reviewed changes

Merge branch 'main' into 73230-filter-personal-cash-cards

d930e0e

rojiphil dismissed iwiznia’s stale review via d930e0e December 30, 2025 13:50

rojiphil requested a review from iwiznia December 30, 2025 14:19

iwiznia approved these changes Dec 30, 2025

View reviewed changes

iwiznia merged commit f049f33 into Expensify:main Dec 30, 2025
31 checks passed

OSBotify mentioned this pull request Dec 31, 2025

Deploy Checklist: New Expensify 2025-12-31 #78646

Closed

28 tasks

melvin-bot Bot mentioned this pull request Jan 2, 2026

[Due for payment 2026-02-17] [Due for payment 2026-01-09] [$500] Expense - Member's unreported expense appears in admin's unreported expense list #70639

Closed

8 tasks

rojiphil mentioned this pull request Jan 6, 2026

Filter unreported expenses by owner to prevent showing member expenses to admin #73230

Merged

51 tasks

LukasMod reviewed Jan 13, 2026

View reviewed changes

LukasMod mentioned this pull request Jan 15, 2026

perf: Add NON_PERSONAL_AND_WORKSPACE_CARD_LIST derived value #79347

Merged

53 tasks

jayeshmangwani reviewed Jan 23, 2026

View reviewed changes

jayeshmangwani mentioned this pull request Jan 23, 2026

[$150] Console error: useOnyx returned no data for key with canBeMissing set to false for key cardList #78851

Closed

7 tasks

amyevans mentioned this pull request Jan 29, 2026

Feat: existing personal cards #79562

Merged

58 tasks

Conversation

rojiphil commented Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

github-actions Bot commented Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rojiphil commented Dec 8, 2025

Uh oh!

codecov Bot commented Dec 8, 2025 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rojiphil commented Dec 18, 2025

Uh oh!

melvin-bot Bot commented Dec 18, 2025

Uh oh!

melvin-bot Bot commented Dec 18, 2025

Uh oh!

abzokhattab commented Dec 18, 2025

Uh oh!

abzokhattab commented Dec 23, 2025

Uh oh!

abzokhattab commented Dec 23, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

abzokhattab commented Dec 23, 2025

Uh oh!

abzokhattab commented Dec 24, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

iwiznia commented Dec 30, 2025

Uh oh!

rojiphil commented Dec 30, 2025

Uh oh!

Uh oh!

OSBotify commented Dec 30, 2025

Uh oh!

OSBotify commented Dec 31, 2025

Uh oh!

OSBotify commented Jan 2, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

rojiphil commented Dec 8, 2025 •

edited

Loading

github-actions Bot commented Dec 8, 2025 •

edited

Loading

codecov Bot commented Dec 8, 2025 •

edited by github-actions Bot

Loading