Skip to content

Commit f7d95e5

Browse files
authored
Merge pull request #87553 from Expensify/claude-hideCardRowErrorWhenFeedConnectionBroken
Hide duplicate card row error when feed connection is broken
2 parents d41b087 + d507774 commit f7d95e5

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

  • src/pages/workspace/companyCards/WorkspaceCompanyCardsTable

src/pages/workspace/companyCards/WorkspaceCompanyCardsTable/index.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import TableRowSkeleton from '@components/Skeletons/TableRowSkeleton';
99
import Table from '@components/Table';
1010
import type {ActiveSorting, CompareItemsCallback, FilterConfig, IsItemInFilterCallback, IsItemInSearchCallback, TableColumn, TableHandle} from '@components/Table';
1111
import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle';
12+
import useCardFeedErrors from '@hooks/useCardFeedErrors';
1213
import type {UseCompanyCardsResult} from '@hooks/useCompanyCards';
1314
import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
1415
import useLocalize from '@hooks/useLocalize';
@@ -87,6 +88,9 @@ function WorkspaceCompanyCardsTable({
8788
onyxMetadata: {cardListMetadata, lastSelectedFeedMetadata},
8889
} = companyCards;
8990

91+
const {cardFeedErrors} = useCardFeedErrors();
92+
const isFeedConnectionBroken = feedName ? cardFeedErrors[feedName]?.isFeedConnectionBroken : false;
93+
9094
const [countryByIp] = useOnyx(ONYXKEYS.COUNTRY);
9195
const [personalDetails, personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
9296
const [customCardNames] = useOnyx(ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES);
@@ -170,7 +174,7 @@ function WorkspaceCompanyCardsTable({
170174
isAssigned,
171175
assignedCard,
172176
cardholder,
173-
errors: assignedCard?.errors,
177+
errors: isFeedConnectionBroken || assignedCard?.pendingFields?.lastScrape ? undefined : assignedCard?.errors,
174178
pendingAction: assignedCard?.pendingAction,
175179
onDismissError: () => resetFailedWorkspaceCompanyCardUnassignment(domainOrWorkspaceAccountID, bankName, assignedCard?.cardID),
176180
};

0 commit comments

Comments
 (0)