Skip to content

Commit e946cdf

Browse files
committed
exclude another RHP screen from revealing route
1 parent 0ae9561 commit e946cdf

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

src/libs/actions/App.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
1111
import DateUtils from '@libs/DateUtils';
1212
import Log from '@libs/Log';
1313
import getCurrentUrl from '@libs/Navigation/currentUrl';
14+
import willRouteNavigateToRHP from '@libs/Navigation/helpers/willRouteNavigateToRHP';
1415
import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
1516
import {isPublicRoom, isValidReport} from '@libs/ReportUtils';
1617
import {isLoggingInAsNewUser as isLoggingInAsNewUserSessionUtils} from '@libs/SessionUtils';
@@ -631,6 +632,15 @@ function createWorkspaceWithPolicyDraftAndNavigateToIt(params: CreateWorkspaceWi
631632
if (transitionFromOldDot) {
632633
Navigation.navigate(routeToNavigate);
633634
} else if (Navigation.isTopmostRouteModalScreen()) {
635+
// `revealRouteBeforeDismissingModal` only works for fullscreen targets. Modal targets
636+
// (e.g. workspace confirmation success) still need to open after the current RHP closes.
637+
if (willRouteNavigateToRHP(routeToNavigate)) {
638+
Navigation.dismissModal({
639+
afterTransition: () => Navigation.navigate(routeToNavigate),
640+
});
641+
return;
642+
}
643+
634644
Navigation.revealRouteBeforeDismissingModal(routeToNavigate);
635645
} else {
636646
Navigation.navigate(routeToNavigate, {forceReplace: true});

0 commit comments

Comments
 (0)