Skip to content

Commit 88b1ce4

Browse files
authored
Merge pull request Expensify#74361 from paulnjs/paulnjs-fix/73057
2 parents c21a1f5 + fc75795 commit 88b1ce4

1 file changed

Lines changed: 13 additions & 0 deletions

File tree

src/pages/TransactionMerge/ConfirmationPage.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ import usePermissions from '@hooks/usePermissions';
1818
import useThemeStyles from '@hooks/useThemeStyles';
1919
import {mergeTransactionRequest} from '@libs/actions/MergeTransaction';
2020
import {buildMergedTransactionData, getReportIDForExpense, getSourceTransactionFromMergeTransaction, getTargetTransactionFromMergeTransaction} from '@libs/MergeTransactionUtils';
21+
import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute';
2122
import Navigation from '@libs/Navigation/Navigation';
2223
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
2324
import type {MergeTransactionNavigatorParamList} from '@libs/Navigation/types';
2425
import {getIOUActionForTransactionID} from '@libs/ReportActionsUtils';
2526
import CONST from '@src/CONST';
2627
import ONYXKEYS from '@src/ONYXKEYS';
28+
import ROUTES from '@src/ROUTES';
2729
import type SCREENS from '@src/SCREENS';
2830
import type {ReportActions, Transaction} from '@src/types/onyx';
2931
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
@@ -108,6 +110,17 @@ function ConfirmationPage({route}: ConfirmationPageProps) {
108110

109111
const reportIDToDismiss = reportID !== CONST.REPORT.UNREPORTED_REPORT_ID ? reportID : targetTransactionThreadReportID;
110112
if (reportID !== targetTransaction.reportID && reportIDToDismiss) {
113+
// Navigate to search money report screen if we're on Reports
114+
if (isSearchTopmostFullScreenRoute()) {
115+
// Close the current modal screen
116+
Navigation.dismissModal();
117+
// Ensure the dismiss completes first
118+
Navigation.setNavigationActionToMicrotaskQueue(() => {
119+
// Navigate to the money request report in search results
120+
Navigation.navigate(ROUTES.SEARCH_MONEY_REQUEST_REPORT.getRoute({reportID: reportIDToDismiss}));
121+
});
122+
return;
123+
}
111124
Navigation.dismissModalWithReport({reportID: reportIDToDismiss});
112125
} else {
113126
Navigation.dismissModal();

0 commit comments

Comments
 (0)