Merge pull request #2723 from decentdao/eng-205-handle-missing-dao-ad…

…dress-query `[ENG-205]` handle missing/malformed query
decentdao · Feb 10, 2025 · 1b937b6 · 1b937b6
2 parents 50eeafd + 319aa18
commit 1b937b6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/hooks/DAO/loaders/useFractalNode.ts b/src/hooks/DAO/loaders/useFractalNode.ts
@@ -12,10 +12,12 @@ export const useFractalNode = ({
   addressPrefix,
   safeAddress,
   wrongNetwork,
+  invalidQuery,
 }: {
   addressPrefix?: string;
   safeAddress?: Address;
   wrongNetwork?: boolean;
+  invalidQuery?: boolean;
 }) => {
   const safeApi = useSafeAPI();
   const lookupModules = useDecentModules();
@@ -96,11 +98,15 @@ export const useFractalNode = ({
   ]);
 
   useEffect(() => {
-    if (`${addressPrefix}${safeAddress}` !== currentValidSafe.current && !wrongNetwork) {
+    if (
+      `${addressPrefix}${safeAddress}` !== currentValidSafe.current &&
+      !wrongNetwork &&
+      !invalidQuery
+    ) {
       reset({ error: false });
       setDAO();
     }
-  }, [addressPrefix, safeAddress, setDAO, reset, wrongNetwork]);
+  }, [addressPrefix, safeAddress, setDAO, reset, wrongNetwork, invalidQuery]);
 
   return { errorLoading };
 };
diff --git a/src/pages/dao/SafeController.tsx b/src/pages/dao/SafeController.tsx
@@ -32,6 +32,7 @@ export function SafeController() {
     addressPrefix,
     safeAddress,
     wrongNetwork,
+    invalidQuery,
   });
 
   useGovernanceContracts();

diff --git a/src/router.tsx b/src/router.tsx
@@ -4,6 +4,7 @@ import { ModalProvider } from './components/ui/modals/ModalProvider';
 import { Global } from './components/ui/page/Global';
 import { BASE_ROUTES, DAO_ROUTES } from './constants/routes';
 import FourOhFourPage from './pages/404';
+import LoadingProblem from './pages/LoadingProblem';
 import { SafeCreatePage } from './pages/create/SafeCreatePage';
 import { SafeController } from './pages/dao/SafeController';
 import { SafeDashboardPage } from './pages/dao/SafeDashboardPage';
@@ -31,6 +32,9 @@ import { SafePermissionsSettingsPage } from './pages/dao/settings/permissions/Sa
 import { SafeTreasuryPage } from './pages/dao/treasury/SafeTreasuryPage';
 import HomePage from './pages/home/HomePage';
 
+interface LoaderFunctionArgs {
+  request: Request;
+}
 export const router = (addressPrefix: string, daoAddress: string | undefined) =>
   wrapCreateBrowserRouter(createBrowserRouter)([
     {
@@ -59,6 +63,16 @@ export const router = (addressPrefix: string, daoAddress: string | undefined) =>
         {
           path: '/',
           element: <SafeController />,
+          // @dev handles redirect when dao address query is missing from URL
+          loader: ({ request }: LoaderFunctionArgs) => {
+            const url = new URL(request.url);
+            const searchParams = new URLSearchParams(url.search);
+            const daoAddressWithPrefix = searchParams.get('dao');
+            if (!daoAddressWithPrefix) {
+              return <LoadingProblem type="badQueryParam" />;
+            }
+            return null;
+          },
           children: [
             {
               path: DAO_ROUTES.dao.path,