Merge pull request #1032 from tailwarden/fix-unnecessary-redirect

fix: prevent redirecting when not visiting the onboarding wizard
tailwarden · Oct 4, 2023 · 72346a7 · 72346a7
2 parents ad517d8 + c848d5f
commit 72346a7
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/dashboard/components/layout/Layout.tsx b/dashboard/components/layout/Layout.tsx
@@ -28,7 +28,11 @@ function Layout({ children }: LayoutProps) {
 
   useEffect(() => {
     settingsService.getOnboardingStatus().then(res => {
-      if (res.onboarded === true && res.status === 'COMPLETE') {
+      if (
+        res.onboarded === true &&
+        res.status === 'COMPLETE' &&
+        router.asPath.includes('/onboarding/')
+      ) {
         router.replace('/dashboard/');
       } else if (res.onboarded === false && res.status === 'PENDING_DATABASE') {
         router.replace('/onboarding/choose-database');