fix: get proper name for the feed

Author: koko57

src/libs/ExpensifyCardFeedSelectorUtils.ts

@@ -1,8 +1,14 @@
-import type {OnyxCollection} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {ExpensifyCardSettings, Policy} from '@src/types/onyx';
-import {getFundIdFromSettingsKey, getLinkedPolicyIDsFromExpensifyCardSettings, getPreferredPolicyFromExpensifyCardSettings, isPolicyIDInLinkedExpensifyCardPolicyList} from './CardUtils';
-import {isPolicyAdmin} from './PolicyUtils';
+import {
+    getCardSettings,
+    getFundIdFromSettingsKey,
+    getLinkedPolicyIDsFromExpensifyCardSettings,
+    getPreferredPolicyFromExpensifyCardSettings,
+    isPolicyIDInLinkedExpensifyCardPolicyList,
+} from './CardUtils';
+import {getDescriptionForPolicyDomainCard, isPolicyAdmin} from './PolicyUtils';
 
 type ExpensifyCardFeedEntry = {
     settingsKey: string;
@@ -70,4 +76,15 @@ function partitionExpensifyCardFeedsForSelector(entries: ExpensifyCardFeedEntry[
     return {primary, other};
 }
 
-export {getAdminExpensifyCardFeedEntries, partitionExpensifyCardFeedsForSelector, type ExpensifyCardFeedEntry};
+function getExpensifyCardFeedDescription(cardSettings: OnyxEntry<ExpensifyCardSettings>, policies: OnyxCollection<Policy>): string {
+    const domainName = getCardSettings(cardSettings)?.domainName ?? '';
+    if (domainName) {
+        return getDescriptionForPolicyDomainCard(domainName, policies);
+    }
+    const linkedPolicyIDs = getLinkedPolicyIDsFromExpensifyCardSettings(cardSettings);
+    const preferredPolicyID = getPreferredPolicyFromExpensifyCardSettings(cardSettings);
+    const policyIDForName = linkedPolicyIDs?.length ? linkedPolicyIDs.at(0) : preferredPolicyID;
+    return (policyIDForName && policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyIDForName.toUpperCase()}`]?.name) ?? '';
+}
+
+export {getAdminExpensifyCardFeedEntries, getExpensifyCardFeedDescription, partitionExpensifyCardFeedsForSelector, type ExpensifyCardFeedEntry};

src/pages/workspace/expensifyCard/WorkspaceExpensifyCardFeedSelectorPage.tsx

@@ -21,13 +21,12 @@ import useOnyx from '@hooks/useOnyx';
 import usePrimaryContactMethod from '@hooks/usePrimaryContactMethod';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {clearIssueNewCardFormData, setIssueNewCardStepAndData, updateSelectedExpensifyCardFeed} from '@libs/actions/Card';
-import {getLinkedPolicyIDsFromExpensifyCardSettings, getPreferredPolicyFromExpensifyCardSettings} from '@libs/CardUtils';
 import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
 import type {ExpensifyCardFeedEntry} from '@libs/ExpensifyCardFeedSelectorUtils';
+import {getExpensifyCardFeedDescription} from '@libs/ExpensifyCardFeedSelectorUtils';
 import {isEmailPublicDomain} from '@libs/LoginUtils';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import {getDescriptionForPolicyDomainCard} from '@libs/PolicyUtils';
 import Navigation from '@navigation/Navigation';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import variables from '@styles/variables';
@@ -84,17 +83,6 @@ function WorkspaceExpensifyCardFeedSelectorPage({route}: WorkspaceExpensifyCardF
 
     const issueCardFundID = getIssueCardFundID();
 
-    const getFeedSelectorRowText = (entry: ExpensifyCardFeedEntry) => {
-        const domainName = entry.settings?.domainName ?? '';
-        if (domainName) {
-            return getDescriptionForPolicyDomainCard(domainName, policies);
-        }
-        const linkedPolicyIDs = getLinkedPolicyIDsFromExpensifyCardSettings(entry.settings);
-        const preferredPolicyID = getPreferredPolicyFromExpensifyCardSettings(entry.settings);
-        const policyIDForName = linkedPolicyIDs?.length ? linkedPolicyIDs.at(0) : preferredPolicyID;
-        return (policyIDForName && policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyIDForName.toUpperCase()}`]?.name) ?? '';
-    };
-
     const handleAddCardPress = () => {
         if (issueCardFundID === undefined) {
             return;
@@ -129,7 +117,7 @@ function WorkspaceExpensifyCardFeedSelectorPage({route}: WorkspaceExpensifyCardF
 
     const toListItem = (entry: ExpensifyCardFeedEntry, isOtherWorkspaceSection: boolean): ExpensifyFeedListItem => ({
         value: entry.fundID,
-        text: getFeedSelectorRowText(entry),
+        text: getExpensifyCardFeedDescription(entry.settings, policies),
         keyForList: entry.fundID.toString(),
         isSelected: entry.fundID === lastSelectedExpensifyCardFeedID,
         isDisabled: isOtherWorkspaceSection && isOffline,

src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx

@@ -32,9 +32,10 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 import {clearIssueNewCardFormData, setIssueNewCardStepAndData} from '@libs/actions/Card';
 import {clearDeletePaymentMethodError} from '@libs/actions/PaymentMethods';
 import {filterCardsByPersonalDetails, getCardsByCardholderName, getCardSettings, sortCardsByCardholderName} from '@libs/CardUtils';
+import {getExpensifyCardFeedDescription} from '@libs/ExpensifyCardFeedSelectorUtils';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import {getDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
-import {getDescriptionForPolicyDomainCard, getMemberAccountIDsForWorkspace} from '@libs/PolicyUtils';
+import {getMemberAccountIDsForWorkspace} from '@libs/PolicyUtils';
 import Navigation from '@navigation/Navigation';
 import type {WorkspaceSplitNavigatorParamList} from '@navigation/types';
 import CONST from '@src/CONST';
@@ -255,7 +256,7 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
                         onFeedSelect={() => Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_SELECT_FEED.getRoute(policyID))}
                         CardFeedIcon={cardFeedIcon}
                         feedName={translate('workspace.common.expensifyCard')}
-                        supportingText={getDescriptionForPolicyDomainCard(settings?.domainName ?? '', allPolicies)}
+                        supportingText={getExpensifyCardFeedDescription(cardSettings, allPolicies)}
                     />
                     {isBankAccountVerified && getHeaderButtons()}
                 </View>