Merge pull request #25924 from Expensify/alberto-emptyMerchant

Default to empty merchant for receipt requests
Expensify · Aug 25, 2023 · 68a9fcd · 68a9fcd
2 parents f3af8ce + 443127e
commit 68a9fcd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
@@ -43,7 +43,7 @@ function buildOptimisticTransaction(
     created = '',
     source = '',
     originalTransactionID = '',
-    merchant = CONST.TRANSACTION.DEFAULT_MERCHANT,
+    merchant = '',
     receipt = {},
     filename = '',
     existingTransactionID = null,
@@ -60,13 +60,16 @@ function buildOptimisticTransaction(
         commentJSON.originalTransactionID = originalTransactionID;
     }
 
+    // For the SmartScan to run successfully, we need to pass the merchant field empty to the API
+    const defaultMerchant = _.isEmpty(receipt) ? CONST.TRANSACTION.DEFAULT_MERCHANT : '';
+
     return {
         transactionID,
         amount,
         currency,
         reportID,
         comment: commentJSON,
-        merchant: merchant || CONST.TRANSACTION.DEFAULT_MERCHANT,
+        merchant: merchant || defaultMerchant,
         created: created || DateUtils.getDBTime(),
         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
         receipt,

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
@@ -1758,7 +1758,7 @@ function setMoneyRequestParticipants(participants) {
  * @param {String} receiptSource
  */
 function setMoneyRequestReceipt(receiptPath, receiptSource) {
-    Onyx.merge(ONYXKEYS.IOU, {receiptPath, receiptSource});
+    Onyx.merge(ONYXKEYS.IOU, {receiptPath, receiptSource, merchant: ''});
 }
 
 function createEmptyTransaction() {