chore: APP-3034 - Remove support for goerli based networks

.env.development

@@ -2,10 +2,8 @@ VITE_FEATURE_FLAG_DAO_WALLET_CONNECT=true
 
 # for networks, please use the all-caps SupportedNetworks name
 VITE_FEATURE_FLAG_BASE=true
-VITE_FEATURE_FLAG_BASE_GOERLI=true
 
 VITE_FEATURE_FLAG_ARBITRUM=true
-VITE_FEATURE_FLAG_ARBITRUM_GOERLI=true
 
 VITE_FEATURE_FLAG_MONITORING=true
 
@@ -16,8 +14,6 @@ VITE_FEATURE_FLAG_OSX_UPDATES=true
 # Enable gasless plugin on DAO creation
 VITE_FEATURE_FLAG_GASLESS_PLUGIN=true
 
-VITE_FEATURE_FLAG_HIDE_GOERLIBASED_NETWORKS=true
-
 VITE_VOCDONI_ENV='stg'
 
 VITE_BACKEND_URL=https://stg.app-backend.aragon.org

.env.production

@@ -2,10 +2,8 @@ VITE_FEATURE_FLAG_DAO_WALLET_CONNECT=true
 
 # for networks, please use the all-caps SupportedNetworks name
 VITE_FEATURE_FLAG_BASE=true
-VITE_FEATURE_FLAG_BASE_GOERLI=true
 
 VITE_FEATURE_FLAG_ARBITRUM=true
-VITE_FEATURE_FLAG_ARBITRUM_GOERLI=true
 
 VITE_FEATURE_FLAG_MONITORING=true
 
@@ -16,8 +14,6 @@ VITE_FEATURE_FLAG_OSX_UPDATES=true
 # Enable gasless plugin on DAO creation
 VITE_FEATURE_FLAG_GASLESS_PLUGIN=false
 
-VITE_FEATURE_FLAG_HIDE_GOERLIBASED_NETWORKS=true
-
 VITE_VOCDONI_ENV='stg'
 
 VITE_BACKEND_URL=https://app-backend.aragon.org

.env.staging

@@ -2,10 +2,8 @@ VITE_FEATURE_FLAG_DAO_WALLET_CONNECT=true
 
 # for networks, please use the all-caps SupportedNetworks name
 VITE_FEATURE_FLAG_BASE=true
-VITE_FEATURE_FLAG_BASE_GOERLI=true
 
 VITE_FEATURE_FLAG_ARBITRUM=true
-VITE_FEATURE_FLAG_ARBITRUM_GOERLI=true
 
 VITE_FEATURE_FLAG_MONITORING=true
 
@@ -16,8 +14,6 @@ VITE_FEATURE_FLAG_OSX_UPDATES=true
 # Enable gasless plugin on DAO creation
 VITE_FEATURE_FLAG_GASLESS_PLUGIN=true
 
-VITE_FEATURE_FLAG_HIDE_GOERLIBASED_NETWORKS=true
-
 VITE_VOCDONI_ENV='stg'
 
 VITE_BACKEND_URL=https://stg.app-backend.aragon.org

src/app.tsx

@@ -37,7 +37,6 @@ import {ProposalSettingsFormData} from 'utils/types';
 import {GatingMenu} from 'containers/gatingMenu';
 import {DelegationGatingMenu} from 'containers/delegationGatingMenu';
 import UpdateBanner from 'containers/navbar/updateBanner';
-import DeprecationBanner from 'containers/navbar/deprecationBanner';
 import {ActionsProvider} from './context/actions';
 
 export const App: React.FC = () => {
@@ -199,7 +198,6 @@ const DaoWrapper: React.FC = () => {
 
   return (
     <GovTokensWrappingProvider>
-      <DeprecationBanner />
       <UpdateBanner />
       <Navbar />
       <div className="min-h-screen">

src/assets/locales/en/common.json

@@ -1064,11 +1064,8 @@
           "polygon": "Polygon",
           "tokenVoting": "Token-based",
           "ethereum": "Ethereum",
-          "baseGoerli": "Base Goerli",
-          "polygonMumbai": "Polygon Mumbai",
           "member": "Wallet-based",
           "governanceType": "Governance type",
-          "arbitrumGoerli": "Arbitrum Goerli",
           "arbitrum": "Arbitrum",
           "ethereumSepolia": "Ethereum Sepolia"
         },
@@ -1795,13 +1792,6 @@
       "labelDaysAgo": "days ago"
     }
   },
-  "deprecation": {
-    "banner": {
-      "title": "This DAO will no longer be usable once support for Goerli and related testnets ends in 2024.",
-      "ctaLabel": "Learn more",
-      "ctaLink": "https://blog.ethereum.org/2023/11/30/goerli-lts-update"
-    }
-  },
   "transactionDialog": {
     "title": "Transaction required",
     "description": "You will need to sign a transaction in your connected wallet.",

src/containers/daoExplorer/daoExplorer.tsx

@@ -62,15 +62,7 @@ export const DaoExplorer = () => {
         pluginNames: filters.pluginNames,
       }),
       ...(filters.networks?.length !== 0 && {
-        networks: filters.networks?.map(network => {
-          // TODO: Remove this Goerli based network conditions
-          if (network === 'arbitrum-goerli') {
-            return 'arbitrumGoerli';
-          } else if (network === 'base-goerli') {
-            return 'baseGoerli';
-          }
-          return network;
-        }),
+        networks: filters.networks,
       }),
       ...(filters.quickFilter === 'memberOf' && address
         ? {memberAddress: address}
@@ -101,7 +93,8 @@ export const DaoExplorer = () => {
     () =>
       followedDaosResult.data?.pages
         .flatMap(page => page.data)
-        .map(followedDaoToDao),
+        .map(followedDaoToDao)
+        .filter(dao => dao.network),
     [followedDaosResult]
   );
 

src/containers/daoFilterModal/data.ts

@@ -1,11 +1,4 @@
-import {
-  CHAIN_METADATA,
-  GOERLI_BASED_NETWORKS,
-  SupportedNetworks,
-} from 'utils/constants';
-
-const ShowGoerliBasedNetworks =
-  import.meta.env.VITE_FEATURE_FLAG_HIDE_GOERLIBASED_NETWORKS === 'false';
+import {CHAIN_METADATA, SupportedNetworks} from 'utils/constants';
 
 type NetworkFilter = {
   label: string;
@@ -18,10 +11,7 @@ export const networkFilters: Array<NetworkFilter> = Object.entries(
 ).flatMap(([key, {name, isTestnet}]) => {
   const value: SupportedNetworks = key as SupportedNetworks;
 
-  if (!ShowGoerliBasedNetworks && GOERLI_BASED_NETWORKS.includes(value))
-    return [];
-
-  return value !== 'goerli' && value !== 'unsupported'
+  return value !== 'unsupported'
     ? ({label: name, value, testnet: isTestnet} as NetworkFilter)
     : [];
 });

src/containers/navbar/updateBanner.tsx

@@ -18,7 +18,6 @@ import {useIsMember} from 'services/aragon-sdk/queries/use-is-member';
 import {featureFlags} from 'utils/featureFlags';
 import {NewProposal} from 'utils/paths';
 import {ProposalTypes} from 'utils/types';
-import {GOERLI_BASED_NETWORKS} from 'utils/constants';
 
 const UpdateBanner: React.FC = () => {
   const [bannerHidden, setBannerHidden] = useState(false);
@@ -42,8 +41,6 @@ const UpdateBanner: React.FC = () => {
   const daoUpdateEnabled =
     featureFlags.getValue('VITE_FEATURE_FLAG_OSX_UPDATES') === 'true';
 
-  const isDeprecationAlertShown = GOERLI_BASED_NETWORKS.includes(network);
-
   const showBanner = !!(
     !bannerHidden &&
     isMember &&
@@ -55,8 +52,7 @@ const UpdateBanner: React.FC = () => {
     location.pathname.includes('new-proposal') ||
     location.pathname.includes('settings') ||
     location.pathname.includes('create') ||
-    showBanner === false ||
-    isDeprecationAlertShown
+    showBanner === false
   )
     return null;
 

src/containers/selectChainForm/index.tsx

@@ -103,24 +103,15 @@ type SelectableNetworks = Record<
   }
 >;
 
-const ShowGoerliBasedNetworks =
-  import.meta.env.VITE_FEATURE_FLAG_HIDE_GOERLIBASED_NETWORKS === 'false';
-
 const networks: SelectableNetworks = {
   main: {
     cost: ['polygon', 'base', 'arbitrum', 'ethereum'],
     popularity: ['ethereum', 'polygon', 'arbitrum', 'base'],
     security: ['ethereum', 'base', 'arbitrum', 'polygon'],
   },
   test: {
-    cost: ShowGoerliBasedNetworks
-      ? ['mumbai', 'base-goerli', 'arbitrum-goerli', 'sepolia', 'goerli']
-      : ['sepolia'],
-    popularity: ShowGoerliBasedNetworks
-      ? ['goerli', 'sepolia', 'mumbai', 'arbitrum-goerli', 'base-goerli']
-      : ['sepolia'],
-    security: ShowGoerliBasedNetworks
-      ? ['goerli', 'sepolia', 'base-goerli', 'arbitrum-goerli', 'mumbai']
-      : ['sepolia'],
+    cost: ['sepolia'],
+    popularity: ['sepolia'],
+    security: ['sepolia'],
   },
 };

src/hooks/useDaoMembers.tsx

@@ -137,14 +137,8 @@ export const useDaoMembers = (
   const countOnly = opts?.countOnly || false;
   const enabled = opts?.enabled || true;
 
-  // TODO: Remove this Goerli based network conditions
   const covalentSupportedNetwork = !(
-    network === 'goerli' ||
-    network === 'mumbai' ||
-    network === 'arbitrum' ||
-    network === 'arbitrum-goerli' ||
-    network === 'base' ||
-    network === 'base-goerli'
+    network === 'arbitrum' || network === 'base'
   );
 
   const useGraphql =

src/index.tsx

@@ -11,18 +11,7 @@ import {createWeb3Modal} from '@web3modal/wagmi/react';
 import {http, createConfig, WagmiProvider} from 'wagmi';
 import {walletConnect, coinbaseWallet} from 'wagmi/connectors';
 
-import {
-  Chain,
-  arbitrum,
-  arbitrumGoerli,
-  base,
-  baseGoerli,
-  goerli,
-  mainnet,
-  polygon,
-  polygonMumbai,
-  sepolia,
-} from 'wagmi/chains';
+import {Chain, arbitrum, base, mainnet, polygon, sepolia} from 'wagmi/chains';
 import {AlertProvider} from 'context/alert';
 import {GlobalModalsProvider} from 'context/globalModals';
 import {NetworkProvider} from 'context/network';
@@ -43,17 +32,10 @@ import {App} from './app';
 import {aragonGateway} from 'utils/aragonGateway';
 import {HttpTransport} from 'viem';
 
-const chains = [
-  base,
-  baseGoerli,
-  goerli,
-  mainnet,
-  polygon,
-  polygonMumbai,
-  arbitrum,
-  arbitrumGoerli,
-  sepolia,
-] as [Chain, ...Chain[]];
+const chains = [base, mainnet, polygon, arbitrum, sepolia] as [
+  Chain,
+  ...Chain[],
+];
 
 const transports = chains.reduce(
   (RPCs, value) => {

src/services/aragon-backend/aragon-backend-service.api.ts

@@ -13,6 +13,5 @@ export interface IFetchDaosParams
   extends IOrderedRequest<OrderByValue>,
     IPaginatedRequest {
   pluginNames?: string[];
-  // TODO: Remove this Goerli based network conditions
-  networks?: Array<SupportedNetworks | 'arbitrumGoerli' | 'baseGoerli'>;
+  networks?: Array<SupportedNetworks>;
 }

src/services/aragon-backend/queries/use-token-holders.ts

@@ -3,7 +3,6 @@ import {UseQueryOptions, useQuery} from '@tanstack/react-query';
 import {aragonBackendQueryKeys} from '../query-keys';
 import type {IFetchTokenHoldersParams} from '../aragon-backend-service.api';
 import {TokenHoldersResponse} from '../domain/token-holders-response';
-import {supportedNetworksToBackendMap} from 'utils/constants';
 
 const tokenHoldersQueryDocument = gql`
   query Holders($network: Network!, $tokenAddress: String!, $page: Int!) {
@@ -37,7 +36,7 @@ const fetchTokenHolders = async (
     tokenHoldersQueryDocument,
     {
       ...params,
-      network: supportedNetworksToBackendMap[params.network],
+      network: params.network,
       page: params.page ?? 0,
     }
   );

src/services/token/token-service.ts

@@ -9,7 +9,6 @@ import {
   CHAIN_METADATA,
   COVALENT_API_KEY,
   SupportedNetworks,
-  supportedNetworksToBackendMap,
 } from 'utils/constants';
 import {TOP_ETH_SYMBOL_ADDRESSES} from 'utils/constants/topSymbolAddresses';
 import {isNativeToken} from 'utils/tokens';
@@ -105,7 +104,7 @@ class TokenService {
       const {token: resp} = await request(
         `${import.meta.env.VITE_BACKEND_URL}/graphql`,
         this.tokenQueryDocument,
-        {network: supportedNetworksToBackendMap[network], tokenAddress}
+        {network: network, tokenAddress}
       );
       const currPriceUsd = resp.priceUsd || 0;
       const prevPriceUsd = currPriceUsd - (resp.priceChangeOnDayUsd || 0);
@@ -127,11 +126,7 @@ class TokenService {
         },
       };
 
-      // TODO: Remove this Goerli based network conditions
-      if (
-        (network === 'base' || network === 'base-goerli') &&
-        token.address === constants.AddressZero
-      ) {
+      if (network === 'base' && token.address === constants.AddressZero) {
         token.imgUrl = REPLACEMENT_BASE_ETHER_LOGO_URL;
       }
     } catch {
@@ -184,7 +179,7 @@ class TokenService {
       `${import.meta.env.VITE_BACKEND_URL}/graphql`,
       this.tokenBalanceQueryDocument,
       {
-        network: supportedNetworksToBackendMap[network],
+        network: network,
         address,
         currency: this.defaultCurrency,
       }