Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
10 changes: 10 additions & 0 deletions src/libs/CardUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import type {
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import type IconAsset from '@src/types/utils/IconAsset';
import {isBankAccountPartiallySetup} from './BankAccountUtils';
import DateUtils from './DateUtils';
import {filterObject} from './ObjectUtils';
import {arePersonalDetailsMissing, getDisplayNameOrDefault} from './PersonalDetailsUtils';
import StringUtils from './StringUtils';
Expand Down Expand Up @@ -1392,6 +1393,14 @@ function getDisplayableExpensifyCards(cardList: CardList | undefined): Card[] {
});
}

function isExpiredCard(card: Card): boolean {
if (!card.nameValuePairs?.validThru) {
return false;
}
const currentTime = DateUtils.getDBTime();
return card.nameValuePairs.validThru < currentTime;
}

export {
getAssignedCardSortKey,
getDefaultExpensifyCardLimitType,
Expand Down Expand Up @@ -1482,6 +1491,7 @@ export {
isCardFrozen,
isCardWithPotentialFraud,
getDisplayableExpensifyCards,
isExpiredCard,
};

export type {CompanyCardFeedIcons, CompanyCardBankIcons};
4 changes: 3 additions & 1 deletion src/pages/settings/Wallet/PaymentMethodList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
isCardFrozen,
isExpensifyCard,
isExpensifyCardPendingAction,
isExpiredCard,
isPersonalCard,
lastFourNumbersFromCardName,
maskCardNumber,
Expand Down Expand Up @@ -214,7 +215,8 @@ function PaymentMethodList({
(card) =>
CONST.EXPENSIFY_CARD.ACTIVE_STATES.includes(card.state ?? 0) &&
(isExpensifyCard(card) || !!card.domainName || isPersonalCard(card)) &&
card.cardName !== CONST.COMPANY_CARDS.CARD_NAME.CASH,
card.cardName !== CONST.COMPANY_CARDS.CARD_NAME.CASH &&
(!isExpensifyCard(card) || !isExpiredCard(card)),
);

const assignedCardsSorted = lodashSortBy(assignedCards, getAssignedCardSortKey);
Expand Down
29 changes: 29 additions & 0 deletions tests/unit/CardUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import {
isDirectFeed as isDirectFeedCardUtils,
isExpensifyCard,
isExpensifyCardFullySetUp,
isExpiredCard,
isMatchingCard,
isPersonalCard,
lastFourNumbersFromCardName,
Expand All @@ -62,6 +63,7 @@ import {
splitCardFeedWithDomainID,
splitMaskedCardNumber,
} from '@src/libs/CardUtils';
import DateUtils from '@src/libs/DateUtils';
import type {
BankAccountList,
Card,
Expand Down Expand Up @@ -3501,6 +3503,33 @@ describe('CardUtils', () => {
expect(result?.domainName).toBe('legacy.com');
});
});

describe('isExpiredCard', () => {
afterEach(() => {
jest.restoreAllMocks();
});

it('returns false when validThru is missing', () => {
jest.spyOn(DateUtils, 'getDBTime').mockReturnValue('2026-02-25 00:00:00');
expect(isExpiredCard({} as Card)).toBe(false);
expect(isExpiredCard({nameValuePairs: {}} as Card)).toBe(false);
});

it('returns true when validThru is before current time (UTC)', () => {
jest.spyOn(DateUtils, 'getDBTime').mockReturnValue('2026-02-25 00:00:00');
expect(isExpiredCard({nameValuePairs: {validThru: '2026-02-24 23:59:59'}} as Card)).toBe(true);
});

it('returns false when validThru equals current time', () => {
jest.spyOn(DateUtils, 'getDBTime').mockReturnValue('2026-02-25 00:00:00');
expect(isExpiredCard({nameValuePairs: {validThru: '2026-02-25 00:00:00'}} as Card)).toBe(false);
});

it('returns false when validThru is after current time', () => {
jest.spyOn(DateUtils, 'getDBTime').mockReturnValue('2026-02-25 00:00:00');
expect(isExpiredCard({nameValuePairs: {validThru: '2026-02-25 00:00:01'}} as Card)).toBe(false);
});
});
});

describe('formatMaskedCardName', () => {
Expand Down
Loading