Skip to content

Commit 321e4bb

Browse files
authored
Merge pull request #48422 from daledah/fix/47974
fix: Description review appears when distance expenses are created without description
2 parents a5ca9b8 + 28a27ef commit 321e4bb

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/libs/TransactionUtils/index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ function compareDuplicateTransactionFields(transactionID: string): {keep: Partia
982982

983983
// Helper function to check if all comments are equal
984984
function areAllCommentsEqual(items: Array<OnyxEntry<Transaction>>, firstTransaction: OnyxEntry<Transaction>) {
985-
return items.every((item) => lodashIsEqual(item?.comment, firstTransaction?.comment));
985+
return items.every((item) => lodashIsEqual(getDescription(item), getDescription(firstTransaction)));
986986
}
987987

988988
// Helper function to check if all fields are equal for a given key
@@ -1007,8 +1007,7 @@ function compareDuplicateTransactionFields(transactionID: string): {keep: Partia
10071007

10081008
if (fieldName === 'description') {
10091009
const allCommentsAreEqual = areAllCommentsEqual(transactions, firstTransaction);
1010-
const allCommentsAreEmpty = isFirstTransactionCommentEmptyObject && transactions.every((item) => item?.comment === undefined);
1011-
1010+
const allCommentsAreEmpty = isFirstTransactionCommentEmptyObject && transactions.every((item) => getDescription(item) === '');
10121011
if (allCommentsAreEqual || allCommentsAreEmpty) {
10131012
keep[fieldName] = firstTransaction?.comment?.comment ?? firstTransaction?.comment;
10141013
} else {

src/pages/TransactionDuplicate/Confirmation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function Confirmation() {
7171
ReportUtils.isReportNotFound(report) ||
7272
(reviewDuplicatesResult.status === 'loaded' && (!transaction?.transactionID || !doesTransactionBelongToReport));
7373

74-
if (isLoadingOnyxValue(reviewDuplicatesResult, reportResult)) {
74+
if (isLoadingOnyxValue(reviewDuplicatesResult, reportResult) || !transaction?.transactionID) {
7575
return <FullScreenLoadingIndicator />;
7676
}
7777

0 commit comments

Comments
 (0)