NABs

Expensify · Sep 1, 2023 · 4654843 · 4654843
1 parent aaa345b
commit 4654843
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js
@@ -120,15 +120,12 @@ function ReportPreview(props) {
     const lastThreeTransactionsWithReceipts = ReportUtils.getReportPreviewDisplayTransactions(props.action);
 
     const hasOnlyOneReceiptRequest = numberOfRequests === 1 && hasReceipts;
-    let previewSubtitle = '';
-    if (hasOnlyOneReceiptRequest) {
-        previewSubtitle = transactionsWithReceipts[0].modifiedMerchant || transactionsWithReceipts[0].merchant;
-    } else {
-        previewSubtitle = props.translate('iou.requestCount', {
-            count: numberOfRequests,
-            scanningReceipts: numberOfScanningReceipts,
-        });
-    }
+    const previewSubtitle = hasOnlyOneReceiptRequest
+        ? TransactionUtils.getMerchant(transactionsWithReceipts[0])
+        : props.translate('iou.requestCount', {
+              count: numberOfRequests,
+              scanningReceipts: numberOfScanningReceipts,
+          });
 
     const getDisplayAmount = () => {
         if (reportTotal) {

diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
@@ -238,7 +238,7 @@ function getCreated(transaction) {
 }
 
 function isReceiptBeingScanned(transaction) {
-    return transaction.receipt.state === CONST.IOU.RECEIPT_STATE.SCANREADY || transaction.receipt.state === CONST.IOU.RECEIPT_STATE.SCANNING;
+    return _.contains([CONST.IOU.RECEIPT_STATE.SCANREADY, CONST.IOU.RECEIPT_STATE.SCANNING], transaction.receipt.state);
 }
 
 /**