Merge pull request #28706 from namhihi237/fix-28690-app-crash-update-…

…date-merchant [CP Staging] fix null coallescing logic
Expensify · Oct 3, 2023 · 8e974b7 · 8e974b7
2 parents fca7d5b + 665a9c2
commit 8e974b7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
@@ -220,7 +220,7 @@ function getCurrency(transaction: Transaction): string {
  * Return the merchant field from the transaction, return the modifiedMerchant if present.
  */
 function getMerchant(transaction: Transaction): string {
-    return transaction?.modifiedMerchant ?? transaction?.merchant ?? '';
+    return transaction?.modifiedMerchant ? transaction.modifiedMerchant : transaction?.merchant || '';
 }
 
 /**
@@ -255,7 +255,7 @@ function getTag(transaction: Transaction): string {
  * Return the created field from the transaction, return the modifiedCreated if present.
  */
 function getCreated(transaction: Transaction): string {
-    const created = transaction?.modifiedCreated ?? transaction?.created ?? '';
+    const created = transaction?.modifiedCreated ? transaction.modifiedCreated : transaction?.created || '';
     const createdDate = parseISO(created);
     if (isValid(createdDate)) {
         return format(createdDate, CONST.DATE.FNS_FORMAT_STRING);