Update DAO_ROUTES.relative to take network prefix, fix all errors

decentdao · Mar 27, 2024 · 789573e · 789573e
1 parent 14a927f
commit 789573e
Show file tree

Hide file tree

Showing 35 changed files with 204 additions and 127 deletions.
diff --git a/src/components/DaoCreator/StepWrapper.tsx b/src/components/DaoCreator/StepWrapper.tsx
@@ -27,7 +27,7 @@ export function StepWrapper({
   shouldWrapChildren = true,
 }: IStepWrapper) {
   const {
-    node: { daoAddress },
+    node: { daoAddress, daoNetwork },
   } = useFractal();
   const { t } = useTranslation(['daoCreate']);
   const navigate = useNavigate();
@@ -64,7 +64,9 @@ export function StepWrapper({
           isButtonDisabled={isFormSubmitting}
           buttonClick={() =>
             navigate(
-              !isSubDAO || !daoAddress ? BASE_ROUTES.landing : DAO_ROUTES.dao.relative(daoAddress),
+              !isSubDAO || !daoAddress || !daoNetwork
+                ? BASE_ROUTES.landing
+                : DAO_ROUTES.dao.relative(daoNetwork, daoAddress),
             )
           }
         />

diff --git a/src/components/ProposalTemplates/ProposalTemplateCard.tsx b/src/components/ProposalTemplates/ProposalTemplateCard.tsx
@@ -26,7 +26,7 @@ export default function ProposalTemplateCard({
   const navigate = useNavigate();
   const { t } = useTranslation('proposalTemplate');
   const {
-    node: { safe, daoAddress },
+    node: { safe, daoAddress, daoNetwork },
   } = useFractal();
 
   const { prepareRemoveProposalTemplateProposal } = useRemoveProposalTemplate();
@@ -42,11 +42,11 @@ export default function ProposalTemplateCard({
   });
 
   const successCallback = useCallback(() => {
-    if (daoAddress) {
+    if (daoAddress && daoNetwork) {
       // Redirecting to proposals page so that user will see Proposal for Proposal Template creation
-      navigate(DAO_ROUTES.proposals.relative(daoAddress));
+      navigate(DAO_ROUTES.proposals.relative(daoNetwork, daoAddress));
     }
-  }, [navigate, daoAddress]);
+  }, [navigate, daoAddress, daoNetwork]);
 
   const nonce = safe?.nonce;
   const handleRemoveTemplate = useCallback(async () => {

diff --git a/src/components/ProposalTemplates/index.tsx b/src/components/ProposalTemplates/index.tsx
@@ -11,7 +11,7 @@ import ProposalTemplateCard from './ProposalTemplateCard';
 export default function ProposalTemplates() {
   const { t } = useTranslation('proposalTemplate');
   const {
-    node: { daoAddress },
+    node: { daoAddress, daoNetwork },
     governance: { proposalTemplates },
   } = useFractal();
   const { canUserCreateProposal } = useSubmitProposal();
@@ -36,8 +36,8 @@ export default function ProposalTemplates() {
         ))
       ) : (
         <EmptyBox emptyText={t('emptyProposalTemplates')}>
-          {canUserCreateProposal && (
-            <Link to={DAO_ROUTES.proposalTemplateNew.relative(daoAddress)}>
+          {canUserCreateProposal && daoNetwork && daoAddress && (
+            <Link to={DAO_ROUTES.proposalTemplateNew.relative(daoNetwork, 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
@@ -12,7 +12,7 @@ import QuorumBadge from '../../ui/badges/QuorumBadge';
 
 function ProposalCard({ proposal }: { proposal: FractalProposal }) {
   const {
-    node: { daoAddress },
+    node: { daoAddress, daoNetwork },
   } = useFractal();
   const { t } = useTranslation('common');
 
@@ -26,8 +26,12 @@ function ProposalCard({ proposal }: { proposal: FractalProposal }) {
 
   const isSnapshotProposal = !!(proposal as SnapshotProposal).snapshotProposalId;
 
+  if (!daoNetwork || !daoAddress) {
+    return <></>;
+  }
+
   return (
-    <Link to={DAO_ROUTES.proposal.relative(daoAddress, proposal.proposalId)}>
+    <Link to={DAO_ROUTES.proposal.relative(daoNetwork, daoAddress, proposal.proposalId)}>
       <Box
         minHeight="6.25rem"
         bg="chocolate.900"

diff --git a/src/components/Proposals/ProposalsList.tsx b/src/components/Proposals/ProposalsList.tsx
@@ -11,7 +11,7 @@ import ProposalCard from './ProposalCard/ProposalCard';
 
 export function ProposalsList({ proposals }: { proposals: FractalProposal[] }) {
   const {
-    node: { daoAddress },
+    node: { daoAddress, daoNetwork },
   } = useFractal();
   const { canUserCreateProposal } = useSubmitProposal();
 
@@ -34,8 +34,8 @@ export function ProposalsList({ proposals }: { proposals: FractalProposal[] }) {
         ))
       ) : (
         <EmptyBox emptyText={t('emptyProposals')}>
-          {canUserCreateProposal && (
-            <Link to={DAO_ROUTES.proposalNew.relative(daoAddress)}>
+          {canUserCreateProposal && daoNetwork && daoAddress && (
+            <Link to={DAO_ROUTES.proposalNew.relative(daoNetwork, daoAddress)}>
               <Button
                 variant="text"
                 textStyle="text-xl-mono-bold"

diff --git a/src/components/pages/AppHome/FeaturedDAOCard.tsx b/src/components/pages/AppHome/FeaturedDAOCard.tsx
@@ -7,13 +7,15 @@ interface DAOFeatureProps extends BoxProps {
   iconSrc: string;
   title: string;
   desc: string;
+  network: string;
   address: string;
 }
 
 export default function FeaturedDAOCard({
   iconSrc,
   title,
   desc,
+  network,
   address,
   ...rest
 }: DAOFeatureProps) {
@@ -57,7 +59,7 @@ export default function FeaturedDAOCard({
             _hover={{ color: 'gold.500-hover' }}
             alignSelf="end"
             textStyle="text-lg-mono-bold"
-            to={DAO_ROUTES.dao.relative(address)}
+            to={DAO_ROUTES.dao.relative(network, address)}
           >
             {t('featureLink')}
           </Link>

diff --git a/src/components/pages/DaoDashboard/Info/ParentLink.tsx b/src/components/pages/DaoDashboard/Info/ParentLink.tsx
@@ -9,20 +9,20 @@ import { useFractal } from '../../../../providers/App/AppProvider';
  */
 export function ParentLink() {
   const {
-    node: { nodeHierarchy },
+    node: { nodeHierarchy, daoNetwork },
     action,
   } = useFractal();
   const { t } = useTranslation('breadcrumbs');
 
-  if (!nodeHierarchy.parentAddress) {
+  if (!nodeHierarchy.parentAddress || !daoNetwork) {
     return null;
   }
 
   return (
     <Link
       color="gold.500"
       _hover={{ textDecoration: 'none', color: 'gold.500-hover' }}
-      href={DAO_ROUTES.dao.relative(nodeHierarchy.parentAddress)}
+      href={DAO_ROUTES.dao.relative(daoNetwork, 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
@@ -12,7 +12,7 @@ import { ParentLink } from './ParentLink';
 
 export function Info() {
   const {
-    node: { daoAddress },
+    node: { daoAddress, daoNetwork },
   } = useFractal();
   const daoMetadata = useDAOMetadata();
 
@@ -135,18 +135,22 @@ export function Info() {
               pb={{ sm: PAD, md: NONE }}
               pt={{ sm: PAD, lg: NONE }}
             >
-              <InfoBox to={DAO_ROUTES.proposals.relative(daoAddress)}>
-                <InfoProposals />
-              </InfoBox>
+              {daoNetwork && daoAddress && (
+                <InfoBox to={DAO_ROUTES.proposals.relative(daoNetwork, daoAddress)}>
+                  <InfoProposals />
+                </InfoBox>
+              )}
             </Box>
             <Box
               width={{ base: '100%', md: '33.3%', lg: '23%', xl: '20%' }}
               ps={{ base: NONE, md: PAD }}
               pt={{ sm: PAD, lg: NONE }}
             >
-              <InfoBox to={DAO_ROUTES.treasury.relative(daoAddress)}>
-                <InfoTreasury />
-              </InfoBox>
+              {daoNetwork && daoAddress && (
+                <InfoBox to={DAO_ROUTES.treasury.relative(daoNetwork, daoAddress)}>
+                  <InfoTreasury />
+                </InfoBox>
+              )}
             </Box>
           </>
         )}

diff --git a/src/components/pages/DaoSettings/components/Metadata/index.tsx b/src/components/pages/DaoSettings/components/Metadata/index.tsx
@@ -22,7 +22,7 @@ export default function MetadataContainer() {
   const { canUserCreateProposal, submitProposal } = useSubmitProposal();
   const {
     baseContracts,
-    node: { daoName, daoSnapshotURL, daoAddress, safe },
+    node: { daoName, daoSnapshotURL, daoAddress, safe, daoNetwork },
     readOnly: {
       user: { votingWeight },
     },
@@ -50,7 +50,11 @@ export default function MetadataContainer() {
 
   const userHasVotingWeight = votingWeight.gt(0);
 
-  const submitProposalSuccessCallback = () => navigate(DAO_ROUTES.proposals.relative(daoAddress));
+  const submitProposalSuccessCallback = () => {
+    if (daoNetwork && daoAddress) {
+      navigate(DAO_ROUTES.proposals.relative(daoNetwork, daoAddress));
+    }
+  };
 
   const handleEditDAOName = () => {
     if (!baseContracts) {

diff --git a/src/components/ui/cards/DAOInfoCard.tsx b/src/components/ui/cards/DAOInfoCard.tsx
@@ -46,7 +46,7 @@ export function DAOInfoCard({
   const { displayName } = useDisplayName(node?.daoAddress);
 
   // node hasn't loaded yet
-  if (!node || !node.daoAddress) {
+  if (!node || !node.daoAddress || !node.daoNetwork) {
     return (
       <Flex
         w="full"
@@ -77,7 +77,7 @@ export function DAOInfoCard({
           <Link
             as={RouterLink}
             pointerEvents={isCurrentDAO ? 'none' : undefined}
-            to={DAO_ROUTES.dao.relative(displayedAddress)}
+            to={DAO_ROUTES.dao.relative(node.daoNetwork, displayedAddress)}
             _hover={{ textDecoration: 'none' }}
             onClick={() => {
               // if we're not on the current DAO, reset
@@ -104,7 +104,7 @@ export function DAOInfoCard({
           />
           {childCount && childCount > 0 && (
             <Link
-              to={DAO_ROUTES.hierarchy.relative(displayedAddress)}
+              to={DAO_ROUTES.hierarchy.relative(node.daoNetwork, displayedAddress)}
               as={RouterLink}
             >
               <Box

diff --git a/src/components/ui/menus/DAOSearch/SearchDisplay.tsx b/src/components/ui/menus/DAOSearch/SearchDisplay.tsx
@@ -79,7 +79,7 @@ export function SearchDisplay({
               onClickView();
               if (closeDrawer) closeDrawer();
               action.resetDAO();
-              navigate(DAO_ROUTES.dao.relative(`${addressPrefix}:${address}`));
+              navigate(DAO_ROUTES.dao.relative(addressPrefix, address));
             }}
           >
             {t('labelViewDAO')}

diff --git a/src/components/ui/menus/FavoritesMenu/Favorite.tsx b/src/components/ui/menus/FavoritesMenu/Favorite.tsx
@@ -6,16 +6,17 @@ import useDAOName from '../../../../hooks/DAO/useDAOName';
 import { useFractal } from '../../../../providers/App/AppProvider';
 
 interface IFavorite {
+  network: string;
   address: string;
 }
-export function Favorite({ address }: IFavorite) {
+export function Favorite({ network, address }: IFavorite) {
   const { daoRegistryName } = useDAOName({ address });
   const { action } = useFractal();
   const navigate = useNavigate();
 
   const onClickNav = () => {
     action.resetDAO();
-    navigate(DAO_ROUTES.dao.relative(address));
+    navigate(DAO_ROUTES.dao.relative(network, address));
   };
 
   return (

diff --git a/src/components/ui/menus/FavoritesMenu/FavoritesList.tsx b/src/components/ui/menus/FavoritesMenu/FavoritesList.tsx
@@ -1,10 +1,12 @@
 import { Box, MenuList } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import { useAccountFavorites } from '../../../../hooks/DAO/loaders/useFavorites';
+import { useNetworkConfig } from '../../../../providers/NetworkConfig/NetworkConfigProvider';
 import { Favorite } from './Favorite';
 
 export function FavoritesList() {
   const { favoritesList } = useAccountFavorites();
+  const { addressPrefix } = useNetworkConfig();
 
   const { t } = useTranslation('dashboard');
   return (
@@ -45,6 +47,7 @@ export function FavoritesList() {
             {favoritesList.map(favorite => (
               <Favorite
                 key={favorite}
+                network={addressPrefix}
                 address={favorite}
               />
             ))}

diff --git a/src/components/ui/menus/ManageDAO/ManageDAOMenu.tsx b/src/components/ui/menus/ManageDAO/ManageDAOMenu.tsx
@@ -56,34 +56,33 @@ export function ManageDAOMenu({
   const [canUserCreateProposal, setCanUserCreateProposal] = useState(false);
   const [governanceType, setGovernanceType] = useState(GovernanceType.MULTISIG);
   const {
-    node: { safe },
+    node: { safe, daoNetwork, daoAddress },
     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, safeAddress, false);
+  const { getUserERC721VotingTokens } = useUserERC721VotingTokens(undefined, daoAddress, false);
   const { handleClawBack } = useClawBack({
     parentAddress,
     childSafeInfo: fractalNode,
   });
 
   useEffect(() => {
     const loadCanUserCreateProposal = async () => {
-      if (safeAddress) {
-        setCanUserCreateProposal(await getCanUserCreateProposal(safeAddress));
+      if (daoAddress) {
+        setCanUserCreateProposal(await getCanUserCreateProposal(daoAddress));
       }
     };
 
     loadCanUserCreateProposal();
-  }, [safeAddress, getCanUserCreateProposal]);
+  }, [daoAddress, getCanUserCreateProposal]);
 
   useEffect(() => {
     const loadGovernanceType = async () => {
-      if (safe && safe.address && safe.address === safeAddress && type) {
+      if (safe && safe.address && safe.address === daoAddress && 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);
@@ -124,19 +123,24 @@ export function ManageDAOMenu({
     };
 
     loadGovernanceType();
-  }, [fractalNode, safe, safeAddress, type, getZodiacModuleProxyMasterCopyData, baseContracts]);
+  }, [fractalNode, safe, daoAddress, type, getZodiacModuleProxyMasterCopyData, baseContracts]);
 
-  const handleNavigateToSettings = useCallback(
-    () => navigate(DAO_ROUTES.settings.relative(safeAddress)),
-    [navigate, safeAddress],
-  );
+  const handleNavigateToSettings = useCallback(() => {
+    if (daoNetwork && daoAddress) {
+      navigate(DAO_ROUTES.settings.relative(daoNetwork, daoAddress));
+    }
+  }, [navigate, daoAddress, daoNetwork]);
 
   const handleModifyGovernance = useFractalModal(ModalType.CONFIRM_MODIFY_GOVERNANCE);
 
   const options = useMemo(() => {
     const createSubDAOOption = {
       optionKey: 'optionCreateSubDAO',
-      onClick: () => navigate(DAO_ROUTES.newSubDao.relative(safeAddress)),
+      onClick: () => {
+        if (daoNetwork && daoAddress) {
+          navigate(DAO_ROUTES.newSubDao.relative(daoNetwork, daoAddress));
+        }
+      },
     };
 
     const freezeOption = {
@@ -226,7 +230,7 @@ export function ManageDAOMenu({
     freezeGuard,
     currentTime,
     navigate,
-    safeAddress,
+    daoAddress,
     parentAddress,
     governanceType,
     guardContracts?.freezeVotingContract?.asSigner,
@@ -236,6 +240,7 @@ export function ManageDAOMenu({
     handleModifyGovernance,
     handleNavigateToSettings,
     getUserERC721VotingTokens,
+    daoNetwork,
   ]);
 
   return (