Merge pull request #57679 from callstack-internal/fix/57403-do-not-show-feeds-in-pending-state

Fix/57403 do not show feeds in pending state

Author: mountiny

src/libs/CardUtils.ts

@@ -308,12 +308,15 @@ function isCustomFeed(feed: CompanyCardFeedWithNumber): boolean {
     return [CONST.COMPANY_CARD.FEED_BANK_NAME.MASTER_CARD, CONST.COMPANY_CARD.FEED_BANK_NAME.VISA, CONST.COMPANY_CARD.FEED_BANK_NAME.AMEX].some((value) => feed.startsWith(value));
 }
 
-function getCompanyFeeds(cardFeeds: OnyxEntry<CardFeeds>, shouldFilterOutRemovedFeeds = false): CompanyFeeds {
+function getCompanyFeeds(cardFeeds: OnyxEntry<CardFeeds>, shouldFilterOutRemovedFeeds = false, shouldFilterOutPendingFeeds = false): CompanyFeeds {
     return Object.fromEntries(
         Object.entries(cardFeeds?.settings?.companyCards ?? {}).filter(([key, value]) => {
             if (shouldFilterOutRemovedFeeds && value.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
                 return false;
             }
+            if (shouldFilterOutPendingFeeds && value.pending) {
+                return false;
+            }
             return key !== CONST.EXPENSIFY_CARD.BANK;
         }),
     );

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

@@ -86,7 +86,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
     const isCurrentUserOwner = policy?.owner === currentUserPersonalDetails?.login;
     const ownerDetails = useMemo(() => personalDetails?.[policy?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID] ?? ({} as PersonalDetails), [personalDetails, policy?.ownerAccountID]);
     const policyOwnerDisplayName = formatPhoneNumber(getDisplayNameOrDefault(ownerDetails)) ?? policy?.owner ?? '';
-    const hasMultipleFeeds = Object.values(getCompanyFeeds(cardFeeds)).filter((feed) => !feed.pending).length > 0;
+    const hasMultipleFeeds = Object.keys(getCompanyFeeds(cardFeeds, false, true)).length > 0;
     const workspaceCards = getAllCardsForWorkspace(workspaceAccountID, cardList);
 
     const policyApproverEmail = policy?.approver;

src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx

@@ -62,7 +62,7 @@ function WorkspaceMemberNewCardPage({route, personalDetails}: WorkspaceMemberNew
     const accountID = Number(route.params.accountID);
     const memberLogin = personalDetails?.[accountID]?.login ?? '';
     const memberName = personalDetails?.[accountID]?.firstName ? personalDetails?.[accountID]?.firstName : personalDetails?.[accountID]?.login;
-    const companyFeeds = getCompanyFeeds(cardFeeds);
+    const companyFeeds = getCompanyFeeds(cardFeeds, false, true);
     const isFeedExpired = isSelectedFeedExpired((selectedFeed as CompanyCardFeed) ? cardFeeds?.settings?.oAuthAccountDetails?.[selectedFeed as CompanyCardFeed] : undefined);
 
     const [list] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${selectedFeed}`);

tests/unit/CardUtilsTest.ts

@@ -97,6 +97,15 @@ const companyCardsSettingsWithoutExpensifyBank = {
     ...companyCardsDirectFeedSettings,
 };
 
+const companyCardsSettingsWithOnePendingFeed = {
+    [CONST.COMPANY_CARD.FEED_BANK_NAME.MASTER_CARD]: {
+        pending: true,
+    },
+    [CONST.COMPANY_CARD.FEED_BANK_NAME.VISA]: {
+        pending: false,
+    },
+};
+
 const oAuthAccountDetails = {
     [CONST.COMPANY_CARD.FEED_BANK_NAME.CHASE]: {
         accountList: ['CREDIT CARD...6607', 'CREDIT CARD...5501'],
@@ -237,6 +246,13 @@ const cardFeedsCollection: OnyxCollection<CardFeeds> = {
             companyCards: companyCardsCustomVisaFeedSettingsWithNumbers,
         },
     },
+
+    // Policy with one pending feed
+    FAKE_ID_6: {
+        settings: {
+            companyCards: companyCardsSettingsWithOnePendingFeed,
+        },
+    },
 };
 
 /* eslint-disable @typescript-eslint/naming-convention */
@@ -379,6 +395,11 @@ describe('CardUtils', () => {
             const companyFeeds = getCompanyFeeds(undefined);
             expect(companyFeeds).toStrictEqual({});
         });
+
+        it('Should return only feeds that are not pending', () => {
+            const companyFeeds = getCompanyFeeds(cardFeedsCollection.FAKE_ID_6, false, true);
+            expect(Object.keys(companyFeeds).length).toStrictEqual(1);
+        });
     });
 
     describe('getSelectedFeed', () => {