[Payment due @bernhardoj] Properly display CSV feeds before we load the cards by Gonals · Pull Request #88136 · Expensify/App

Gonals · 2026-04-16T16:42:08Z

Explanation of Change

Before, we did not display CSV feeds with no cards in Onyx. However, unassigned cards are not loaded until the feed is selected (which we couldn't do because we were not displaying it). We will now display the feed.

This likely also caused part of the issue by which we did not properly display the feed after a first import

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/623387
$ #86814
$ https://github.com/Expensify/Expensify/issues/548636
PROPOSAL:

Tests

Go to Workspace -> Company Cards
Click Add cards.
Select United States > Next.
Select Direct feed > Next.
Select Import transactions from file > Next.
Enter Company card layout name and save it.
Click Next.
Upload a valid CSV file like this one:
uploads_1594908368712-Best+Example+CSV+for+Domains.csv
Map Account number to Card number.
Click Import.
Confirm the cards import properly

Go to OldDot -> Domains and select a Newdot Workspace
Click CSV Import.
Follow the process to import cards. You can use this file:
uploads_1594908368712-Best+Example+CSV+for+Domains.csv
Go to newdot and confirm the new feed displays in Workspace -> Company Cards

Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Same as tests

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

melvin-bot · 2026-04-16T16:50:47Z

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

dylanexpensify · 2026-04-17T10:33:50Z

@bernhardoj can we prioritize reviewing this today?

heyjennahay

Product change LGTM

bernhardoj · 2026-04-17T11:15:21Z

Reviewing now

bernhardoj · 2026-04-17T11:50:29Z

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

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mp4

bernhardoj

LGTM!

(note that this issue still happens to me)

melvin-bot · 2026-04-17T11:55:47Z

@mollfpr 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 · 2026-04-17T11:55:49Z

🎯 @bernhardoj, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/623387.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

trjExpensify · 2026-04-20T13:27:36Z

@mollfpr can you do your review of this and merge it if you're happy? Thanks.

github-actions · 2026-04-20T14:11:37Z

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

OSBotify · 2026-04-20T14:14:32Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-04-20T14:16:42Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-d501480-f81070b-c987c6d8e7fb23dbb3722fd169fbefb4274c18c9/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-d501480-f81070b-c02656508e2c181dd12c2832109c557a9e790d7c/index.html

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

👀 View the workflow run that generated this build 👀

Address Copilot review feedback on PR #88359: gate the four new linkedPolicyIDs tests on `result.current[1].status === 'loaded'` (the ResultMetadata from useOnyx) before running the assertion, so that negative checks don't pass vacuously while Onyx is still loading. Verified locally that all 7 tests pass on main, and that reverting the predicate to its pre-#88136 form still correctly fails the `linkedPolicyIDs: ['']` and `linkedPolicyIDs: []` regression tests. Made-with: Cursor

Addresses Copilot review comment on PR #88359 (#88359 (comment)): the four new tests previously matched feeds via key.includes(oauthFeed) and gated on result.current[1].status === 'loaded' (an Onyx implementation detail). Now compute the exact combined feed key with getCardFeedWithDomainID and put toHaveProperty([combinedFeedKey]) inside waitFor for the three positive cases, so the wait resolves on the actual expectation. The negative case keeps the loaded-status gate before asserting absence to avoid a vacuous pass while Onyx is still hydrating. Verified locally: - All 7 tests pass on main. - Reverting the predicate to its pre-#88136 form still fails the two linkedPolicyIDs: [''] / [] regression tests. Made-with: Cursor

Pin the corrected behavior of the include predicate in useCardFeeds: domain feeds whose `linkedPolicyIDs` is `[]` or `['']` (a legacy/invalid shape persisted by older clients and by DomainAPI's default when `preferredPolicy` was empty) should still match via `preferredPolicy` rather than being silently dropped. The predicate fix itself shipped in PR Expensify#88136; this commit adds the regression coverage that PR did not. Made-with: Cursor

OSBotify · 2026-04-21T11:41:51Z

🚀 Deployed to staging by https://github.com/mollfpr in version: 9.3.61-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-21T11:43:36Z

👋 I've reviewed the changes in this PR against the help site articles under App/docs/articles.

No help site changes are required.

This PR is a bug fix that ensures CSV company card feeds (both NewDot ccupload and Classic csv feeds) display properly in the Company Cards section before their unassigned cards are loaded. The changes are purely internal:

New isCSVUploadFeed() utility and CSV_CLASSIC constant
Modified feed filtering logic to always show CSV upload feeds
Fallback to layoutName for feed display names
Bug fix for linkedPolicyIDs filtering

No new UI flows, labels, buttons, or user-facing features were introduced — the CSV import workflow already existed. The existing help site articles (including Set up a Direct Company Card Feed Connection, Configure Company Card Settings, and Import Personal Card Transactions From a Spreadsheet) remain accurate as-is.

OSBotify · 2026-04-23T20:00:54Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.3.61-4 🚀

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

Properly display CSV feeds before we load the cards

878f28b

Gonals self-assigned this Apr 16, 2026

better names

7985577

Gonals marked this pull request as ready for review April 16, 2026 16:50

Gonals requested review from a team as code owners April 16, 2026 16:50

melvin-bot Bot requested review from bernhardoj and heyjennahay and removed request for a team April 16, 2026 16:50

melvin-bot Bot removed the request for review from a team April 16, 2026 16:50

github-actions Bot reviewed Apr 16, 2026

View reviewed changes

Comment thread src/libs/CardFeedUtils.ts

github-actions Bot reviewed Apr 16, 2026

View reviewed changes

Comment thread src/libs/CardFeedUtils.ts

Gonals added 4 commits April 16, 2026 18:59

Merge branch 'main' into alberto-oldDotCards

095678f

use constant

9822cba

lint

8e97f06

add doc

f5311a2

This comment was marked as resolved.

Sign in to view

ad tests

418918a

heyjennahay approved these changes Apr 17, 2026

View reviewed changes

bernhardoj approved these changes Apr 17, 2026

View reviewed changes

melvin-bot Bot requested a review from mollfpr April 17, 2026 11:55

melvin-bot Bot changed the title ~~Properly display CSV feeds before we load the cards~~ [Payment due @bernhardoj] Properly display CSV feeds before we load the cards Apr 17, 2026

mollfpr approved these changes Apr 20, 2026

View reviewed changes

mollfpr merged commit d501480 into main Apr 20, 2026
43 of 45 checks passed

mollfpr deleted the alberto-oldDotCards branch April 20, 2026 14:04

mountiny mentioned this pull request Apr 20, 2026

Add useCardFeeds regression tests for empty linkedPolicyIDs #88359

Merged

52 tasks

OSBotify mentioned this pull request Apr 21, 2026

Deploy Checklist: New Expensify 2026-04-21 #88394

Closed

vincdargento mentioned this pull request Apr 22, 2026

[$250] Company Cards - Imported cards are not displayed until multiple page refreshes #88496

Open

7 tasks

melvin-bot Bot mentioned this pull request Apr 23, 2026

[Due for payment 2026-04-30] [$250] Company card - Imported card feed only appears after importing for the second time #86814

Closed

7 tasks

Uh oh!

Conversation

Gonals commented Apr 16, 2026 • edited by mountiny 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!

melvin-bot Bot commented Apr 16, 2026

Uh oh!

Uh oh!

Uh oh!

This comment was marked as resolved.

dylanexpensify commented Apr 17, 2026

Uh oh!

heyjennahay left a comment

Choose a reason for hiding this comment

Uh oh!

bernhardoj commented Apr 17, 2026

Uh oh!

bernhardoj commented Apr 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

bernhardoj left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Apr 17, 2026

Uh oh!

melvin-bot Bot commented Apr 17, 2026

Uh oh!

trjExpensify commented Apr 20, 2026

Uh oh!

Uh oh!

github-actions Bot commented Apr 20, 2026

Uh oh!

OSBotify commented Apr 20, 2026

Uh oh!

github-actions Bot commented Apr 20, 2026

Uh oh!

OSBotify commented Apr 21, 2026

Uh oh!

MelvinBot commented Apr 21, 2026

Uh oh!

OSBotify commented Apr 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Gonals commented Apr 16, 2026 •

edited by mountiny

Loading

bernhardoj commented Apr 17, 2026 •

edited

Loading