Merge pull request #2382 from decentdao/hotfix/v0.3.4

Hotfix/v0.3.4
decentdao · Sep 27, 2024 · e4b7643 · e4b7643
2 parents fe328a9 + 5d1c3f0
commit e4b7643
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "decent-interface",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "private": true,
   "dependencies": {
     "@amplitude/analytics-browser": "^2.11.1",

diff --git a/src/hooks/DAO/useDAOController.ts b/src/hooks/DAO/useDAOController.ts
@@ -56,5 +56,5 @@ export default function useDAOController() {
   useKeyValuePairs();
   useHatsTree();
 
-  return { invalidQuery, wrongNetwork, errorLoading };
+  return { invalidQuery, wrongNetwork, errorLoading, urlAddressPrefix: addressPrefix };
 }
diff --git a/src/pages/DAOController.tsx b/src/pages/DAOController.tsx
@@ -2,9 +2,12 @@ import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Outlet } from 'react-router-dom';
 import { toast } from 'react-toastify';
+import { useSwitchChain } from 'wagmi';
+import { logError } from '../helpers/errorLogging';
 import useDAOController from '../hooks/DAO/useDAOController';
 import { useUpdateSafeData } from '../hooks/utils/useUpdateSafeData';
 import { useFractal } from '../providers/App/AppProvider';
+import { getChainIdFromPrefix } from '../utils/url';
 import LoadingProblem from './LoadingProblem';
 
 const useTemporaryProposals = () => {
@@ -32,14 +35,26 @@ const useTemporaryProposals = () => {
 };
 
 export default function DAOController() {
-  const { errorLoading, wrongNetwork, invalidQuery } = useDAOController();
+  const { switchChain } = useSwitchChain();
+  const { errorLoading, wrongNetwork, invalidQuery, urlAddressPrefix } = useDAOController();
   useUpdateSafeData();
   const {
     node: { daoName },
   } = useFractal();
 
   useTemporaryProposals();
 
+  useEffect(() => {
+    if (urlAddressPrefix && wrongNetwork) {
+      try {
+        switchChain({ chainId: getChainIdFromPrefix(urlAddressPrefix) });
+        window.location.reload();
+      } catch (e) {
+        logError(e);
+      }
+    }
+  }, [wrongNetwork, switchChain, urlAddressPrefix]);
+
   useEffect(() => {
     if (daoName) {
       document.title = `${import.meta.env.VITE_APP_NAME} | ${daoName}`;

diff --git a/src/router.tsx b/src/router.tsx
@@ -67,6 +67,7 @@ export const router = (addressPrefix: string) =>
               // @ts-ignore:next-line
               loader: ({ params: { daoAddress } }) =>
                 redirect(DAO_ROUTES.modifyGovernance.relative(addressPrefix, daoAddress)),
+              // @todo - this redirect doesn't work anymore for some reason
             },
             {
               path: DAO_ROUTES.hierarchy.path,
@@ -105,6 +106,7 @@ export const router = (addressPrefix: string) =>
               // @ts-ignore:next-line
               loader: ({ params: { daoAddress } }) =>
                 redirect(DAO_ROUTES.newSubDao.relative(addressPrefix, daoAddress)),
+              // @todo - this redirect doesn't work anymore for some reason
             },
             {
               path: 'proposal-templates',
@@ -122,6 +124,7 @@ export const router = (addressPrefix: string) =>
                   // @ts-ignore:next-line
                   loader: ({ params: { daoAddress } }) =>
                     redirect(DAO_ROUTES.proposalTemplateNew.relative(addressPrefix, daoAddress)),
+                  // @todo - this redirect doesn't work anymore for some reason
                 },
               ],
             },
@@ -145,6 +148,7 @@ export const router = (addressPrefix: string) =>
                   // @ts-ignore:next-line
                   loader: ({ params: { daoAddress } }) =>
                     redirect(DAO_ROUTES.proposalNew.relative(addressPrefix, daoAddress)),
+                  // @todo - this redirect doesn't work anymore for some reason
                 },
                 {
                   path: 'new/sablier/*',
@@ -158,6 +162,7 @@ export const router = (addressPrefix: string) =>
                       DAO_ROUTES.proposalNew
                         .relative(addressPrefix, daoAddress)
                         .replace('new', 'new/sablier'),
+                      // @todo - this redirect doesn't work anymore for some reason
                     ),
                 },
               ],
@@ -179,6 +184,7 @@ export const router = (addressPrefix: string) =>
           // @ts-ignore:next-line
           loader: ({ params: { daoAddress } }) =>
             redirect(DAO_ROUTES.dao.relative(addressPrefix, daoAddress)),
+          // @todo - this redirect doesn't work anymore for some reason
         },
         {
           path: '*', // 404