fix: close issue

Author: blushi

web-marketplace/src/components/organisms/ProjectDashboardBanner/ProjectDashboardBanner.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 import { useLingui } from '@lingui/react';
 import { useMediaQuery, useTheme } from '@mui/material';
 import { useAtom } from 'jotai';
@@ -60,7 +60,6 @@ const ProjectDashboardBanner = ({
   const isMobile = useMediaQuery(theme.breakpoints.down('sm'));
   const [projectsCurrentStep] = useAtom(projectsCurrentStepAtom);
   const router = useRouter();
-  const navigate = useNavigate();
   const location = useLocation();
 
   const truncatedPlace = truncateEnd(
@@ -218,13 +217,17 @@ const ProjectDashboardBanner = ({
                     if (isDraft) {
                       const currentStep =
                         projectsCurrentStep[id] || 'basic-info';
-                      navigate(`/project-pages/${id}/${currentStep}`, {
-                        state: { from: location.pathname },
-                      });
+                      router.push(
+                        `/project-pages/${id}/${currentStep}?from=${encodeURIComponent(
+                          location.pathname,
+                        )}`,
+                      );
                     } else {
-                      navigate(`/project-pages/${id}/edit/basic-info`, {
-                        state: { from: location.pathname },
-                      });
+                      router.push(
+                        `/project-pages/${id}/edit/basic-info?from=${encodeURIComponent(
+                          location.pathname,
+                        )}`,
+                      );
                     }
                   }}
                 >

web-marketplace/src/legacy-pages/ProjectEdit/ProjectEdit.tsx

@@ -21,6 +21,7 @@ import { useCanAccessManageProjectWithRole } from 'legacy-pages/Dashboard/MyProj
 import { useFeeGranter } from 'legacy-pages/Dashboard/MyProjects/hooks/useFeeGranter';
 import NotFoundPage from 'legacy-pages/NotFound';
 import { startCase } from 'lodash';
+import { useRouter } from 'next/navigation';
 
 import Banner from 'web-components/src/components/banner';
 import ArrowDownIcon from 'web-components/src/components/icons/ArrowDownIcon';
@@ -101,6 +102,7 @@ function ProjectEdit(): JSX.Element {
   const navigate = useNavigate();
   const graphqlClient = useApolloClient();
   const { queryClient } = useLedger();
+  const router = useRouter();
 
   const setProcessingModalAtom = useSetAtom(processingModalAtom);
   const setErrorCodeAtom = useSetAtom(errorCodeAtom);
@@ -240,10 +242,10 @@ function ProjectEdit(): JSX.Element {
       if (isFormDirty) {
         setIsWarningModalOpen(path);
       } else {
-        navigate(path);
+        router.push(path);
       }
     } else {
-      navigate('/dashboard/projects');
+      router.push('/dashboard/projects');
     }
   };