[Home Page] Extend Your spend to include third-party cards alongside Expensify Cards by adamgrzybowski · Pull Request #91835 · Expensify/App

adamgrzybowski · 2026-05-27T12:30:50Z

Explanation of Change

Adds third-party card rows (employer-feed + personal Plaid) to the Your spend section, ordered after Expensify Card rows.
Each row shows the bank/institution artwork and the bold total; no remaining-limit doughnut (no credit-limit data from the provider).
Broken-feed and broken-connection cards are filtered out via CARD_FEED_ERRORS; the whole slot still hides when no rows apply.

Fixed Issues

$ #91711
PROPOSAL:

Tests

Offline tests

QA Steps

Sign in with an account that has a third-party card (employer feed or Plaid) with transactions in the last 30 days. Verify a Recent transactions • [lastFour] row appears in Your spend with the bank/institution artwork, bold total, and no doughnut. Tap it and verify it opens the matching Spend > Expenses search.
Sign in with an account that has both an Expensify Card and third-party cards. Verify Expensify Card rows appear before third-party rows.
Sign in with an account that has a third-party card in a broken-feed / disconnected state. Verify its row is hidden. Reconnect it and verify the row appears.
Sign in with an account that has only third-party cards with no transactions in the last 30 days. Verify the entire Your spend slot is hidden.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-05-27.at.14.19.38.mov

Merges employer-feed and personal Plaid card rows into the YourSpend hook alongside Expensify cards, tagged with a `YOUR_SPEND_CARD_KIND` discriminator so `CardRow` can pick the right artwork branch (bank icon via `feed|domainID` or bare Plaid feed). Adds a new `getDisplayableThirdPartyCards` selector that filters out broken-feed and broken-connection cards.

melvin-bot · 2026-05-27T12:30:59Z

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

github-actions · 2026-05-27T12:41:51Z

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

github-actions · 2026-05-27T12:55:17Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #91835.

Android 🤖	iOS 🍎
⏩ SKIPPED ⏩	⏩ SKIPPED ⏩
The build for Android was skipped	The build for iOS was skipped

Web 🕸️
https://91835.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

JmillsExpensify

Works great!

grgia

NAB comments

… with tests Clarify the third-party `cardName` fallback in `useYourSpendData` so the space requirement and no-space fall-through behavior are explicit, and add two cases to `lastFourNumbersFromCardName` to lock that behavior in.

adamgrzybowski · 2026-05-28T15:02:38Z

@grgia done ✅

ZhenjaHorbach · 2026-05-29T08:12:06Z

Spell check issue 🥲

ZhenjaHorbach · 2026-05-29T08:16:13Z

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

2026-05-29.10.41.32.mov

Android: mWeb Chrome

2026-05-29.10.38.22.mov

iOS: HybridApp

2026-05-29.10.41.32.mov

iOS: mWeb Safari

2026-05-29.10.38.22.mov

MacOS: Chrome / Safari

2026-05-29.10.35.54.mov

ZhenjaHorbach · 2026-05-29T08:54:26Z

But overall changes look good
Only this comment left

Spell check issue 🥲

Use SomeCardName instead of CREDITCARD in the no-space ellipsis test to avoid adding a cspell dictionary entry.

ZhenjaHorbach · 2026-06-01T11:34:50Z

TS issues
But looks like they are not related to this PR

grgia · 2026-06-01T16:40:08Z

+                if (!lastFour) {
+                    return acc;
+                }


does this hide valid cards

grgia · 2026-06-01T16:43:02Z

+                iconProps={iconProps}
+            />
+        );
+    } else if (cardRow.fundID !== undefined) {


what exactly is this row meant to catch? Should we consider '0'?

is it better to use a util like isPersonalCard(card)

grgia

@adamgrzybowski conflicts. Nothing blocking but minor questions

Keep getCardFeedWithDomainID for third-party card icons while adopting main's useCurrencyListActions for currency formatting.

adamgrzybowski requested review from a team as code owners May 27, 2026 12:30

melvin-bot Bot assigned adamgrzybowski May 27, 2026

melvin-bot Bot requested review from ZhenjaHorbach and trjExpensify and removed request for a team and trjExpensify May 27, 2026 12:30

JmillsExpensify self-requested a review May 27, 2026 12:39

JmillsExpensify previously approved these changes May 27, 2026

View reviewed changes

grgia reviewed May 27, 2026

View reviewed changes

Comment thread src/components/CardFeedIcon.tsx Outdated

Remove unnecessary comment on CardFeedIconProps.selectedFeed

15f3281

adamgrzybowski dismissed JmillsExpensify’s stale review via 15f3281 May 27, 2026 14:22

grgia reviewed May 28, 2026

View reviewed changes

Comment thread src/pages/home/YourSpendSection/useYourSpendData.ts

grgia reviewed May 28, 2026

View reviewed changes

Comment thread src/libs/CardUtils.ts

grgia previously approved these changes May 28, 2026

View reviewed changes

adamgrzybowski dismissed grgia’s stale review via 69df4b9 May 28, 2026 15:01

Fix spell check by renaming test card name fixture

7e855f0

Use SomeCardName instead of CREDITCARD in the no-space ellipsis test to avoid adding a cspell dictionary entry.

ZhenjaHorbach approved these changes Jun 1, 2026

View reviewed changes

melvin-bot Bot requested a review from grgia June 1, 2026 11:35

grgia reviewed Jun 1, 2026

View reviewed changes

Merge main and resolve CardRow conflict

60b8fa6

Keep getCardFeedWithDomainID for third-party card icons while adopting main's useCurrencyListActions for currency formatting.

Conversation

adamgrzybowski commented May 27, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented May 27, 2026

Uh oh!

github-actions Bot commented May 27, 2026

Uh oh!

github-actions Bot commented May 27, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

grgia left a comment

Choose a reason for hiding this comment

Uh oh!

adamgrzybowski commented May 28, 2026

Uh oh!

ZhenjaHorbach commented May 29, 2026

Uh oh!

ZhenjaHorbach commented May 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ZhenjaHorbach commented May 29, 2026

Uh oh!

ZhenjaHorbach commented Jun 1, 2026

Uh oh!

grgia Jun 1, 2026

Choose a reason for hiding this comment

Uh oh!

grgia Jun 1, 2026

Choose a reason for hiding this comment

Uh oh!

grgia left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ZhenjaHorbach commented May 29, 2026 •

edited

Loading