Skip to content

Fix Company Cards error UI not shown with invalid workspace account ID #81978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlosmiceli merged 2 commits into from
Feb 16, 2026
+10 −1
Merged

Fix Company Cards error UI not shown with invalid workspace account ID #81978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38bfa2f
Fix Company Cards error UI not shown with invalid workspace account ID
MobileMage Feb 6, 2026
df09e66
Add explanatory comments
MobileMage Feb 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ function WorkspaceCompanyCardsPage({route}: WorkspaceCompanyCardsPageProps) {
const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, selectedFeed);

const loadPolicyCompanyCardsPage = useCallback(() => {
// Skip the API call when workspaceAccountID is 0 -- Onyx discards writes to collection keys with member ID '0'.
if (domainOrWorkspaceAccountID === CONST.DEFAULT_NUMBER_ID) {
return;
}

openPolicyCompanyCardsPage(policyID, domainOrWorkspaceAccountID, translate);
}, [domainOrWorkspaceAccountID, policyID, translate]);

Expand Down
6 changes: 5 additions & 1 deletion src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,11 @@ function WorkspaceCompanyCardsTable({
const hasNoAssignedCard = Object.keys(assignedCards ?? {}).length === 0;

const areWorkspaceCardFeedsLoading = !!workspaceCardFeedsStatus?.[domainOrWorkspaceAccountID]?.isLoading;
const workspaceCardFeedsErrors = workspaceCardFeedsStatus?.[domainOrWorkspaceAccountID]?.errors;
// Synthesize error locally since Onyx discards writes to collection keys with member ID '0'.
const shouldShowWorkspaceFeedsLoadError = domainOrWorkspaceAccountID === CONST.DEFAULT_NUMBER_ID && isPolicyLoaded && !isOffline;
const workspaceCardFeedsErrors = shouldShowWorkspaceFeedsLoadError
? {[CONST.COMPANY_CARDS.WORKSPACE_FEEDS_LOAD_ERROR]: translate('workspace.companyCards.error.workspaceFeedsCouldNotBeLoadedMessage')}
: workspaceCardFeedsStatus?.[domainOrWorkspaceAccountID]?.errors;

const selectedFeedStatus = selectedFeed?.status;
const selectedFeedErrors = selectedFeedStatus?.errors;
Expand Down
Loading