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

src/components/DaoCreator/formComponents/AzoriusGovernance.tsx

@@ -88,16 +88,12 @@ function DayStepperInput({
 export function AzoriusGovernance(props: ICreationStepProps) {
   const { values, setFieldValue, isSubmitting, transactionPending, isSubDAO, mode } = props;
 
-  const {
-    safe,
-    nodeHierarchy: { parentAddress },
-    fractalModules,
-  } = useDaoInfoStore();
+  const { safe, subgraphInfo, modules } = useDaoInfoStore();
 
-  const fractalModule = useMemo(
-    () => fractalModules.find(_module => _module.moduleType === FractalModuleType.FRACTAL),
-    [fractalModules],
-  );
+  const fractalModule = useMemo(() => {
+    if (!modules) return null;
+    return modules.find(_module => _module.moduleType === FractalModuleType.FRACTAL);
+  }, [modules]);
 
   const [showCustomNonce, setShowCustomNonce] = useState<boolean>();
   const { t } = useTranslation(['daoCreate', 'common']);
@@ -241,7 +237,7 @@ export function AzoriusGovernance(props: ICreationStepProps) {
           </Alert>
         </Flex>
       </StepWrapper>
-      {!!parentAddress && (
+      {!!subgraphInfo?.parentAddress && (
         <Box
           padding="1.5rem"
           bg="neutral-2"

src/components/DaoCreator/formComponents/EstablishEssentials.tsx

@@ -22,27 +22,38 @@ export function EstablishEssentials(props: ICreationStepProps) {
   const { t } = useTranslation(['daoCreate', 'common']);
   const { values, setFieldValue, isSubmitting, transactionPending, isSubDAO, errors, mode } = props;
 
-  const { daoName, daoSnapshotENS, safe } = useDaoInfoStore();
+  const { subgraphInfo, safe } = useDaoInfoStore();
 
   const isEdit = mode === DAOCreateMode.EDIT;
 
   const safeAddress = safe?.address;
 
   useEffect(() => {
-    if (isEdit) {
-      setFieldValue('essentials.daoName', daoName, false);
-      if (safeAddress && createAccountSubstring(safeAddress) !== daoName) {
+    if (isEdit && subgraphInfo) {
+      setFieldValue('essentials.daoName', subgraphInfo.daoName, false);
+      if (safeAddress && createAccountSubstring(safeAddress) !== subgraphInfo.daoName) {
         // Pre-fill the snapshot URL form field when editing
-        setFieldValue('essentials.snapshotENS', daoSnapshotENS || '', false);
+        setFieldValue('essentials.snapshotENS', subgraphInfo.daoSnapshotENS || '', false);
       }
     }
-  }, [setFieldValue, mode, daoName, daoSnapshotENS, isEdit, safeAddress]);
+  }, [
+    setFieldValue,
+    mode,
+    subgraphInfo?.daoName,
+    subgraphInfo?.daoSnapshotENS,
+    isEdit,
+    safeAddress,
+    subgraphInfo,
+  ]);
 
   const daoNameDisabled =
-    isEdit && !!daoName && !!safeAddress && createAccountSubstring(safeAddress) !== daoName;
+    isEdit &&
+    !!subgraphInfo?.daoName &&
+    !!safeAddress &&
+    createAccountSubstring(safeAddress) !== subgraphInfo?.daoName;
 
   // If in governance edit mode and snapshot URL is already set, disable the field
-  const snapshotENSDisabled = isEdit && !!daoSnapshotENS;
+  const snapshotENSDisabled = isEdit && !!subgraphInfo?.daoSnapshotENS;
 
   const handleGovernanceChange = (value: string) => {
     if (value === GovernanceType.AZORIUS_ERC20) {

src/components/DaoDashboard/Activities/ProposalsHome.tsx

@@ -59,7 +59,7 @@ export function ProposalsHome() {
 
   const { canUserCreateProposal } = useCanUserCreateProposal();
 
-  const { daoSnapshotENS } = useDaoInfoStore();
+  const { subgraphInfo } = useDaoInfoStore();
   const [allOptions, setAllFilterOptions] = useState<FractalProposalState[]>([]);
 
   const { t } = useTranslation(['proposal', 'common']);
@@ -114,12 +114,12 @@ export function ProposalsHome() {
         break;
     }
 
-    if (daoSnapshotENS) {
+    if (subgraphInfo?.daoSnapshotENS) {
       filterOptions = [...filterOptions, ...FILTERS_SNAPSHOT];
     }
     setAllFilterOptions(filterOptions);
     setFilters(filterOptions);
-  }, [daoSnapshotENS, guardContracts.freezeGuardContractAddress, type]);
+  }, [subgraphInfo?.daoSnapshotENS, guardContracts.freezeGuardContractAddress, type]);
 
   const toggleFilter = (filter: FractalProposalState) => {
     setFilters(prevState => {

src/components/DaoDashboard/Info/ParentLink.tsx

@@ -9,19 +9,19 @@ import { useDaoInfoStore } from '../../../store/daoInfo/useDaoInfoStore';
  * Displays a link to the current DAO's parent, if it has one.
  */
 export function ParentLink() {
-  const { nodeHierarchy } = useDaoInfoStore();
+  const { subgraphInfo } = useDaoInfoStore();
   const { addressPrefix } = useNetworkConfig();
   const { t } = useTranslation('breadcrumbs');
 
-  if (!nodeHierarchy.parentAddress) {
+  if (!subgraphInfo?.parentAddress) {
     return null;
   }
 
   return (
     <Link
       color="celery-0"
       _hover={{ textDecoration: 'none', color: 'celery--6' }}
-      to={DAO_ROUTES.dao.relative(addressPrefix, nodeHierarchy.parentAddress)}
+      to={DAO_ROUTES.dao.relative(addressPrefix, subgraphInfo.parentAddress)}
       marginBottom="1rem"
       as={RouterLink}
       width="fit-content"