Merge pull request #2696 from decentdao/fix-subgraph-bug

[Hotfix/v0.4.7] Base DAO not loading
decentdao · Jan 30, 2025 · e3af403 · e3af403
2 parents e09ce9c + b704bb8
commit e3af403
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 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.4.6",
+  "version": "0.4.7",
   "private": true,
   "dependencies": {
     "@amplitude/analytics-browser": "^2.11.1",

diff --git a/src/hooks/DAO/loaders/useFractalNode.ts b/src/hooks/DAO/loaders/useFractalNode.ts
@@ -52,24 +52,29 @@ export const useFractalNode = ({
       try {
         const safeInfo = await safeApi.getSafeData(safeAddress);
         setSafeInfo(safeInfo);
+
         const modules = await lookupModules(safeInfo.modules);
+
         const graphRawNodeData = await getDAOInfo({ variables: { safeAddress } });
         const graphDAOData = graphRawNodeData.data?.daos[0];
+
         if (!graphRawNodeData || !graphDAOData) {
-          throw new Error('No data found');
+          console.error('No graph data found');
         }
+
         setDecentModules(modules);
 
         setDaoInfo({
-          parentAddress: isAddress(graphDAOData.parentAddress)
+          parentAddress: isAddress(graphDAOData?.parentAddress)
             ? getAddress(graphDAOData.parentAddress)
             : null,
-          childAddresses: graphDAOData.hierarchy.map(child => getAddress(child.address)),
-          daoName: graphDAOData.name ?? null,
-          daoSnapshotENS: graphDAOData.snapshotENS ?? null,
-          proposalTemplatesHash: graphDAOData.proposalTemplatesHash ?? null,
+          childAddresses: graphDAOData?.hierarchy.map(child => getAddress(child.address)) ?? [],
+          daoName: graphDAOData?.name ?? null,
+          daoSnapshotENS: graphDAOData?.snapshotENS ?? null,
+          proposalTemplatesHash: graphDAOData?.proposalTemplatesHash ?? null,
         });
       } catch (e) {
+        console.error('Error in setDAO:', e);
         reset({ error: true });
         return;
       }