Merge branch 'issue/noIssue-state-loading-cleanup' of github.com:dece…

…ntdao/decent-interface into issue/2565-network-config-updates
decentdao · Dec 12, 2024 · fc918d5 · fc918d5
2 parents 5337915 + 17bc618
commit fc918d5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 49 deletions.
diff --git a/src/components/ui/menus/SafesMenu/SafesList.tsx b/src/components/ui/menus/SafesMenu/SafesList.tsx
diff --git a/src/hooks/DAO/loaders/useGovernanceContracts.ts b/src/hooks/DAO/loaders/useGovernanceContracts.ts
@@ -24,7 +24,10 @@ export const useGovernanceContracts = () => {
   const safeAddress = safe?.address;
 
   const loadGovernanceContracts = useCallback(async () => {
-    const azoriusModule = getAzoriusModuleFromModules(modules ?? []);
+    if (!modules) {
+      return;
+    }
+    const azoriusModule = getAzoriusModuleFromModules(modules);
 
     const votingStrategies = await getVotingStrategies();
 
@@ -131,7 +134,11 @@ export const useGovernanceContracts = () => {
   }, [action, modules, getVotingStrategies, publicClient, getAddressContractType]);
 
   useEffect(() => {
-    if (currentValidAddress.current !== safeAddress && modules !== null) {
+    if (
+      safeAddress !== undefined &&
+      currentValidAddress.current !== safeAddress &&
+      modules !== null
+    ) {
       loadGovernanceContracts();
       currentValidAddress.current = safeAddress;
     }