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: 5 additions & 3 deletions src/libs/CardUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1458,16 +1458,18 @@ function getDisplayableExpensifyCards(cardList: CardList | undefined): Card[] {
}

const activeCards = filterAllInactiveCards(cardList);
const activeExpensifyCards = Object.values(activeCards).filter((card) => isExpensifyCard(card) && !isExpiredCard(card) && card.cardName !== CONST.COMPANY_CARDS.CARD_NAME.CASH);
const activeExpensifyCards = Object.values(activeCards).filter(
(card) => isExpensifyCard(card) && !isExpiredCard(card) && card.cardName !== CONST.COMPANY_CARDS.CARD_NAME.CASH && !isTravelCard(card),
);

const sortedCards = lodashSortBy(activeExpensifyCards, getAssignedCardSortKey);
const seenDomains = new Set<string>();

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

// Always show non-combo cards (admin-issued virtual, travel cards, or cards without domain)
// Always show non-combo cards (admin-issued virtual or cards without domain)
if (!isComboCard) {
return true;
}
Expand Down
5 changes: 3 additions & 2 deletions tests/unit/CardUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2466,7 +2466,7 @@ describe('CardUtils', () => {
expect(result).toHaveLength(2); // Both cards shown (admin-issued virtual is not grouped)
});

it('should show travel cards separately', () => {
it('should exclude travel cards', () => {
const cardList = {
1: {
accountID: 10160771,
Expand Down Expand Up @@ -2503,7 +2503,8 @@ describe('CardUtils', () => {
},
} as unknown as CardList;
const result = getDisplayableExpensifyCards(cardList);
expect(result).toHaveLength(2); // Both cards shown (travel card is not grouped)
expect(result).toHaveLength(1);
expect(result.at(0)?.cardID).toBe(18468850);
});

it('should show cards from different domains separately', () => {
Expand Down
Loading