[PRD] | [Issue #2529] Organization Hierarchy Cache

src/components/DaoHierarchy/DaoHierarchyNode.tsx

@@ -2,15 +2,15 @@ import { Center, Flex, Icon, Link } from '@chakra-ui/react';
 import { ArrowElbowDownRight } from '@phosphor-icons/react';
 import { useEffect, useState } from 'react';
 import { Link as RouterLink } from 'react-router-dom';
-import { Address, getAddress } from 'viem';
+import { Address } from 'viem';
 import { useChainId } from 'wagmi';
 import { DAO_ROUTES } from '../../constants/routes';
 import { useLoadDAONode } from '../../hooks/DAO/loaders/useLoadDAONode';
 import { CacheKeys } from '../../hooks/utils/cache/cacheDefaults';
 import { setValue, getValue } from '../../hooks/utils/cache/useLocalStorage';
 import { useNetworkConfig } from '../../providers/NetworkConfig/NetworkConfigProvider';
 import { useDaoInfoStore } from '../../store/daoInfo/useDaoInfoStore';
-import { DaoInfo, WithError } from '../../types';
+import { DaoHierarchyInfo, DaoInfo, WithError } from '../../types';
 import { DAONodeInfoCard, NODE_HEIGHT_REM } from '../ui/cards/DAONodeInfoCard';
 import { BarLoader } from '../ui/loaders/BarLoader';
 /**
@@ -30,7 +30,7 @@ export function DaoHierarchyNode({
   depth: number;
 }) {
   const { safe: currentSafe } = useDaoInfoStore();
-  const [hierarchyNode, setHierarchyNode] = useState<DaoInfo>();
+  const [hierarchyNode, setHierarchyNode] = useState<DaoHierarchyInfo>();
   const { addressPrefix } = useNetworkConfig();
   const chainId = useChainId();
   const { loadDao } = useLoadDAONode();
@@ -50,25 +50,26 @@ export function DaoHierarchyNode({
         const errorNode = _node as WithError;
         if (!errorNode.error) {
           const fnode = _node as DaoInfo;
+          const theNode = {
+            daoName: fnode.daoName,
+            safeAddress: safeAddress,
+            fractalModules: fnode.fractalModules,
+            nodeHierarchy: {
+              parentAddress: fnode.nodeHierarchy.parentAddress,
+              childNodes: fnode.nodeHierarchy.childNodes,
+            },
+          };
           setValue(
             {
               cacheName: CacheKeys.HIERARCHY_DAO_INFO,
               chainId,
               daoAddress: safeAddress,
             },
-            fnode,
+            theNode,
           );
-          setHierarchyNode(fnode);
+          setHierarchyNode(theNode);
         } else if (errorNode.error === 'errorFailedSearch') {
-          setHierarchyNode({
-            daoName: null,
-            safe: null,
-            fractalModules: [],
-            nodeHierarchy: {
-              parentAddress: null,
-              childNodes: [],
-            },
-          });
+          setHierarchyNode(undefined);
         }
       });
     }
@@ -88,12 +89,8 @@ export function DaoHierarchyNode({
     );
   }
 
-  const hierarchyNodeDAOAddress = hierarchyNode?.safe?.address;
-  if (!hierarchyNodeDAOAddress) {
-    throw new Error('Hierarchy node DAO address is missing');
-  }
   const isCurrentViewingDAO =
-    currentSafe?.address.toLowerCase() === hierarchyNodeDAOAddress.toLocaleLowerCase();
+    currentSafe?.address.toLowerCase() === hierarchyNode.safeAddress.toLocaleLowerCase();
   return (
     <Flex
       flexDirection="column"
@@ -103,7 +100,7 @@ export function DaoHierarchyNode({
     >
       <Link
         as={RouterLink}
-        to={DAO_ROUTES.dao.relative(addressPrefix, hierarchyNodeDAOAddress)}
+        to={DAO_ROUTES.dao.relative(addressPrefix, hierarchyNode.safeAddress)}
         _hover={{ textDecoration: 'none', cursor: isCurrentViewingDAO ? 'default' : 'pointer' }}
         onClick={event => {
           if (isCurrentViewingDAO) {
@@ -113,8 +110,8 @@ export function DaoHierarchyNode({
       >
         <DAONodeInfoCard
           node={{
-            daoAddress: hierarchyNodeDAOAddress,
-            daoName: hierarchyNode?.daoName ?? getAddress(hierarchyNodeDAOAddress),
+            daoAddress: hierarchyNode.safeAddress,
+            daoName: hierarchyNode?.daoName ?? hierarchyNode.safeAddress,
             daoSnapshotENS: hierarchyNode?.daoSnapshotENS,
           }}
           isCurrentViewingDAO={isCurrentViewingDAO}

src/hooks/utils/cache/cacheDefaults.ts

@@ -1,5 +1,5 @@
 import { Address } from 'viem';
-import { AzoriusProposal, DaoInfo } from '../../../types';
+import { AzoriusProposal, DaoHierarchyInfo } from '../../../types';
 
 export interface IStorageValue {
   // the value to store, 1 character to minimize cache size
@@ -104,7 +104,7 @@ type CacheKeyToValueMap = {
   [CacheKeys.AVERAGE_BLOCK_TIME]: number;
   [CacheKeys.MIGRATION]: number;
   [CacheKeys.IPFS_HASH]: string;
-  [CacheKeys.HIERARCHY_DAO_INFO]: DaoInfo;
+  [CacheKeys.HIERARCHY_DAO_INFO]: DaoHierarchyInfo;
 };
 
 export type CacheValueType<T extends CacheKeyType> = T extends { cacheName: infer U }

src/types/fractal.ts

@@ -204,6 +204,13 @@ export interface DaoInfo extends SubgraphDAOInfo {
   isModulesLoaded?: boolean;
 }
 
+export interface DaoHierarchyInfo {
+  daoName: string | null;
+  nodeHierarchy: NodeHierarchy;
+  safeAddress: Address;
+  daoSnapshotENS?: string;
+}
+
 export interface FractalModuleData {
   moduleAddress: Address;
   moduleType: FractalModuleType;