Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/libs/CardUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,10 @@ function getBrokenConnectionUrlToFixPersonalCard(cards: Record<string, Card>, en
return `${environmentURL}/${ROUTES.SETTINGS_WALLET}`;
}

function isTravelCard(card: Card | undefined): boolean {
return card?.nameValuePairs?.feedCountry === CONST.TRAVEL.PROGRAM_TRAVEL_US;
}

/**
* Gets displayable Expensify cards, filtering out inactive cards and grouping combo cards
* (physical + virtual pairs) so only the physical card is shown per domain.
Expand All @@ -1425,8 +1429,7 @@ function getDisplayableExpensifyCards(cardList: CardList | undefined): Card[] {

return sortedCards.filter((card) => {
const isAdminIssuedVirtualCard = !!card.nameValuePairs?.issuedBy && !!card.nameValuePairs?.isVirtual;
const isTravelCard = !!card.nameValuePairs?.isVirtual && !!card.nameValuePairs?.isTravelCard;
const isComboCard = !!card.domainName && !isAdminIssuedVirtualCard && !isTravelCard;
const isComboCard = !!card.domainName && !isAdminIssuedVirtualCard && !isTravelCard(card);

// Always show non-combo cards (admin-issued virtual, travel cards, or cards without domain)
if (!isComboCard) {
Expand Down Expand Up @@ -1516,6 +1519,7 @@ export {
getCardFeedIcon,
getBankName,
isSelectedFeedExpired,
isTravelCard,
getCompanyFeeds,
isPersonalCardBrokenConnection,
isCustomFeed,
Expand Down
12 changes: 6 additions & 6 deletions src/pages/settings/Wallet/ExpensifyCardPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import {
getDomainCards,
getTranslationKeyForLimitType,
isCardFrozen,
isTravelCard,
maskCard,
maskPin,
supportsPINManagementFeatures,
Expand Down Expand Up @@ -91,10 +92,9 @@ function ExpensifyCardPage({route}: ExpensifyCardPageProps) {
const {isOffline} = useNetwork();
const {translate} = useLocalize();
const {executeScenario} = useMultifactorAuthentication();
const isTravelCard = cardList?.[cardID]?.nameValuePairs?.isTravelCard;
const shouldDisplayCardDomain = !isTravelCard && (!cardList?.[cardID]?.nameValuePairs?.issuedBy || !cardList?.[cardID]?.nameValuePairs?.isVirtual);
const shouldDisplayCardDomain = !isTravelCard(cardList?.[cardID]) && (!cardList?.[cardID]?.nameValuePairs?.issuedBy || !cardList?.[cardID]?.nameValuePairs?.isVirtual);
const domain = cardList?.[cardID]?.domainName ?? '';
const expensifyCardTitle = isTravelCard ? translate('cardPage.expensifyTravelCard') : translate('cardPage.expensifyCard');
const expensifyCardTitle = isTravelCard(cardList?.[cardID]) ? translate('cardPage.expensifyTravelCard') : translate('cardPage.expensifyCard');
const pageTitle = shouldDisplayCardDomain ? expensifyCardTitle : (cardList?.[cardID]?.nameValuePairs?.cardTitle ?? expensifyCardTitle);
const {displayName} = useCurrentUserPersonalDetails();
const personalDetails = usePersonalDetails();
Expand All @@ -108,8 +108,8 @@ function ExpensifyCardPage({route}: ExpensifyCardPageProps) {
}, [shouldDisplayCardDomain, cardList, cardID, domain]);
const currentCard = useMemo(() => cardsToShow?.find((card) => String(card?.cardID) === cardID) ?? cardsToShow?.at(0), [cardsToShow, cardID]);

const virtualCards = useMemo(() => cardsToShow?.filter((card) => card?.nameValuePairs?.isVirtual && !card?.nameValuePairs?.isTravelCard), [cardsToShow]);
const travelCards = useMemo(() => cardsToShow?.filter((card) => card?.nameValuePairs?.isVirtual && card?.nameValuePairs?.isTravelCard), [cardsToShow]);
const virtualCards = useMemo(() => cardsToShow?.filter((card) => card?.nameValuePairs?.isVirtual && !isTravelCard(card)), [cardsToShow]);
const travelCards = useMemo(() => cardsToShow?.filter((card) => card?.nameValuePairs?.isVirtual && isTravelCard(card)), [cardsToShow]);
const physicalCards = useMemo(() => cardsToShow?.filter((card) => !card?.nameValuePairs?.isVirtual), [cardsToShow]);
const cardToAdd = useMemo(() => {
return virtualCards?.at(0);
Expand Down Expand Up @@ -363,7 +363,7 @@ function ExpensifyCardPage({route}: ExpensifyCardPageProps) {
)}
</React.Fragment>
))}
{isTravelCard &&
{isTravelCard(cardList?.[cardID]) &&
travelCards.map((card) => (
<React.Fragment key={card.cardID}>
{!!cardsDetails[card.cardID] && cardsDetails[card.cardID]?.cvv ? (
Expand Down
4 changes: 2 additions & 2 deletions src/pages/settings/Wallet/PaymentMethodList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import {
isExpensifyCardPendingAction,
isExpiredCard,
isPersonalCard,
isTravelCard,
lastFourNumbersFromCardName,
maskCardNumber,
} from '@libs/CardUtils';
Expand Down Expand Up @@ -313,10 +314,9 @@ function PaymentMethodList({
}

const isAdminIssuedVirtualCard = !!card?.nameValuePairs?.issuedBy && !!card?.nameValuePairs?.isVirtual;
const isTravelCard = card?.nameValuePairs?.feedCountry === CONST.TRAVEL.PROGRAM_TRAVEL_US;

// Travel cards are handled by the dedicated travelCardGrouped section below
if (isTravelCard) {
if (isTravelCard(card)) {
continue;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/CardUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2487,7 +2487,7 @@ describe('CardUtils', () => {
state: CONST.EXPENSIFY_CARD.STATE.OPEN,
nameValuePairs: {
isVirtual: true,
isTravelCard: true,
feedCountry: CONST.TRAVEL.PROGRAM_TRAVEL_US,
},
},
} as unknown as CardList;
Expand Down
Loading