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
13 changes: 9 additions & 4 deletions src/libs/SearchUIUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import {
isClosedReport,
isInvoiceReport,
isMoneyRequestReport,
isOpenExpenseReport,
isSettled,
} from './ReportUtils';
import {buildCannedSearchQuery} from './SearchQueryUtils';
Expand Down Expand Up @@ -283,8 +284,10 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
.filter(isTransactionEntry)
.map((key) => {
const transactionItem = data[key];
const report = data[`${ONYXKEYS.COLLECTION.REPORT}${transactionItem.reportID}`];
const shouldShowBlankTo = isOpenExpenseReport(report);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{BZ CHECKLIST} coming from #62558, we should also check if report exists otherwise it shows blank "to" breifly after moving a expense.

const from = data.personalDetailsList?.[transactionItem.accountID];
const to = transactionItem.managerID ? data.personalDetailsList?.[transactionItem.managerID] : emptyPersonalDetails;
const to = transactionItem.managerID && !shouldShowBlankTo ? data.personalDetailsList?.[transactionItem.managerID] : emptyPersonalDetails;

const {formattedFrom, formattedTo, formattedTotal, formattedMerchant, date} = getTransactionItemCommonFormattedProperties(transactionItem, from, to);

Expand All @@ -294,7 +297,7 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata
from,
to,
formattedFrom,
formattedTo,
formattedTo: shouldShowBlankTo ? '' : formattedTo,
formattedTotal,
formattedMerchant,
date,
Expand Down Expand Up @@ -483,9 +486,11 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx
} else if (isTransactionEntry(key)) {
const transactionItem = {...data[key]};
const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${transactionItem.reportID}`;
const report = data[`${ONYXKEYS.COLLECTION.REPORT}${transactionItem.reportID}`];
const shouldShowBlankTo = isOpenExpenseReport(report);

const from = data.personalDetailsList?.[transactionItem.accountID];
const to = transactionItem.managerID ? data.personalDetailsList?.[transactionItem.managerID] : emptyPersonalDetails;
const to = transactionItem.managerID && !shouldShowBlankTo ? data.personalDetailsList?.[transactionItem.managerID] : emptyPersonalDetails;

const {formattedFrom, formattedTo, formattedTotal, formattedMerchant, date} = getTransactionItemCommonFormattedProperties(transactionItem, from, to);

Expand All @@ -495,7 +500,7 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx
from,
to,
formattedFrom,
formattedTo,
formattedTo: shouldShowBlankTo ? '' : formattedTo,
formattedTotal,
formattedMerchant,
date,
Expand Down
Loading