Skip to content

Commit 22a2751

Browse files
committed
Fix one transaction thread report open from Reports -> Reports
1 parent a636246 commit 22a2751

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

src/components/Search/index.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,11 @@ function Search({queryJSON, searchResults, onSearchListScroll, contentContainerS
679679
if (isTransactionGroupListItemType(item)) {
680680
const firstTransaction = item.transactions.at(0);
681681
if (item.isOneTransactionReport && firstTransaction && transactionPreviewData) {
682-
setOptimisticDataForTransactionThreadPreview(firstTransaction, transactionPreviewData);
682+
if (firstTransaction.transactionThreadReportID === CONST.REPORT.UNREPORTED_REPORT_ID) {
683+
createAndOpenSearchTransactionThread(firstTransaction, hash, backTo, transactionPreviewData, false);
684+
} else {
685+
setOptimisticDataForTransactionThreadPreview(firstTransaction, transactionPreviewData);
686+
}
683687
}
684688
requestAnimationFrame(() => Navigation.navigate(ROUTES.SEARCH_MONEY_REQUEST_REPORT.getRoute({reportID, backTo})));
685689
return;

src/libs/SearchUIUtils.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,7 @@ function getTaskSections(
12801280
}
12811281

12821282
/** Creates transaction thread report and navigates to it from the search page */
1283-
function createAndOpenSearchTransactionThread(item: TransactionListItemType, hash: number, backTo: string, transactionPreviewData?: TransactionPreviewData) {
1283+
function createAndOpenSearchTransactionThread(item: TransactionListItemType, hash: number, backTo: string, transactionPreviewData?: TransactionPreviewData, shouldNavigate = true) {
12841284
const previewData = transactionPreviewData
12851285
? {...transactionPreviewData, hasTransactionThreadReport: true}
12861286
: {hasTransaction: false, hasParentReport: false, hasParentReportAction: false, hasTransactionThreadReport: true};
@@ -1291,7 +1291,9 @@ function createAndOpenSearchTransactionThread(item: TransactionListItemType, has
12911291
updateSearchResultsWithTransactionThreadReportID(hash, item.transactionID, transactionThreadReport?.reportID);
12921292
}
12931293

1294-
Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID: transactionThreadReport?.reportID, backTo}));
1294+
if (shouldNavigate) {
1295+
Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID: transactionThreadReport?.reportID, backTo}));
1296+
}
12951297
}
12961298

12971299
/**

0 commit comments

Comments
 (0)