Skip to content

potential duplicate violation is not removed #66920

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
marcochavezf merged 5 commits into from
Jul 28, 2025
Merged

potential duplicate violation is not removed #66920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc53283
potential duplicate violation is not removed
nkdengineer Jul 23, 2025
7331087
Merge branch 'main' into fix/66181
nkdengineer Jul 28, 2025
97e8cb0
add test for isViolationDismissed
nkdengineer Jul 28, 2025
a3761ad
improve isViolationDismissed test
nkdengineer Jul 28, 2025
081d4e1
fix prettier
nkdengineer Jul 28, 2025
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
2 changes: 1 addition & 1 deletion src/libs/TransactionUtils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@

let allTransactions: OnyxCollection<Transaction> = {};

Onyx.connect({

Check warning on line 103 in src/libs/TransactionUtils/index.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,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -112,7 +112,7 @@
});

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

Check warning on line 115 in src/libs/TransactionUtils/index.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 @@ -121,7 +121,7 @@
});

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

Check warning on line 124 in src/libs/TransactionUtils/index.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 @@ -130,7 +130,7 @@
});

let allTransactionViolations: OnyxCollection<TransactionViolations> = {};
Onyx.connect({

Check warning on line 133 in src/libs/TransactionUtils/index.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,
waitForCollectionCallback: true,
callback: (value) => (allTransactionViolations = value),
Expand All @@ -138,7 +138,7 @@

let currentUserEmail = '';
let currentUserAccountID = -1;
Onyx.connect({

Check warning on line 141 in src/libs/TransactionUtils/index.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.SESSION,
callback: (val) => {
currentUserEmail = val?.email ?? '';
Expand Down Expand Up @@ -1185,7 +1185,7 @@
if (!transaction || !violation) {
return false;
}
return transaction?.comment?.dismissedViolations?.[violation.name]?.[currentUserEmail] === `${currentUserAccountID}`;
return !!transaction?.comment?.dismissedViolations?.[violation.name]?.[currentUserEmail];

@marcochavezf marcochavezf Jul 25, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a unit test for this case?

@nkdengineer nkdengineer Jul 28, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ahmedGaber93 @marcochavezf i added

@marcochavezf marcochavezf Jul 28, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect, thanks!

}

/**
Expand Down
21 changes: 20 additions & 1 deletion tests/unit/TransactionUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Onyx from 'react-native-onyx';
import DateUtils from '@libs/DateUtils';
import {shouldShowBrokenConnectionViolation, shouldShowBrokenConnectionViolationForMultipleTransactions} from '@libs/TransactionUtils';
import CONST from '@src/CONST';
import IntlStore from '@src/languages/IntlStore';
Expand Down Expand Up @@ -34,6 +35,7 @@ function generateTransaction(values: Partial<Transaction> = {}): Transaction {
}

const CURRENT_USER_ID = 1;
const CURRENT_USER_EMAIL = 'test@example.com';
const SECOND_USER_ID = 2;
const FAKE_OPEN_REPORT_ID = 'FAKE_OPEN_REPORT_ID';
const FAKE_OPEN_REPORT_SECOND_USER_ID = 'FAKE_OPEN_REPORT_SECOND_USER_ID';
Expand Down Expand Up @@ -111,7 +113,7 @@ describe('TransactionUtils', () => {
Onyx.init({
keys: ONYXKEYS,
initialKeyStates: {
[ONYXKEYS.SESSION]: {accountID: CURRENT_USER_ID},
[ONYXKEYS.SESSION]: {accountID: CURRENT_USER_ID, email: 'test@example.com'},
...reportCollectionDataSet,
},
});
Expand Down Expand Up @@ -646,4 +648,21 @@ describe('TransactionUtils', () => {
expect(result).toBe(true);
});
});

describe('isViolationDismissed', () => {
it('should return true when violation is dismissed for current user', () => {
const transaction = generateTransaction({
comment: {
dismissedViolations: {
[CONST.VIOLATIONS.DUPLICATED_TRANSACTION]: {
[CURRENT_USER_EMAIL]: DateUtils.getDBTime(),
},
},
},
});
const violation = {type: CONST.VIOLATION_TYPES.VIOLATION, name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION};
const result = TransactionUtils.isViolationDismissed(transaction, violation);
expect(result).toBe(true);
});
});
});
Loading