From 962fa53f140dbbf430414070eb67b6839b2095c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Musia=C5=82?= Date: Thu, 15 Jan 2026 14:59:10 +0100 Subject: [PATCH 1/2] fix redirect --- src/components/TestDrive/Modal/AdminTestDriveModal.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/TestDrive/Modal/AdminTestDriveModal.tsx b/src/components/TestDrive/Modal/AdminTestDriveModal.tsx index 559ba3a1310ec..923764416a139 100644 --- a/src/components/TestDrive/Modal/AdminTestDriveModal.tsx +++ b/src/components/TestDrive/Modal/AdminTestDriveModal.tsx @@ -17,6 +17,10 @@ function AdminTestDriveModal() { const navigate = () => { Log.hmmm('[AdminTestDriveModal] Navigate function called'); + if (shouldOpenRHPVariant()) { + Log.hmmm('[AdminTestDriveModal] User was redirected to Workspace Editor, skipping navigation to admin room'); + return; + } // eslint-disable-next-line @typescript-eslint/no-deprecated InteractionManager.runAfterInteractions(() => { Log.hmmm('[AdminTestDriveModal] Calling Navigation.navigate()'); From acbbba2582ae0c7c1f7e3c0773377dc20c6db929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Musia=C5=82?= Date: Thu, 15 Jan 2026 15:30:39 +0100 Subject: [PATCH 2/2] fix return was too early in the flow --- src/components/TestDrive/Modal/AdminTestDriveModal.tsx | 4 ---- src/components/TestDrive/TestDriveBanner.tsx | 2 +- src/components/TestDrive/TestDriveDemo.tsx | 6 ++++++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/TestDrive/Modal/AdminTestDriveModal.tsx b/src/components/TestDrive/Modal/AdminTestDriveModal.tsx index 923764416a139..559ba3a1310ec 100644 --- a/src/components/TestDrive/Modal/AdminTestDriveModal.tsx +++ b/src/components/TestDrive/Modal/AdminTestDriveModal.tsx @@ -17,10 +17,6 @@ function AdminTestDriveModal() { const navigate = () => { Log.hmmm('[AdminTestDriveModal] Navigate function called'); - if (shouldOpenRHPVariant()) { - Log.hmmm('[AdminTestDriveModal] User was redirected to Workspace Editor, skipping navigation to admin room'); - return; - } // eslint-disable-next-line @typescript-eslint/no-deprecated InteractionManager.runAfterInteractions(() => { Log.hmmm('[AdminTestDriveModal] Calling Navigation.navigate()'); diff --git a/src/components/TestDrive/TestDriveBanner.tsx b/src/components/TestDrive/TestDriveBanner.tsx index b1070b87c7202..af464655659bc 100644 --- a/src/components/TestDrive/TestDriveBanner.tsx +++ b/src/components/TestDrive/TestDriveBanner.tsx @@ -17,7 +17,7 @@ function TestDriveBanner({onPress}: TestDriveBannerProps) { const {translate} = useLocalize(); return ( - + {shouldUseNarrowLayout diff --git a/src/components/TestDrive/TestDriveDemo.tsx b/src/components/TestDrive/TestDriveDemo.tsx index 902bef99817a5..52ad6b33aea42 100644 --- a/src/components/TestDrive/TestDriveDemo.tsx +++ b/src/components/TestDrive/TestDriveDemo.tsx @@ -5,6 +5,7 @@ import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOffli import EmbeddedDemo from '@components/EmbeddedDemo'; import Modal from '@components/Modal'; import SafeAreaConsumer from '@components/SafeAreaConsumer'; +import {shouldOpenRHPVariant} from '@components/SidePanel/RHPVariantTest'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useIsPaidPolicyAdmin from '@hooks/useIsPaidPolicyAdmin'; import useOnboardingMessages from '@hooks/useOnboardingMessages'; @@ -14,6 +15,7 @@ import useParentReportAction from '@hooks/useParentReportAction'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; import {completeTestDriveTask} from '@libs/actions/Task'; +import Log from '@libs/Log'; import Navigation from '@libs/Navigation/Navigation'; import {isAdminRoom} from '@libs/ReportUtils'; import {getTestDriveURL} from '@libs/TourUtils'; @@ -74,6 +76,10 @@ function TestDriveDemo() { InteractionManager.runAfterInteractions(() => { Navigation.goBack(); + if (shouldOpenRHPVariant()) { + Log.hmmm('[AdminTestDriveModal] User was redirected to Workspace Editor, skipping navigation to admin room'); + return; + } if (isAdminRoom(onboardingReport)) { Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(onboardingReport?.reportID)); }