diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts index 585439a6663b..0f159ce22017 100644 --- a/src/libs/SearchUIUtils.ts +++ b/src/libs/SearchUIUtils.ts @@ -1176,7 +1176,7 @@ function createReportActionsLookupMaps(data: OnyxTypes.SearchResults['data']): { function getToFieldValueForTransaction( transactionItem: OnyxTypes.Transaction, report: OnyxTypes.Report | undefined, - personalDetailsList: OnyxTypes.PersonalDetailsList, + personalDetailsList: OnyxTypes.PersonalDetailsList | undefined, reportAction: OnyxTypes.ReportAction | undefined, ): OnyxTypes.PersonalDetails { const shouldShowBlankTo = !report || isOpenExpenseReport(report); @@ -1229,7 +1229,7 @@ function getTransactionsSections( const allViolations = getViolations(data); // Use Map for faster lookups of personal details and reportActions - const personalDetailsMap = new Map(Object.entries(data.personalDetailsList || {})); + const personalDetailsMap = new Map(Object.entries(data.personalDetailsList ?? {})); const {moneyRequestReportActionsByTransactionID, holdReportActionsByTransactionID} = createReportActionsLookupMaps(data); const transactionsSections: TransactionListItemType[] = []; @@ -1783,8 +1783,8 @@ function getReportSections( allActions, keyForList: String(reportItem.reportID), groupedBy: CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT, - from: fromDetails, - to: toDetails, + from: (fromDetails ?? emptyPersonalDetails) as OnyxTypes.PersonalDetails, + to: (toDetails ?? emptyPersonalDetails) as OnyxTypes.PersonalDetails, exported: lastExportedActionByReportID.get(reportItem.reportID)?.created ?? '', formattedFrom, formattedTo, @@ -1855,10 +1855,10 @@ function getReportSections( }; if (reportIDToTransactions[reportKey]?.transactions) { reportIDToTransactions[reportKey].transactions.push(transaction); - reportIDToTransactions[reportKey].from = data.personalDetailsList[data?.[reportKey as ReportKey]?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID]; + reportIDToTransactions[reportKey].from = data?.personalDetailsList?.[data?.[reportKey as ReportKey]?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID] ?? emptyPersonalDetails; } else if (reportIDToTransactions[reportKey]) { reportIDToTransactions[reportKey].transactions = [transaction]; - reportIDToTransactions[reportKey].from = data.personalDetailsList[data?.[reportKey as ReportKey]?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID]; + reportIDToTransactions[reportKey].from = data?.personalDetailsList?.[data?.[reportKey as ReportKey]?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID] ?? emptyPersonalDetails; } } } diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts index 53b4fd9ef0d6..ca6dfe59fdda 100644 --- a/src/types/onyx/SearchResults.ts +++ b/src/types/onyx/SearchResults.ts @@ -182,8 +182,9 @@ type SearchResults = { search: SearchResultsInfo; /** Search results data */ + // eslint-disable-next-line @typescript-eslint/no-deprecated data: PrefixedRecord & - Record> & + Record | undefined> & PrefixedRecord> & PrefixedRecord & PrefixedRecord &