From 6226324e9b070e515ae51805fea1b4b73fc31f68 Mon Sep 17 00:00:00 2001 From: daledah Date: Tue, 3 Sep 2024 01:24:49 +0700 Subject: [PATCH 1/2] fix: Description review appears when distance expenses are created without description --- src/libs/TransactionUtils/index.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts index 339f57c8e04a..07416f6bc346 100644 --- a/src/libs/TransactionUtils/index.ts +++ b/src/libs/TransactionUtils/index.ts @@ -970,7 +970,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 @@ -995,8 +995,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 { From 28a27ef8e3504ab9393641340cc687b89ad8aac1 Mon Sep 17 00:00:00 2001 From: daledah Date: Thu, 19 Sep 2024 17:34:46 +0700 Subject: [PATCH 2/2] fix: prevent not here page showing up --- src/pages/TransactionDuplicate/Confirmation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ; }