Scope card feed nickname lookup to correct workspace on Spend page by MelvinBot · Pull Request #89988 · Expensify/App

MelvinBot · 2026-05-08T10:00:46Z

Explanation of Change

When two workspaces both have the same card feed type (e.g. vcf) with different custom nicknames, the Spend page shows the wrong feed name for one of the workspaces. This happens because getCustomFeedNameFromFeeds iterates all workspace card feeds and returns whichever nickname it finds first, with no concept of which workspace the card belongs to.

This PR scopes the nickname lookup to the correct workspace by using the card's fundID (obtained via a cardList lookup using cardID) to index into the specific workspace's cardFeeds entry. The resolved custom name is then passed directly to getFeedNameForDisplay, bypassing the unscoped iteration.

Fixed Issues

$ #89619
PROPOSAL: #89619 (comment)

Tests

Have two card feeds that are connected to two workspaces
Go to Spend
Click either "Card statements" or "Card accruals."
Adjust the date range if needed
See spend grouped by card
Verify that card feed shows the correct card feed name

Verify that no errors appear in the JS console

Offline tests

// TODO: The human co-author must fill out the offline tests before marking this PR as "ready for review"

QA Steps

Have two card feeds that are connected to two workspaces
Go to Spend
Click either "Card statements" or "Card accruals."
Adjust the date range if needed
See spend grouped by card
Verify that card feed shows the correct card feed name

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

AI Tests

Test	Result
TypeScript (`typecheck-tsgo`)	Passed (no new errors)
Prettier	Passed
ESLint	Passed (no new warnings)
Jest (Search tests — 34 suites, 978 tests)	Passed
React Compiler Compliance	Skipped (pre-existing env issue)

When two workspaces have the same card feed type with different custom nicknames, getCustomFeedNameFromFeeds iterates all workspace card feeds and returns whichever nickname it finds first. This causes the wrong feed name to display for one of the workspaces. Use the card's fundID (via cardList lookup) to scope the nickname resolution to the correct workspace's cardFeeds entry. Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>

MelvinBot · 2026-05-08T10:01:01Z

I created this PR from an upstream branch since I don't have push access to your fork.

To take ownership of this branch and be able to push updates, run:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-fixCardFeedNameScope
git checkout -b claude-fixCardFeedNameScope upstream/claude-fixCardFeedNameScope
git push -u origin claude-fixCardFeedNameScope

Then you can close this PR and open a new one from your fork.

codecov · 2026-05-08T10:27:49Z

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 Δ
src/components/Search/index.tsx	`0.62% <ø> (ø)`
src/hooks/useSearchSections.ts	`100.00% <100.00%> (ø)`
src/libs/SearchUIUtils.ts	`64.15% <50.00%> (-0.04%)`	⬇️
... and 10 files with indirect coverage changes

eVoloshchak · 2026-05-24T13:57:56Z

@MelvinBot, pull the latest main

…eScope Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>

MelvinBot · 2026-05-24T14:04:47Z

Merged the latest main into this branch and pushed. The branch is now up to date.

eVoloshchak · 2026-05-25T10:34:19Z

@MelvinBot, this needs to be tested by QA, who might not have an account with two card feeds that are connected two workspaces. Is there an onyx data we could set in browser console to mock this?

MelvinBot · 2026-05-25T10:37:04Z

Yes — QA can mock this entirely via Onyx.multiSet in the browser console. Here's a snippet that creates two workspaces each with a vcf card feed that has a different custom nickname, plus cards in cardList linked via fundID:

Onyx.multiSet({
  // Workspace A card feeds (domainID 111111)
  'sharedNVP_private_domain_member_111111': {
    settings: {
      companyCards: {
        vcf: {
          pending: false,
          preferredPolicy: 'policyA',
          linkedPolicyIDs: ['policyA'],
          domainID: 111111,
        },
      },
      companyCardNicknames: {
        vcf: 'Workspace A Cards',
      },
    },
  },

  // Workspace B card feeds (domainID 222222)
  'sharedNVP_private_domain_member_222222': {
    settings: {
      companyCards: {
        vcf: {
          pending: false,
          preferredPolicy: 'policyB',
          linkedPolicyIDs: ['policyB'],
          domainID: 222222,
        },
      },
      companyCardNicknames: {
        vcf: 'Workspace B Cards',
      },
    },
  },

  // Cards linked to each workspace via fundID
  cardList: {
    '9001': {
      cardID: 9001,
      state: 3,
      bank: 'vcf',
      domainName: 'workspaceA.com',
      fundID: '111111',
      lastFourPAN: '1111',
      fraud: 'none',
      cardName: 'Test Card A',
      lastUpdated: '2026-05-25',
    },
    '9002': {
      cardID: 9002,
      state: 3,
      bank: 'vcf',
      domainName: 'workspaceB.com',
      fundID: '222222',
      lastFourPAN: '2222',
      fraud: 'none',
      cardName: 'Test Card B',
      lastUpdated: '2026-05-25',
    },
  },
});

The key fields for this PR's fix:

fundID on each card links it to a workspace (matches the domainID suffix in the sharedNVP_private_domain_member_{domainID} key)
companyCardNicknames.vcf is the custom feed name per workspace — set these to different values to verify the correct one displays
Both feeds use bank: 'vcf' so they share the same feed type but belong to different workspaces

After setting this, navigate to the Spend page grouped by Card to verify each card shows its workspace-specific feed nickname rather than whichever one is found first.

Note: QA may also need matching expense data (transactions with these cardIDs) for the cards to appear on the Spend page. If the Spend page is empty after setting the above, create a couple of test expenses charged to cards 9001 and 9002.

eVoloshchak · 2026-05-25T10:53:05Z

#89988 (comment)

If the Spend page is empty after setting the above, create a couple of test expenses charged to cards 9001 and 9002.

@MelvinBot, Create a moch onyx object to populate these via console

MelvinBot · 2026-05-25T10:57:58Z

The Spend page reads from search snapshots (snapshot_{hash}), not raw Onyx transactions. So you'll need to inject mock data into the active snapshot. Here's a two-step approach:

Step 1 — Set card feeds + card list (run first, from my previous comment)

Step 2 — Navigate to the Spend page grouped by Card, then run this to inject mock card groups + transactions into the active snapshot:

// Find the active snapshot key
const snapshotKey = Object.keys(OnyxUtils.getMergeQueue?.() ?? {}).find(k => k.startsWith('snapshot_'))
  || Object.keys(Onyx.getOnyxInstance?.() ?? {}).find?.(k => k.startsWith('snapshot_'))
  || (() => {
    // Fallback: find it from Onyx state
    const allKeys = Onyx.getAllKeys?.() ?? new Set();
    return [...allKeys].find(k => k.startsWith('snapshot_'));
  })();

if (!snapshotKey) {
  console.error('No snapshot found — navigate to the Spend page grouped by Card first, then re-run.');
} else {
  console.log('Merging mock data into:', snapshotKey);
  Onyx.merge(snapshotKey, {
    data: {
      // Card group for Workspace A card
      'group_card_9001': {
        accountID: 1,
        count: 2,
        total: 15000,
        currency: 'USD',
        bank: 'vcf',
        cardName: 'Test Card A',
        cardID: 9001,
        lastFourPAN: '1111',
      },
      // Card group for Workspace B card
      'group_card_9002': {
        accountID: 1,
        count: 2,
        total: 20000,
        currency: 'USD',
        bank: 'vcf',
        cardName: 'Test Card B',
        cardID: 9002,
        lastFourPAN: '2222',
      },
      // Transactions for card 9001 (Workspace A)
      'transactions_tx_a1': {
        transactionID: 'tx_a1',
        cardID: 9001,
        amount: -5000,
        currency: 'USD',
        merchant: 'Coffee Shop',
        created: '2026-05-25',
        reportID: 'mockReport1',
      },
      'transactions_tx_a2': {
        transactionID: 'tx_a2',
        cardID: 9001,
        amount: -10000,
        currency: 'USD',
        merchant: 'Office Supplies',
        created: '2026-05-24',
        reportID: 'mockReport1',
      },
      // Transactions for card 9002 (Workspace B)
      'transactions_tx_b1': {
        transactionID: 'tx_b1',
        cardID: 9002,
        amount: -8000,
        currency: 'USD',
        merchant: 'Restaurant',
        created: '2026-05-25',
        reportID: 'mockReport2',
      },
      'transactions_tx_b2': {
        transactionID: 'tx_b2',
        cardID: 9002,
        amount: -12000,
        currency: 'USD',
        merchant: 'Travel Booking',
        created: '2026-05-23',
        reportID: 'mockReport2',
      },
    },
  });
  console.log('Done! The Spend page should now show two card groups with different feed nicknames.');
}

What to verify: Both card groups should display — one labeled "Workspace A Cards" and the other "Workspace B Cards" (the custom nicknames from companyCardNicknames). Before this PR's fix, both would show whichever nickname was found first.

eVoloshchak · 2026-05-25T11:15:03Z

Melvin's comments above don't work, that means QA will indeed need an account with two card feeds that are connected two workspaces to test this in real life. Works for me locally though

eVoloshchak · 2026-05-25T11:16:17Z

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

Android: mWeb Chrome

iOS: HybridApp

Simulator Screenshot - iPhone 16e - 2026-05-25 at 13 08 51

iOS: mWeb Safari

Simulator Screenshot - iPhone 16e - 2026-05-25 at 13 09 49

MacOS: Chrome / Safari

eVoloshchak · 2026-05-25T11:17:42Z

Have two card feeds that are connected to two workspaces
Go to Spend
Click either "Card statements" or "Card accruals."
Adjust the date range if needed
See spend grouped by card
Verify that card feed shows the correct card feed name

@MelvinBot, use this to populate Tests and QA Tests

MelvinBot · 2026-05-25T11:19:23Z

Updated the PR body — populated both the Tests and QA Steps sections with the provided steps.

eVoloshchak

LGTM!
@MelvinBot, check off every checkbox in the PR author checklist and mark this PR as ready for review

melvin-bot · 2026-05-25T11:21:06Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #89619 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

MelvinBot · 2026-05-25T11:24:30Z

Done — checked off all PR Author Checklist items and marked the PR as ready for review.

melvin-bot · 2026-05-25T11:24:32Z

@eVoloshchak 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-26T16:53:44Z

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

github-actions · 2026-05-26T17:01:59Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-050fa1f1f93-73f6a85-be5531bed2d9a7a3ff072281cd4c27aaaca3d752/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-050fa1f-73f6a85-535a466a6dfa2a8923e03e2a32a62bf0676dc7a7/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-26T17:04:40Z

✋ 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 · 2026-05-26T20:37:45Z

🚀 Deployed to staging by https://github.com/tylerkaraszewski in version: 9.3.83-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-26T20:39:36Z

I reviewed the changes in this PR. This is a bug fix only — it corrects the scoping of card feed nickname lookups so the Spend page displays the correct feed name when multiple workspaces share the same card feed type.

No help site changes are required because:

No new features, settings, or UI elements were added
No user-facing workflows or navigation changed
No labels, button names, or terminology changed
The fix only corrects which existing nickname is displayed for a card feed grouping

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

OSBotify · 2026-05-27T17:27:22Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.3.83-3 🚀

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

MelvinBot assigned eVoloshchak May 8, 2026

MelvinBot requested a review from a team May 8, 2026 10:00

MelvinBot mentioned this pull request May 8, 2026

[Due for payment 2026-06-03] [$250] Feed Name for company card is incorrect when viewing from the Spend page #89619

Closed

7 tasks

Merge remote-tracking branch 'origin/main' into claude-fixCardFeedNam…

076f1b8

…eScope Co-authored-by: Eugene Voloshchak <eVoloshchak@users.noreply.github.com>

eVoloshchak approved these changes May 25, 2026

View reviewed changes

melvin-bot Bot requested a review from tylerkaraszewski May 25, 2026 11:21

MelvinBot marked this pull request as ready for review May 25, 2026 11:24

MelvinBot requested a review from a team as a code owner May 25, 2026 11:24

melvin-bot Bot requested review from eVoloshchak and heyjennahay and removed request for a team May 25, 2026 11:24

melvin-bot Bot removed the request for review from a team May 25, 2026 11:24

eVoloshchak approved these changes May 25, 2026

View reviewed changes

tylerkaraszewski approved these changes May 26, 2026

View reviewed changes

tylerkaraszewski merged commit 050fa1f into main May 26, 2026
57 of 60 checks passed

tylerkaraszewski deleted the claude-fixCardFeedNameScope branch May 26, 2026 16:52

OSBotify mentioned this pull request May 26, 2026

Deploy Checklist: New Expensify 2026-05-26 #91756

Closed

54 tasks

applause-bot Bot mentioned this pull request May 27, 2026

[Exploratory] Spend-Card accruals highlight disappears after changing filters #91790

Open

7 tasks

Uh oh!

Conversation

MelvinBot commented May 8, 2026 • 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

AI Tests

Uh oh!

MelvinBot commented May 8, 2026

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

eVoloshchak commented May 24, 2026

Uh oh!

MelvinBot commented May 24, 2026

Uh oh!

eVoloshchak commented May 25, 2026

Uh oh!

MelvinBot commented May 25, 2026

Uh oh!

eVoloshchak commented May 25, 2026

Uh oh!

MelvinBot commented May 25, 2026

Uh oh!

eVoloshchak commented May 25, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eVoloshchak commented May 25, 2026

Uh oh!

MelvinBot commented May 25, 2026

Uh oh!

eVoloshchak left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented May 25, 2026

Uh oh!

MelvinBot commented May 25, 2026

Uh oh!

melvin-bot Bot commented May 25, 2026

Uh oh!

Uh oh!

github-actions Bot commented May 26, 2026

Uh oh!

github-actions Bot commented May 26, 2026

Uh oh!

OSBotify commented May 26, 2026

Uh oh!

OSBotify commented May 26, 2026

Uh oh!

MelvinBot commented May 26, 2026

Uh oh!

OSBotify commented May 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

MelvinBot commented May 8, 2026 •

edited

Loading

codecov Bot commented May 8, 2026 •

edited by github-actions Bot

Loading

eVoloshchak commented May 25, 2026 •

edited

Loading