Skip to content

fix: Expense-Keep this one option doesn't resolve duplicates in trackmap expense #79871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amyevans merged 4 commits into from
Jan 30, 2026
Merged

fix: Expense-Keep this one option doesn't resolve duplicates in trackmap expense #79871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
341ff67
fix: Expense-Keep this one option doesn't resolve duplicates in track…
nkdengineer Jan 19, 2026
78a26b1
Merge branch 'main' into fix/79179
nkdengineer Jan 21, 2026
21c3a52
change to to use selector again
nkdengineer Jan 21, 2026
e3fe826
Merge branch 'main' into fix/79179
nkdengineer Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/libs/TransactionPreviewUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type {TranslationPaths} from '@src/languages/types';
import ROUTES from '@src/ROUTES';
import type * as OnyxTypes from '@src/types/onyx';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import {abandonReviewDuplicateTransactions, setReviewDuplicatesKey} from './actions/Transaction';
import {setReviewDuplicatesKey} from './actions/Transaction';
import {isCategoryMissing} from './CategoryUtils';
import {convertToDisplayString} from './CurrencyUtils';
import DateUtils from './DateUtils';
Expand Down Expand Up @@ -79,16 +79,18 @@ const getReviewNavigationRoute = (
policyCategories: OnyxTypes.PolicyCategories | undefined,
transactionReport: OnyxEntry<OnyxTypes.Report>,
) => {
// Clear the draft before selecting a different expense to prevent merging fields from the previous expense
// Use set method to prevent merging fields from the previous expense
// (e.g., category, tag, tax) that may be not enabled/available in the new expense's policy.
abandonReviewDuplicateTransactions();
const comparisonResult = compareDuplicateTransactionFields(transaction, duplicates, transactionReport, transaction?.transactionID, policyCategories);
setReviewDuplicatesKey({
...comparisonResult.keep,
duplicates: duplicates.map((duplicate) => duplicate?.transactionID).filter(Boolean) as string[],
transactionID: transaction?.transactionID,
reportID: transaction?.reportID,
});
setReviewDuplicatesKey(
{
...comparisonResult.keep,
duplicates: duplicates.map((duplicate) => duplicate?.transactionID).filter(Boolean) as string[],
transactionID: transaction?.transactionID,
reportID: transaction?.reportID,
},
true,
);

if (comparisonResult.change.merchant) {
return ROUTES.TRANSACTION_DUPLICATE_REVIEW_MERCHANT_PAGE.getRoute(threadReportID, backTo);
Expand Down
12 changes: 8 additions & 4 deletions src/libs/actions/Transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
import {getPolicyTagsData} from './Policy/Tag';

let allTransactionDrafts: OnyxCollection<Transaction> = {};
Onyx.connect({

Check warning on line 60 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -66,7 +66,7 @@
});

let allReports: OnyxCollection<Report> = {};
Onyx.connect({

Check warning on line 69 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.REPORT,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -78,7 +78,7 @@
});

const allTransactionViolation: OnyxCollection<TransactionViolation[]> = {};
Onyx.connect({

Check warning on line 81 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
callback: (transactionViolation, key) => {
if (!key || !transactionViolation) {
Expand All @@ -90,7 +90,7 @@
});

let allTransactionViolations: TransactionViolations = [];
Onyx.connect({

Check warning on line 93 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
callback: (val) => (allTransactionViolations = val ?? []),
});
Expand Down Expand Up @@ -629,10 +629,14 @@
});
}

function setReviewDuplicatesKey(values: Partial<ReviewDuplicates>) {
Onyx.merge(`${ONYXKEYS.REVIEW_DUPLICATES}`, {
...values,
});
function setReviewDuplicatesKey(values: Partial<ReviewDuplicates>, shouldUseSetMethod = false) {
if (shouldUseSetMethod) {
Onyx.set(`${ONYXKEYS.REVIEW_DUPLICATES}`, values);
} else {
Onyx.merge(`${ONYXKEYS.REVIEW_DUPLICATES}`, {
...values,
});
}
}

function abandonReviewDuplicateTransactions() {
Expand Down
Loading