diff --git a/package.json b/package.json index cabefc4fd..108c61d29 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "license": "GPL-3.0", "type": "module", "scripts": { - "dev": "vite --host", + "dev": "vite --host --force", "dev:watch": "cross-env WATCH=true vite --host", "build": "cross-env NODE_ENV=production vite build", "build:analyze": "cross-env ANALYZE=true vite build", diff --git a/src/hooks/useDaoDetails.tsx b/src/hooks/useDaoDetails.tsx index 1d10dc36b..e0e0d674b 100644 --- a/src/hooks/useDaoDetails.tsx +++ b/src/hooks/useDaoDetails.tsx @@ -185,7 +185,7 @@ export const useDaoQuery = ( : {refetchOnWindowFocus: false}), }, refetchInterval, - select: addAvatarToDao(), + select: processDaoResponse(network), }); }; @@ -239,19 +239,24 @@ export const useDaoDetailsQuery = () => { return apiResponse; }; -/** - * Adds avatar to DAO - * @param dao DAO details - * @returns DAO details object augmented with a resolved IPFS avatar - */ -const addAvatarToDao = () => (dao: DaoDetails | null) => { - if (!dao) return null; +const processDaoResponse = + (network: SupportedNetworks) => (dao: DaoDetails | null) => { + if (!dao) { + return null; + } - return { - ...dao, - metadata: { - ...dao?.metadata, - avatar: dao?.metadata.avatar, - }, + // Set ENS to empty string for DAOs with an ENS on chains that do not support ENS + // (e.g. when a DAO is created with an ENS outside of Aragon App) + const processedEns = !CHAIN_METADATA[network].supportsEns + ? '' + : dao.ensDomain; + + return { + ...dao, + ensDomain: processedEns, + metadata: { + ...dao?.metadata, + avatar: dao?.metadata.avatar, + }, + }; }; -}; diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx index 9367a7924..7ec47f119 100644 --- a/src/pages/dashboard.tsx +++ b/src/pages/dashboard.tsx @@ -87,10 +87,7 @@ export const Dashboard: React.FC = () => { isSuccess, isFetched: liveDaoFetched, } = useDaoQuery(urlAddressOrEns, pollInterval); - const liveAddressOrEns = - network !== 'sepolia' - ? toDisplayEns(liveDao?.ensDomain) || liveDao?.address - : liveDao?.address; + const liveAddressOrEns = toDisplayEns(liveDao?.ensDomain) || liveDao?.address; // pending DAO const {