Skip to content
Merged
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
15 changes: 14 additions & 1 deletion src/pages/TransactionMerge/ConfirmationPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ import useThemeStyles from '@hooks/useThemeStyles';
import {mergeTransactionRequest} from '@libs/actions/MergeTransaction';
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
import {buildMergedTransactionData} 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 CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import type {Transaction} from '@src/types/onyx';
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
Expand Down Expand Up @@ -78,7 +80,18 @@ function ConfirmationPage({route}: ConfirmationPageProps) {

// If we're on search, dismiss the modal and stay on search
if (!isOnSearch && reportIDToDismiss && reportID !== targetTransaction.reportID) {
Navigation.dismissModalWithReport({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(() => {
// Navigate to the money request report in search results
Navigation.navigate(ROUTES.SEARCH_MONEY_REQUEST_REPORT.getRoute({reportID: reportIDToDismiss}));
});
} else {
Navigation.dismissModalWithReport({reportID: reportIDToDismiss});
}
} else {
Navigation.dismissModal();
}
Expand Down
Loading