Fix company cards endless skeleton for domain feeds by fedirjh · Pull Request #79937 · Expensify/App

fedirjh · 2026-01-20T00:33:49Z

Explanation of Change

Fixed Issues

$ #79383
$ https://github.com/Expensify/Expensify/issues/587676

PROPOSAL:

Tests

Connect an OAuth Feed in the old Dot.
Assign cards within that feed.
Proceed to the new Dot and confirm that feeds have loaded accurately with the same users assigned from the old Dot.
Confirm that when the feed is empty (i.e., no users assigned), a message indicating no feed cards should be displayed.

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

Screenshots/Videos

CleanShot.2026-01-20.at.01.14.22.mp4

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

codecov · 2026-01-20T01:14:29Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/hooks/useCompanyCards.ts	`100.00% <100.00%> (ø)`
.../companyCards/WorkspaceCompanyCardsTable/index.tsx	`0.00% <0.00%> (ø)`
... and 9 files with indirect coverage changes

melvin-bot · 2026-01-27T17:03:32Z

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

carlosmiceli · 2026-01-27T17:07:52Z

@fedirjh we have conflicts, probably because of a PR we juuuuuust merged from Chris 🙏

fedirjh · 2026-01-27T17:21:04Z

@carlosmiceli Just updated the PR. Should be ready.

carlosmiceli · 2026-01-27T17:35:47Z

Ready for you @hungvu193 @joekaufmanexpensify !

carlosmiceli · 2026-01-27T19:53:05Z

@fedirjh conflicts again (I think because we had to revert @chrispader's PR from before) 🙏

…y isLoadingCards condition

github-actions · 2026-01-28T01:05:42Z

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

github-actions · 2026-01-28T01:11:04Z

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

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

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

👀 View the workflow run that generated this build 👀

…h cardNamesToEncryptedCardNumber assertions, ensuring accurate mapping for custom, OAuth, and Plaid feeds. Enhance test coverage for card name derivation and merging logic.

… ensure consistent code style.

carlosmiceli · 2026-01-28T17:36:29Z

@hungvu193 I think this is ready to review 💪

…e WorkspaceCompanyCardsPage to clarify API call dependencies, enhancing code readability and maintainability.

carlosmiceli · 2026-01-28T19:56:39Z

@fedirjh there's lint issues 😅

hungvu193 · 2026-01-29T01:42:43Z

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

Screen.Recording.2026-01-29.at.13.46.07.mov

Android: mWeb Chrome

Screen.Recording.2026-01-29.at.13.46.07.mov

iOS: HybridApp

Screen.Recording.2026-01-29.at.11.47.10.mov

iOS: mWeb Safari

Screen.Recording.2026-01-29.at.11.25.15.mov

MacOS: Chrome / Safari

Screen.Recording.2026-01-29.at.11.21.36.mov

hungvu193 · 2026-01-29T04:22:52Z

@fedirjh Can you resolve the conflict ?

chrispader

LGTM once main is merged, i just have minor questions

chrispader · 2026-01-29T13:41:03Z

src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx

        openPolicyCompanyCardsPage(policyID, domainOrWorkspaceAccountID);
-    }, [policyID, domainOrWorkspaceAccountID]);
+        // eslint-disable-next-line -- The API call is only needed when the policyID changes
+    }, [policyID]);


Why are we changing this effect to only fire on policyID change?

There was a race condition between this call and openPolicyCompanyCardsFeed. If openPolicyCompanyCardsPage resolves after openPolicyCompanyCardsFeed, the latter would overwrite the Onyx data.

Since openPolicyCompanyCardsFeed only accepts policyID as a parameter, it should only be fetched when that parameter changes. However, it was also firing when domainOrWorkspaceAccountID changed, which was unnecessary.

Don't both openPolicyCompanyCardsPage and openPolicyCompanyCardsFeed depend on domainOrWorkspaceAccountID?

Nope, openPolicyCompanyCardsPage depends only on policyID. https://github.com/fedirjh/ExpensiApp/blob/a43303cc63db12696a0668d1e60fd702eacd8c57/src/libs/actions/CompanyCards.ts#L877-L879

Ahh, ok got it, thanks!

src/hooks/useCompanyCards.ts

…mberMapping for clarity Updated the naming convention in the useCompanyCards hook and related components to improve clarity. The variable cardNamesToEncryptedCardNumber has been renamed to cardNamesToEncryptedCardNumberMapping across the codebase, including tests, to better reflect its purpose. This change enhances code readability and consistency.

hungvu193 · 2026-01-29T14:31:18Z

LGTM

joekaufmanexpensify

Tested and works well. However, I still think we should make it possible to assign domain feed cards in NewDot as a follow up. That not being possible isn't super ideal...

OSBotify · 2026-01-29T17:52:09Z

✋ 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-01-30T22:16:18Z

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.3.11-16 🚀

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

m-natarajan · 2026-02-01T00:39:35Z

@fedirjh @carlosmiceli
Can you please explain Step 1: Connect an OAuth Feed in the old Dot. Is this company card ?

m-natarajan · 2026-02-02T14:31:19Z

@fedirjh @carlosmiceli Any update on this?

fedirjh · 2026-02-04T16:11:52Z

Can you please explain Step 1: Connect an OAuth Feed in the old Dot. Is this company card ?

@m-natarajan Yes company card, It's a direct feed cards.

Fix company cards endless skeleton for domain feeds (cherry picked from commit 3ee0968) (cherry-picked to production by lakchote)

Julesssss · 2026-02-05T18:37:06Z

Cancelling CP to prod

OSBotify · 2026-02-05T20:18:29Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.3.12-1 🚀

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

fedirjh added 2 commits January 20, 2026 01:28

fix: Update loading logic for company cards based on feed type

e4253f5

fix: Refactor loading logic for company cards to improve readability

4350f3e

melvin-bot bot assigned fedirjh Jan 20, 2026

fix: Enhance loading logic for company cards to improve clarity

f03a1ce

fedirjh added 3 commits January 20, 2026 17:40

Merge remote-tracking branch 'upstream' into fix-company-cards-skeleton

3a862a0

Merge remote-tracking branch 'upstream' into fix-company-cards-skeleton

17e4ef4

Merge remote-tracking branch 'upstream' into fix-company-cards-skeleton

268264d

carlosmiceli mentioned this pull request Jan 25, 2026

[Due for payment 2026-03-30] Company Cards not showing up on Workspace #79383

Open

carlosmiceli self-requested a review January 25, 2026 21:14

Merge remote-tracking branch 'upstream' into fix-company-cards-skeleton

ed02b47

fedirjh marked this pull request as ready for review January 27, 2026 17:03

fedirjh requested review from a team as code owners January 27, 2026 17:03

melvin-bot bot requested review from hungvu193 and joekaufmanexpensify and removed request for a team January 27, 2026 17:03

melvin-bot bot removed the request for review from a team January 27, 2026 17:03

fedirjh added 2 commits January 27, 2026 18:17

Merge remote-tracking branch 'upstream' into fix-company-cards-skeleton

f286caa

fix: Update loading state logic for company cards table

9a0fe26

fedirjh changed the title ~~[Hold Auth#19312] Fix company cards endless skeleton for domain feeds~~ Fix company cards endless skeleton for domain feeds Jan 27, 2026

fedirjh added 2 commits January 27, 2026 21:08

Merge branch 'main' into fix-company-cards-skeleton

8baf54e

Refactor loading state logic in WorkspaceCompanyCardsTable to simplif…

527c5b1

…y isLoadingCards condition

fedirjh added 3 commits January 28, 2026 17:56

Refactor tests for useCompanyCards to replace cardFeedType checks wit…

b1b80af

…h cardNamesToEncryptedCardNumber assertions, ensuring accurate mapping for custom, OAuth, and Plaid feeds. Enhance test coverage for card name derivation and merging logic.

Merge remote-tracking branch 'upstream' into fix-company-cards-skeleton

a15ce52

Enable ESLint naming convention rule for useCompanyCards test file to…

cbd2a24

… ensure consistent code style.

fedirjh added 2 commits January 28, 2026 19:10

Refactor useCompanyCards hook to improve feed loading logic and updat…

f1ae7ef

…e WorkspaceCompanyCardsPage to clarify API call dependencies, enhancing code readability and maintainability.

Merge branch 'Expensify:main' into fix-company-cards-skeleton

b1308f4

Merge branch 'Expensify:main' into fix-company-cards-skeleton

7a19a5d

chrispader approved these changes Jan 29, 2026

View reviewed changes

fedirjh added 2 commits January 29, 2026 15:17

Merge branch 'main' into fix-company-cards-skeleton

b639387

hungvu193 approved these changes Jan 29, 2026

View reviewed changes

joekaufmanexpensify approved these changes Jan 29, 2026

View reviewed changes

carlosmiceli approved these changes Jan 29, 2026

View reviewed changes

carlosmiceli merged commit 3ee0968 into Expensify:main Jan 29, 2026
35 checks passed

fedirjh deleted the fix-company-cards-skeleton branch January 29, 2026 17:42

OSBotify mentioned this pull request Jan 30, 2026

Deploy Checklist: New Expensify 2026-01-28 #80808

Closed

os-botify bot mentioned this pull request Feb 5, 2026

🍒 Cherry pick PR #79937 to production 🍒 #81562

Closed

51 tasks

OSBotify added the CP Production label Feb 5, 2026

lakchote pushed a commit that referenced this pull request Feb 5, 2026

Merge pull request #79937 from fedirjh/fix-company-cards-skeleton

4176c5f

Fix company cards endless skeleton for domain feeds (cherry picked from commit 3ee0968) (cherry-picked to production by lakchote)

Conversation

fedirjh commented Jan 20, 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

Uh oh!

codecov bot commented Jan 20, 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!

melvin-bot bot commented Jan 27, 2026

Uh oh!

carlosmiceli commented Jan 27, 2026

Uh oh!

fedirjh commented Jan 27, 2026

Uh oh!

carlosmiceli commented Jan 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

carlosmiceli commented Jan 27, 2026

Uh oh!

github-actions bot commented Jan 28, 2026

Uh oh!

github-actions bot commented Jan 28, 2026

Uh oh!

carlosmiceli commented Jan 28, 2026

Uh oh!

carlosmiceli commented Jan 28, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

hungvu193 commented Jan 29, 2026

Uh oh!

chrispader left a comment

Choose a reason for hiding this comment

Uh oh!

chrispader Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

chrispader Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

chrispader Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

hungvu193 commented Jan 29, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jan 29, 2026

Uh oh!

OSBotify commented Jan 30, 2026

Uh oh!

m-natarajan commented Feb 1, 2026

Uh oh!

m-natarajan commented Feb 2, 2026

Uh oh!

fedirjh commented Feb 4, 2026

Uh oh!

Julesssss commented Feb 5, 2026

Uh oh!

fedirjh commented Jan 20, 2026 •

edited

Loading

codecov bot commented Jan 20, 2026 •

edited by github-actions bot

Loading

carlosmiceli commented Jan 27, 2026 •

edited

Loading

hungvu193 commented Jan 29, 2026 •

edited

Loading

fedirjh Jan 29, 2026 •

edited

Loading

fedirjh Jan 29, 2026 •

edited

Loading