-
Notifications
You must be signed in to change notification settings - Fork 4k
Search: Don't display violations that are dismissed #70603
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.
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
pecanoro
merged 13 commits into
Expensify:main
from
s77rt:search-transactions-violations
Sep 17, 2025
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
6f973c6
Search: don't display dismissed violations
s77rt ad334de
update shouldShowBrokenConnectionViolationForMultipleTransactions to …
s77rt 9a1bafe
remove empty line
s77rt 2af3371
update function call param
s77rt dbe0caf
Revert "update function call param"
s77rt 4706c68
Revert "remove empty line"
s77rt 7c154df
Revert "update shouldShowBrokenConnectionViolationForMultipleTransact…
s77rt a1bdfc3
filter out dismissed violations
s77rt 0df3b4d
fix uncorrect lookup key
s77rt 74fa24f
lint
s77rt c4fa303
lint
s77rt d66f823
Merge branch 'main' into search-transactions-violations
s77rt 404690e
set primary action to review duplicates only if was not handled already
s77rt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,35 @@ | ||
| import {useMemo} from 'react'; | ||
| import {useAllReportsTransactionsAndViolations} from '@components/OnyxListItemProvider'; | ||
| import CONST from '@src/CONST'; | ||
| import {getTransactionViolations} from '@libs/TransactionUtils'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import type {TransactionViolations} from '@src/types/onyx'; | ||
| import type {ReportTransactionsAndViolations} from '@src/types/onyx/DerivedValues'; | ||
|
|
||
| const DEFAULT_RETURN_VALUE: ReportTransactionsAndViolations = {transactions: {}, violations: {}}; | ||
|
|
||
| function useTransactionsAndViolationsForReport(reportID?: string) { | ||
| const allReportsTransactionsAndViolations = useAllReportsTransactionsAndViolations(); | ||
|
|
||
| if (!reportID) { | ||
| return DEFAULT_RETURN_VALUE; | ||
| } | ||
| const {transactions, violations} = reportID ? (allReportsTransactionsAndViolations?.[reportID] ?? DEFAULT_RETURN_VALUE) : DEFAULT_RETURN_VALUE; | ||
|
s77rt marked this conversation as resolved.
|
||
|
|
||
| return allReportsTransactionsAndViolations?.[reportID ?? CONST.DEFAULT_NUMBER_ID] ?? DEFAULT_RETURN_VALUE; | ||
| const transactionsAndViolations = useMemo<ReportTransactionsAndViolations>(() => { | ||
| const filteredViolations = Object.keys(violations).reduce( | ||
| (filteredTransactionViolations, transactionViolationKey) => { | ||
| const transactionID = transactionViolationKey.split('_').at(1) ?? ''; | ||
| const transaction = transactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]; | ||
|
|
||
| // This is our accumulator, it's okay to reassign | ||
| // eslint-disable-next-line no-param-reassign | ||
| filteredTransactionViolations[transactionViolationKey] = getTransactionViolations(transaction, violations) ?? []; | ||
| return filteredTransactionViolations; | ||
| }, | ||
| {} as Record<string, TransactionViolations>, | ||
| ); | ||
|
|
||
| return {transactions, violations: filteredViolations}; | ||
| }, [transactions, violations]); | ||
|
|
||
| return transactionsAndViolations; | ||
| } | ||
|
|
||
| export default useTransactionsAndViolationsForReport; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We missed filtering violations based on users via
shouldShowViolation, which we fixed in #70685