diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx index a38845ec33627..c36fb3cb15709 100644 --- a/src/components/ReportActionItem/MoneyRequestView.tsx +++ b/src/components/ReportActionItem/MoneyRequestView.tsx @@ -19,7 +19,6 @@ import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import useViolations from '@hooks/useViolations'; import type {ViolationField} from '@hooks/useViolations'; -import * as CardUtils from '@libs/CardUtils'; import * as CurrencyUtils from '@libs/CurrencyUtils'; import type {MileageRate} from '@libs/DistanceRequestUtils'; import DistanceRequestUtils from '@libs/DistanceRequestUtils'; @@ -163,14 +162,14 @@ function MoneyRequestView({ tag: transactionTag, originalAmount: transactionOriginalAmount, originalCurrency: transactionOriginalCurrency, - cardID: transactionCardID, } = useMemo>(() => ReportUtils.getTransactionDetails(transaction) ?? {}, [transaction]); const isEmptyMerchant = transactionMerchant === '' || transactionMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT; const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction); const formattedTransactionAmount = transactionAmount ? CurrencyUtils.convertToDisplayString(transactionAmount, transactionCurrency) : ''; const formattedOriginalAmount = transactionOriginalAmount && transactionOriginalCurrency && CurrencyUtils.convertToDisplayString(transactionOriginalAmount, transactionOriginalCurrency); const isCardTransaction = TransactionUtils.isCardTransaction(transaction); - const cardProgramName = isCardTransaction && transactionCardID !== undefined ? CardUtils.getCardDescription(transactionCardID) : ''; + const cardProgramName = TransactionUtils.getCardName(transaction); + const shouldShowCard = isCardTransaction && cardProgramName; const isApproved = ReportUtils.isReportApproved(moneyRequestReport); const isInvoice = ReportUtils.isInvoiceReport(moneyRequestReport); const isPaidReport = ReportActionsUtils.isPayAction(parentReportAction); @@ -602,7 +601,7 @@ function MoneyRequestView({ )} {shouldShowTag && tagList} - {isCardTransaction && ( + {shouldShowCard && ( , dateFor * Determine whether a transaction is made with an Expensify card. */ function isExpensifyCardTransaction(transaction: OnyxEntry): boolean { - if (!transaction?.cardID) { - return false; - } - return isExpensifyCard(transaction.cardID); + return transaction?.bank === CONST.EXPENSIFY_CARD.BANK; } /** * Determine whether a transaction is made with a card (Expensify or Company Card). */ function isCardTransaction(transaction: OnyxEntry): boolean { - const cardID = transaction?.cardID ?? -1; - return isCorporateCard(cardID); + return !!transaction?.managedCard; +} + +function getCardName(transaction: OnyxEntry): string { + return transaction?.cardName ?? ''; } /** @@ -1116,6 +1115,7 @@ export { buildTransactionsMergeParams, getReimbursable, isPayAtEndExpense, + getCardName, }; export type {TransactionChanges};