.

AboutClan · Dec 15, 2024 · e5b7b88 · e5b7b88
1 parent ec5133a
commit e5b7b88
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/pageTemplates/home/HomeInitialSetting.tsx b/pageTemplates/home/HomeInitialSetting.tsx
@@ -52,6 +52,15 @@ function HomeInitialSetting() {
   const isPWALogin = isPWA();
 
   useEffect(() => {
+    if (userInfo?.role === "newUser") {
+      router.push("/register/name");
+      return;
+    }
+
+    if (userInfo?.role === "waiting") {
+      router.push("/login?status=waiting");
+      return;
+    }
     if (userInfo?.role === "human") {
       if (isPWALogin) {
         setRole({ role: "member" });

diff --git a/pageTemplates/layout/Layout.tsx b/pageTemplates/layout/Layout.tsx
@@ -72,15 +72,7 @@ function Layout({ children }: ILayout) {
       return;
     }
     if (status === "loading" || session === undefined) return;
-    const role = session?.user.role;
-    if (role === "newUser") {
-      router.push("/register/name");
-      return;
-    }
-    if (role === "waiting") {
-      router.push("/login?status=waiting");
-      return;
-    }
+
     if (!session?.user?.location) {
       toast(
         "warning",