Merge pull request #2107 from holium/fix-cypress-next-router

Move to next/navigation
holium · Nov 8, 2023 · a0d4967 · a0d4967 · vercel · Nov 8, 2023
2 parents 27aaeac + 57c677b
commit a0d4967
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 37 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
diff --git a/hosting-holium-com/src/util/useNavigation.ts b/hosting-holium-com/src/util/useNavigation.ts
@@ -1,5 +1,5 @@
 import { useCallback, useMemo } from 'react';
-import { useRouter } from 'next/router';
+import { usePathname, useRouter } from 'next/navigation';
 
 import { capitalizeFirstLetter } from '@holium/design-system/util';
 import {
@@ -21,18 +21,19 @@ export const accountPageUrl: Record<string, OnboardingPage> = {
 
 export const useNavigation = () => {
   const router = useRouter();
+  const pathname = usePathname();
 
   const currentAccountSection = useMemo(() => {
-    const isAccountSection = router.pathname.split('/')[1] === 'account';
+    const isAccountSection = pathname.split('/')[1] === 'account';
     if (!isAccountSection) return null;
 
-    const path = router.pathname.split('/')[2] ?? SidebarSection.Hosting;
+    const path = pathname.split('/')[2] ?? SidebarSection.Hosting;
     const eachWordCapitalized = path
       .split('-')
       .map((word) => capitalizeFirstLetter(word))
       .join(' ');
     return eachWordCapitalized as SidebarSection;
-  }, [router.pathname]);
+  }, [pathname]);
 
   const goToPage = useCallback(
     (
@@ -45,17 +46,23 @@ export const useNavigation = () => {
         product_type?: ThirdEarthProductType;
       }
     ) => {
-      const path =
-        page + (params ? `?${new URLSearchParams(params).toString()}` : '');
-      return router.push(path);
+      try {
+        const path =
+          page + (params ? `?${new URLSearchParams(params).toString()}` : '');
+        router.push(path);
+        return Promise.resolve(true);
+      } catch (e) {
+        console.error(e);
+        return Promise.resolve(false);
+      }
     },
     [router]
   );
 
   const logout = useCallback(() => {
     goToPage('/login');
     OnboardingStorage.reset();
-  }, [router]);
+  }, [goToPage]);
 
   return { currentAccountSection, goToPage, logout };
 };