Skip to content

Commit 52130a5

Browse files
committed
add isCardWithCustomZeroLimit helper
1 parent 0e7e9c3 commit 52130a5

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

src/libs/CardUtils.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,6 +1327,10 @@ function isCardPendingActivate(card?: Card) {
13271327
return card?.state === CONST.EXPENSIFY_CARD.STATE.NOT_ACTIVATED;
13281328
}
13291329

1330+
function isCardWithCustomZeroLimit(card: Card): boolean {
1331+
return !!card.nameValuePairs?.hasCustomUnapprovedExpenseLimit && card.nameValuePairs?.unapprovedExpenseLimit === 0;
1332+
}
1333+
13301334
/**
13311335
* Check if a card has potential fraud that needs review.
13321336
* Returns true if the card has fraud type 'domain' or 'individual'.
@@ -1549,7 +1553,7 @@ function hasDisplayableAssignedCards(cardList: CardList | undefined): boolean {
15491553
(isExpensifyCard(card) || !!card.domainName || isPersonalCard(card)) &&
15501554
card.cardName !== CONST.COMPANY_CARDS.CARD_NAME.CASH &&
15511555
(!isExpensifyCard(card) || !isExpiredCard(card)) &&
1552-
(!isExpensifyCard(card) || !(card.nameValuePairs?.hasCustomUnapprovedExpenseLimit && card.nameValuePairs?.unapprovedExpenseLimit === 0)),
1556+
(!isExpensifyCard(card) || !isCardWithCustomZeroLimit(card)),
15531557
);
15541558
}
15551559

@@ -1598,12 +1602,7 @@ function getDisplayableExpensifyCards(cardList: CardList | undefined): Card[] {
15981602

15991603
const activeCards = filterAllInactiveCards(cardList);
16001604
const activeExpensifyCards = Object.values(activeCards).filter(
1601-
(card) =>
1602-
isExpensifyCard(card) &&
1603-
!isExpiredCard(card) &&
1604-
card.cardName !== CONST.COMPANY_CARDS.CARD_NAME.CASH &&
1605-
!isTravelCard(card) &&
1606-
!(card.nameValuePairs?.hasCustomUnapprovedExpenseLimit && card.nameValuePairs?.unapprovedExpenseLimit === 0),
1605+
(card) => isExpensifyCard(card) && !isExpiredCard(card) && card.cardName !== CONST.COMPANY_CARDS.CARD_NAME.CASH && !isTravelCard(card) && !isCardWithCustomZeroLimit(card),
16071606
);
16081607

16091608
const sortedCards = lodashSortBy(activeExpensifyCards, getAssignedCardSortKey);
@@ -1811,6 +1810,7 @@ export {
18111810
getPersonalBankCardDetailsImage,
18121811
isCardPendingIssue,
18131812
isCardPendingActivate,
1813+
isCardWithCustomZeroLimit,
18141814
hasPendingExpensifyCardAction,
18151815
isExpensifyCardPendingAction,
18161816
getFundIdFromSettingsKey,

src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveCards.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import useOnyx from '@hooks/useOnyx';
2-
import {isCard, isCardPendingActivate, isCardPendingIssue, isCardWithPotentialFraud, isExpensifyCard} from '@libs/CardUtils';
2+
import {isCard, isCardPendingActivate, isCardPendingIssue, isCardWithCustomZeroLimit, isCardWithPotentialFraud, isExpensifyCard} from '@libs/CardUtils';
33
import ONYXKEYS from '@src/ONYXKEYS';
44
import type {Card} from '@src/types/onyx';
55

@@ -19,14 +19,14 @@ function useTimeSensitiveCards() {
1919
continue;
2020
}
2121

22-
if (card.nameValuePairs?.hasCustomUnapprovedExpenseLimit && card.nameValuePairs?.unapprovedExpenseLimit === 0) {
23-
continue;
24-
}
25-
2622
if (isCardWithPotentialFraud(card) && card.nameValuePairs?.possibleFraud?.fraudAlertReportID) {
2723
cardsWithFraud.push(card);
2824
}
2925

26+
if (isCardWithCustomZeroLimit(card)) {
27+
continue;
28+
}
29+
3030
const isPhysicalCard = !card.nameValuePairs?.isVirtual;
3131
if (!isPhysicalCard) {
3232
continue;

0 commit comments

Comments
 (0)