diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts index 0dc483aff50e..b0d426c9774a 100644 --- a/src/libs/CardUtils.ts +++ b/src/libs/CardUtils.ts @@ -37,6 +37,14 @@ function isExpensifyCard(cardID: number) { return card.bank === CONST.EXPENSIFY_CARD.BANK; } +/** + * @param cardID + * @returns boolean if the cardID is in the cardList from ONYX. Includes Expensify Cards. + */ +function isCorporateCard(cardID: number) { + return !!allCards[cardID]; +} + /** * @param cardID * @returns string in format % - %. @@ -99,4 +107,4 @@ function findPhysicalCard(cards: Card[]) { return cards.find((card) => !card.isVirtual); } -export {isExpensifyCard, getDomainCards, getMonthFromExpirationDateString, getYearFromExpirationDateString, maskCard, getCardDescription, findPhysicalCard}; +export {isExpensifyCard, isCorporateCard, getDomainCards, getMonthFromExpirationDateString, getYearFromExpirationDateString, maskCard, getCardDescription, findPhysicalCard}; diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts index 763c8d19f800..d03235a637c7 100644 --- a/src/libs/TransactionUtils.ts +++ b/src/libs/TransactionUtils.ts @@ -5,7 +5,7 @@ import ONYXKEYS from '@src/ONYXKEYS'; import {RecentWaypoint, ReportAction, Transaction} from '@src/types/onyx'; import {Comment, Receipt, Waypoint, WaypointCollection} from '@src/types/onyx/Transaction'; import {EmptyObject} from '@src/types/utils/EmptyObject'; -import {isExpensifyCard} from './CardUtils'; +import {isCorporateCard, isExpensifyCard} from './CardUtils'; import DateUtils from './DateUtils'; import * as NumberUtils from './NumberUtils'; @@ -335,10 +335,11 @@ function isExpensifyCardTransaction(transaction: Transaction): boolean { } /** - * Determine whether a transaction is made with a card. + * Determine whether a transaction is made with a card (Expensify or Company Card). */ function isCardTransaction(transaction: Transaction): boolean { - return (transaction?.cardID ?? 0) > 0; + const cardID = transaction?.cardID ?? 0; + return isCorporateCard(cardID); } /**