Skip to content

Commit 0c5bc2d

Browse files
committed
Apply reviewer suggestion
1 parent 2abc8f7 commit 0c5bc2d

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/pages/TransactionMerge/MergeTransactionsListContent.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@ function MergeTransactionsListContent({transactionID, mergeTransaction}: MergeTr
133133
});
134134

135135
const {conflictFields, mergeableData} = getMergeableDataAndConflictFields(targetTransaction, sourceTransaction);
136-
if (conflictFields.length > 0) {
137-
Navigation.navigate(ROUTES.MERGE_TRANSACTION_DETAILS_PAGE.getRoute(transactionID, Navigation.getActiveRoute()));
138-
} else {
136+
if (!conflictFields.length) {
139137
// If there are no conflict fields, we should set mergeable data and navigate to the confirmation page
140138
setMergeTransactionKey(transactionID, mergeableData);
141139
Navigation.navigate(ROUTES.MERGE_TRANSACTION_CONFIRMATION_PAGE.getRoute(transactionID, Navigation.getActiveRoute()));
140+
return;
142141
}
142+
Navigation.navigate(ROUTES.MERGE_TRANSACTION_DETAILS_PAGE.getRoute(transactionID, Navigation.getActiveRoute()));
143143
}
144144
}, [mergeTransaction, transactionID, targetTransaction]);
145145

src/pages/TransactionMerge/ReceiptReviewPage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ function ReceiptReviewPage({route}: ReceiptReviewPageProps) {
4747
}
4848

4949
const {conflictFields, mergeableData} = getMergeableDataAndConflictFields(targetTransaction, sourceTransaction);
50-
if (conflictFields.length > 0) {
51-
Navigation.navigate(ROUTES.MERGE_TRANSACTION_DETAILS_PAGE.getRoute(transactionID, Navigation.getActiveRoute()));
52-
} else {
50+
if (!conflictFields.length) {
5351
// If there are no conflict fields, we should set mergeable data and navigate to the confirmation page
5452
setMergeTransactionKey(transactionID, mergeableData);
5553
Navigation.navigate(ROUTES.MERGE_TRANSACTION_CONFIRMATION_PAGE.getRoute(transactionID, Navigation.getActiveRoute()));
54+
return;
5655
}
56+
Navigation.navigate(ROUTES.MERGE_TRANSACTION_DETAILS_PAGE.getRoute(transactionID, Navigation.getActiveRoute()));
5757
};
5858

5959
if (isLoadingOnyxValue(mergeTransactionMetadata)) {

0 commit comments

Comments
 (0)