From 20f8ec0e93fd4b1cf940d98f14e0f639de215184 Mon Sep 17 00:00:00 2001
From: Adam Gall <galladamj@gmail.com>
Date: Thu, 28 Mar 2024 22:23:51 -0400
Subject: [PATCH] Remove "daoNetwork" from Fractal state, use value from
 useNetworkConfig everywhere

---
 src/components/DaoCreator/StepWrapper.tsx     |  8 +-
 .../ProposalTemplateCard.tsx                  | 10 ++-
 src/components/ProposalTemplates/index.tsx    |  8 +-
 .../Proposals/ProposalCard/ProposalCard.tsx   |  8 +-
 src/components/Proposals/ProposalsList.tsx    |  8 +-
 .../pages/DaoDashboard/Info/ParentLink.tsx    |  8 +-
 .../pages/DaoDashboard/Info/index.tsx         | 12 +--
 src/components/pages/DaoHierarchy/DaoNode.tsx | 12 ++-
 .../DaoSettings/components/Metadata/index.tsx |  8 +-
 src/components/ui/cards/DAOInfoCard.tsx       |  8 +-
 .../ui/menus/ManageDAO/ManageDAOMenu.tsx      | 32 ++++----
 .../modals/ConfirmModifyGovernanceModal.tsx   |  8 +-
 .../ui/modals/ForkProposalTemplateModal.tsx   | 20 +++--
 .../ui/modals/ProposalTemplateModal.tsx       |  8 +-
 src/components/ui/modals/Stake.tsx            |  8 +-
 src/components/ui/page/Header/PageHeader.tsx  | 10 ++-
 .../ui/page/Navigation/NavigationLinks.tsx    | 16 ++--
 src/components/ui/page/Navigation/index.tsx   |  4 +-
 src/constants/routes.ts                       | 48 ++++++------
 src/hooks/DAO/loaders/useFractalNode.ts       | 76 +++++++++----------
 src/hooks/DAO/loaders/useLoadDAONode.ts       | 49 ++++++------
 src/hooks/DAO/proposal/useSubmitProposal.ts   |  2 +-
 src/hooks/DAO/useCreateSubDAOProposal.ts      |  2 +-
 src/hooks/DAO/useDAOController.ts             |  4 +-
 src/hooks/DAO/useDeployAzorius.ts             |  9 ++-
 src/hooks/DAO/useDeployDAO.ts                 |  2 +-
 src/pages/create/index.tsx                    |  4 +-
 .../[daoAddress]/edit/governance/index.tsx    |  8 +-
 .../daos/[daoAddress]/hierarchy/index.tsx     |  5 +-
 src/pages/daos/[daoAddress]/new/index.tsx     |  4 +-
 .../[daoAddress]/proposal-templates/index.tsx |  8 +-
 .../proposal-templates/new/index.tsx          | 16 ++--
 .../proposals/[proposalId]/index.tsx          |  8 +-
 .../daos/[daoAddress]/proposals/index.tsx     |  8 +-
 .../daos/[daoAddress]/proposals/new/index.tsx | 16 ++--
 src/providers/App/node/reducer.ts             |  1 -
 src/types/fractal.ts                          |  1 -
 37 files changed, 246 insertions(+), 221 deletions(-)

diff --git a/src/components/DaoCreator/StepWrapper.tsx b/src/components/DaoCreator/StepWrapper.tsx
index 82faffb0c9..ba9f45aa06 100644
--- a/src/components/DaoCreator/StepWrapper.tsx
+++ b/src/components/DaoCreator/StepWrapper.tsx
@@ -6,6 +6,7 @@ import { useNavigate } from 'react-router-dom';
 import { BACKGROUND_SEMI_TRANSPARENT } from '../../constants/common';
 import { BASE_ROUTES, DAO_ROUTES } from '../../constants/routes';
 import { useFractal } from '../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../providers/NetworkConfig/NetworkConfigProvider';
 import PageHeader from '../ui/page/Header/PageHeader';
 import { DAOCreateMode } from './formComponents/EstablishEssentials';
 
@@ -27,8 +28,9 @@ export function StepWrapper({
   shouldWrapChildren = true,
 }: IStepWrapper) {
   const {
-    node: { daoAddress, daoNetwork },
+    node: { daoAddress },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
   const { t } = useTranslation(['daoCreate']);
   const navigate = useNavigate();
 
@@ -64,9 +66,9 @@ export function StepWrapper({
           isButtonDisabled={isFormSubmitting}
           buttonClick={() =>
             navigate(
-              !isSubDAO || !daoAddress || !daoNetwork
+              !isSubDAO || !daoAddress
                 ? BASE_ROUTES.landing
-                : DAO_ROUTES.dao.relative(daoNetwork, daoAddress),
+                : DAO_ROUTES.dao.relative(addressPrefix, daoAddress),
             )
           }
         />
diff --git a/src/components/ProposalTemplates/ProposalTemplateCard.tsx b/src/components/ProposalTemplates/ProposalTemplateCard.tsx
index 493fb09943..d8b27a2098 100644
--- a/src/components/ProposalTemplates/ProposalTemplateCard.tsx
+++ b/src/components/ProposalTemplates/ProposalTemplateCard.tsx
@@ -7,6 +7,7 @@ import { DAO_ROUTES } from '../../constants/routes';
 import useRemoveProposalTemplate from '../../hooks/DAO/proposal/useRemoveProposalTemplate';
 import useSubmitProposal from '../../hooks/DAO/proposal/useSubmitProposal';
 import { useFractal } from '../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../providers/NetworkConfig/NetworkConfigProvider';
 import { ProposalTemplate } from '../../types/createProposalTemplate';
 import ContentBox from '../ui/containers/ContentBox';
 import { OptionMenu } from '../ui/menus/OptionMenu';
@@ -26,8 +27,9 @@ export default function ProposalTemplateCard({
   const navigate = useNavigate();
   const { t } = useTranslation('proposalTemplate');
   const {
-    node: { safe, daoAddress, daoNetwork },
+    node: { safe, daoAddress },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
 
   const { prepareRemoveProposalTemplateProposal } = useRemoveProposalTemplate();
   const { submitProposal, canUserCreateProposal } = useSubmitProposal();
@@ -42,11 +44,11 @@ export default function ProposalTemplateCard({
   });
 
   const successCallback = useCallback(() => {
-    if (daoAddress && daoNetwork) {
+    if (daoAddress) {
       // Redirecting to proposals page so that user will see Proposal for Proposal Template creation
-      navigate(DAO_ROUTES.proposals.relative(daoNetwork, daoAddress));
+      navigate(DAO_ROUTES.proposals.relative(addressPrefix, daoAddress));
     }
-  }, [navigate, daoAddress, daoNetwork]);
+  }, [navigate, daoAddress, addressPrefix]);
 
   const nonce = safe?.nonce;
   const handleRemoveTemplate = useCallback(async () => {
diff --git a/src/components/ProposalTemplates/index.tsx b/src/components/ProposalTemplates/index.tsx
index 7cf24fa072..7776bf1538 100644
--- a/src/components/ProposalTemplates/index.tsx
+++ b/src/components/ProposalTemplates/index.tsx
@@ -4,6 +4,7 @@ import { Link } from 'react-router-dom';
 import { DAO_ROUTES } from '../../constants/routes';
 import useSubmitProposal from '../../hooks/DAO/proposal/useSubmitProposal';
 import { useFractal } from '../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../providers/NetworkConfig/NetworkConfigProvider';
 import { EmptyBox } from '../ui/containers/EmptyBox';
 import { InfoBoxLoader } from '../ui/loaders/InfoBoxLoader';
 import ProposalTemplateCard from './ProposalTemplateCard';
@@ -11,9 +12,10 @@ import ProposalTemplateCard from './ProposalTemplateCard';
 export default function ProposalTemplates() {
   const { t } = useTranslation('proposalTemplate');
   const {
-    node: { daoAddress, daoNetwork },
+    node: { daoAddress },
     governance: { proposalTemplates },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
   const { canUserCreateProposal } = useSubmitProposal();
 
   return (
@@ -36,8 +38,8 @@ export default function ProposalTemplates() {
         ))
       ) : (
         <EmptyBox emptyText={t('emptyProposalTemplates')}>
-          {canUserCreateProposal && daoNetwork && daoAddress && (
-            <Link to={DAO_ROUTES.proposalTemplateNew.relative(daoNetwork, daoAddress)}>
+          {canUserCreateProposal && daoAddress && (
+            <Link to={DAO_ROUTES.proposalTemplateNew.relative(addressPrefix, daoAddress)}>
               <Button
                 variant="text"
                 textStyle="text-xl-mono-bold"
diff --git a/src/components/Proposals/ProposalCard/ProposalCard.tsx b/src/components/Proposals/ProposalCard/ProposalCard.tsx
index 3e6628a0b1..5a4961f994 100644
--- a/src/components/Proposals/ProposalCard/ProposalCard.tsx
+++ b/src/components/Proposals/ProposalCard/ProposalCard.tsx
@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import { DAO_ROUTES } from '../../../constants/routes';
 import { useFractal } from '../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../providers/NetworkConfig/NetworkConfigProvider';
 import { ActivityEventType, FractalProposal, SnapshotProposal } from '../../../types';
 import { DEFAULT_DATE_FORMAT } from '../../../utils';
 import { ActivityDescription } from '../../Activity/ActivityDescription';
@@ -12,8 +13,9 @@ import QuorumBadge from '../../ui/badges/QuorumBadge';
 
 function ProposalCard({ proposal }: { proposal: FractalProposal }) {
   const {
-    node: { daoAddress, daoNetwork },
+    node: { daoAddress },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
   const { t } = useTranslation('common');
 
   const eventDateLabel = t(
@@ -26,12 +28,12 @@ function ProposalCard({ proposal }: { proposal: FractalProposal }) {
 
   const isSnapshotProposal = !!(proposal as SnapshotProposal).snapshotProposalId;
 
-  if (!daoNetwork || !daoAddress) {
+  if (!daoAddress) {
     return null;
   }
 
   return (
-    <Link to={DAO_ROUTES.proposal.relative(daoNetwork, daoAddress, proposal.proposalId)}>
+    <Link to={DAO_ROUTES.proposal.relative(addressPrefix, daoAddress, proposal.proposalId)}>
       <Box
         minHeight="6.25rem"
         bg="chocolate.900"
diff --git a/src/components/Proposals/ProposalsList.tsx b/src/components/Proposals/ProposalsList.tsx
index 4e11af7f47..d4f204893c 100644
--- a/src/components/Proposals/ProposalsList.tsx
+++ b/src/components/Proposals/ProposalsList.tsx
@@ -4,6 +4,7 @@ import { Link } from 'react-router-dom';
 import { DAO_ROUTES } from '../../constants/routes';
 import useSubmitProposal from '../../hooks/DAO/proposal/useSubmitProposal';
 import { useFractal } from '../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../providers/NetworkConfig/NetworkConfigProvider';
 import { FractalProposal } from '../../types';
 import { EmptyBox } from '../ui/containers/EmptyBox';
 import { InfoBoxLoader } from '../ui/loaders/InfoBoxLoader';
@@ -11,8 +12,9 @@ import ProposalCard from './ProposalCard/ProposalCard';
 
 export function ProposalsList({ proposals }: { proposals: FractalProposal[] }) {
   const {
-    node: { daoAddress, daoNetwork },
+    node: { daoAddress },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
   const { canUserCreateProposal } = useSubmitProposal();
 
   const { t } = useTranslation('proposal');
@@ -34,8 +36,8 @@ export function ProposalsList({ proposals }: { proposals: FractalProposal[] }) {
         ))
       ) : (
         <EmptyBox emptyText={t('emptyProposals')}>
-          {canUserCreateProposal && daoNetwork && daoAddress && (
-            <Link to={DAO_ROUTES.proposalNew.relative(daoNetwork, daoAddress)}>
+          {canUserCreateProposal && daoAddress && (
+            <Link to={DAO_ROUTES.proposalNew.relative(addressPrefix, daoAddress)}>
               <Button
                 variant="text"
                 textStyle="text-xl-mono-bold"
diff --git a/src/components/pages/DaoDashboard/Info/ParentLink.tsx b/src/components/pages/DaoDashboard/Info/ParentLink.tsx
index 79a8bf3ae6..b874402e2c 100644
--- a/src/components/pages/DaoDashboard/Info/ParentLink.tsx
+++ b/src/components/pages/DaoDashboard/Info/ParentLink.tsx
@@ -3,18 +3,20 @@ import { useTranslation } from 'react-i18next';
 import { Link as RouterLink } from 'react-router-dom';
 import { DAO_ROUTES } from '../../../../constants/routes';
 import { useFractal } from '../../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../../providers/NetworkConfig/NetworkConfigProvider';
 
 /**
  * Displays a link to the current DAO's parent, if it has one.
  */
 export function ParentLink() {
   const {
-    node: { nodeHierarchy, daoNetwork },
+    node: { nodeHierarchy },
     action,
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
   const { t } = useTranslation('breadcrumbs');
 
-  if (!nodeHierarchy.parentAddress || !daoNetwork) {
+  if (!nodeHierarchy.parentAddress) {
     return null;
   }
 
@@ -22,7 +24,7 @@ export function ParentLink() {
     <Link
       color="gold.500"
       _hover={{ textDecoration: 'none', color: 'gold.500-hover' }}
-      href={DAO_ROUTES.dao.relative(daoNetwork, nodeHierarchy.parentAddress)}
+      href={DAO_ROUTES.dao.relative(addressPrefix, nodeHierarchy.parentAddress)}
       onClick={action.resetDAO}
       marginBottom="1rem"
       as={RouterLink}
diff --git a/src/components/pages/DaoDashboard/Info/index.tsx b/src/components/pages/DaoDashboard/Info/index.tsx
index ffd4f19d4d..930273a845 100644
--- a/src/components/pages/DaoDashboard/Info/index.tsx
+++ b/src/components/pages/DaoDashboard/Info/index.tsx
@@ -2,6 +2,7 @@ import { Box, Flex, Text } from '@chakra-ui/react';
 import { DAO_ROUTES } from '../../../../constants/routes';
 import useDAOMetadata from '../../../../hooks/DAO/useDAOMetadata';
 import { useFractal } from '../../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../../providers/NetworkConfig/NetworkConfigProvider';
 import { InfoBox } from '../../../ui/containers/InfoBox';
 import ExternalLink from '../../../ui/links/ExternalLink';
 import { InfoDAO } from './InfoDAO';
@@ -12,8 +13,9 @@ import { ParentLink } from './ParentLink';
 
 export function Info() {
   const {
-    node: { daoAddress, daoNetwork },
+    node: { daoAddress },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
   const daoMetadata = useDAOMetadata();
 
   // using this gap method instead of 'gap' to make width percentages more precise, since they
@@ -135,8 +137,8 @@ export function Info() {
               pb={{ sm: PAD, md: NONE }}
               pt={{ sm: PAD, lg: NONE }}
             >
-              {daoNetwork && daoAddress && (
-                <InfoBox to={DAO_ROUTES.proposals.relative(daoNetwork, daoAddress)}>
+              {daoAddress && (
+                <InfoBox to={DAO_ROUTES.proposals.relative(addressPrefix, daoAddress)}>
                   <InfoProposals />
                 </InfoBox>
               )}
@@ -146,8 +148,8 @@ export function Info() {
               ps={{ base: NONE, md: PAD }}
               pt={{ sm: PAD, lg: NONE }}
             >
-              {daoNetwork && daoAddress && (
-                <InfoBox to={DAO_ROUTES.treasury.relative(daoNetwork, daoAddress)}>
+              {daoAddress && (
+                <InfoBox to={DAO_ROUTES.treasury.relative(addressPrefix, daoAddress)}>
                   <InfoTreasury />
                 </InfoBox>
               )}
diff --git a/src/components/pages/DaoHierarchy/DaoNode.tsx b/src/components/pages/DaoHierarchy/DaoNode.tsx
index c77bca3140..5fb5820f59 100644
--- a/src/components/pages/DaoHierarchy/DaoNode.tsx
+++ b/src/components/pages/DaoHierarchy/DaoNode.tsx
@@ -4,6 +4,7 @@ import { useEffect, useState } from 'react';
 import { useLoadDAONode } from '../../../hooks/DAO/loaders/useLoadDAONode';
 import { useLoadDAOData } from '../../../hooks/DAO/useDAOData';
 import { useFractal } from '../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../providers/NetworkConfig/NetworkConfigProvider';
 import { FractalNode, WithError } from '../../../types';
 import { DAONodeRow } from '../../ui/cards/DAONodeRow';
 import { NodeLineVertical } from './NodeLines';
@@ -20,12 +21,10 @@ import { NodeLineVertical } from './NodeLines';
 export function DaoNode({
   parentAddress,
   daoAddress,
-  daoNetwork,
   depth,
 }: {
   parentAddress?: string;
   daoAddress?: string;
-  daoNetwork?: string;
   depth: number;
 }) {
   const [fractalNode, setNode] = useState<FractalNode>();
@@ -36,12 +35,13 @@ export function DaoNode({
   const {
     node: { daoAddress: currentDAOAddress }, // used ONLY to determine if we're on the current DAO
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
 
   const isCurrentDAO = daoAddress === currentDAOAddress;
 
   useEffect(() => {
-    if (daoAddress && daoNetwork && !fractalNode) {
-      loadDao(daoNetwork, utils.getAddress(daoAddress)).then(_node => {
+    if (daoAddress && !fractalNode) {
+      loadDao(utils.getAddress(daoAddress)).then(_node => {
         const errorNode = _node as WithError;
         if (!errorNode.error) {
           // calculates the total number of descendants below the given node
@@ -72,7 +72,6 @@ export function DaoNode({
           setNode({
             daoName: null,
             daoAddress,
-            daoNetwork,
             safe: null,
             fractalModules: [],
             nodeHierarchy: {
@@ -83,7 +82,7 @@ export function DaoNode({
         }
       });
     }
-  }, [loadDao, daoAddress, fractalNode, depth, daoNetwork]);
+  }, [loadDao, daoAddress, fractalNode, depth, addressPrefix]);
 
   return (
     <Box position="relative">
@@ -109,7 +108,6 @@ export function DaoNode({
           <DaoNode
             parentAddress={daoAddress}
             daoAddress={childNode.daoAddress || undefined}
-            daoNetwork={daoNetwork}
             depth={depth + 1}
           />
         </Box>
diff --git a/src/components/pages/DaoSettings/components/Metadata/index.tsx b/src/components/pages/DaoSettings/components/Metadata/index.tsx
index 6a9cf47bae..513374e4f9 100644
--- a/src/components/pages/DaoSettings/components/Metadata/index.tsx
+++ b/src/components/pages/DaoSettings/components/Metadata/index.tsx
@@ -8,6 +8,7 @@ import { DAO_ROUTES } from '../../../../../constants/routes';
 import useSubmitProposal from '../../../../../hooks/DAO/proposal/useSubmitProposal';
 import { createAccountSubstring } from '../../../../../hooks/utils/useDisplayName';
 import { useFractal } from '../../../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../../../providers/NetworkConfig/NetworkConfigProvider';
 import { ProposalExecuteData } from '../../../../../types';
 import { couldBeENS } from '../../../../../utils/url';
 import { InputComponent } from '../../../../ui/forms/InputComponent';
@@ -22,11 +23,12 @@ export default function MetadataContainer() {
   const { canUserCreateProposal, submitProposal } = useSubmitProposal();
   const {
     baseContracts,
-    node: { daoName, daoSnapshotURL, daoAddress, safe, daoNetwork },
+    node: { daoName, daoSnapshotURL, daoAddress, safe },
     readOnly: {
       user: { votingWeight },
     },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
 
   useEffect(() => {
     if (daoName && daoAddress && createAccountSubstring(daoAddress) !== daoName) {
@@ -51,8 +53,8 @@ export default function MetadataContainer() {
   const userHasVotingWeight = votingWeight.gt(0);
 
   const submitProposalSuccessCallback = () => {
-    if (daoNetwork && daoAddress) {
-      navigate(DAO_ROUTES.proposals.relative(daoNetwork, daoAddress));
+    if (daoAddress) {
+      navigate(DAO_ROUTES.proposals.relative(addressPrefix, daoAddress));
     }
   };
 
diff --git a/src/components/ui/cards/DAOInfoCard.tsx b/src/components/ui/cards/DAOInfoCard.tsx
index b3b2a0dede..a68aa83696 100644
--- a/src/components/ui/cards/DAOInfoCard.tsx
+++ b/src/components/ui/cards/DAOInfoCard.tsx
@@ -3,6 +3,7 @@ import { Link as RouterLink } from 'react-router-dom';
 import { DAO_ROUTES } from '../../../constants/routes';
 import useDisplayName from '../../../hooks/utils/useDisplayName';
 import { useFractal } from '../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../providers/NetworkConfig/NetworkConfigProvider';
 import { FreezeGuard, FractalGuardContracts, FractalNode } from '../../../types';
 import Snapshot from '../badges/Snapshot';
 import FavoriteIcon from '../icons/FavoriteIcon';
@@ -42,11 +43,12 @@ export function DAOInfoCard({
     action,
     readOnly: { user },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
   // for non Fractal Safes
   const { displayName } = useDisplayName(node?.daoAddress);
 
   // node hasn't loaded yet
-  if (!node || !node.daoAddress || !node.daoNetwork) {
+  if (!node || !node.daoAddress) {
     return (
       <Flex
         w="full"
@@ -77,7 +79,7 @@ export function DAOInfoCard({
           <Link
             as={RouterLink}
             pointerEvents={isCurrentDAO ? 'none' : undefined}
-            to={DAO_ROUTES.dao.relative(node.daoNetwork, displayedAddress)}
+            to={DAO_ROUTES.dao.relative(addressPrefix, displayedAddress)}
             _hover={{ textDecoration: 'none' }}
             onClick={() => {
               // if we're not on the current DAO, reset
@@ -104,7 +106,7 @@ export function DAOInfoCard({
           />
           {childCount && childCount > 0 && (
             <Link
-              to={DAO_ROUTES.hierarchy.relative(node.daoNetwork, displayedAddress)}
+              to={DAO_ROUTES.hierarchy.relative(addressPrefix, displayedAddress)}
               as={RouterLink}
             >
               <Box
diff --git a/src/components/ui/menus/ManageDAO/ManageDAOMenu.tsx b/src/components/ui/menus/ManageDAO/ManageDAOMenu.tsx
index ed309d8e3b..f3b3bb5ddd 100644
--- a/src/components/ui/menus/ManageDAO/ManageDAOMenu.tsx
+++ b/src/components/ui/menus/ManageDAO/ManageDAOMenu.tsx
@@ -18,6 +18,7 @@ import useClawBack from '../../../../hooks/DAO/useClawBack';
 import useBlockTimestamp from '../../../../hooks/utils/useBlockTimestamp';
 import { useMasterCopy } from '../../../../hooks/utils/useMasterCopy';
 import { useFractal } from '../../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../../providers/NetworkConfig/NetworkConfigProvider';
 import {
   FractalGuardContracts,
   FractalNode,
@@ -56,15 +57,16 @@ export function ManageDAOMenu({
   const [canUserCreateProposal, setCanUserCreateProposal] = useState(false);
   const [governanceType, setGovernanceType] = useState(GovernanceType.MULTISIG);
   const {
-    node: { safe, daoNetwork, daoAddress },
+    node: { safe },
     governance: { type },
     baseContracts,
   } = useFractal();
   const currentTime = BigNumber.from(useBlockTimestamp());
   const navigate = useNavigate();
+  const safeAddress = fractalNode?.daoAddress;
   const { getZodiacModuleProxyMasterCopyData } = useMasterCopy();
   const { getCanUserCreateProposal } = useSubmitProposal();
-  const { getUserERC721VotingTokens } = useUserERC721VotingTokens(undefined, daoAddress, false);
+  const { getUserERC721VotingTokens } = useUserERC721VotingTokens(undefined, safeAddress, false);
   const { handleClawBack } = useClawBack({
     parentAddress,
     childSafeInfo: fractalNode,
@@ -72,17 +74,17 @@ export function ManageDAOMenu({
 
   useEffect(() => {
     const loadCanUserCreateProposal = async () => {
-      if (daoAddress) {
-        setCanUserCreateProposal(await getCanUserCreateProposal(daoAddress));
+      if (safeAddress) {
+        setCanUserCreateProposal(await getCanUserCreateProposal(safeAddress));
       }
     };
 
     loadCanUserCreateProposal();
-  }, [daoAddress, getCanUserCreateProposal]);
+  }, [safeAddress, getCanUserCreateProposal]);
 
   useEffect(() => {
     const loadGovernanceType = async () => {
-      if (safe && safe.address && safe.address === daoAddress && type) {
+      if (safe && safe.address && safe.address === safeAddress && type) {
         // Since safe.address (global scope DAO address) and safeAddress(Node provided to this component via props)
         // are the same - we can simply grab governance type from global scope and avoid double-fetching
         setGovernanceType(type);
@@ -123,13 +125,15 @@ export function ManageDAOMenu({
     };
 
     loadGovernanceType();
-  }, [fractalNode, safe, daoAddress, type, getZodiacModuleProxyMasterCopyData, baseContracts]);
+  }, [fractalNode, safe, safeAddress, type, getZodiacModuleProxyMasterCopyData, baseContracts]);
+
+  const { addressPrefix } = useNetworkConfig();
 
   const handleNavigateToSettings = useCallback(() => {
-    if (daoNetwork && daoAddress) {
-      navigate(DAO_ROUTES.settings.relative(daoNetwork, daoAddress));
+    if (safeAddress) {
+      navigate(DAO_ROUTES.settings.relative(addressPrefix, safeAddress));
     }
-  }, [navigate, daoAddress, daoNetwork]);
+  }, [navigate, addressPrefix, safeAddress]);
 
   const handleModifyGovernance = useFractalModal(ModalType.CONFIRM_MODIFY_GOVERNANCE);
 
@@ -137,8 +141,8 @@ export function ManageDAOMenu({
     const createSubDAOOption = {
       optionKey: 'optionCreateSubDAO',
       onClick: () => {
-        if (daoNetwork && daoAddress) {
-          navigate(DAO_ROUTES.newSubDao.relative(daoNetwork, daoAddress));
+        if (safeAddress) {
+          navigate(DAO_ROUTES.newSubDao.relative(addressPrefix, safeAddress));
         }
       },
     };
@@ -230,7 +234,7 @@ export function ManageDAOMenu({
     freezeGuard,
     currentTime,
     navigate,
-    daoAddress,
+    safeAddress,
     parentAddress,
     governanceType,
     guardContracts?.freezeVotingContract?.asSigner,
@@ -240,7 +244,7 @@ export function ManageDAOMenu({
     handleModifyGovernance,
     handleNavigateToSettings,
     getUserERC721VotingTokens,
-    daoNetwork,
+    addressPrefix,
   ]);
 
   return (
diff --git a/src/components/ui/modals/ConfirmModifyGovernanceModal.tsx b/src/components/ui/modals/ConfirmModifyGovernanceModal.tsx
index 18132e7889..cb2c3bbc2c 100644
--- a/src/components/ui/modals/ConfirmModifyGovernanceModal.tsx
+++ b/src/components/ui/modals/ConfirmModifyGovernanceModal.tsx
@@ -3,14 +3,16 @@ import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import { DAO_ROUTES } from '../../../constants/routes';
 import { useFractal } from '../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../providers/NetworkConfig/NetworkConfigProvider';
 
 export function ConfirmModifyGovernanceModal({ close }: { close: () => void }) {
   const { t } = useTranslation('modals');
   const {
-    node: { daoAddress, daoNetwork },
+    node: { daoAddress },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
 
-  if (!daoNetwork || !daoAddress) {
+  if (!daoAddress) {
     return null;
   }
 
@@ -32,7 +34,7 @@ export function ConfirmModifyGovernanceModal({ close }: { close: () => void }) {
       >
         {t('confirmAction')}
       </Text>
-      <Link to={DAO_ROUTES.modifyGovernance.relative(daoNetwork, daoAddress)}>
+      <Link to={DAO_ROUTES.modifyGovernance.relative(addressPrefix, daoAddress)}>
         <Button
           width="100%"
           onClick={close}
diff --git a/src/components/ui/modals/ForkProposalTemplateModal.tsx b/src/components/ui/modals/ForkProposalTemplateModal.tsx
index 3aed855a1b..25e5484b51 100644
--- a/src/components/ui/modals/ForkProposalTemplateModal.tsx
+++ b/src/components/ui/modals/ForkProposalTemplateModal.tsx
@@ -30,9 +30,9 @@ export default function ForkProposalTemplateModal({
   const { t } = useTranslation('proposalTemplate');
   const navigate = useNavigate();
   const signerOrProvider = useSignerOrProvider();
-  const { name } = useNetworkConfig();
+  const { name, addressPrefix } = useNetworkConfig();
   const {
-    node: { proposalTemplatesHash, daoNetwork },
+    node: { proposalTemplatesHash },
   } = useFractal();
 
   const { isSafe, isSafeLoading } = useIsSafe(targetDAOAddress);
@@ -74,15 +74,13 @@ export default function ForkProposalTemplateModal({
   }, [getCanUserCreateProposal, inputValue, isSafe, isSafeLoading, name, signerOrProvider, t]);
 
   const handleSubmit = () => {
-    if (daoNetwork) {
-      navigate(
-        `${DAO_ROUTES.proposalTemplateNew.relative(
-          daoNetwork,
-          targetDAOAddress,
-        )}?templatesHash=${proposalTemplatesHash}&templateIndex=${templateIndex}`,
-      );
-      onClose();
-    }
+    navigate(
+      `${DAO_ROUTES.proposalTemplateNew.relative(
+        addressPrefix,
+        targetDAOAddress,
+      )}?templatesHash=${proposalTemplatesHash}&templateIndex=${templateIndex}`,
+    );
+    onClose();
   };
 
   useEffect(() => {
diff --git a/src/components/ui/modals/ProposalTemplateModal.tsx b/src/components/ui/modals/ProposalTemplateModal.tsx
index 7010e59d3c..45028ba7aa 100644
--- a/src/components/ui/modals/ProposalTemplateModal.tsx
+++ b/src/components/ui/modals/ProposalTemplateModal.tsx
@@ -17,6 +17,7 @@ import { logError } from '../../../helpers/errorLogging';
 import { usePrepareProposal } from '../../../hooks/DAO/proposal/usePrepareProposal';
 import useSubmitProposal from '../../../hooks/DAO/proposal/useSubmitProposal';
 import { useFractal } from '../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../providers/NetworkConfig/NetworkConfigProvider';
 import { ProposalTemplate } from '../../../types/createProposalTemplate';
 import { isValidUrl } from '../../../utils/url';
 import { CustomNonceInput } from '../forms/CustomNonceInput';
@@ -33,8 +34,9 @@ export default function ProposalTemplateModal({
   onClose,
 }: IProposalTemplateModalProps) {
   const {
-    node: { daoAddress, safe, daoNetwork },
+    node: { daoAddress, safe },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
 
   const [filledProposalTransactions, setFilledProposalTransactions] = useState(transactions);
   const [nonce, setNonce] = useState<number | undefined>(safe!.nonce);
@@ -78,8 +80,8 @@ export default function ProposalTemplateModal({
   };
 
   const successCallback = () => {
-    if (daoAddress && daoNetwork) {
-      navigate(DAO_ROUTES.proposals.relative(daoNetwork, daoAddress));
+    if (daoAddress) {
+      navigate(DAO_ROUTES.proposals.relative(addressPrefix, daoAddress));
       onClose();
     }
   };
diff --git a/src/components/ui/modals/Stake.tsx b/src/components/ui/modals/Stake.tsx
index 5efe2e6d9b..dc5bc783c9 100644
--- a/src/components/ui/modals/Stake.tsx
+++ b/src/components/ui/modals/Stake.tsx
@@ -7,14 +7,16 @@ import { useNavigate } from 'react-router-dom';
 import { DAO_ROUTES } from '../../../constants/routes';
 import useLidoStaking from '../../../hooks/stake/lido/useLidoStaking';
 import { useFractal } from '../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../providers/NetworkConfig/NetworkConfigProvider';
 import { BigNumberValuePair } from '../../../types';
 import { BigNumberInput } from '../forms/BigNumberInput';
 
 export default function StakeModal({ close }: { close: () => void }) {
   const {
-    node: { daoAddress, daoNetwork },
+    node: { daoAddress },
     treasury: { assetsFungible },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
   const navigate = useNavigate();
   const { t } = useTranslation('stake');
 
@@ -31,8 +33,8 @@ export default function StakeModal({ close }: { close: () => void }) {
     if (inputAmount?.bigNumberValue) {
       await handleStake(inputAmount?.bigNumberValue);
       close();
-      if (daoNetwork && daoAddress) {
-        navigate(DAO_ROUTES.proposals.relative(daoNetwork, daoAddress));
+      if (daoAddress) {
+        navigate(DAO_ROUTES.proposals.relative(addressPrefix, daoAddress));
       }
     }
   };
diff --git a/src/components/ui/page/Header/PageHeader.tsx b/src/components/ui/page/Header/PageHeader.tsx
index 295d83921c..c65b0507bd 100644
--- a/src/components/ui/page/Header/PageHeader.tsx
+++ b/src/components/ui/page/Header/PageHeader.tsx
@@ -12,6 +12,7 @@ import {
 import { ReactNode, useEffect, useState } from 'react';
 import { DAO_ROUTES } from '../../../../constants/routes';
 import { useFractal } from '../../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../../providers/NetworkConfig/NetworkConfigProvider';
 import AddressCopier from '../../links/AddressCopier';
 import Breadcrumbs, { Crumb } from './Breadcrumbs';
 interface IPageHeader {
@@ -45,22 +46,23 @@ function PageHeader({
   children,
 }: IPageHeader) {
   const {
-    node: { daoAddress, daoName, daoNetwork },
+    node: { daoAddress, daoName },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
 
   const [links, setLinks] = useState([...breadcrumbs]);
 
   useEffect(() => {
-    if (hasDAOLink && daoNetwork && daoAddress) {
+    if (hasDAOLink && daoAddress) {
       setLinks([
         {
           terminus: daoName || '',
-          path: DAO_ROUTES.dao.relative(daoNetwork, daoAddress),
+          path: DAO_ROUTES.dao.relative(addressPrefix, daoAddress),
         },
         ...breadcrumbs,
       ]);
     }
-  }, [hasDAOLink, daoName, daoAddress, breadcrumbs, daoNetwork]);
+  }, [hasDAOLink, daoName, daoAddress, breadcrumbs, addressPrefix]);
 
   return (
     <Box
diff --git a/src/components/ui/page/Navigation/NavigationLinks.tsx b/src/components/ui/page/Navigation/NavigationLinks.tsx
index b374dcd3b6..20c16597f1 100644
--- a/src/components/ui/page/Navigation/NavigationLinks.tsx
+++ b/src/components/ui/page/Navigation/NavigationLinks.tsx
@@ -12,23 +12,23 @@ import {
 import { DAO_ROUTES } from '../../../../constants/routes';
 import { URL_FAQ, URL_DISCORD, URL_DOCS } from '../../../../constants/url';
 import { LanguageSwitcher } from '../../../../i18n/LanguageSwitcher';
+import { useNetworkConfig } from '../../../../providers/NetworkConfig/NetworkConfigProvider';
 import { NavigationExternalLink } from './NavigationExternalLink';
 import { NavigationLink } from './NavigationLink';
 
 export function NavigationLinks({
-  network,
   address,
   showDAOLinks,
   closeDrawer,
 }: {
-  network: string | null;
   showDAOLinks: boolean;
   address: string | null;
   closeDrawer?: () => void;
 }) {
+  const { addressPrefix } = useNetworkConfig();
   return (
     <>
-      {showDAOLinks && network && address && (
+      {showDAOLinks && address && (
         <>
           <Flex
             alignItems={{ base: 'flex-start', md: 'center' }}
@@ -38,35 +38,35 @@ export function NavigationLinks({
             my={8}
           >
             <NavigationLink
-              href={DAO_ROUTES.dao.relative(network, address)}
+              href={DAO_ROUTES.dao.relative(addressPrefix, address)}
               labelKey="home"
               testId="navigation-daoHomeLink"
               Icon={Home}
               closeDrawer={closeDrawer}
             />
             <NavigationLink
-              href={DAO_ROUTES.hierarchy.relative(network, address)}
+              href={DAO_ROUTES.hierarchy.relative(addressPrefix, address)}
               labelKey="nodes"
               testId="navigation-hierarchy"
               Icon={Tree}
               closeDrawer={closeDrawer}
             />
             <NavigationLink
-              href={DAO_ROUTES.proposals.relative(network, address)}
+              href={DAO_ROUTES.proposals.relative(addressPrefix, address)}
               labelKey="proposals"
               testId="navigation-proposalsLink"
               Icon={Proposals}
               closeDrawer={closeDrawer}
             />
             <NavigationLink
-              href={DAO_ROUTES.treasury.relative(network, address)}
+              href={DAO_ROUTES.treasury.relative(addressPrefix, address)}
               labelKey="treasury"
               testId="navigation-treasuryLink"
               Icon={Treasury}
               closeDrawer={closeDrawer}
             />
             <NavigationLink
-              href={DAO_ROUTES.proposalTemplates.relative(network, address)}
+              href={DAO_ROUTES.proposalTemplates.relative(addressPrefix, address)}
               labelKey="proposalTemplates"
               testId="navigation-proposalTemplatesLink"
               Icon={Templates}
diff --git a/src/components/ui/page/Navigation/index.tsx b/src/components/ui/page/Navigation/index.tsx
index 6442268d4f..e83bec9175 100644
--- a/src/components/ui/page/Navigation/index.tsx
+++ b/src/components/ui/page/Navigation/index.tsx
@@ -26,7 +26,7 @@ function Navigation() {
   const btnRef = React.useRef<HTMLButtonElement | null>(null);
 
   const {
-    node: { daoAddress, daoNetwork },
+    node: { daoAddress },
   } = useFractal();
 
   const showDAOLinks = !!daoAddress;
@@ -93,7 +93,6 @@ function Navigation() {
                   <Divider color="chocolate.700" />
                   <NavigationLinks
                     showDAOLinks={showDAOLinks}
-                    network={daoNetwork}
                     address={daoAddress}
                     closeDrawer={onClose}
                   />
@@ -115,7 +114,6 @@ function Navigation() {
           </Link>
           <NavigationLinks
             showDAOLinks={showDAOLinks}
-            network={daoNetwork}
             address={daoAddress}
           />
         </Show>
diff --git a/src/constants/routes.ts b/src/constants/routes.ts
index f3ae24f40c..95b55789d2 100644
--- a/src/constants/routes.ts
+++ b/src/constants/routes.ts
@@ -4,7 +4,7 @@ export const BASE_ROUTES = {
 };
 
 type RouteInfo = {
-  relative: (daoNetwork: string, daoAddress: string, ...args: string[]) => string;
+  relative: (addressPrefix: string, daoAddress: string, ...args: string[]) => string;
   path: string;
 };
 type RouteIndex = { [key: string]: RouteInfo };
@@ -25,61 +25,63 @@ export interface DAORoutes extends RouteIndex {
 
 export const DAO_ROUTES: DAORoutes = {
   dao: {
-    relative: (daoNetwork: string, daoAddress: string) => `/home?dao=${daoNetwork}:${daoAddress}`,
+    relative: (addressPrefix: string, daoAddress: string) =>
+      `/home?dao=${addressPrefix}:${daoAddress}`,
     path: '*',
   },
   newSubDao: {
-    relative: (daoNetwork: string, daoAddress: string) => `/new?dao=${daoNetwork}:${daoAddress}`,
+    relative: (addressPrefix: string, daoAddress: string) =>
+      `/new?dao=${addressPrefix}:${daoAddress}`,
     path: 'new',
   },
   modifyGovernance: {
-    relative: (daoNetwork: string, daoAddress: string) =>
-      `/edit/governance?dao=${daoNetwork}:${daoAddress}`,
+    relative: (addressPrefix: string, daoAddress: string) =>
+      `/edit/governance?dao=${addressPrefix}:${daoAddress}`,
     path: 'edit/governance',
   },
   hierarchy: {
-    relative: (daoNetwork: string, daoAddress: string) =>
-      `/hierarchy?dao=${daoNetwork}:${daoAddress}`,
+    relative: (addressPrefix: string, daoAddress: string) =>
+      `/hierarchy?dao=${addressPrefix}:${daoAddress}`,
     path: 'hierarchy',
   },
   treasury: {
-    relative: (daoNetwork: string, daoAddress: string) =>
-      `/treasury?dao=${daoNetwork}:${daoAddress}`,
+    relative: (addressPrefix: string, daoAddress: string) =>
+      `/treasury?dao=${addressPrefix}:${daoAddress}`,
     path: 'treasury',
   },
   proposals: {
-    relative: (daoNetwork: string, daoAddress: string) =>
-      `/proposals?dao=${daoNetwork}:${daoAddress}`,
+    relative: (addressPrefix: string, daoAddress: string) =>
+      `/proposals?dao=${addressPrefix}:${daoAddress}`,
     path: 'proposals',
   },
   proposal: {
-    relative: (daoNetwork: string, daoAddress: string, proposalId: string) =>
-      `/proposals/${proposalId}?dao=${daoNetwork}:${daoAddress}`,
+    relative: (addressPrefix: string, daoAddress: string, proposalId: string) =>
+      `/proposals/${proposalId}?dao=${addressPrefix}:${daoAddress}`,
     path: 'proposals/:proposalId',
   },
   proposalNew: {
-    relative: (daoNetwork: string, daoAddress: string) =>
-      `/proposals/new?dao=${daoNetwork}:${daoAddress}`,
+    relative: (addressPrefix: string, daoAddress: string) =>
+      `/proposals/new?dao=${addressPrefix}:${daoAddress}`,
     path: 'proposals/new',
   },
   settings: {
-    relative: (daoNetwork: string, daoAddress: string) =>
-      `/settings?dao=${daoNetwork}:${daoAddress}`,
+    relative: (addressPrefix: string, daoAddress: string) =>
+      `/settings?dao=${addressPrefix}:${daoAddress}`,
     path: 'settings',
   },
   proposalTemplates: {
-    relative: (daoNetwork: string, daoAddress: string) =>
-      `/proposal-templates?dao=${daoNetwork}:${daoAddress}`,
+    relative: (addressPrefix: string, daoAddress: string) =>
+      `/proposal-templates?dao=${addressPrefix}:${daoAddress}`,
     path: 'proposal-templates',
   },
   proposalTemplate: {
-    relative: (daoNetwork: string, daoAddress: string, proposalTemplateKey: string) =>
-      `/proposal-templates/${proposalTemplateKey}?dao=${daoNetwork}:${daoAddress}`,
+    relative: (addressPrefix: string, daoAddress: string, proposalTemplateKey: string) =>
+      `/proposal-templates/${proposalTemplateKey}?dao=${addressPrefix}:${daoAddress}`,
     path: 'proposal-templates/:proposalTemplateKey',
   },
   proposalTemplateNew: {
-    relative: (daoNetwork: string, daoAddress: string) =>
-      `/proposal-templates/new?dao=${daoNetwork}:${daoAddress}`,
+    relative: (addressPrefix: string, daoAddress: string) =>
+      `/proposal-templates/new?dao=${addressPrefix}:${daoAddress}`,
     path: 'proposal-templates/new',
   },
 };
diff --git a/src/hooks/DAO/loaders/useFractalNode.ts b/src/hooks/DAO/loaders/useFractalNode.ts
index f00446607c..56caf81741 100644
--- a/src/hooks/DAO/loaders/useFractalNode.ts
+++ b/src/hooks/DAO/loaders/useFractalNode.ts
@@ -15,11 +15,11 @@ import { useFractalModules } from './useFractalModules';
 const ONE_MINUTE = 60 * 1000;
 
 export const useFractalNode = ({
+  addressPrefix,
   daoAddress,
-  daoNetwork,
 }: {
+  addressPrefix: string;
   daoAddress: string;
-  daoNetwork: string;
 }) => {
   // tracks the current valid Safe address and chain id; helps prevent unnecessary calls
   const currentValidSafe = useRef<string>();
@@ -34,41 +34,37 @@ export const useFractalNode = ({
   const lookupModules = useFractalModules();
   const { requestWithRetries } = useAsyncRetry();
 
-  const formatDAOQuery = useCallback(
-    (result: { data?: DAOQueryQuery }, _daoNetwork: string, _daoAddress: string) => {
-      if (!result.data) {
-        return;
-      }
-      const { daos } = result.data;
-      const dao = daos[0];
-      if (dao) {
-        const { parentAddress, name, hierarchy, snapshotURL, proposalTemplatesHash } = dao;
-
-        const currentNode: Node = {
-          nodeHierarchy: {
-            parentAddress: parentAddress as string,
-            childNodes: mapChildNodes(hierarchy),
-          },
-          daoName: name as string,
-          daoAddress: utils.getAddress(_daoAddress as string),
-          daoNetwork: _daoNetwork,
-          daoSnapshotURL: snapshotURL as string,
-          proposalTemplatesHash: proposalTemplatesHash as string,
-        };
-        return currentNode;
-      }
+  const formatDAOQuery = useCallback((result: { data?: DAOQueryQuery }, _daoAddress: string) => {
+    if (!result.data) {
       return;
-    },
-    [],
-  );
+    }
+    const { daos } = result.data;
+    const dao = daos[0];
+    if (dao) {
+      const { parentAddress, name, hierarchy, snapshotURL, proposalTemplatesHash } = dao;
+
+      const currentNode: Node = {
+        nodeHierarchy: {
+          parentAddress: parentAddress as string,
+          childNodes: mapChildNodes(hierarchy),
+        },
+        daoName: name as string,
+        daoAddress: utils.getAddress(_daoAddress as string),
+        daoSnapshotURL: snapshotURL as string,
+        proposalTemplatesHash: proposalTemplatesHash as string,
+      };
+      return currentNode;
+    }
+    return;
+  }, []);
 
-  const { subgraphChainName, addressPrefix } = useNetworkConfig();
+  const { subgraphChainName, addressPrefix: connectedAddressPrefix } = useNetworkConfig();
 
   useQuery(DAOQueryDocument, {
     variables: { daoAddress },
     onCompleted: async data => {
-      if (!daoAddress || !daoNetwork) return;
-      const graphNodeInfo = formatDAOQuery({ data }, daoNetwork, daoAddress);
+      if (!daoAddress) return;
+      const graphNodeInfo = formatDAOQuery({ data }, daoAddress);
       const daoName = await getDaoName(utils.getAddress(daoAddress), graphNodeInfo?.daoName);
 
       if (!!graphNodeInfo) {
@@ -95,12 +91,12 @@ export const useFractalNode = ({
   }, [safeAPI, daoAddress]);
 
   const setDAO = useCallback(
-    async (_daoNetwork: string, _daoAddress: string, _connectedNetwork: string) => {
+    async (_addressPrefix: string, _daoAddress: string, _connectedAddressPrefix: string) => {
       setNodeLoading(true);
       setErrorLoading(false);
       setWrongNetwork(false);
 
-      if (_connectedNetwork !== _daoNetwork) {
+      if (_connectedAddressPrefix !== _addressPrefix) {
         currentValidSafe.current = undefined;
         action.resetDAO();
         setWrongNetwork(true);
@@ -112,7 +108,7 @@ export const useFractalNode = ({
             action.resetDAO();
             setErrorLoading(true);
           } else {
-            currentValidSafe.current = _daoNetwork + _daoAddress;
+            currentValidSafe.current = _addressPrefix + _daoAddress;
             action.dispatch({
               type: NodeAction.SET_FRACTAL_MODULES,
               payload: await lookupModules(safeInfo.modules),
@@ -142,17 +138,13 @@ export const useFractalNode = ({
 
   useEffect(() => {
     if (
-      (daoAddress && daoNetwork && daoNetwork + daoAddress !== currentValidSafe.current) ||
-      daoNetwork !== addressPrefix
+      addressPrefix + daoAddress !== currentValidSafe.current ||
+      addressPrefix !== connectedAddressPrefix
     ) {
       setNodeLoading(true);
-      setDAO(daoNetwork, daoAddress, addressPrefix);
-    }
-    if (!daoAddress || !daoNetwork) {
-      currentValidSafe.current = undefined;
-      setNodeLoading(false);
+      setDAO(addressPrefix, daoAddress, connectedAddressPrefix);
     }
-  }, [daoAddress, daoNetwork, setDAO, currentValidSafe, addressPrefix]);
+  }, [daoAddress, addressPrefix, setDAO, currentValidSafe, connectedAddressPrefix]);
 
   return { nodeLoading, errorLoading, wrongNetwork };
 };
diff --git a/src/hooks/DAO/loaders/useLoadDAONode.ts b/src/hooks/DAO/loaders/useLoadDAONode.ts
index 1033b3ea61..7be3374867 100644
--- a/src/hooks/DAO/loaders/useLoadDAONode.ts
+++ b/src/hooks/DAO/loaders/useLoadDAONode.ts
@@ -19,40 +19,35 @@ export const useLoadDAONode = () => {
     context: { chainName: subgraphChainName },
   });
 
-  const formatDAOQuery = useCallback(
-    (result: { data?: DAOQueryQuery }, _daoNetwork: string, _daoAddress: string) => {
-      if (!result.data) {
-        return;
-      }
-      const { daos } = result.data;
-      const dao = daos[0];
-      if (dao) {
-        const { parentAddress, name, hierarchy, snapshotURL } = dao;
-
-        const currentNode: Node = {
-          nodeHierarchy: {
-            parentAddress: parentAddress as string,
-            childNodes: mapChildNodes(hierarchy),
-          },
-          daoName: name as string,
-          daoAddress: utils.getAddress(_daoAddress as string),
-          daoNetwork: _daoNetwork,
-          daoSnapshotURL: snapshotURL as string,
-        };
-        return currentNode;
-      }
+  const formatDAOQuery = useCallback((result: { data?: DAOQueryQuery }, _daoAddress: string) => {
+    if (!result.data) {
       return;
-    },
-    [],
-  );
+    }
+    const { daos } = result.data;
+    const dao = daos[0];
+    if (dao) {
+      const { parentAddress, name, hierarchy, snapshotURL } = dao;
+
+      const currentNode: Node = {
+        nodeHierarchy: {
+          parentAddress: parentAddress as string,
+          childNodes: mapChildNodes(hierarchy),
+        },
+        daoName: name as string,
+        daoAddress: utils.getAddress(_daoAddress as string),
+        daoSnapshotURL: snapshotURL as string,
+      };
+      return currentNode;
+    }
+    return;
+  }, []);
 
   const loadDao = useCallback(
-    async (_daoNetwork: string, _daoAddress: string): Promise<FractalNode | WithError> => {
+    async (_daoAddress: string): Promise<FractalNode | WithError> => {
       if (utils.isAddress(_daoAddress) && safeAPI) {
         try {
           const graphNodeInfo = formatDAOQuery(
             await getDAOInfo({ variables: { daoAddress: _daoAddress } }),
-            _daoNetwork,
             _daoAddress,
           );
           if (!graphNodeInfo) {
diff --git a/src/hooks/DAO/proposal/useSubmitProposal.ts b/src/hooks/DAO/proposal/useSubmitProposal.ts
index e7d75d0915..484d9ae22d 100644
--- a/src/hooks/DAO/proposal/useSubmitProposal.ts
+++ b/src/hooks/DAO/proposal/useSubmitProposal.ts
@@ -34,7 +34,7 @@ interface ISubmitProposal {
   pendingToastMessage: string;
   failedToastMessage: string;
   successToastMessage: string;
-  successCallback?: (daoNetwork: string, daoAddress: string) => void;
+  successCallback?: (addressPrefix: string, daoAddress: string) => void;
   /**
    * @param safeAddress - provided address of DAO to which proposal will be submitted
    */
diff --git a/src/hooks/DAO/useCreateSubDAOProposal.ts b/src/hooks/DAO/useCreateSubDAOProposal.ts
index fe765434dc..6a591f7c07 100644
--- a/src/hooks/DAO/useCreateSubDAOProposal.ts
+++ b/src/hooks/DAO/useCreateSubDAOProposal.ts
@@ -22,7 +22,7 @@ export const useCreateSubDAOProposal = () => {
     (
       daoData: AzoriusERC20DAO | AzoriusERC721DAO | SafeMultisigDAO,
       nonce: number | undefined,
-      successCallback: (daoNetwork: string, daoAddress: string) => void,
+      successCallback: (addressPrefix: string, daoAddress: string) => void,
     ) => {
       const propose = async () => {
         if (!baseContracts || !daoAddress) {
diff --git a/src/hooks/DAO/useDAOController.ts b/src/hooks/DAO/useDAOController.ts
index 975f91bd1f..c8fb7a81ca 100644
--- a/src/hooks/DAO/useDAOController.ts
+++ b/src/hooks/DAO/useDAOController.ts
@@ -23,7 +23,7 @@ export default function useDAOController() {
   }
 
   const prefixAndAddress = addressWithPrefix.split(':');
-  const daoNetwork = prefixAndAddress[0];
+  const addressPrefix = prefixAndAddress[0];
   const daoAddress = prefixAndAddress[1];
 
   const {
@@ -39,7 +39,7 @@ export default function useDAOController() {
     }
   }, [action, daoAddress]);
 
-  const { nodeLoading, errorLoading, wrongNetwork } = useFractalNode({ daoAddress, daoNetwork });
+  const { nodeLoading, errorLoading, wrongNetwork } = useFractalNode({ addressPrefix, daoAddress });
   useGovernanceContracts();
   useFractalGuardContracts({});
   useFractalFreeze({ parentSafeAddress: parentAddress });
diff --git a/src/hooks/DAO/useDeployAzorius.ts b/src/hooks/DAO/useDeployAzorius.ts
index 5b64e348a1..0ec2ee4817 100644
--- a/src/hooks/DAO/useDeployAzorius.ts
+++ b/src/hooks/DAO/useDeployAzorius.ts
@@ -21,9 +21,10 @@ const useDeployAzorius = () => {
   const navigate = useNavigate();
   const {
     contracts: { fallbackHandler },
+    addressPrefix,
   } = useNetworkConfig();
   const {
-    node: { daoAddress, safe, daoNetwork },
+    node: { daoAddress, safe },
     baseContracts,
   } = useFractal();
 
@@ -36,7 +37,7 @@ const useDeployAzorius = () => {
       shouldSetName?: boolean,
       shouldSetSnapshot?: boolean,
     ) => {
-      if (!daoAddress || !canUserCreateProposal || !safe || !baseContracts || !daoNetwork) {
+      if (!daoAddress || !canUserCreateProposal || !safe || !baseContracts) {
         return;
       }
       const {
@@ -121,7 +122,7 @@ const useDeployAzorius = () => {
         pendingToastMessage: t('modifyGovernanceSetAzoriusProposalPendingMessage'),
         successToastMessage: t('proposalCreateSuccessToastMessage', { ns: 'proposal' }),
         failedToastMessage: t('proposalCreateFailureToastMessage', { ns: 'proposal' }),
-        successCallback: () => navigate(DAO_ROUTES.proposals.relative(daoNetwork, daoAddress)),
+        successCallback: () => navigate(DAO_ROUTES.proposals.relative(addressPrefix, daoAddress)),
       });
     },
     [
@@ -134,7 +135,7 @@ const useDeployAzorius = () => {
       navigate,
       safe,
       fallbackHandler,
-      daoNetwork,
+      addressPrefix,
     ],
   );
 
diff --git a/src/hooks/DAO/useDeployDAO.ts b/src/hooks/DAO/useDeployDAO.ts
index 4974c81133..be500b601f 100644
--- a/src/hooks/DAO/useDeployDAO.ts
+++ b/src/hooks/DAO/useDeployDAO.ts
@@ -19,7 +19,7 @@ const useDeployDAO = () => {
   const deployDao = useCallback(
     (
       daoData: SafeMultisigDAO | AzoriusERC20DAO | AzoriusERC721DAO,
-      successCallback: (daoNetwork: string, daoAddress: string) => void,
+      successCallback: (addressPrefix: string, daoAddress: string) => void,
     ) => {
       const deploy = async () => {
         if (!baseContracts) {
diff --git a/src/pages/create/index.tsx b/src/pages/create/index.tsx
index 4181e2f42b..fd894b9a2b 100644
--- a/src/pages/create/index.tsx
+++ b/src/pages/create/index.tsx
@@ -21,7 +21,7 @@ export default function DaoCreatePage() {
   const safeAPI = useSafeAPI();
 
   const successCallback = useCallback(
-    async (daoNetwork: string, daoAddress: string) => {
+    async (addressPrefix: string, daoAddress: string) => {
       setRedirectPending(true);
       const { getAddress } = ethers.utils;
       const daoFound = await requestWithRetries(
@@ -30,7 +30,7 @@ export default function DaoCreatePage() {
       );
       toggleFavorite(daoAddress);
       if (daoFound) {
-        navigate(DAO_ROUTES.dao.relative(daoNetwork, daoAddress));
+        navigate(DAO_ROUTES.dao.relative(addressPrefix, daoAddress));
       } else {
         toast(t('failedIndexSafe'), {
           autoClose: false,
diff --git a/src/pages/daos/[daoAddress]/edit/governance/index.tsx b/src/pages/daos/[daoAddress]/edit/governance/index.tsx
index 85c3a78974..174fc56ae1 100644
--- a/src/pages/daos/[daoAddress]/edit/governance/index.tsx
+++ b/src/pages/daos/[daoAddress]/edit/governance/index.tsx
@@ -11,6 +11,7 @@ import { DAO_ROUTES } from '../../../../../constants/routes';
 import useDeployAzorius from '../../../../../hooks/DAO/useDeployAzorius';
 import { createAccountSubstring } from '../../../../../hooks/utils/useDisplayName';
 import { useFractal } from '../../../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../../../providers/NetworkConfig/NetworkConfigProvider';
 import {
   DAOTrigger,
   AzoriusERC20DAO,
@@ -20,10 +21,11 @@ import {
 
 export default function ModifyGovernancePage() {
   const {
-    node: { daoAddress, safe, daoName, daoSnapshotURL, daoNetwork },
+    node: { daoAddress, safe, daoName, daoSnapshotURL },
     governance: { type },
     readOnly: { user },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
   const { t } = useTranslation(['daoEdit', 'common', 'breadcrumbs']);
   const navigate = useNavigate();
   const isMultisig = type === GovernanceType.MULTISIG;
@@ -38,7 +40,7 @@ export default function ModifyGovernancePage() {
     );
   };
 
-  if (!daoNetwork || !daoAddress) {
+  if (!daoAddress) {
     return null;
   }
 
@@ -48,7 +50,7 @@ export default function ModifyGovernancePage() {
         hasDAOLink
         ButtonIcon={CloseX}
         buttonVariant="secondary"
-        buttonClick={() => navigate(DAO_ROUTES.dao.relative(daoNetwork, daoAddress))}
+        buttonClick={() => navigate(DAO_ROUTES.dao.relative(addressPrefix, daoAddress))}
         isButtonDisabled={false}
         breadcrumbs={[
           {
diff --git a/src/pages/daos/[daoAddress]/hierarchy/index.tsx b/src/pages/daos/[daoAddress]/hierarchy/index.tsx
index f9595b2ff3..b24bc10323 100644
--- a/src/pages/daos/[daoAddress]/hierarchy/index.tsx
+++ b/src/pages/daos/[daoAddress]/hierarchy/index.tsx
@@ -8,11 +8,11 @@ import { useFractal } from '../../../../providers/App/AppProvider';
 
 export default function HierarchyPage() {
   const {
-    node: { daoAddress, daoNetwork, daoName, nodeHierarchy },
+    node: { daoAddress, daoName, nodeHierarchy },
   } = useFractal();
   const { t } = useTranslation('breadcrumbs');
 
-  if (!daoAddress || !daoNetwork) {
+  if (!daoAddress) {
     return (
       <Center minH={`calc(100vh - ${HEADER_HEIGHT})`}>
         <BarLoader />
@@ -36,7 +36,6 @@ export default function HierarchyPage() {
       />
       <DaoNode
         daoAddress={nodeHierarchy.parentAddress || daoAddress}
-        daoNetwork={daoNetwork}
         depth={0}
       />
     </div>
diff --git a/src/pages/daos/[daoAddress]/new/index.tsx b/src/pages/daos/[daoAddress]/new/index.tsx
index f7ebf8f131..6a02637c83 100644
--- a/src/pages/daos/[daoAddress]/new/index.tsx
+++ b/src/pages/daos/[daoAddress]/new/index.tsx
@@ -14,9 +14,9 @@ export default function SubDaoCreate() {
     node: { safe },
   } = useFractal();
 
-  const successCallback = async (daoNetwork: string, daoAddress: string) => {
+  const successCallback = async (addressPrefix: string, daoAddress: string) => {
     setRedirectPending(true);
-    navigate(DAO_ROUTES.dao.relative(daoNetwork, daoAddress));
+    navigate(DAO_ROUTES.dao.relative(addressPrefix, daoAddress));
   };
 
   const { proposeDao, pendingCreateTx } = useCreateSubDAOProposal();
diff --git a/src/pages/daos/[daoAddress]/proposal-templates/index.tsx b/src/pages/daos/[daoAddress]/proposal-templates/index.tsx
index a5e21cafff..5e7fdd5dc0 100644
--- a/src/pages/daos/[daoAddress]/proposal-templates/index.tsx
+++ b/src/pages/daos/[daoAddress]/proposal-templates/index.tsx
@@ -7,12 +7,14 @@ import PageHeader from '../../../../components/ui/page/Header/PageHeader';
 import { DAO_ROUTES } from '../../../../constants/routes';
 import useSubmitProposal from '../../../../hooks/DAO/proposal/useSubmitProposal';
 import { useFractal } from '../../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../../providers/NetworkConfig/NetworkConfigProvider';
 
 export default function ProposalTemplatesPage() {
   const { t } = useTranslation();
   const {
-    node: { daoAddress, daoNetwork },
+    node: { daoAddress },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
   const { canUserCreateProposal } = useSubmitProposal();
 
   return (
@@ -26,8 +28,8 @@ export default function ProposalTemplatesPage() {
           },
         ]}
       >
-        {canUserCreateProposal && daoNetwork && daoAddress && (
-          <Link to={DAO_ROUTES.proposalTemplateNew.relative(daoNetwork, daoAddress)}>
+        {canUserCreateProposal && daoAddress && (
+          <Link to={DAO_ROUTES.proposalTemplateNew.relative(addressPrefix, daoAddress)}>
             <Button minW={0}>
               <AddPlus />
               <Show above="sm">{t('create')}</Show>
diff --git a/src/pages/daos/[daoAddress]/proposal-templates/new/index.tsx b/src/pages/daos/[daoAddress]/proposal-templates/new/index.tsx
index e8929c1b3f..bc58c19a3c 100644
--- a/src/pages/daos/[daoAddress]/proposal-templates/new/index.tsx
+++ b/src/pages/daos/[daoAddress]/proposal-templates/new/index.tsx
@@ -19,6 +19,7 @@ import useSubmitProposal from '../../../../../hooks/DAO/proposal/useSubmitPropos
 import useCreateProposalTemplateSchema from '../../../../../hooks/schemas/createProposalTemplate/useCreateProposalTemplateSchema';
 import { useFractal } from '../../../../../providers/App/AppProvider';
 import useIPFSClient from '../../../../../providers/App/hooks/useIPFSClient';
+import { useNetworkConfig } from '../../../../../providers/NetworkConfig/NetworkConfigProvider';
 import {
   CreateProposalTemplateForm,
   CreateProposalTemplateFormState,
@@ -46,8 +47,9 @@ export default function CreateProposalTemplatePage() {
   );
 
   const {
-    node: { daoAddress, safe, daoNetwork },
+    node: { daoAddress, safe },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
 
   const { prepareProposalTemplateProposal } = useCreateProposalTemplate();
   const { submitProposal, pendingCreateTx, canUserCreateProposal } = useSubmitProposal();
@@ -55,9 +57,9 @@ export default function CreateProposalTemplatePage() {
   const ipfsClient = useIPFSClient();
 
   const successCallback = () => {
-    if (daoAddress && daoNetwork) {
+    if (daoAddress) {
       // Redirecting to proposals page so that user will see Proposal for Proposal Template creation
-      navigate(DAO_ROUTES.proposals.relative(daoNetwork, daoAddress));
+      navigate(DAO_ROUTES.proposals.relative(addressPrefix, daoAddress));
     }
   };
 
@@ -116,7 +118,7 @@ export default function CreateProposalTemplatePage() {
       {(formikProps: FormikProps<CreateProposalTemplateForm>) => {
         const { handleSubmit } = formikProps;
 
-        if (!daoAddress || !daoNetwork) {
+        if (!daoAddress) {
           return;
         }
 
@@ -128,7 +130,7 @@ export default function CreateProposalTemplatePage() {
                 breadcrumbs={[
                   {
                     terminus: t('proposalTemplates', { ns: 'breadcrumbs' }),
-                    path: DAO_ROUTES.proposalTemplates.relative(daoNetwork, daoAddress),
+                    path: DAO_ROUTES.proposalTemplates.relative(addressPrefix, daoAddress),
                   },
                   {
                     terminus: t('proposalTemplateNew', { ns: 'breadcrumbs' }),
@@ -139,8 +141,8 @@ export default function CreateProposalTemplatePage() {
                 buttonVariant="secondary"
                 buttonClick={() =>
                   navigate(
-                    daoAddress && daoNetwork
-                      ? DAO_ROUTES.proposalTemplates.relative(daoNetwork, daoAddress)
+                    daoAddress
+                      ? DAO_ROUTES.proposalTemplates.relative(addressPrefix, daoAddress)
                       : BASE_ROUTES.landing,
                   )
                 }
diff --git a/src/pages/daos/[daoAddress]/proposals/[proposalId]/index.tsx b/src/pages/daos/[daoAddress]/proposals/[proposalId]/index.tsx
index e8b54dc242..fcf77e5fe3 100644
--- a/src/pages/daos/[daoAddress]/proposals/[proposalId]/index.tsx
+++ b/src/pages/daos/[daoAddress]/proposals/[proposalId]/index.tsx
@@ -12,14 +12,16 @@ import { DAO_ROUTES } from '../../../../../constants/routes';
 import useSnapshotProposal from '../../../../../hooks/DAO/loaders/snapshot/useSnapshotProposal';
 import { useGetMetadata } from '../../../../../hooks/DAO/proposal/useGetMetadata';
 import { useFractal } from '../../../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../../../providers/NetworkConfig/NetworkConfigProvider';
 import { FractalProposal, AzoriusProposal, SnapshotProposal } from '../../../../../types';
 
 export default function ProposalDetailsPage() {
   const {
-    node: { daoAddress, daoNetwork },
+    node: { daoAddress },
     governance: { proposals },
     readOnly: { dao },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
   const { proposalId } = useParams();
   const [proposal, setProposal] = useState<FractalProposal | null>();
   const { isSnapshotProposal, snapshotProposal } = useSnapshotProposal(proposal);
@@ -48,7 +50,7 @@ export default function ProposalDetailsPage() {
     setProposal(foundProposal);
   }, [proposals, proposalId, isSnapshotProposal]);
 
-  if (!daoAddress || !daoNetwork) {
+  if (!daoAddress) {
     return null;
   }
 
@@ -59,7 +61,7 @@ export default function ProposalDetailsPage() {
         breadcrumbs={[
           {
             terminus: t('proposals', { ns: 'breadcrumbs' }),
-            path: DAO_ROUTES.proposals.relative(daoNetwork, daoAddress),
+            path: DAO_ROUTES.proposals.relative(addressPrefix, daoAddress),
           },
           {
             terminus: t('proposal', {
diff --git a/src/pages/daos/[daoAddress]/proposals/index.tsx b/src/pages/daos/[daoAddress]/proposals/index.tsx
index 4d3048af6f..d6f8c9d214 100644
--- a/src/pages/daos/[daoAddress]/proposals/index.tsx
+++ b/src/pages/daos/[daoAddress]/proposals/index.tsx
@@ -10,14 +10,16 @@ import PageHeader from '../../../../components/ui/page/Header/PageHeader';
 import { DAO_ROUTES } from '../../../../constants/routes';
 import useSubmitProposal from '../../../../hooks/DAO/proposal/useSubmitProposal';
 import { useFractal } from '../../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../../providers/NetworkConfig/NetworkConfigProvider';
 import { AzoriusGovernance, DecentGovernance, GovernanceType } from '../../../../types';
 
 export default function ProposalsPage() {
   const { t } = useTranslation(['common', 'proposal', 'breadcrumbs']);
   const {
     governance,
-    node: { daoAddress, daoNetwork },
+    node: { daoAddress },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
   const azoriusGovernance = governance as AzoriusGovernance;
   const delegate = useFractalModal(ModalType.DELEGATE);
   const wrapTokenOpen = useFractalModal(ModalType.WRAP_TOKEN);
@@ -91,8 +93,8 @@ export default function ProposalsPage() {
             </Flex>
           </Button>
         )}
-        {canUserCreateProposal && daoNetwork && daoAddress && (
-          <Link to={DAO_ROUTES.proposalNew.relative(daoNetwork, daoAddress)}>
+        {canUserCreateProposal && daoAddress && (
+          <Link to={DAO_ROUTES.proposalNew.relative(addressPrefix, daoAddress)}>
             <Button minW={0}>
               <AddPlus />
               <Show above="sm">{t('create')}</Show>
diff --git a/src/pages/daos/[daoAddress]/proposals/new/index.tsx b/src/pages/daos/[daoAddress]/proposals/new/index.tsx
index 4399868a71..a148cd9a5f 100644
--- a/src/pages/daos/[daoAddress]/proposals/new/index.tsx
+++ b/src/pages/daos/[daoAddress]/proposals/new/index.tsx
@@ -17,6 +17,7 @@ import { usePrepareProposal } from '../../../../../hooks/DAO/proposal/usePrepare
 import useSubmitProposal from '../../../../../hooks/DAO/proposal/useSubmitProposal';
 import { useCreateProposalSchema } from '../../../../../hooks/schemas/proposalCreate/useCreateProposalSchema';
 import { useFractal } from '../../../../../providers/App/AppProvider';
+import { useNetworkConfig } from '../../../../../providers/NetworkConfig/NetworkConfigProvider';
 import { CreateProposalForm, CreateProposalState, GovernanceType } from '../../../../../types';
 
 const templateAreaTwoCol = '"content details"';
@@ -25,9 +26,10 @@ const templateAreaSingleCol = `"content"
 
 export default function ProposalCreatePage() {
   const {
-    node: { daoAddress, safe, daoNetwork },
+    node: { daoAddress, safe },
     governance: { type },
   } = useFractal();
+  const { addressPrefix } = useNetworkConfig();
   const { createProposalValidation } = useCreateProposalSchema();
   const { prepareProposal } = usePrepareProposal();
   const { submitProposal, pendingCreateTx, canUserCreateProposal } = useSubmitProposal();
@@ -42,12 +44,12 @@ export default function ProposalCreatePage() {
   );
 
   const successCallback = () => {
-    if (daoAddress && daoNetwork) {
-      navigate(DAO_ROUTES.proposals.relative(daoNetwork, daoAddress));
+    if (daoAddress) {
+      navigate(DAO_ROUTES.proposals.relative(addressPrefix, daoAddress));
     }
   };
 
-  if (!type || !daoAddress || !safe || !daoNetwork) {
+  if (!type || !daoAddress || !safe) {
     return (
       <Center minH={`calc(100vh - ${HEADER_HEIGHT})`}>
         <BarLoader />
@@ -84,7 +86,7 @@ export default function ProposalCreatePage() {
                 breadcrumbs={[
                   {
                     terminus: t('proposals', { ns: 'breadcrumbs' }),
-                    path: DAO_ROUTES.proposals.relative(daoNetwork, daoAddress),
+                    path: DAO_ROUTES.proposals.relative(addressPrefix, daoAddress),
                   },
                   {
                     terminus: t('proposalNew', { ns: 'breadcrumbs' }),
@@ -93,7 +95,9 @@ export default function ProposalCreatePage() {
                 ]}
                 ButtonIcon={Trash}
                 buttonVariant="secondary"
-                buttonClick={() => navigate(DAO_ROUTES.proposals.relative(daoNetwork, daoAddress))}
+                buttonClick={() =>
+                  navigate(DAO_ROUTES.proposals.relative(addressPrefix, daoAddress))
+                }
                 isButtonDisabled={pendingCreateTx}
               />
               <Grid
diff --git a/src/providers/App/node/reducer.ts b/src/providers/App/node/reducer.ts
index 43789b5914..e10a7a0489 100644
--- a/src/providers/App/node/reducer.ts
+++ b/src/providers/App/node/reducer.ts
@@ -10,7 +10,6 @@ export const initialNodeHierarchyState: NodeHierarchy = {
 export const initialNodeState: FractalNode = {
   daoName: null,
   daoAddress: null,
-  daoNetwork: null,
   safe: null,
   fractalModules: [],
   nodeHierarchy: initialNodeHierarchyState,
diff --git a/src/types/fractal.ts b/src/types/fractal.ts
index f5a927a328..9d8d5899fa 100644
--- a/src/types/fractal.ts
+++ b/src/types/fractal.ts
@@ -234,7 +234,6 @@ export interface FractalGovernanceContracts {
 export interface FractalNode {
   daoName: string | null;
   daoAddress: string | null;
-  daoNetwork: string | null;
   safe: SafeInfoResponseWithGuard | null;
   fractalModules: FractalModuleData[];
   nodeHierarchy: NodeHierarchy;