From 4ec8b967eeb5b367bf6876a7e9d389cb0f0538ad Mon Sep 17 00:00:00 2001 From: Roji Philip Date: Wed, 10 Jan 2024 23:25:36 +0530 Subject: [PATCH 1/2] ignore partial merchant for display in report preview --- src/components/ReportActionItem/ReportPreview.js | 3 +++ src/libs/TransactionUtils.ts | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js index abc7e3954200..44bdef932a8c 100644 --- a/src/components/ReportActionItem/ReportPreview.js +++ b/src/components/ReportActionItem/ReportPreview.js @@ -155,6 +155,9 @@ function ReportPreview(props) { const lastThreeTransactionsWithReceipts = transactionsWithReceipts.slice(-3); const lastThreeReceipts = _.map(lastThreeTransactionsWithReceipts, (transaction) => ReceiptUtils.getThumbnailAndImageURIs(transaction)); let formattedMerchant = numberOfRequests === 1 && hasReceipts ? TransactionUtils.getMerchant(transactionsWithReceipts[0]) : null; + if (TransactionUtils.isPartialMerchant(formattedMerchant)) { + formattedMerchant = null; + } const hasPendingWaypoints = formattedMerchant && hasOnlyDistanceRequests && _.every(transactionsWithReceipts, (transaction) => lodashGet(transaction, 'pendingFields.waypoints', null)); if (hasPendingWaypoints) { formattedMerchant = formattedMerchant.replace(CONST.REGEX.FIRST_SPACE, props.translate('common.tbd')); diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts index c34a6753c1d5..b8ebb36d5aa8 100644 --- a/src/libs/TransactionUtils.ts +++ b/src/libs/TransactionUtils.ts @@ -147,6 +147,13 @@ function isMerchantMissing(transaction: Transaction) { return isMerchantEmpty && isModifiedMerchantEmpty; } +/** + * Check if the merchant is a partial one `(none)` or `Unknown merchant` + */ +function isPartialMerchant(merchant: string): boolean { + return merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT || merchant === CONST.TRANSACTION.UNKNOWN_MERCHANT; +} + function isAmountMissing(transaction: Transaction) { return transaction.amount === 0 && (!transaction.modifiedAmount || transaction.modifiedAmount === 0); } @@ -573,6 +580,7 @@ export { getWaypoints, isAmountMissing, isMerchantMissing, + isPartialMerchant, isCreatedMissing, areRequiredFieldsEmpty, hasMissingSmartscanFields, From 9f37be559f0ee1d99924f11e69c2840560fe7b70 Mon Sep 17 00:00:00 2001 From: Roji Philip Date: Mon, 15 Jan 2024 00:45:49 +0530 Subject: [PATCH 2/2] hide preview subtitle for none --- src/components/ReportActionItem/ReportPreview.js | 2 +- src/libs/TransactionUtils.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js index 44bdef932a8c..0ce166e61d49 100644 --- a/src/components/ReportActionItem/ReportPreview.js +++ b/src/components/ReportActionItem/ReportPreview.js @@ -308,7 +308,7 @@ function ReportPreview(props) { )} - {!isScanning && (numberOfRequests > 1 || hasReceipts) && ( + {!isScanning && (numberOfRequests > 1 || (hasReceipts && numberOfRequests === 1 && formattedMerchant)) && ( {previewSubtitle || moneyRequestComment} diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts index b8ebb36d5aa8..ba856a2b1afb 100644 --- a/src/libs/TransactionUtils.ts +++ b/src/libs/TransactionUtils.ts @@ -148,10 +148,10 @@ function isMerchantMissing(transaction: Transaction) { } /** - * Check if the merchant is a partial one `(none)` or `Unknown merchant` + * Check if the merchant is partial i.e. `(none)` */ function isPartialMerchant(merchant: string): boolean { - return merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT || merchant === CONST.TRANSACTION.UNKNOWN_MERCHANT; + return merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT; } function isAmountMissing(transaction: Transaction) {