From c3fae90a00277b8bfb8eb94b10b7d4c0b4119e55 Mon Sep 17 00:00:00 2001 From: Abdelrahman Khattab Date: Fri, 12 Sep 2025 20:49:32 +0300 Subject: [PATCH 1/8] Fix RECEIPT_NOT_SMART_SCANNED violation visibility across Report Preview, LHN, and Search --- src/components/Search/index.tsx | 44 ++++- src/libs/ReportPreviewActionUtils.ts | 4 +- src/libs/ReportUtils.ts | 3 + src/libs/SearchUIUtils.ts | 6 +- src/libs/Violations/ViolationsUtils.ts | 22 ++- tests/actions/ReportPreviewActionUtilsTest.ts | 37 ++++ tests/unit/ViolationUtilsTest.ts | 162 +++++++++++++++++- 7 files changed, 272 insertions(+), 6 deletions(-) diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx index a4a19fe65454..1045a8135110 100644 --- a/src/components/Search/index.tsx +++ b/src/components/Search/index.tsx @@ -3,6 +3,7 @@ import type {ContentStyle} from '@shopify/flash-list'; import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; import type {NativeScrollEvent, NativeSyntheticEvent} from 'react-native'; import {View} from 'react-native'; +import type {OnyxEntry} from 'react-native-onyx'; import Animated, {FadeIn, FadeOut, useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated'; import FullPageErrorView from '@components/BlockingViews/FullPageErrorView'; import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView'; @@ -49,6 +50,7 @@ import { shouldShowYear as shouldShowYearUtil, } from '@libs/SearchUIUtils'; import type {ArchivedReportsIDSet, SearchKey} from '@libs/SearchUIUtils'; +import {shouldShowViolation} from '@libs/TransactionUtils'; import {isOnHold, isTransactionPendingDelete} from '@libs/TransactionUtils'; import Navigation, {navigationRef} from '@navigation/Navigation'; import type {SearchFullscreenNavigatorParamList} from '@navigation/types'; @@ -59,7 +61,11 @@ import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import SCREENS from '@src/SCREENS'; import type {OutstandingReportsByPolicyIDDerivedValue, ReportAction} from '@src/types/onyx'; +import type Policy from '@src/types/onyx/Policy'; +import type Report from '@src/types/onyx/Report'; +import type {SearchTransaction} from '@src/types/onyx/SearchResults'; import type SearchResults from '@src/types/onyx/SearchResults'; +import type {TransactionViolation} from '@src/types/onyx/TransactionViolation'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; import arraysEqual from '@src/utils/arraysEqual'; import {useSearchContext} from './SearchContext'; @@ -220,6 +226,42 @@ function Search({queryJSON, searchResults, onSearchListScroll, contentContainerS const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID, {canBeMissing: true}); const [violations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, {canBeMissing: true}); + // Filter violations based on user visibility + const filteredViolations = useMemo(() => { + if (!violations || !searchResults?.data) { + return violations; + } + + const filtered: Record = {}; + + const transactionKeys = Object.keys(searchResults.data).filter((key) => key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)); + + for (const key of transactionKeys) { + const transaction = searchResults.data[key as keyof typeof searchResults.data] as SearchTransaction; + if (!transaction || typeof transaction !== 'object' || !('transactionID' in transaction) || !('reportID' in transaction)) { + continue; + } + + const report = searchResults.data[`${ONYXKEYS.COLLECTION.REPORT}${transaction.reportID}`]; + const policy = searchResults.data[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]; + + if (report && policy) { + const transactionViolations = violations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`]; + if (transactionViolations) { + const filteredTransactionViolations = transactionViolations.filter((violation) => + shouldShowViolation(report as OnyxEntry, policy as OnyxEntry, violation.name), + ); + + if (filteredTransactionViolations.length > 0) { + filtered[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`] = filteredTransactionViolations; + } + } + } + } + + return filtered; + }, [violations, searchResults]); + const [archivedReportsIdSet = new Set()] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, { canBeMissing: true, selector: (all): ArchivedReportsIDSet => { @@ -908,7 +950,7 @@ function Search({queryJSON, searchResults, onSearchListScroll, contentContainerS queryJSON={queryJSON} columns={columnsToShow} areAllOptionalColumnsHidden={areAllOptionalColumnsHidden} - violations={violations} + violations={filteredViolations} onLayout={onLayout} isMobileSelectionModeEnabled={isMobileSelectionModeEnabled} shouldAnimate={type === CONST.SEARCH.DATA_TYPES.EXPENSE} diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts index 49797eec4548..cc04b7aeb181 100644 --- a/src/libs/ReportPreviewActionUtils.ts +++ b/src/libs/ReportPreviewActionUtils.ts @@ -36,6 +36,7 @@ import { } from './ReportUtils'; import {getSession} from './SessionUtils'; import {allHavePendingRTERViolation, isPending, isScanning, shouldShowBrokenConnectionViolationForMultipleTransactions} from './TransactionUtils'; +import ViolationsUtils from './Violations/ViolationsUtils'; function canSubmit(report: Report, violations: OnyxCollection, isReportArchived: boolean, policy?: Policy, transactions?: Transaction[]) { if (isReportArchived) { @@ -189,12 +190,13 @@ function canExport(report: Report, violations: OnyxCollection, isReportArchived: boolean, policy?: Policy, transactions?: Transaction[]) { const hasAnyViolations = hasMissingSmartscanFields(report.reportID, transactions) || hasAnyViolationsUtil(report.reportID, violations); + const hasVisibleViolations = hasAnyViolations && ViolationsUtils.hasVisibleViolationsForUser(report, violations, policy, transactions); const isSubmitter = isCurrentUserSubmitter(report); const isOpen = isOpenExpenseReport(report); const isReimbursed = isSettled(report); if ( - !hasAnyViolations || + !hasVisibleViolations || isReimbursed || (!(isSubmitter && isOpen && policy?.areWorkflowsEnabled) && !canApprove(report, violations, policy, transactions, false) && diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 6cb14f2b40b9..4c23728b6c7c 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -8177,9 +8177,12 @@ function shouldDisplayViolationsRBRInLHN(report: OnyxEntry, transactionV if (!potentialReport) { return false; } + const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${potentialReport.policyID}`]; + const transactions = getReportTransactions(potentialReport.reportID); return ( !isInvoiceReport(potentialReport) && + ViolationsUtils.hasVisibleViolationsForUser(potentialReport, transactionViolations, policy, transactions) && (hasViolations(potentialReport.reportID, transactionViolations, true) || hasWarningTypeViolations(potentialReport.reportID, transactionViolations, true) || hasNoticeTypeViolations(potentialReport.reportID, transactionViolations, true)) diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts index 2f98ed84e788..60a4b12ae4ac 100644 --- a/src/libs/SearchUIUtils.ts +++ b/src/libs/SearchUIUtils.ts @@ -117,6 +117,7 @@ import { isViolationDismissed, } from './TransactionUtils'; import shouldShowTransactionYear from './TransactionUtils/shouldShowTransactionYear'; +import ViolationsUtils from './Violations/ViolationsUtils'; const transactionColumnNamesToSortingProperty = { [CONST.SEARCH.TABLE_COLUMNS.TO]: 'formattedTo' as const, @@ -1156,8 +1157,11 @@ function getActions( const chatReportRNVP = data[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report.chatReportID}`] ?? undefined; const isChatReportArchived = isArchivedReport(chatReportRNVP); + const hasAnyViolationsForReport = hasAnyViolations(report.reportID, allViolations, allReportTransactions); + const hasVisibleViolationsForReport = hasAnyViolationsForReport && ViolationsUtils.hasVisibleViolationsForUser(report, allViolations, policy, allReportTransactions); + // Only check for violations if we need to (when user has permission to review) - if ((isSubmitter || isApprover || isAdmin) && hasAnyViolations(report.reportID, allViolations, allReportTransactions)) { + if ((isSubmitter || isApprover || isAdmin) && hasVisibleViolationsForReport) { if (isSubmitter && !isApprover && !isAdmin && !canReview(report, allViolations, isIOUReportArchived || isChatReportArchived, policy, allReportTransactions)) { allActions.push(CONST.SEARCH.ACTION_TYPES.VIEW); } else { diff --git a/src/libs/Violations/ViolationsUtils.ts b/src/libs/Violations/ViolationsUtils.ts index f8e53afa010c..6c9e6bfdd1fe 100644 --- a/src/libs/Violations/ViolationsUtils.ts +++ b/src/libs/Violations/ViolationsUtils.ts @@ -1,8 +1,8 @@ import isEmpty from 'lodash/isEmpty'; import keyBy from 'lodash/keyBy'; import reject from 'lodash/reject'; +import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; -import type {OnyxUpdate} from 'react-native-onyx'; import type {LocaleContextProps} from '@components/LocaleContextProvider'; import * as CurrencyUtils from '@libs/CurrencyUtils'; import DateUtils from '@libs/DateUtils'; @@ -10,9 +10,10 @@ import {isReceiptError} from '@libs/ErrorUtils'; import Parser from '@libs/Parser'; import {getDistanceRateCustomUnitRate, getSortedTagKeys} from '@libs/PolicyUtils'; import * as TransactionUtils from '@libs/TransactionUtils'; +import {shouldShowViolation} from '@libs/TransactionUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; -import type {Policy, PolicyCategories, PolicyTagLists, ReportAction, Transaction, TransactionViolation, ViolationName} from '@src/types/onyx'; +import type {Policy, PolicyCategories, PolicyTagLists, Report, ReportAction, Transaction, TransactionViolation, ViolationName} from '@src/types/onyx'; import type {Errors} from '@src/types/onyx/OnyxCommon'; import type {ReceiptError, ReceiptErrors} from '@src/types/onyx/Transaction'; @@ -612,6 +613,23 @@ const ViolationsUtils = { .filter(Boolean) .join(' '); }, + + hasVisibleViolationsForUser(report: OnyxEntry, violations: OnyxCollection, policy?: OnyxEntry, transactions?: Transaction[]): boolean { + if (!report || !violations || !transactions) { + return false; + } + + return transactions.some((transaction) => { + const transactionViolations = violations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`]; + if (!transactionViolations) { + return false; + } + + return transactionViolations.some((violation: TransactionViolation) => { + return shouldShowViolation(report, policy, violation.name); + }); + }); + }, }; export default ViolationsUtils; diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts index 328e3c1c8dc4..06768de2f0e4 100644 --- a/tests/actions/ReportPreviewActionUtilsTest.ts +++ b/tests/actions/ReportPreviewActionUtilsTest.ts @@ -512,4 +512,41 @@ describe('getReportPreviewAction', () => { const {result: isReportArchived} = renderHook(() => useReportIsArchived(report?.parentReportID)); expect(getReportPreviewAction(VIOLATIONS, isReportArchived.current, report, policy, [transaction])).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW); }); + + it('canReview should return false for submitters when RECEIPT_NOT_SMART_SCANNED violation exists but is hidden from submitter', async () => { + (ReportUtils.hasAnyViolations as jest.Mock).mockReturnValue(true); + const report: Report = { + ...createRandomReport(REPORT_ID), + statusNum: 0, + stateNum: 0, + type: CONST.REPORT.TYPE.EXPENSE, + ownerAccountID: CURRENT_USER_ACCOUNT_ID, + isWaitingOnBankAccount: false, + }; + + const policy = createRandomPolicy(0); + policy.areWorkflowsEnabled = true; + policy.type = CONST.POLICY.TYPE.CORPORATE; + + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report); + + // Create a RECEIPT_NOT_SMART_SCANNED violation that should be hidden from submitter + const violations: OnyxCollection = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [ + { + name: CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED, + type: CONST.VIOLATION_TYPES.VIOLATION, + } as TransactionViolation, + ], + }; + + const transaction = { + transactionID: `${TRANSACTION_ID}`, + reportID: `${REPORT_ID}`, + } as unknown as Transaction; + + const {result: isReportArchived} = renderHook(() => useReportIsArchived(report?.parentReportID)); + // Should return VIEW instead of REVIEW because the violation is hidden from submitter + expect(getReportPreviewAction(violations, isReportArchived.current, report, policy, [transaction])).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW); + }); }); diff --git a/tests/unit/ViolationUtilsTest.ts b/tests/unit/ViolationUtilsTest.ts index 507b875f7f62..0ffadbf6c426 100644 --- a/tests/unit/ViolationUtilsTest.ts +++ b/tests/unit/ViolationUtilsTest.ts @@ -6,7 +6,7 @@ import {getTransactionViolations, hasWarningTypeViolation, isViolationDismissed} import ViolationsUtils from '@libs/Violations/ViolationsUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; -import type {Policy, PolicyCategories, PolicyTagLists, Transaction, TransactionViolation} from '@src/types/onyx'; +import type {Policy, PolicyCategories, PolicyTagLists, Report, Transaction, TransactionViolation} from '@src/types/onyx'; import type {TransactionCollectionDataSet} from '@src/types/onyx/Transaction'; const categoryOutOfPolicyViolation = { @@ -677,3 +677,163 @@ describe('getRBRMessages', () => { expect(result).toBe(expectedResult); }); }); + +describe('hasVisibleViolationsForUser', () => { + const submitterAccountID = 12345; + const testReportID = 'test-report-123'; + const testTransactionID = 'test-transaction-123'; + const testPolicyID = 'test-policy-123'; + + const mockReport = { + reportID: testReportID, + ownerAccountID: submitterAccountID, + policyID: testPolicyID, + stateNum: CONST.REPORT.STATE_NUM.OPEN, + statusNum: CONST.REPORT.STATUS_NUM.OPEN, + } as Report; + + const mockPolicy = { + id: testPolicyID, + role: CONST.POLICY.ROLE.ADMIN, + type: CONST.POLICY.TYPE.TEAM, + } as Policy; + + const mockTransaction = { + transactionID: testTransactionID, + reportID: testReportID, + accountID: submitterAccountID, + amount: 1000, + created: '2023-01-01', + currency: 'USD', + merchant: 'Test Merchant', + } as Transaction; + + beforeEach(() => { + Onyx.set(ONYXKEYS.SESSION, {accountID: submitterAccountID}); + }); + + it('should return false when report is null', () => { + const violations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${testTransactionID}`]: [missingCategoryViolation], + }; + + const result = ViolationsUtils.hasVisibleViolationsForUser(null as any, violations, mockPolicy, [mockTransaction]); + expect(result).toBe(false); + }); + + it('should return false when violations is null', () => { + const result = ViolationsUtils.hasVisibleViolationsForUser(mockReport, null as any, mockPolicy, [mockTransaction]); + expect(result).toBe(false); + }); + + it('should return false when transactions is null', () => { + const violations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${testTransactionID}`]: [missingCategoryViolation], + }; + + const result = ViolationsUtils.hasVisibleViolationsForUser(mockReport, violations, mockPolicy, null as any); + expect(result).toBe(false); + }); + + it('should return false when no violations exist for transactions', () => { + const violations = {}; + + const result = ViolationsUtils.hasVisibleViolationsForUser(mockReport, violations, mockPolicy, [mockTransaction]); + expect(result).toBe(false); + }); + + it('should return true when violations are visible to submitter', () => { + const violations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${testTransactionID}`]: [missingCategoryViolation], + }; + + // Mock shouldShowViolation to return true for missing category + jest.spyOn(require('@src/libs/TransactionUtils'), 'shouldShowViolation').mockReturnValue(true); + + const result = ViolationsUtils.hasVisibleViolationsForUser(mockReport, violations, mockPolicy, [mockTransaction]); + expect(result).toBe(true); + }); + + it('should return false when violations are hidden from submitter', () => { + const violations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${testTransactionID}`]: [ + { + name: CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED, + type: CONST.VIOLATION_TYPES.NOTICE, + }, + ], + }; + + // Mock shouldShowViolation to return false for RECEIPT_NOT_SMART_SCANNED (hidden from submitter) + jest.spyOn(require('@src/libs/TransactionUtils'), 'shouldShowViolation').mockImplementation((report, policy, violationName) => { + if (violationName === CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED) { + return false; // Hidden from submitter + } + return true; + }); + + const result = ViolationsUtils.hasVisibleViolationsForUser(mockReport, violations, mockPolicy, [mockTransaction]); + expect(result).toBe(false); + }); + + it('should return true when at least one violation is visible', () => { + const violations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${testTransactionID}`]: [ + { + name: CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED, + type: CONST.VIOLATION_TYPES.NOTICE, + }, + missingCategoryViolation, + ], + }; + + jest.spyOn(require('@src/libs/TransactionUtils'), 'shouldShowViolation').mockImplementation((report, policy, violationName) => { + if (violationName === CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED) { + return false; + } + if (violationName === CONST.VIOLATIONS.MISSING_CATEGORY) { + return true; + } + return true; + }); + + const result = ViolationsUtils.hasVisibleViolationsForUser(mockReport, violations, mockPolicy, [mockTransaction]); + expect(result).toBe(true); + }); + + it('should handle multiple transactions correctly', () => { + const secondTransactionID = 'test-transaction-456'; + const secondTransaction = { + transactionID: secondTransactionID, + reportID: testReportID, + accountID: submitterAccountID, + amount: 2000, + created: '2023-01-02', + currency: 'USD', + merchant: 'Test Merchant 2', + } as Transaction; + + const violations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${testTransactionID}`]: [ + { + name: CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED, + type: CONST.VIOLATION_TYPES.NOTICE, + }, + ], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${secondTransactionID}`]: [missingCategoryViolation], + }; + + jest.spyOn(require('@src/libs/TransactionUtils'), 'shouldShowViolation').mockImplementation((report, policy, violationName) => { + if (violationName === CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED) { + return false; + } + if (violationName === CONST.VIOLATIONS.MISSING_CATEGORY) { + return true; + } + return true; + }); + + const result = ViolationsUtils.hasVisibleViolationsForUser(mockReport, violations, mockPolicy, [mockTransaction, secondTransaction]); + expect(result).toBe(true); + }); +}); From 6456973771617b9a6571ab2e7b086c9f8affc0de Mon Sep 17 00:00:00 2001 From: Abdelrahman Khattab Date: Sun, 14 Sep 2025 22:08:20 +0300 Subject: [PATCH 2/8] fix double import --- src/components/Search/index.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx index 1045a8135110..17bb76107f1a 100644 --- a/src/components/Search/index.tsx +++ b/src/components/Search/index.tsx @@ -29,6 +29,7 @@ import Performance from '@libs/Performance'; import {getIOUActionForTransactionID, isExportIntegrationAction, isIntegrationMessageAction} from '@libs/ReportActionsUtils'; import {canEditFieldOfMoneyRequest, isArchivedReport} from '@libs/ReportUtils'; import {buildCannedSearchQuery, buildSearchQueryJSON, buildSearchQueryString} from '@libs/SearchQueryUtils'; +import type {ArchivedReportsIDSet, SearchKey} from '@libs/SearchUIUtils'; import { createAndOpenSearchTransactionThread, getColumnsToShow, @@ -49,9 +50,7 @@ import { shouldShowEmptyState, shouldShowYear as shouldShowYearUtil, } from '@libs/SearchUIUtils'; -import type {ArchivedReportsIDSet, SearchKey} from '@libs/SearchUIUtils'; -import {shouldShowViolation} from '@libs/TransactionUtils'; -import {isOnHold, isTransactionPendingDelete} from '@libs/TransactionUtils'; +import {isOnHold, isTransactionPendingDelete, shouldShowViolation} from '@libs/TransactionUtils'; import Navigation, {navigationRef} from '@navigation/Navigation'; import type {SearchFullscreenNavigatorParamList} from '@navigation/types'; import EmptySearchView from '@pages/Search/EmptySearchView'; @@ -63,8 +62,8 @@ import SCREENS from '@src/SCREENS'; import type {OutstandingReportsByPolicyIDDerivedValue, ReportAction} from '@src/types/onyx'; import type Policy from '@src/types/onyx/Policy'; import type Report from '@src/types/onyx/Report'; -import type {SearchTransaction} from '@src/types/onyx/SearchResults'; import type SearchResults from '@src/types/onyx/SearchResults'; +import type {SearchTransaction} from '@src/types/onyx/SearchResults'; import type {TransactionViolation} from '@src/types/onyx/TransactionViolation'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; import arraysEqual from '@src/utils/arraysEqual'; From 8455914d1367c7730afd51fec7e3598cb7afca29 Mon Sep 17 00:00:00 2001 From: Abdelrahman Khattab Date: Sun, 14 Sep 2025 22:42:29 +0300 Subject: [PATCH 3/8] fixing ts types --- tests/unit/ViolationUtilsTest.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/ViolationUtilsTest.ts b/tests/unit/ViolationUtilsTest.ts index 0ffadbf6c426..0f90151550d8 100644 --- a/tests/unit/ViolationUtilsTest.ts +++ b/tests/unit/ViolationUtilsTest.ts @@ -717,12 +717,12 @@ describe('hasVisibleViolationsForUser', () => { [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${testTransactionID}`]: [missingCategoryViolation], }; - const result = ViolationsUtils.hasVisibleViolationsForUser(null as any, violations, mockPolicy, [mockTransaction]); + const result = ViolationsUtils.hasVisibleViolationsForUser(undefined, violations, mockPolicy, [mockTransaction]); expect(result).toBe(false); }); it('should return false when violations is null', () => { - const result = ViolationsUtils.hasVisibleViolationsForUser(mockReport, null as any, mockPolicy, [mockTransaction]); + const result = ViolationsUtils.hasVisibleViolationsForUser(mockReport, undefined, mockPolicy, [mockTransaction]); expect(result).toBe(false); }); @@ -731,7 +731,7 @@ describe('hasVisibleViolationsForUser', () => { [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${testTransactionID}`]: [missingCategoryViolation], }; - const result = ViolationsUtils.hasVisibleViolationsForUser(mockReport, violations, mockPolicy, null as any); + const result = ViolationsUtils.hasVisibleViolationsForUser(mockReport, violations, mockPolicy); expect(result).toBe(false); }); From a84ffcca48e682349ce36fa8ee1dbcdf2c45a28c Mon Sep 17 00:00:00 2001 From: Abdelrahman Khattab Date: Mon, 15 Sep 2025 15:19:00 +0300 Subject: [PATCH 4/8] fixing failing tests --- tests/actions/ReportPreviewActionUtilsTest.ts | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts index 06768de2f0e4..3893b8cf2cdb 100644 --- a/tests/actions/ReportPreviewActionUtilsTest.ts +++ b/tests/actions/ReportPreviewActionUtilsTest.ts @@ -446,12 +446,23 @@ describe('getReportPreviewAction', () => { name: CONST.VIOLATIONS.OVER_LIMIT, } as TransactionViolation, ]); + const violations: OnyxCollection = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [ + { + name: CONST.VIOLATIONS.OVER_LIMIT, + type: CONST.VIOLATION_TYPES.VIOLATION, + } as TransactionViolation, + ], + }; + const transaction = { + transactionID: `${TRANSACTION_ID}`, reportID: `${REPORT_ID}`, } as unknown as Transaction; const {result: isReportArchived} = renderHook(() => useReportIsArchived(report?.parentReportID)); - expect(getReportPreviewAction(VIOLATIONS, isReportArchived.current, report, policy, [transaction])).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW); + + expect(getReportPreviewAction(violations, isReportArchived.current, report, policy, [transaction])).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW); }); it('canReview should return true for reports with RTER violations regardless of workspace workflow configuration', async () => { @@ -475,20 +486,25 @@ describe('getReportPreviewAction', () => { } as unknown as ReportViolations; await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_VIOLATIONS}${REPORT_ID}`, REPORT_VIOLATION); - await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`, [ - { - name: CONST.VIOLATIONS.RTER, - data: { - pendingPattern: true, - rterType: CONST.RTER_VIOLATION_TYPES.SEVEN_DAY_HOLD, - }, - } as TransactionViolation, - ]); + const violations: OnyxCollection = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [ + { + name: CONST.VIOLATIONS.RTER, + type: CONST.VIOLATION_TYPES.VIOLATION, + data: { + pendingPattern: true, + rterType: CONST.RTER_VIOLATION_TYPES.SEVEN_DAY_HOLD, + }, + } as TransactionViolation, + ], + }; + const transaction = { + transactionID: `${TRANSACTION_ID}`, reportID: `${REPORT_ID}`, } as unknown as Transaction; - expect(getReportPreviewAction(VIOLATIONS, false, report, policy, [transaction])).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW); + expect(getReportPreviewAction(violations, false, report, policy, [transaction])).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW); }); it('canView should return true for reports in which we are waiting for user to add a bank account', async () => { From a10be7d0926670dfb6ebf8d4a03276431dfd47d8 Mon Sep 17 00:00:00 2001 From: Abdelrahman Khattab Date: Mon, 15 Sep 2025 15:23:51 +0300 Subject: [PATCH 5/8] fixing imports --- src/components/Search/index.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx index e16c6cc056e0..0ff219e9f534 100644 --- a/src/components/Search/index.tsx +++ b/src/components/Search/index.tsx @@ -3,8 +3,7 @@ import {accountIDSelector} from '@selectors/Session'; import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; import type {NativeScrollEvent, NativeSyntheticEvent, StyleProp, ViewStyle} from 'react-native'; import {View} from 'react-native'; -import type {OnyxEntry} from 'react-native-onyx'; -import type {OnyxCollection} from 'react-native-onyx'; +import type {OnyxCollection, OnyxEntry} from 'react-native-onyx'; import Animated, {FadeIn, FadeOut, useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated'; import FullPageErrorView from '@components/BlockingViews/FullPageErrorView'; import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView'; @@ -60,10 +59,9 @@ import NAVIGATORS from '@src/NAVIGATORS'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import SCREENS from '@src/SCREENS'; -import type {OutstandingReportsByPolicyIDDerivedValue, ReportAction} from '@src/types/onyx'; +import type {OutstandingReportsByPolicyIDDerivedValue, ReportAction, ReportActions, ReportNameValuePairs} from '@src/types/onyx'; import type Policy from '@src/types/onyx/Policy'; import type Report from '@src/types/onyx/Report'; -import type {OutstandingReportsByPolicyIDDerivedValue, ReportAction, ReportActions, ReportNameValuePairs} from '@src/types/onyx'; import type SearchResults from '@src/types/onyx/SearchResults'; import type {SearchTransaction} from '@src/types/onyx/SearchResults'; import type {TransactionViolation} from '@src/types/onyx/TransactionViolation'; From f3e5f5b81311c174513fe60eee5929a46cc0c599 Mon Sep 17 00:00:00 2001 From: Abdelrahman Khattab Date: Sat, 4 Oct 2025 15:18:56 +0200 Subject: [PATCH 6/8] Filter transaction violations based on user visibility rules --- .../MoneyRequestReportTransactionList.tsx | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index 85018c599712..7ee135f5078c 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -27,7 +27,7 @@ import Parser from '@libs/Parser'; import {getIOUActionForTransactionID} from '@libs/ReportActionsUtils'; import {getMoneyRequestSpendBreakdown, isExpenseReport} from '@libs/ReportUtils'; import {compareValues, getColumnsToShow, isTransactionAmountTooLong, isTransactionTaxAmountTooLong} from '@libs/SearchUIUtils'; -import {getAmount, getCategory, getCreated, getMerchant, getTag, getTransactionPendingAction, isTransactionPendingDelete} from '@libs/TransactionUtils'; +import {getAmount, getCategory, getCreated, getMerchant, getTag, getTransactionPendingAction, isTransactionPendingDelete, shouldShowViolation} from '@libs/TransactionUtils'; import shouldShowTransactionYear from '@libs/TransactionUtils/shouldShowTransactionYear'; import Navigation from '@navigation/Navigation'; import type {ReportsSplitNavigatorParamList} from '@navigation/types'; @@ -153,6 +153,28 @@ function MoneyRequestReportTransactionList({ const isMobileSelectionModeEnabled = useMobileSelectionMode(); const personalDetailsList = usePersonalDetails(); + // Filter violations based on user visibility + const filteredViolations = useMemo(() => { + if (!violations || !report || !policy || !transactions) { + return violations; + } + + const filtered: Record = {}; + + for (const transaction of transactions) { + const transactionViolations = violations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`]; + if (transactionViolations) { + const filteredTransactionViolations = transactionViolations.filter((violation) => shouldShowViolation(report, policy, violation.name)); + + if (filteredTransactionViolations.length > 0) { + filtered[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`] = filteredTransactionViolations; + } + } + } + + return filtered; + }, [violations, report, policy, transactions]); + const toggleTransaction = useCallback( (transactionID: string) => { let newSelectedTransactionIDs = selectedTransactionIDs; @@ -339,7 +361,7 @@ function MoneyRequestReportTransactionList({ Date: Sat, 4 Oct 2025 15:22:13 +0200 Subject: [PATCH 7/8] adding function comments to hasVisibleViolationsForUser --- src/libs/Violations/ViolationsUtils.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libs/Violations/ViolationsUtils.ts b/src/libs/Violations/ViolationsUtils.ts index 5b966e8d895c..4c7a678b79e3 100644 --- a/src/libs/Violations/ViolationsUtils.ts +++ b/src/libs/Violations/ViolationsUtils.ts @@ -609,17 +609,23 @@ const ViolationsUtils = { .join(' '); }, + /** + * Checks if any transactions in the report have violations that should be visible to the current user. + * Filters violations based on user role (submitter, admin, policy member) and report state. + */ hasVisibleViolationsForUser(report: OnyxEntry, violations: OnyxCollection, policy?: OnyxEntry, transactions?: Transaction[]): boolean { if (!report || !violations || !transactions) { return false; } + // Check if any transaction has at least one violation visible to the current user return transactions.some((transaction) => { const transactionViolations = violations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`]; if (!transactionViolations) { return false; } + // Check if any violation should be shown based on user role and violation type return transactionViolations.some((violation: TransactionViolation) => { return shouldShowViolation(report, policy, violation.name); }); From 356061281b4caa38cc69f21db3ccf4fc08687ed6 Mon Sep 17 00:00:00 2001 From: Abdelrahman Khattab Date: Sat, 11 Oct 2025 17:49:13 +0200 Subject: [PATCH 8/8] Add test coverage for violation filtering --- tests/actions/ReportPreviewActionUtilsTest.ts | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts index 4525e27314fd..5c9329cdd423 100644 --- a/tests/actions/ReportPreviewActionUtilsTest.ts +++ b/tests/actions/ReportPreviewActionUtilsTest.ts @@ -609,4 +609,85 @@ describe('getReportPreviewAction', () => { // Should return VIEW instead of REVIEW because the violation is hidden from submitter expect(getReportPreviewAction(violations, isReportArchived.current, report, policy, [transaction])).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW); }); + + it('canReview should return true when report has mix of visible and hidden violations but at least one is visible', async () => { + (ReportUtils.hasAnyViolations as jest.Mock).mockReturnValue(true); + const report: Report = { + ...createRandomReport(REPORT_ID), + statusNum: 0, + stateNum: 0, + type: CONST.REPORT.TYPE.EXPENSE, + ownerAccountID: CURRENT_USER_ACCOUNT_ID, + isWaitingOnBankAccount: false, + }; + + const policy = createRandomPolicy(0); + policy.areWorkflowsEnabled = true; + policy.type = CONST.POLICY.TYPE.CORPORATE; + + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report); + + // Mix of hidden and visible violations + const violations: OnyxCollection = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [ + { + name: CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED, + type: CONST.VIOLATION_TYPES.VIOLATION, + } as TransactionViolation, + { + name: CONST.VIOLATIONS.MISSING_CATEGORY, + type: CONST.VIOLATION_TYPES.VIOLATION, + } as TransactionViolation, + ], + }; + + const transaction = { + transactionID: `${TRANSACTION_ID}`, + reportID: `${REPORT_ID}`, + } as unknown as Transaction; + + const {result: isReportArchived} = renderHook(() => useReportIsArchived(report?.parentReportID)); + // Should return REVIEW because at least one violation (MISSING_CATEGORY) is visible + expect(getReportPreviewAction(violations, isReportArchived.current, report, policy, [transaction])).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW); + }); + + it('canReview should return false when report has no visible violations for current user role', async () => { + (ReportUtils.hasAnyViolations as jest.Mock).mockReturnValue(true); + const report: Report = { + ...createRandomReport(REPORT_ID), + statusNum: 0, + stateNum: 0, + type: CONST.REPORT.TYPE.EXPENSE, + ownerAccountID: CURRENT_USER_ACCOUNT_ID, + isWaitingOnBankAccount: false, + }; + + const policy = createRandomPolicy(0); + policy.areWorkflowsEnabled = true; + policy.type = CONST.POLICY.TYPE.CORPORATE; + + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report); + + // All violations hidden from submitter + const violations: OnyxCollection = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [ + { + name: CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED, + type: CONST.VIOLATION_TYPES.NOTICE, + } as TransactionViolation, + { + name: CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED, + type: CONST.VIOLATION_TYPES.WARNING, + } as TransactionViolation, + ], + }; + + const transaction = { + transactionID: `${TRANSACTION_ID}`, + reportID: `${REPORT_ID}`, + } as unknown as Transaction; + + const {result: isReportArchived} = renderHook(() => useReportIsArchived(report?.parentReportID)); + expect(getReportPreviewAction(violations, isReportArchived.current, report, policy, [transaction])).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW); + }); });