[CP Staging] Fix skeleton loader flash after inviting a member on Company Cards page by fedirjh · Pull Request #83105 · Expensify/App

fedirjh · 2026-02-20T20:13:46Z

Explanation of Change

PR #82055 added policy?.employeeList as a dependency of the loadPolicyCompanyCardsPage useCallback (to build the emailList parameter for openPolicyCompanyCardsPage). When a user invites a new member during the card assignment flow, addMembersToWorkspace optimistically updates policy.employeeList, which recreates the callback, re-fires the useEffect, and calls openPolicyCompanyCardsPage — which optimistically sets isLoading: true on SHARED_NVP_PRIVATE_DOMAIN_MEMBER, causing a skeleton loader to flash above the card list.

This PR stores policy?.employeeList in a ref and reads from it inside the callback. This way, changes to the employee list no longer recreate the callback or trigger the effect, while the callback still has access to the latest employee list when it's actually called (on initial load, reconnect, etc.).

Fixed Issues

$ #83084
PROPOSAL: #83084 (comment)

Tests

Navigate to a workspace that has company cards enabled with at least one card feed configured
Open the Company Cards page
Click Assign card on any card
Enter an email of a non-member and select the user
Click Invite
Close the RHP
Verify no skeleton loader appears above the card list after closing the RHP

Verify that no errors appear in the JS console

Offline tests

Go offline while on the Company Cards page
Reconnect
Verify the card feed reloads correctly (the onReconnect callback should still work)

QA Steps

Navigate to a workspace with company cards and a direct feed with a card
Go to workspace settings > Company Cards
Click Assign card on any card
Enter an email of a non-member and select the user
Click Invite
Close the RHP
Verify no skeleton loader appears above the card list

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

CleanShot.2026-02-20.at.21.05.45.mp4

Store policy.employeeList in a ref instead of including it in the loadPolicyCompanyCardsPage useCallback dependency array. This prevents the callback from being recreated when a new member is invited during the card assignment flow, which was causing an unnecessary re-fetch that briefly showed a skeleton loader above the card list. Co-authored-by: Chavda Sachin <ChavdaSachin@users.noreply.github.com>

melvin-bot · 2026-02-20T20:14:25Z

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

…AfterInviteMember

Updated the logic for determining when to show company cards in the WorkspaceCompanyCardsTable component. The condition now checks for a general loading state instead of just the loading feed, improving the accuracy of the loading indicator. Co-authored-by: Chavda Sachin <ChavdaSachin@users.noreply.github.com>

ChavdaSachin · 2026-02-20T20:41:46Z

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

Screen.Recording.2026-02-21.at.2.10.29.AM.mov

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

ChavdaSachin

LGTM

codecov · 2026-02-20T22:26:41Z

Codecov Report

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

Files with missing lines	Coverage Δ
.../companyCards/WorkspaceCompanyCardsTable/index.tsx	`0.00% <0.00%> (ø)`
...rkspace/companyCards/WorkspaceCompanyCardsPage.tsx	`0.00% <0.00%> (ø)`
... and 34 files with indirect coverage changes

github-actions · 2026-02-21T17:44:01Z

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

github-actions · 2026-02-21T17:47:39Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-05e6ea7-08338eb-dcfabce0c3332c6a8d570fd85d35a211b2ffac88/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-05e6ea7-08338eb-67ab6d4dd02b5bf2e1035bea9eddce420de8fb0b/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-02-21T17:50:00Z

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

…nviteMember [CP Staging] Fix skeleton loader flash after inviting a member on Company Cards page (cherry picked from commit 05e6ea7) (cherry-picked to staging by puneetlath)

OSBotify · 2026-02-23T18:42:09Z

🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 9.3.24-2 🚀

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

IuliiaHerets · 2026-02-23T19:10:11Z

Windows 10/ Chrome
v9.3.24-2
Pass

Repro.-.PR.83105.mp4

OSBotify · 2026-02-23T21:46:22Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.3.24-3 🚀

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

OSBotify · 2026-02-24T01:19:26Z

🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 9.3.25-0 🚀

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

OSBotify · 2026-02-25T15:53:00Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.3.25-13 🚀

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

fedirjh requested review from a team as code owners February 20, 2026 20:13

melvin-bot bot assigned fedirjh Feb 20, 2026

melvin-bot bot requested review from arosiclair and joekaufmanexpensify and removed request for a team February 20, 2026 20:13

fedirjh requested review from ChavdaSachin and carlosmiceli February 20, 2026 20:15

fedirjh and others added 2 commits February 20, 2026 21:20

Merge remote-tracking branch 'upstream' into claude-fixSkeletonLoader…

8cba50c

…AfterInviteMember

fedirjh changed the title ~~Fix skeleton loader flash after inviting a member on Company Cards page~~ [CP Staging] Fix skeleton loader flash after inviting a member on Company Cards page Feb 20, 2026

ChavdaSachin approved these changes Feb 20, 2026

View reviewed changes

carlosmiceli approved these changes Feb 21, 2026

View reviewed changes

carlosmiceli merged commit 05e6ea7 into Expensify:main Feb 21, 2026
32 checks passed

fedirjh deleted the claude-fixSkeletonLoaderAfterInviteMember branch February 21, 2026 18:37

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Feb 23, 2026

OSBotify mentioned this pull request Feb 23, 2026

Deploy Checklist: New Expensify 2026-02-20 #83077

Closed

67 tasks

melvin-bot bot mentioned this pull request Feb 25, 2026

[Due for payment 2026-03-04] [$250] Company cards - Skeleton loader appears above card list after inviting member #83084

Closed

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Fix skeleton loader flash after inviting a member on Company Cards page#83105

[CP Staging] Fix skeleton loader flash after inviting a member on Company Cards page#83105
carlosmiceli merged 3 commits intoExpensify:mainfrom
fedirjh:claude-fixSkeletonLoaderAfterInviteMember

fedirjh commented Feb 20, 2026 •

edited

Loading

Uh oh!

melvin-bot bot commented Feb 20, 2026

Uh oh!

ChavdaSachin commented Feb 20, 2026 •

edited

Loading

Uh oh!

ChavdaSachin left a comment

Uh oh!

codecov bot commented Feb 20, 2026 •

edited by github-actions bot

Loading

Uh oh!

Uh oh!

github-actions bot commented Feb 21, 2026

Uh oh!

github-actions bot commented Feb 21, 2026

Uh oh!

OSBotify commented Feb 21, 2026

Uh oh!

OSBotify commented Feb 23, 2026

Uh oh!

IuliiaHerets commented Feb 23, 2026

Uh oh!

OSBotify commented Feb 23, 2026

Uh oh!

OSBotify commented Feb 24, 2026

Uh oh!

OSBotify commented Feb 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

fedirjh commented Feb 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!

melvin-bot bot commented Feb 20, 2026

Uh oh!

ChavdaSachin commented Feb 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ChavdaSachin left a comment

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Feb 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!

Uh oh!

github-actions bot commented Feb 21, 2026

Uh oh!

github-actions bot commented Feb 21, 2026

Uh oh!

OSBotify commented Feb 21, 2026

Uh oh!

OSBotify commented Feb 23, 2026

Uh oh!

IuliiaHerets commented Feb 23, 2026

Uh oh!

OSBotify commented Feb 23, 2026

Uh oh!

OSBotify commented Feb 24, 2026

Uh oh!

OSBotify commented Feb 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

fedirjh commented Feb 20, 2026 •

edited

Loading

ChavdaSachin commented Feb 20, 2026 •

edited

Loading

codecov bot commented Feb 20, 2026 •

edited by github-actions bot

Loading