From 85b4052727810130f1fedb3738ce2e17c0eeabd8 Mon Sep 17 00:00:00 2001 From: Ben Limpich Date: Fri, 3 Apr 2026 09:59:30 -0700 Subject: [PATCH 1/3] Filter out travel invoicing cards from home page assigned cards section --- src/libs/CardUtils.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts index 8cfa1b36d7dc..192243ad5373 100644 --- a/src/libs/CardUtils.ts +++ b/src/libs/CardUtils.ts @@ -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(); 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; } From ec9703e4b03cb649ae562631d296c95a1fd512ee Mon Sep 17 00:00:00 2001 From: Ben Limpich Date: Fri, 3 Apr 2026 10:19:11 -0700 Subject: [PATCH 2/3] Update test to expect travel cards excluded from displayable cards --- tests/unit/CardUtilsTest.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/unit/CardUtilsTest.ts b/tests/unit/CardUtilsTest.ts index 6504908c1ff4..2b9d9ddbc02b 100644 --- a/tests/unit/CardUtilsTest.ts +++ b/tests/unit/CardUtilsTest.ts @@ -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, @@ -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[0].cardID).toBe(18468850); }); it('should show cards from different domains separately', () => { From d24ff0018531ffc8299ebe3241004d7b04980b7b Mon Sep 17 00:00:00 2001 From: Ben Limpich Date: Fri, 3 Apr 2026 10:49:25 -0700 Subject: [PATCH 3/3] Use .at() for array access per eslint rule --- tests/unit/CardUtilsTest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/CardUtilsTest.ts b/tests/unit/CardUtilsTest.ts index 2b9d9ddbc02b..f7b5750484fa 100644 --- a/tests/unit/CardUtilsTest.ts +++ b/tests/unit/CardUtilsTest.ts @@ -2504,7 +2504,7 @@ describe('CardUtils', () => { } as unknown as CardList; const result = getDisplayableExpensifyCards(cardList); expect(result).toHaveLength(1); - expect(result[0].cardID).toBe(18468850); + expect(result.at(0)?.cardID).toBe(18468850); }); it('should show cards from different domains separately', () => {