[Internal QA] Update Company Cards logic to show domain cards

src/hooks/useCardFeeds.tsx

@@ -31,8 +31,8 @@ const useCardFeeds = (policyID: string | undefined): [CardFeeds | undefined, Res
         const defaultFeed = allFeeds?.[`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`];
         const {companyCards = {}, companyCardNicknames = {}, oAuthAccountDetails = {}} = defaultFeed?.settings ?? {};
 
-        return Object.values(allFeeds).reduce<CardFeeds & {settings: Required<CardFeeds['settings']>}>(
-            (acc, feed) => {
+        return Object.entries(allFeeds).reduce<CardFeeds & {settings: Required<CardFeeds['settings']>}>(
+            (acc, [onyxKey, feed]) => {
                 if (!feed?.settings?.companyCards) {
                     return acc;
                 }
@@ -46,7 +46,9 @@ const useCardFeeds = (policyID: string | undefined): [CardFeeds | undefined, Res
                         return;
                     }
 
-                    acc.settings.companyCards[feedName] = feedSettings;
+                    const domainID = onyxKey.split('_').at(-1);
+
+                    acc.settings.companyCards[feedName] = {...feedSettings, domainID: domainID ? Number(domainID) : undefined};
 
                     if (feedOAuthAccountDetails) {
                         acc.settings.oAuthAccountDetails[feedName] = feedOAuthAccountDetails;

src/hooks/useCardsList.tsx

@@ -0,0 +1,23 @@
+import type {ResultMetadata} from 'react-native-onyx';
+import {filterInactiveCards, getCompanyFeeds, getDomainOrWorkspaceAccountID} from '@libs/CardUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {CardList, CompanyCardFeed} from '@src/types/onyx';
+import useCardFeeds from './useCardFeeds';
+import useOnyx from './useOnyx';
+import useWorkspaceAccountID from './useWorkspaceAccountID';
+
+/* Custom hook that retrieves a list of company cards for the given policy and selected feed. */
+const useCardsList = (policyID: string | undefined, selectedFeed: CompanyCardFeed | undefined): [CardList | undefined, ResultMetadata<CardList>] => {
+    const workspaceAccountID = useWorkspaceAccountID(policyID);
+    const [cardFeeds] = useCardFeeds(policyID);
+    const companyCards = getCompanyFeeds(cardFeeds);
+    const domainOrWorkspaceAccountID = getDomainOrWorkspaceAccountID(workspaceAccountID, selectedFeed ? companyCards[selectedFeed] : undefined);
+    const [cardsList, cardsListMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${domainOrWorkspaceAccountID}_${selectedFeed}`, {
+        selector: filterInactiveCards,
+        canBeMissing: true,
+    });
+
+    return [cardsList, cardsListMetadata];
+};
+
+export default useCardsList;

src/hooks/useDefaultFundID.ts

@@ -6,11 +6,11 @@ import useWorkspaceAccountID from './useWorkspaceAccountID';
 
 /**
  * Hook to get the default fundID for a given policyID. This is used to get the settings and cards for each of the feeds.
- * It will always return lastSelectedExpensifyCardFeed if it exists or fallback to the workspaceAccountID or domainFundID.
+ * It will always return lastSelectedExpensifyCardFeed if it exists or fallback to the domainFundID or workspaceAccountID.
  */
 function useDefaultFundID(policyID: string | undefined) {
     const workspaceAccountID = useWorkspaceAccountID(policyID);
-    const [lastSelectedExpensifyCardFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_EXPENSIFY_CARD_FEED}${policyID}`);
+    const [lastSelectedExpensifyCardFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_EXPENSIFY_CARD_FEED}${policyID}`, {canBeMissing: true});
 
     const [domainFundID] = useOnyx(ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS, {
         selector: (cardSettings) => {
@@ -21,17 +21,22 @@ function useDefaultFundID(policyID: string | undefined) {
 
             return getFundIdFromSettingsKey(matchingKey?.[0] ?? '');
         },
+        canBeMissing: true,
     });
 
     if (lastSelectedExpensifyCardFeed) {
         return lastSelectedExpensifyCardFeed;
     }
 
+    if (domainFundID) {
+        return domainFundID;
+    }
+
     if (workspaceAccountID) {
         return workspaceAccountID;
     }
 
-    return domainFundID ?? CONST.DEFAULT_NUMBER_ID;
+    return CONST.DEFAULT_NUMBER_ID;
 }
 
 export default useDefaultFundID;

src/libs/API/parameters/SetCompanyCardFeedName.ts

@@ -2,6 +2,7 @@ type SetCompanyCardFeedName = {
     authToken?: string | null;
     policyID: string;
     bankName: string;
+    domainAccountID: number;
     userDefinedName: string;
 };
 

src/libs/CardUtils.ts

@@ -12,7 +12,7 @@ import type {OnyxValues} from '@src/ONYXKEYS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {BankAccountList, Card, CardFeeds, CardList, CompanyCardFeed, ExpensifyCardSettings, PersonalDetailsList, Policy, WorkspaceCardsList} from '@src/types/onyx';
 import type {FilteredCardList} from '@src/types/onyx/Card';
-import type {CompanyCardFeedWithNumber, CompanyCardNicknames, CompanyFeeds, DirectCardFeedData} from '@src/types/onyx/CardFeeds';
+import type {CardFeedData, CompanyCardFeedWithNumber, CompanyCardNicknames, CompanyFeeds, DirectCardFeedData} from '@src/types/onyx/CardFeeds';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
 import localeCompare from './LocaleCompare';
@@ -405,6 +405,10 @@ function getCustomOrFormattedFeedName(feed?: CompanyCardFeed, companyCardNicknam
     return customFeedName ?? formattedFeedName;
 }
 
+function getDomainOrWorkspaceAccountID(workspaceAccountID: number, cardFeedData: CardFeedData | undefined): number {
+    return cardFeedData?.domainID ?? workspaceAccountID;
+}
+
 // We will simplify the logic below once we have #50450 #50451 implemented
 const getCorrectStepForSelectedBank = (selectedBank: ValueOf<typeof CONST.COMPANY_CARDS.BANKS>) => {
     const banksWithFeedType = [
@@ -505,10 +509,22 @@ function filterInactiveCards(cards: CardList | undefined): CardList {
     return filterObject(cards ?? {}, (key, card) => !closedStates.includes(card.state));
 }
 
-function getAllCardsForWorkspace(workspaceAccountID: number, allCardList: OnyxCollection<WorkspaceCardsList> = allWorkspaceCards): CardList {
+function getAllCardsForWorkspace(
+    workspaceAccountID: number,
+    allCardList: OnyxCollection<WorkspaceCardsList> = allWorkspaceCards,
+    cardFeeds?: CardFeeds,
+    expensifyCardSettings?: OnyxCollection<ExpensifyCardSettings>,
+): CardList {
     const cards = {};
+    const companyCardsDomainFeeds = Object.entries(cardFeeds?.settings?.companyCards ?? {}).map(([feedName, feedData]) => ({domainID: feedData.domainID, feedName}));
+    const expensifyCardsDomainIDs = Object.keys(expensifyCardSettings ?? {})
+        .map((key) => key.split('_').at(-1))
+        .filter((id): id is string => !!id);
     for (const [key, values] of Object.entries(allCardList ?? {})) {
-        if (key.includes(workspaceAccountID.toString()) && values) {
+        const isWorkspaceAccountCards = key.includes(workspaceAccountID.toString());
+        const isCompanyDomainCards = companyCardsDomainFeeds?.some((domainFeed) => domainFeed.domainID && key.includes(domainFeed.domainID.toString()) && key.includes(domainFeed.feedName));
+        const isExpensifyDomainCards = expensifyCardsDomainIDs.some((domainID) => key.includes(domainID.toString()) && key.includes(CONST.EXPENSIFY_CARD.BANK));
+        if ((isWorkspaceAccountCards || isCompanyDomainCards || isExpensifyDomainCards) && values) {
             const {cardList, ...rest} = values;
             const filteredCards = filterInactiveCards(rest);
             Object.assign(cards, filteredCards);
@@ -548,14 +564,17 @@ function getFeedType(feedKey: CompanyCardFeed, cardFeeds: OnyxEntry<CardFeeds>):
  *
  * @param allCardsList the list where cards split by workspaces and feeds and stored under `card_${workspaceAccountID}_${feedName}` keys
  * @param workspaceAccountID the workspace account id we want to get cards for
+ * @param domainIDs the domain ids we want to get cards for
  */
-function flatAllCardsList(allCardsList: OnyxCollection<WorkspaceCardsList>, workspaceAccountID: number): Record<string, Card> | undefined {
+function flatAllCardsList(allCardsList: OnyxCollection<WorkspaceCardsList>, workspaceAccountID: number, domainIDs?: number[]): Record<string, Card> | undefined {
     if (!allCardsList) {
         return;
     }
 
     return Object.entries(allCardsList).reduce((acc, [key, cards]) => {
-        if (!key.includes(workspaceAccountID.toString()) || key.includes(CONST.EXPENSIFY_CARD.BANK)) {
+        const isWorkspaceAccountCards = key.includes(workspaceAccountID.toString());
+        const isDomainCards = domainIDs?.some((domainID) => key.includes(domainID.toString()));
+        if ((!isWorkspaceAccountCards && !isDomainCards) || key.includes(CONST.EXPENSIFY_CARD.BANK)) {
             return acc;
         }
         const {cardList, ...feedCards} = cards ?? {};
@@ -637,6 +656,7 @@ export {
     hasOnlyOneCardToAssign,
     checkIfNewFeedConnected,
     getDefaultCardName,
+    getDomainOrWorkspaceAccountID,
     mergeCardListWithWorkspaceFeeds,
     isCard,
     getAllCardsForWorkspace,