Skip to content
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ function WorkspaceCompanyCardsPage({route}: WorkspaceCompanyCardsPageProps) {
}, [loadPolicyCompanyCardsPage, isOffline]);

const loadPolicyCompanyCardsFeed = useCallback(() => {
if (isLoading || !bankName || isFeedPending) {
if (isLoading || !bankName || isFeedPending || isOffline) {
return;
}

openPolicyCompanyCardsFeed(domainOrWorkspaceAccountID, policyID, bankName, translate);
}, [bankName, domainOrWorkspaceAccountID, isFeedPending, isLoading, policyID, translate]);
}, [bankName, domainOrWorkspaceAccountID, isFeedPending, isLoading, policyID, translate, isOffline]);

useEffect(() => {
loadPolicyCompanyCardsFeed();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,12 @@ function WorkspaceCompanyCardsTable({
feedErrorReloadAction = onReloadFeed;
}

const isLoadingFeed = (!feedName && isInitiallyLoadingFeeds) || !isPolicyLoaded || isLoadingOnyxValue(lastSelectedFeedMetadata) || !!selectedFeedStatus?.isLoading;
const isLoadingCards = (companyCardEntries ?? []).length === 0 ? isLoadingOnyxValue(cardListMetadata) : false;
const isLoadingPage = !isOffline && (isLoadingFeed || isLoadingOnyxValue(personalDetailsMetadata) || areWorkspaceCardFeedsLoading);
// If we already have fetched cards, then do not show skeleton loader (let the remaining updates refresh in the background), else show it
const hasCards = (companyCardEntries ?? []).length > 0;
const isLoadingFeed = !hasCards && ((!feedName && isInitiallyLoadingFeeds) || !isPolicyLoaded || isLoadingOnyxValue(lastSelectedFeedMetadata) || !!selectedFeedStatus?.isLoading);
const isLoadingCards = !hasCards ? isLoadingOnyxValue(cardListMetadata) : false;
const isLoadingPage = !isOffline && !hasCards && (isLoadingFeed || isLoadingOnyxValue(personalDetailsMetadata) || areWorkspaceCardFeedsLoading);

const isLoading = isLoadingPage || isLoadingFeed;

const showCards = !isInitiallyLoadingFeeds && !isFeedPending && !isNoFeed && !isLoadingFeed && !hasFeedErrors;
Expand Down
Loading