diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts index 083a8d238156..2561c54780ce 100644 --- a/src/libs/TransactionUtils/index.ts +++ b/src/libs/TransactionUtils/index.ts @@ -975,7 +975,7 @@ function compareDuplicateTransactionFields(transactionID: string): {keep: Partia // Helper function to check if all comments are equal function areAllCommentsEqual(items: Array>, firstTransaction: OnyxEntry) { - return items.every((item) => lodashIsEqual(item?.comment, firstTransaction?.comment)); + return items.every((item) => lodashIsEqual(getDescription(item), getDescription(firstTransaction))); } // Helper function to check if all fields are equal for a given key @@ -1000,8 +1000,7 @@ function compareDuplicateTransactionFields(transactionID: string): {keep: Partia if (fieldName === 'description') { const allCommentsAreEqual = areAllCommentsEqual(transactions, firstTransaction); - const allCommentsAreEmpty = isFirstTransactionCommentEmptyObject && transactions.every((item) => item?.comment === undefined); - + const allCommentsAreEmpty = isFirstTransactionCommentEmptyObject && transactions.every((item) => getDescription(item) === ''); if (allCommentsAreEqual || allCommentsAreEmpty) { keep[fieldName] = firstTransaction?.comment?.comment ?? firstTransaction?.comment; } else { diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx index 56c600fa1181..9830ea2a8745 100644 --- a/src/pages/TransactionDuplicate/Confirmation.tsx +++ b/src/pages/TransactionDuplicate/Confirmation.tsx @@ -71,7 +71,7 @@ function Confirmation() { ReportUtils.isReportNotFound(report) || (reviewDuplicatesResult.status === 'loaded' && (!transaction?.transactionID || !doesTransactionBelongToReport)); - if (isLoadingOnyxValue(reviewDuplicatesResult, reportResult)) { + if (isLoadingOnyxValue(reviewDuplicatesResult, reportResult) || !transaction?.transactionID) { return ; }