Skip to content

Commit d733b1f

Browse files
authored
Merge pull request #88439 from Expensify/revert-84832-akhattab/fix-ineligible-report-filtering
[Payment due @huult] [CP Staging] Revert "Fix: Filter ineligible reports in useOutstandingReports hook"
2 parents 67a0cc0 + 8a8846d commit d733b1f

2 files changed

Lines changed: 4 additions & 203 deletions

File tree

src/hooks/useOutstandingReports.ts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type {OnyxEntry} from 'react-native-onyx';
2-
import {getOutstandingReportsForUser, isReportIneligibleForMoveExpenses, isSelfDM} from '@libs/ReportUtils';
2+
import {getOutstandingReportsForUser, isSelfDM} from '@libs/ReportUtils';
33
import CONST from '@src/CONST';
44
import ONYXKEYS from '@src/ONYXKEYS';
5-
import type {Policy, Report} from '@src/types/onyx';
5+
import type {Policy} from '@src/types/onyx';
66
import {isEmptyObject} from '@src/types/utils/EmptyObject';
77
import useMappedPolicies from './useMappedPolicies';
88
import useOnyx from './useOnyx';
@@ -13,7 +13,6 @@ export default function useOutstandingReports(selectedReportID: string | undefin
1313
const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID);
1414
const [personalPolicyID] = useOnyx(ONYXKEYS.PERSONAL_POLICY_ID);
1515
const [allPoliciesID] = useMappedPolicies(policyIdMapper);
16-
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
1716
const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS);
1817
const [selectedReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${selectedReportID}`);
1918

@@ -22,12 +21,6 @@ export default function useOutstandingReports(selectedReportID: string | undefin
2221
return [];
2322
}
2423

25-
const filterEligibleReports = (reports: Array<OnyxEntry<Report>>) =>
26-
reports.filter((report) => {
27-
const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`];
28-
return !isReportIneligibleForMoveExpenses(report, policy);
29-
});
30-
3124
if (!selectedPolicyID || selectedPolicyID === personalPolicyID || isSelfDM(selectedReport)) {
3225
const result = [];
3326
for (const policyID of Object.values(allPoliciesID ?? {})) {
@@ -38,10 +31,8 @@ export default function useOutstandingReports(selectedReportID: string | undefin
3831
const reports = getOutstandingReportsForUser(policyID, ownerAccountID, outstandingReportsByPolicyID[policyID] ?? {}, reportNameValuePairs, isEditing);
3932
result.push(...reports);
4033
}
41-
return filterEligibleReports(result);
34+
return result;
4235
}
4336

44-
return filterEligibleReports(
45-
getOutstandingReportsForUser(selectedPolicyID, ownerAccountID, outstandingReportsByPolicyID?.[selectedPolicyID ?? CONST.DEFAULT_NUMBER_ID] ?? {}, reportNameValuePairs, isEditing),
46-
);
37+
return getOutstandingReportsForUser(selectedPolicyID, ownerAccountID, outstandingReportsByPolicyID?.[selectedPolicyID ?? CONST.DEFAULT_NUMBER_ID] ?? {}, reportNameValuePairs, isEditing);
4738
}

tests/unit/hooks/useOutstandingReports.test.ts

Lines changed: 0 additions & 190 deletions
This file was deleted.

0 commit comments

Comments
 (0)