Merge pull request Expensify#34216 from dukenv0307/fix/34029

Display merchant in report name of transaction report if exist
DylanDylann · Jan 23, 2024 · d8fb3f4 · d8fb3f4
2 parents cfea515 + e9ca21b
commit d8fb3f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -2155,7 +2155,7 @@ function getTransactionReportName(reportAction: OnyxEntry<ReportAction>): string
 
     return Localize.translateLocal(ReportActionsUtils.isSentMoneyReportAction(reportAction) ? 'iou.threadSentMoneyReportName' : 'iou.threadRequestReportName', {
         formattedAmount: CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency, TransactionUtils.isDistanceRequest(transaction)) ?? '',
-        comment: transactionDetails?.comment ?? '',
+        comment: (!TransactionUtils.isMerchantMissing(transaction) ? transactionDetails?.merchant : transactionDetails?.comment) ?? '',
     });
 }
 

diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
@@ -141,11 +141,12 @@ function hasReceipt(transaction: Transaction | undefined | null): boolean {
 }
 
 function isMerchantMissing(transaction: Transaction) {
+    if (transaction.modifiedMerchant && transaction.modifiedMerchant !== '') {
+        return transaction.modifiedMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
+    }
     const isMerchantEmpty = transaction.merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT || transaction.merchant === '';
 
-    const isModifiedMerchantEmpty = !transaction.modifiedMerchant || transaction.modifiedMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT || transaction.modifiedMerchant === '';
-
-    return isMerchantEmpty && isModifiedMerchantEmpty;
+    return isMerchantEmpty;
 }
 
 /**