diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx index 077d40c10dce0..0796d4e2575a0 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx @@ -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]); diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/index.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/index.tsx index 7b2892170b43b..1578d0e03312e 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/index.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/index.tsx @@ -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;