Merge pull request #88103 from Expensify/georgia-cards-filter

[Home Page] Expensify card - filter out $0 limit cards

Author: Beamanator

src/libs/CardUtils.ts

@@ -1327,6 +1327,10 @@ function isCardPendingActivate(card?: Card) {
     return card?.state === CONST.EXPENSIFY_CARD.STATE.NOT_ACTIVATED;
 }
 
+function isCardWithCustomZeroLimit(card: Card): boolean {
+    return !!card.nameValuePairs?.hasCustomUnapprovedExpenseLimit && card.nameValuePairs?.unapprovedExpenseLimit === 0;
+}
+
 /**
  * Check if a card has potential fraud that needs review.
  * Returns true if the card has fraud type 'domain' or 'individual'.
@@ -1548,7 +1552,8 @@ function hasDisplayableAssignedCards(cardList: CardList | undefined): boolean {
             CONST.EXPENSIFY_CARD.ACTIVE_STATES.includes(card.state ?? 0) &&
             (isExpensifyCard(card) || !!card.domainName || isPersonalCard(card)) &&
             card.cardName !== CONST.COMPANY_CARDS.CARD_NAME.CASH &&
-            (!isExpensifyCard(card) || !isExpiredCard(card)),
+            (!isExpensifyCard(card) || !isExpiredCard(card)) &&
+            (!isExpensifyCard(card) || !isCardWithCustomZeroLimit(card)),
     );
 }
 
@@ -1597,7 +1602,7 @@ 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 && !isTravelCard(card),
+        (card) => isExpensifyCard(card) && !isExpiredCard(card) && card.cardName !== CONST.COMPANY_CARDS.CARD_NAME.CASH && !isTravelCard(card) && !isCardWithCustomZeroLimit(card),
     );
 
     const sortedCards = lodashSortBy(activeExpensifyCards, getAssignedCardSortKey);
@@ -1805,6 +1810,7 @@ export {
     getPersonalBankCardDetailsImage,
     isCardPendingIssue,
     isCardPendingActivate,
+    isCardWithCustomZeroLimit,
     hasPendingExpensifyCardAction,
     isExpensifyCardPendingAction,
     getFundIdFromSettingsKey,

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

@@ -1,5 +1,5 @@
 import useOnyx from '@hooks/useOnyx';
-import {isCard, isCardPendingActivate, isCardPendingIssue, isCardWithPotentialFraud, isExpensifyCard} from '@libs/CardUtils';
+import {isCard, isCardPendingActivate, isCardPendingIssue, isCardWithCustomZeroLimit, isCardWithPotentialFraud, isExpensifyCard} from '@libs/CardUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Card} from '@src/types/onyx';
 
@@ -23,6 +23,10 @@ function useTimeSensitiveCards() {
             cardsWithFraud.push(card);
         }
 
+        if (isCardWithCustomZeroLimit(card)) {
+            continue;
+        }
+
         const isPhysicalCard = !card.nameValuePairs?.isVirtual;
         if (!isPhysicalCard) {
             continue;

tests/unit/hooks/useTimeSensitiveCards.test.ts

@@ -220,4 +220,76 @@ describe('useTimeSensitiveCards', () => {
         expect(result.current.cardsWithFraud.at(0)?.cardID).toBe(1);
         expect(result.current.shouldShowReviewCardFraud).toBe(true);
     });
+
+    it('should exclude cards with custom $0 limit from shipping address to-dos', async () => {
+        const zeroLimitCard: Card = {
+            ...createRandomExpensifyCard(1, {state: CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED}),
+            nameValuePairs: {hasCustomUnapprovedExpenseLimit: true, unapprovedExpenseLimit: 0} as Card['nameValuePairs'],
+        };
+        const cardList: CardList = {'1': zeroLimitCard};
+
+        await Onyx.merge(ONYXKEYS.CARD_LIST, cardList);
+        await waitForBatchedUpdates();
+
+        const {result} = renderHook(() => useTimeSensitiveCards());
+
+        expect(result.current.cardsNeedingShippingAddress).toHaveLength(0);
+        expect(result.current.shouldShowAddShippingAddress).toBe(false);
+    });
+
+    it('should exclude cards with custom $0 limit from activation to-dos', async () => {
+        const zeroLimitCard: Card = {
+            ...createRandomExpensifyCard(1, {state: CONST.EXPENSIFY_CARD.STATE.NOT_ACTIVATED}),
+            nameValuePairs: {hasCustomUnapprovedExpenseLimit: true, unapprovedExpenseLimit: 0} as Card['nameValuePairs'],
+        };
+        const cardList: CardList = {'1': zeroLimitCard};
+
+        await Onyx.merge(ONYXKEYS.CARD_LIST, cardList);
+        await waitForBatchedUpdates();
+
+        const {result} = renderHook(() => useTimeSensitiveCards());
+
+        expect(result.current.cardsNeedingActivation).toHaveLength(0);
+        expect(result.current.shouldShowActivateCard).toBe(false);
+    });
+
+    it('should not exclude cards without custom limit even if unapprovedExpenseLimit is 0', async () => {
+        const groupLimitCard: Card = {
+            ...createRandomExpensifyCard(1, {state: CONST.EXPENSIFY_CARD.STATE.NOT_ACTIVATED}),
+            nameValuePairs: {hasCustomUnapprovedExpenseLimit: false, unapprovedExpenseLimit: 0} as Card['nameValuePairs'],
+        };
+        const cardList: CardList = {'1': groupLimitCard};
+
+        await Onyx.merge(ONYXKEYS.CARD_LIST, cardList);
+        await waitForBatchedUpdates();
+
+        const {result} = renderHook(() => useTimeSensitiveCards());
+
+        expect(result.current.cardsNeedingActivation).toHaveLength(1);
+        expect(result.current.shouldShowActivateCard).toBe(true);
+    });
+
+    it('should still show fraud alerts for cards with custom $0 limit', async () => {
+        const zeroLimitFraudCard: Card = {
+            ...createRandomExpensifyCard(1, {
+                state: CONST.EXPENSIFY_CARD.STATE.OPEN,
+                fraud: CONST.EXPENSIFY_CARD.FRAUD_TYPES.DOMAIN,
+                possibleFraud: {triggerAmount: 1000, triggerMerchant: 'SUSPICIOUS MERCHANT', currency: 'USD', fraudAlertReportID: 123456},
+            }),
+            nameValuePairs: {
+                hasCustomUnapprovedExpenseLimit: true,
+                unapprovedExpenseLimit: 0,
+                possibleFraud: {triggerAmount: 1000, triggerMerchant: 'SUSPICIOUS MERCHANT', currency: 'USD', fraudAlertReportID: 123456},
+            } as Card['nameValuePairs'],
+        };
+        const cardList: CardList = {'1': zeroLimitFraudCard};
+
+        await Onyx.merge(ONYXKEYS.CARD_LIST, cardList);
+        await waitForBatchedUpdates();
+
+        const {result} = renderHook(() => useTimeSensitiveCards());
+
+        expect(result.current.cardsWithFraud).toHaveLength(1);
+        expect(result.current.shouldShowReviewCardFraud).toBe(true);
+    });
 });