From ca344a5058a7f1a61c0df2b12b30f027b9e8a639 Mon Sep 17 00:00:00 2001
From: Davis799 <davistibz@gmail.com>
Date: Tue, 23 Jul 2024 23:59:17 +0300
Subject: [PATCH] fix(v6-router): fixes

---
 .../hooks/useScorecardManagerNavigate.ts               | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/app/src/modules/Main/Components/ScoreCardManagement/hooks/useScorecardManagerNavigate.ts b/packages/app/src/modules/Main/Components/ScoreCardManagement/hooks/useScorecardManagerNavigate.ts
index b6b1391ff..ec853dd5f 100644
--- a/packages/app/src/modules/Main/Components/ScoreCardManagement/hooks/useScorecardManagerNavigate.ts
+++ b/packages/app/src/modules/Main/Components/ScoreCardManagement/hooks/useScorecardManagerNavigate.ts
@@ -30,11 +30,13 @@ export default function useScorecardManagerNavigate({
 
 	useEffect(() => {
 		const searchParams = new URLSearchParams(search);
+		const currentStep = find(steps, { id: step });
 
-		setActiveStep(() => {
-			const currentStep = find(steps, { id: step });
-			return currentStep;
-		});
+		if (!isEmpty(currentStep)) {
+			setActiveStep(() => {
+				return currentStep;
+			});
+		}
 
 		const isNew = searchParams.get("new");
 		if (isNew) {