Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/libs/SearchUIUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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[] = [];
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/types/onyx/SearchResults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,9 @@ type SearchResults = {
search: SearchResultsInfo;

/** Search results data */
// eslint-disable-next-line @typescript-eslint/no-deprecated
data: PrefixedRecord<typeof ONYXKEYS.COLLECTION.TRANSACTION, Transaction> &
Record<typeof ONYXKEYS.PERSONAL_DETAILS_LIST, Record<string, PersonalDetails>> &
Record<typeof ONYXKEYS.PERSONAL_DETAILS_LIST, Record<string, PersonalDetails> | undefined> &
PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS, Record<string, ReportAction>> &
PrefixedRecord<typeof ONYXKEYS.COLLECTION.REPORT, Report> &
PrefixedRecord<typeof ONYXKEYS.COLLECTION.POLICY, Policy> &
Expand Down
Loading