Merge pull request Expensify#67549 from mkzie2/mkzie2-issue/66714

fix: expense - user avatar is shown in report in which expense is notadded

Author: MariaHCD

src/libs/SearchUIUtils.ts

@@ -1175,7 +1175,7 @@ function getReportSections(
                 action: getAction(data, allViolations, key, currentSearch, actions),
                 groupedBy: CONST.SEARCH.GROUP_BY.REPORTS,
                 keyForList: reportItem.reportID,
-                from: data.personalDetailsList?.[reportItem.accountID ?? CONST.DEFAULT_NUMBER_ID],
+                from: transactions.length > 0 ? data.personalDetailsList[data?.[reportKey as ReportKey]?.accountID ?? CONST.DEFAULT_NUMBER_ID] : emptyPersonalDetails,
                 to: !shouldShowBlankTo && reportItem.managerID ? data.personalDetailsList?.[reportItem.managerID] : emptyPersonalDetails,
                 transactions,
                 ...(reportPendingAction ? {pendingAction: reportPendingAction} : {}),
@@ -1223,8 +1223,10 @@ function getReportSections(
             };
             if (reportIDToTransactions[reportKey]?.transactions) {
                 reportIDToTransactions[reportKey].transactions.push(transaction);
+                reportIDToTransactions[reportKey].from = data.personalDetailsList[data?.[reportKey as ReportKey]?.accountID ?? CONST.DEFAULT_NUMBER_ID];
             } else if (reportIDToTransactions[reportKey]) {
                 reportIDToTransactions[reportKey].transactions = [transaction];
+                reportIDToTransactions[reportKey].from = data.personalDetailsList[data?.[reportKey as ReportKey]?.accountID ?? CONST.DEFAULT_NUMBER_ID];
             }
         }
     }

tests/unit/Search/SearchUIUtilsTest.ts

@@ -28,6 +28,7 @@ const reportID = '123456789';
 const reportID2 = '11111';
 const reportID3 = '99999';
 const reportID4 = '6155022250251839';
+const reportID5 = '22222';
 const transactionID = '1';
 const transactionID2 = '2';
 const transactionID3 = '3';
@@ -232,6 +233,27 @@ const searchResults: OnyxTypes.SearchResults = {
             created: '2025-03-05 16:34:27',
             type: 'chat',
         },
+        [`report_${reportID5}`]: {
+            accountID: adminAccountID,
+            action: 'view',
+            chatReportID: '1706144653204915',
+            created: '2024-12-21 13:05:20',
+            currency: 'USD',
+            isOneTransactionReport: true,
+            isPolicyExpenseChat: false,
+            isWaitingOnBankAccount: false,
+            managerID: adminAccountID,
+            nonReimbursableTotal: 0,
+            ownerAccountID: adminAccountID,
+            policyID,
+            reportID: reportID5,
+            reportName: 'Expense Report #123',
+            stateNum: 0,
+            statusNum: 0,
+            total: 0,
+            type: 'expense',
+            unheldTotal: 0,
+        },
         [`transactions_${transactionID}`]: {
             accountID: adminAccountID,
             action: 'view',
@@ -1005,6 +1027,42 @@ const transactionReportGroupListItems = [
         },
         transactions: [transactionsListItems.at(2), transactionsListItems.at(3)],
     },
+    {
+        groupedBy: 'reports',
+        accountID: 18439984,
+        action: 'view',
+        chatReportID: '1706144653204915',
+        created: '2024-12-21 13:05:20',
+        currency: 'USD',
+        from: {
+            accountID: CONST.REPORT.OWNER_ACCOUNT_ID_FAKE,
+            avatar: '',
+            displayName: undefined,
+            login: undefined,
+        },
+        isOneTransactionReport: true,
+        isPolicyExpenseChat: false,
+        isWaitingOnBankAccount: false,
+        keyForList: reportID5,
+        managerID: 18439984,
+        nonReimbursableTotal: 0,
+        ownerAccountID: 18439984,
+        policyID: 'A1B2C3',
+        reportID: reportID5,
+        reportName: 'Expense Report #123',
+        stateNum: 0,
+        statusNum: 0,
+        to: {
+            accountID: 0,
+            avatar: '',
+            displayName: undefined,
+            login: undefined,
+        },
+        total: 0,
+        transactions: [],
+        type: 'expense',
+        unheldTotal: 0,
+    },
 ] as TransactionReportGroupListItemType[];
 
 describe('SearchUIUtils', () => {