From 95189474a40ff2f21e1d6353f8b70060c3f4e142 Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Mon, 31 Oct 2022 09:01:38 +0100
Subject: [PATCH] bugfixes

---
 src/routes/CompleteAccountRoute.tsx    | 12 +++++++++---
 src/routes/EnterDecryptionPassword.tsx |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/routes/CompleteAccountRoute.tsx b/src/routes/CompleteAccountRoute.tsx
index 8578bcb..84a7bd6 100644
--- a/src/routes/CompleteAccountRoute.tsx
+++ b/src/routes/CompleteAccountRoute.tsx
@@ -1,5 +1,5 @@
 import {ReactElement, useState} from "react"
-import {useNavigate} from "react-router-dom"
+import {useLocation, useNavigate} from "react-router-dom"
 
 import {MultiStepForm} from "~/components"
 import GenerateEmailReportsForm from "~/route-widgets/CompleteAccountRoute/GenerateEmailReportsForm"
@@ -7,9 +7,15 @@ import PasswordForm from "~/route-widgets/CompleteAccountRoute/PasswordForm"
 
 export default function CompleteAccountRoute(): ReactElement {
 	const navigate = useNavigate()
+	const location = useLocation()
 
-	const [showGenerationReportForm, setShowGenerationReportForm] =
-		useState(false)
+	// If query `setup` is `true`, skip directly to the setup
+	const [showGenerationReportForm, setShowGenerationReportForm] = useState(
+		() => {
+			const searchParams = new URLSearchParams(location.search)
+			return searchParams.get("setup") === "true"
+		},
+	)
 
 	return (
 		<MultiStepForm
diff --git a/src/routes/EnterDecryptionPassword.tsx b/src/routes/EnterDecryptionPassword.tsx
index 0746209..dfbc0c8 100644
--- a/src/routes/EnterDecryptionPassword.tsx
+++ b/src/routes/EnterDecryptionPassword.tsx
@@ -41,7 +41,7 @@ export default function EnterDecryptionPassword(): ReactElement {
 			} else {
 				const nextUrl =
 					new URLSearchParams(location.search).get("next") || "/"
-				navigate(nextUrl)
+				setTimeout(() => navigate(nextUrl), 0)
 			}
 		},
 	})