Merge pull request #45105 from Expensify/cmartins-fixToFieldOnReports

Fix to field on reportListItem
Expensify · Jul 12, 2024 · 5b436d9 · 5b436d9
2 parents 5b81bae + 16de7cf
commit 5b436d9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/src/components/SelectionList/Search/TransactionListItemRow.tsx b/src/components/SelectionList/Search/TransactionListItemRow.tsx
@@ -161,7 +161,7 @@ function TotalCell({showTooltip, isLargeScreenWidth, transactionItem}: TotalCell
 
 function TypeCell({transactionItem, isLargeScreenWidth}: TransactionCellProps) {
     const theme = useTheme();
-    const typeIcon = getTypeIcon(transactionItem.type);
+    const typeIcon = getTypeIcon(transactionItem.transactionType);
 
     return (
         <Icon

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
@@ -24,7 +24,7 @@ const columnNamesToSortingProperty = {
     [CONST.SEARCH.TABLE_COLUMNS.MERCHANT]: 'formattedMerchant' as const,
     [CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT]: 'formattedTotal' as const,
     [CONST.SEARCH.TABLE_COLUMNS.CATEGORY]: 'category' as const,
-    [CONST.SEARCH.TABLE_COLUMNS.TYPE]: 'type' as const,
+    [CONST.SEARCH.TABLE_COLUMNS.TYPE]: 'transactionType' as const,
     [CONST.SEARCH.TABLE_COLUMNS.ACTION]: 'action' as const,
     [CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION]: 'comment' as const,
     [CONST.SEARCH.TABLE_COLUMNS.TAX_AMOUNT]: null,
@@ -160,15 +160,20 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx
     const reportIDToTransactions: Record<string, ReportListItemType> = {};
     for (const key in data) {
         if (key.startsWith(ONYXKEYS.COLLECTION.REPORT)) {
-            const value = {...data[key]};
-            const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${value.reportID}`;
+            const reportItem = {...data[key]};
+            const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${reportItem.reportID}`;
             const transactions = reportIDToTransactions[reportKey]?.transactions ?? [];
+            const isExpenseReport = reportItem.type === CONST.REPORT.TYPE.EXPENSE;
+
+            const to = isExpenseReport
+                ? (data[`${ONYXKEYS.COLLECTION.POLICY}${reportItem.policyID}`] as SearchAccountDetails)
+                : (data.personalDetailsList?.[reportItem.managerID] as SearchAccountDetails);
 
             reportIDToTransactions[reportKey] = {
-                ...value,
-                keyForList: value.reportID,
-                from: data.personalDetailsList?.[value.accountID],
-                to: data.personalDetailsList?.[value.managerID],
+                ...reportItem,
+                keyForList: reportItem.reportID,
+                from: data.personalDetailsList?.[reportItem.accountID],
+                to,
                 transactions,
             };
         } else if (key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) {

diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
@@ -111,14 +111,17 @@ type SearchReport = {
     currency?: string;
 
     /** The report type */
-    type?: string;
+    type?: ValueOf<typeof CONST.REPORT.TYPE>;
 
     /** The accountID of the report manager */
     managerID?: number;
 
     /** The accountID of the user who created the report  */
     accountID?: number;
 
+    /** The policyID of the report */
+    policyID?: string;
+
     /** The date the report was created */
     created?: string;
 
@@ -180,7 +183,7 @@ type SearchTransaction = {
     category: string;
 
     /** The type of request */
-    type: ValueOf<typeof CONST.SEARCH.TRANSACTION_TYPE>;
+    transactionType: ValueOf<typeof CONST.SEARCH.TRANSACTION_TYPE>;
 
     /** The type of report the transaction is associated with */
     reportType: string;