Skip to content
Merged
13 changes: 13 additions & 0 deletions src/pages/TransactionMerge/ConfirmationPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ import usePermissions from '@hooks/usePermissions';
import useThemeStyles from '@hooks/useThemeStyles';
import {mergeTransactionRequest} from '@libs/actions/MergeTransaction';
import {buildMergedTransactionData, getReportIDForExpense, getSourceTransactionFromMergeTransaction, getTargetTransactionFromMergeTransaction} from '@libs/MergeTransactionUtils';
import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {MergeTransactionNavigatorParamList} from '@libs/Navigation/types';
import {getIOUActionForTransactionID} from '@libs/ReportActionsUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import type {ReportActions, Transaction} from '@src/types/onyx';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
Expand Down Expand Up @@ -108,6 +110,17 @@ function ConfirmationPage({route}: ConfirmationPageProps) {

const reportIDToDismiss = reportID !== CONST.REPORT.UNREPORTED_REPORT_ID ? reportID : targetTransactionThreadReportID;
if (reportID !== targetTransaction.reportID && reportIDToDismiss) {
// Navigate to search money report screen if we're on Reports
if (isSearchTopmostFullScreenRoute()) {
// Close the current modal screen
Navigation.dismissModal();
// Ensure the dismiss completes first
Navigation.setNavigationActionToMicrotaskQueue(() => {
Comment thread
paulnjs marked this conversation as resolved.
Resolved
// Navigate to the money request report in search results
Navigation.navigate(ROUTES.SEARCH_MONEY_REQUEST_REPORT.getRoute({reportID: reportIDToDismiss}));
});
return;
}
Navigation.dismissModalWithReport({reportID: reportIDToDismiss});
} else {
Navigation.dismissModal();
Expand Down
Loading