Merge pull request #46858 from hungvu193/chore-46303

Clean-up some logic with invoice report fields
Expensify · Aug 12, 2024 · 00057ea · 00057ea
2 parents 4ef1202 + 35cc8f4
commit 00057ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/components/ReportActionItem/MoneyReportView.tsx b/src/components/ReportActionItem/MoneyReportView.tsx
@@ -68,7 +68,7 @@ function MoneyReportView({report, policy, isCombinedReport = false, shouldShowTo
 
     const sortedPolicyReportFields = useMemo<PolicyReportField[]>((): PolicyReportField[] => {
         const fields = ReportUtils.getAvailableReportFields(report, Object.values(policy?.fieldList ?? {}));
-        return fields.sort(({orderWeight: firstOrderWeight}, {orderWeight: secondOrderWeight}) => firstOrderWeight - secondOrderWeight);
+        return fields.filter((field) => field.target === report.type).sort(({orderWeight: firstOrderWeight}, {orderWeight: secondOrderWeight}) => firstOrderWeight - secondOrderWeight);
     }, [policy, report]);
 
     const enabledReportFields = sortedPolicyReportFields.filter((reportField) => !ReportUtils.isReportFieldDisabled(report, reportField, policy));

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
@@ -1267,6 +1267,9 @@ type PolicyReportField = {
     /** Value of the field */
     value?: string | null;
 
+    /** Value of the target */
+    target?: 'expense' | 'invoice' | 'paycheck';
+
     /** Options to select from if field is of type dropdown */
     values: string[];