From 58bb68b7563f51a8ba2d7f38d92e4cab5ae5c383 Mon Sep 17 00:00:00 2001
From: brightiron <brightiron@protonmail.com>
Date: Thu, 21 Dec 2023 19:31:34 -0600
Subject: [PATCH 1/4] hide protocol metrics if no env variable set

---
 src/App.tsx                           | 5 ++++-
 src/components/Sidebar/NavContent.tsx | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index a1ff35bee4..0694cbd14e 100755
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -21,6 +21,7 @@ import StagingNotification from "src/components/StagingNotification";
 import { StakeVersionContainer } from "src/components/StakeVersionContainer";
 import TopBar from "src/components/TopBar/TopBar";
 import { shouldTriggerSafetyCheck } from "src/helpers";
+import { Environment } from "src/helpers/environment/Environment/Environment";
 import { useGoogleAnalytics } from "src/hooks/useGoogleAnalytics";
 import useTheme from "src/hooks/useTheme";
 import { chains } from "src/hooks/wagmi";
@@ -202,6 +203,8 @@ function App() {
     if (isSidebarExpanded) handleSidebarClose();
   }, [location]);
 
+  const protocolMetricsEnabled = Boolean(Environment.getWundergraphNodeUrl());
+  const defaultRoute = protocolMetricsEnabled ? "/dashboard" : "/my-balances";
   return (
     <StyledDiv>
       <RainbowKitProvider
@@ -231,7 +234,7 @@ function App() {
               <Suspense fallback={<div></div>}>
                 <Routes>
                   <Route path="my-balances" element={<MyBalances />} />
-                  <Route path="/" element={<Navigate to="/dashboard" />} />
+                  <Route path="/" element={<Navigate to={defaultRoute} />} />
                   <Route
                     path="/stake"
                     element={<StakeVersionContainer setMigrationModalOpen={setMigrationModalOpen} />}
diff --git a/src/components/Sidebar/NavContent.tsx b/src/components/Sidebar/NavContent.tsx
index 902461b1aa..c995084cec 100644
--- a/src/components/Sidebar/NavContent.tsx
+++ b/src/components/Sidebar/NavContent.tsx
@@ -7,6 +7,7 @@ import { ReactComponent as lendAndBorrowIcon } from "src/assets/icons/lendAndBor
 import { ReactComponent as OlympusIcon } from "src/assets/icons/olympus-nav-header.svg";
 import NavItem from "src/components/library/NavItem";
 import { DecimalBigNumber } from "src/helpers/DecimalBigNumber/DecimalBigNumber";
+import { Environment } from "src/helpers/environment/Environment/Environment";
 import { useTestableNetworks } from "src/hooks/useTestableNetworks";
 import { BondDiscount } from "src/views/Bond/components/BondDiscount";
 import { DetermineRangeDiscount } from "src/views/Range/hooks";
@@ -29,6 +30,7 @@ const NavContent: React.VFC = () => {
   const { chain = { id: 1 } } = useNetwork();
   const networks = useTestableNetworks();
 
+  const protocolMetricsEnabled = Boolean(Environment.getWundergraphNodeUrl());
   return (
     <Paper className="dapp-sidebar">
       <Box className="dapp-sidebar-inner" display="flex" justifyContent="space-between" flexDirection="column">
@@ -50,7 +52,7 @@ const NavContent: React.VFC = () => {
           <div className="dapp-menu-links">
             <div className="dapp-nav" id="navbarNav">
               <NavItem to="/my-balances" icon="stake" label={`My Balances`} />
-              <NavItem to="/dashboard" icon="dashboard" label={`Protocol Metrics`} />
+              {protocolMetricsEnabled && <NavItem to="/dashboard" icon="dashboard" label={`Protocol Metrics`} />}
               {chain.id === networks.MAINNET ? (
                 <>
                   <NavItem

From 03d4233e939d5b5939306425646ebc9ddd527db8 Mon Sep 17 00:00:00 2001
From: brightiron <brightiron@protonmail.com>
Date: Thu, 21 Dec 2023 19:36:30 -0600
Subject: [PATCH 2/4] remove covalent

---
 .../Environment/Environment.unit.test.ts      |  17 ---
 src/lib/covalent.ts                           |  95 --------------
 src/lib/covalent.types.ts                     | 123 ------------------
 3 files changed, 235 deletions(-)
 delete mode 100644 src/lib/covalent.ts
 delete mode 100644 src/lib/covalent.types.ts

diff --git a/src/helpers/environment/Environment/Environment.unit.test.ts b/src/helpers/environment/Environment/Environment.unit.test.ts
index dcbd8b6e4c..f46ee500c0 100644
--- a/src/helpers/environment/Environment/Environment.unit.test.ts
+++ b/src/helpers/environment/Environment/Environment.unit.test.ts
@@ -44,23 +44,6 @@ describe("Environment", () => {
     });
   });
 
-  describe("Covalent", () => {
-    it("should return a Covalent API key", () => {
-      import.meta.env.VITE_COVALENT_API_KEY = "ckey_442d47723592868l8764adf15bf";
-      expect(Environment.getCovalentApiKey()).toEqual("ckey_442d47723592868l8764adf15bf");
-    });
-
-    it("should return a Warning when Covalent API key is not present", () => {
-      expect(Environment.getCovalentApiKey()).toBeUndefined();
-      // assert the expected warning
-      expect(console.warn).toHaveBeenCalledWith(
-        expect.stringContaining(
-          "Please provide an API key for Covalent (https://www.covalenthq.com) in your .env file",
-        ),
-      );
-    });
-  });
-
   describe("Zapper", () => {
     it("should return a Zapper API key", () => {
       import.meta.env.VITE_ZAPPER_API = "somekey";
diff --git a/src/lib/covalent.ts b/src/lib/covalent.ts
deleted file mode 100644
index 44c22f734d..0000000000
--- a/src/lib/covalent.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { NetworkId } from "src/constants";
-import { Environment } from "src/helpers/environment/Environment/Environment";
-import {
-  CovalentErrorResponse,
-  CovalentRequestOptions,
-  CovalentResponse,
-  CovalentSuccessResponse,
-  CovalentSupportedNetwork,
-  CovalentTransaction,
-  CovalentTransfer,
-  ListAllTransfersOptions,
-} from "src/lib/covalent.types";
-
-class Covalent {
-  private SUPPORTED_NETWORKS = [
-    NetworkId.FANTOM,
-    NetworkId.MAINNET,
-    NetworkId.POLYGON,
-    NetworkId.ARBITRUM,
-    NetworkId.AVALANCHE,
-  ];
-
-  private _url = "https://api.covalenthq.com/v1";
-  private _key = Environment.getCovalentApiKey();
-
-  private async _fetch<Data>(path: string) {
-    const url = this._url + path;
-    const options = {
-      headers: {
-        Authorization: `Basic ${this._key}`,
-      },
-    };
-
-    const response = await fetch(url, options);
-
-    return this._validateResponse<Data>(response);
-  }
-
-  private async _validateResponse<Data>(response: Response) {
-    const json: CovalentErrorResponse | CovalentSuccessResponse<Data> = await response.json();
-
-    if (!response.ok) throw new Error("Failed to fetch Covalent API.");
-    else if (json.error) throw new Error(json.error_message);
-
-    return json.data;
-  }
-
-  private _createBaseParams<TOptions extends CovalentRequestOptions>(options: TOptions): Record<string, any> {
-    const _params = {} as Record<string, any>;
-
-    if (options.includeLogs === false) _params["no-logs"] = true;
-    if (options.pageSize !== undefined) _params["page-size"] = options.pageSize;
-    if (options.pageNumber !== undefined) _params["page-number"] = options.pageNumber;
-
-    return _params;
-  }
-
-  public isSupportedNetwork(networkId: NetworkId): networkId is CovalentSupportedNetwork {
-    return this.SUPPORTED_NETWORKS.includes(networkId);
-  }
-
-  public transactions = {
-    listAll: async (options: CovalentRequestOptions) => {
-      if (!this.isSupportedNetwork(options.networkId))
-        throw new Error(`Covalent doesn't support network: ${options.networkId}`);
-
-      const params = this._createBaseParams(options);
-
-      const qsp = new URLSearchParams(params).toString();
-
-      const path = `/${options.networkId}/address/${options.address}/transactions_v2/?${qsp}`;
-
-      return this._fetch<CovalentTransaction[]>(path);
-    },
-  };
-
-  public transfers = {
-    listAll: async (options: ListAllTransfersOptions): Promise<CovalentResponse<CovalentTransfer[]>> => {
-      if (!this.isSupportedNetwork(options.networkId))
-        throw new Error(`Covalent doesn't support network: ${options.networkId}`);
-
-      const params = this._createBaseParams(options);
-
-      params["contract-address"] = options.contractAddress;
-
-      const qsp = new URLSearchParams(params).toString();
-
-      const path = `/${options.networkId}/address/${options.address}/transfers_v2/?${qsp}`;
-
-      return this._fetch<CovalentTransfer[]>(path);
-    },
-  };
-}
-
-export const covalent = new Covalent();
diff --git a/src/lib/covalent.types.ts b/src/lib/covalent.types.ts
deleted file mode 100644
index 2cdfe7dbf7..0000000000
--- a/src/lib/covalent.types.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import { NetworkId } from "src/networkDetails";
-
-export type CovalentSupportedNetwork =
-  | NetworkId.MAINNET
-  | NetworkId.FANTOM
-  | NetworkId.POLYGON
-  | NetworkId.ARBITRUM
-  | NetworkId.AVALANCHE;
-
-export interface CovalentRequestOptions {
-  address: string;
-  pageSize?: number;
-  pageNumber?: number;
-  /**
-   * Boolean on whether or not to include bloom logs in response
-   *
-   * @defaults false
-   */
-  includeLogs?: boolean;
-  networkId: CovalentSupportedNetwork;
-}
-
-export interface ListAllTransfersOptions extends CovalentRequestOptions {
-  contractAddress: string;
-}
-
-export interface CovalentErrorResponse {
-  data: null;
-  error: true;
-  error_code: number;
-  error_message: string;
-}
-
-export interface CovalentSuccessResponse<Data> {
-  error: false;
-  error_code: null;
-  error_message: null;
-  data: CovalentResponse<Data>;
-}
-
-export interface CovalentResponse<Data> {
-  address: string;
-  updated_at: string;
-  next_update_at: string;
-  quote_currency: string;
-  chain_id: number;
-  items: Data;
-  pagination: {
-    has_more: boolean;
-    page_number: number;
-    page_size: number;
-    total_count: number;
-  };
-}
-
-export interface CovalentTransaction extends Transaction {
-  log_events?: LogEventItem[];
-}
-
-export interface CovalentTransfer extends Transaction {
-  transfers?: TokenTransferItem[];
-}
-
-interface Transaction {
-  block_signed_at: string;
-  block_height: number;
-  tx_hash: string;
-  tx_offset: number;
-  successful: boolean;
-  from_address: string;
-  from_address_label?: null;
-  to_address: string;
-  to_address_label?: null;
-  value: string;
-  value_quote: number;
-  gas_offered: number;
-  gas_spent: number;
-  gas_price: number;
-  gas_quote: number;
-  gas_quote_rate: number;
-}
-
-interface LogEventItem {
-  block_height: number;
-  block_signed_at: string;
-  decoded: {
-    name: string;
-    params: { decoded: boolean; indexed: boolean; name: string; type: string; value: string }[];
-    signature: string;
-  };
-  log_offset: number;
-  raw_log_data: string;
-  raw_log_topics: [];
-  sender_address: string;
-  sender_address_label: string;
-  sender_contract_decimals: number;
-  sender_contract_ticker_symbol: string;
-  sender_logo_url: string;
-  sender_name: string;
-  tx_hash: string;
-  tx_offset: number;
-}
-
-interface TokenTransferItem {
-  balance: number;
-  balance_quote: number;
-  block_signed_at: string;
-  contract_address: string;
-  contract_decimals: number;
-  contract_name: string;
-  contract_ticker_symbol: string;
-  delta: number;
-  delta_quote: number;
-  from_address: string;
-  from_address_label: string;
-  logo_url: string;
-  method_calls: { method: string; sender_address: string }[];
-  quote_rate: number;
-  to_address: string;
-  to_address_label: string;
-  transfer_type: string;
-  tx_hash: string;
-}

From 2dc5cc63674138746272a5a220cf56f3f807dc52 Mon Sep 17 00:00:00 2001
From: brightiron <brightiron@protonmail.com>
Date: Thu, 21 Dec 2023 19:38:10 -0600
Subject: [PATCH 3/4] remove unused env

---
 .../environment/Environment/Environment.ts    | 32 -------------------
 .../Environment/Environment.unit.test.ts      | 10 ------
 src/hooks/useArchiveNodeProvider.ts           | 17 ----------
 3 files changed, 59 deletions(-)
 delete mode 100644 src/hooks/useArchiveNodeProvider.ts

diff --git a/src/helpers/environment/Environment/Environment.ts b/src/helpers/environment/Environment/Environment.ts
index 50513666b6..a1aaa1a736 100644
--- a/src/helpers/environment/Environment/Environment.ts
+++ b/src/helpers/environment/Environment/Environment.ts
@@ -37,13 +37,6 @@ export class Environment {
       err: "Please provide an Google Analytics 4 API key in your .env file",
     });
 
-  public static getCovalentApiKey = () =>
-    this._get({
-      first: true,
-      key: "VITE_COVALENT_API_KEY",
-      err: "Please provide an API key for Covalent (https://www.covalenthq.com) in your .env file",
-    });
-
   public static getZapperApiKey = () =>
     this._get({
       first: true,
@@ -69,31 +62,6 @@ export class Environment {
       fallback: "false",
     });
 
-  public static getArchiveNodeUrl = (networkId: number) => {
-    switch (networkId) {
-      case NetworkId.MAINNET:
-        return this._get({
-          key: `VITE_ETHEREUM_ARCHIVE_NODE_URL`,
-          err: "Please provide a VITE_ETHEREUM_ARCHIVE_NODE_URL for governance to function properly",
-        });
-      case NetworkId.TESTNET_GOERLI:
-        return this._get({
-          key: `VITE_ETHEREUM_TESTNET_ARCHIVE_NODE_URL`,
-          err: "Please provide a VITE_ETHEREUM_TESTNET_ARCHIVE_NODE_URL for governance to function properly",
-        });
-      case NetworkId.ARBITRUM_GOERLI:
-        return this._get({
-          key: `VITE_ARBITRUM_GOERLI_ARCHIVE_NODE_URL`,
-          err: "Please provide a VITE_ARBITRUM_GOERLI_ARCHIVE_NODE_URL for governance to function properly",
-        });
-      case NetworkId.ARBITRUM:
-        return this._get({
-          key: `VITE_ARBITRUM_ARCHIVE_NODE_URL`,
-          err: "Please provide a VITE_ARBITRUM_ARCHIVE_NODE_URL for governance to function properly",
-        });
-    }
-  };
-
   public static getNodeUrls = (networkId: NetworkId) => {
     switch (networkId) {
       case NetworkId.MAINNET:
diff --git a/src/helpers/environment/Environment/Environment.unit.test.ts b/src/helpers/environment/Environment/Environment.unit.test.ts
index f46ee500c0..f550f6765f 100644
--- a/src/helpers/environment/Environment/Environment.unit.test.ts
+++ b/src/helpers/environment/Environment/Environment.unit.test.ts
@@ -61,16 +61,6 @@ describe("Environment", () => {
     });
   });
 
-  describe("WalletNewsDisabled", () => {
-    it("should return WalletNewsDisabled", () => {
-      import.meta.env.VITE_DISABLE_NEWS = "true";
-      expect(Environment.isWalletNewsEnabled()).toEqual(false);
-
-      import.meta.env.VITE_DISABLE_NEWS = "false";
-      expect(Environment.isWalletNewsEnabled()).toEqual(true);
-    });
-  });
-
   describe("Node URLs", () => {
     it("should return appropriate NodeURLs by default", () => {
       expect(Environment.getNodeUrls(NetworkId.MAINNET)).not.toBeUndefined();
diff --git a/src/hooks/useArchiveNodeProvider.ts b/src/hooks/useArchiveNodeProvider.ts
deleted file mode 100644
index 922268b377..0000000000
--- a/src/hooks/useArchiveNodeProvider.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Provider } from "@ethersproject/providers";
-import { ethers } from "ethers";
-import { useMemo } from "react";
-import { Environment } from "src/helpers/environment/Environment/Environment";
-
-export const useArchiveNodeProvider = (networkId: number) => {
-  const provider: Provider | undefined = useMemo(() => {
-    if (networkId) {
-      const url = Environment.getArchiveNodeUrl(networkId);
-      if (url == undefined) throw new Error("You need an archive node for this feature to function properly");
-      // NOTE(appleseed) we just choose the first archive node url if you provided multiple...
-      return new ethers.providers.StaticJsonRpcProvider(url[0]);
-    }
-  }, [networkId]);
-
-  return provider;
-};

From 710851c00305678149ff571c6440043259b53beb Mon Sep 17 00:00:00 2001
From: brightiron <brightiron@protonmail.com>
Date: Thu, 21 Dec 2023 20:02:54 -0600
Subject: [PATCH 4/4] cleanup. docs. env vars. one click deploy

---
 .env.example                                  |  25 +---
 README.md                                     |   8 ++
 .../environment/Environment/Environment.ts    |  12 --
 .../Environment/Environment.unit.test.ts      |   7 --
 src/hooks/useZapTokenBalances.ts              | 109 ------------------
 src/hooks/useZeroExSwap.ts                    |   3 +-
 6 files changed, 15 insertions(+), 149 deletions(-)
 delete mode 100644 src/hooks/useZapTokenBalances.ts

diff --git a/.env.example b/.env.example
index d1c2189e10..9630759c9a 100644
--- a/.env.example
+++ b/.env.example
@@ -1,17 +1,9 @@
-# Required
-# Covalent (https://www.covalenthq.com/)
-VITE_COVALENT_API_KEY=""
-
-# Optional
-# Toggle to "true" to use Olympus Give features
-VITE_GIVE_ENABLED="true"
-# This should be toggled to "true" if you need to use the mock sOHM contract
-# (which allows for on-demand rebasing)
-VITE_MOCK_SOHM_ENABLED="false"
 
 # Optional
 # Google Analytics (https://analytics.google.com/)
 VITE_GOOGLE_ANALYTICS_API_KEY=""
+# Google Analytics 4 API Key 
+VITE_GA_4_API_KEY=""
 
 # Optional
 # If you run your own node, you can provide connection url(s) to that node.
@@ -25,14 +17,6 @@ VITE_FANTOM_TESTNET_NODE_URL=""
 VITE_POLYGON_NODE_URL=""
 VITE_POLYGON_TESTNET_NODE_URL=""
 
-# Olympus Give
-# These 2 settings should be toggled to "true" if you want to use Olympus Give features
-VITE_GIVE_ENABLED="true"
-VITE_GIVE_GRANTS_ENABLED="true"
-
-# This should be toggled to "true" if you need to use the mock sOHM contract
-# (which allows for on-demand rebasing)
-VITE_MOCK_SOHM_ENABLED="false"
 
 VITE_ARBITRUM_NODE_URL=""
 VITE_ARBITRUM_TESTNET_NODE_URL=""
@@ -41,4 +25,7 @@ VITE_AVALANCHE_NODE_URL=""
 VITE_AVALANCHE_TESTNET_NODE_URL=""
 
 # Get a wallet connect project id here: https://cloud.walletconnect.com
-VITE_WALLETCONNECT_PROJECT_ID=""
\ No newline at end of file
+VITE_WALLETCONNECT_PROJECT_ID=""
+
+#Subgraph URL for Protocol Metrics. If not set Protocol Metrics will not be displayed.
+VITE_WG_PUBLIC_NODE_URL=""
diff --git a/README.md b/README.md
index 8d12c379d3..5f96f8b8b0 100644
--- a/README.md
+++ b/README.md
@@ -229,3 +229,11 @@ If editing the production content, opt to create a new branch and pull request,
 ## 🗣 Community and Contributions
 
 - [Join our Discord](https://discord.gg/OlympusDAO) and ask how you can get involved with the DAO!
+
+
+
+## Deploy Your Own Frontend
+
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FOlympusDAO%2Folympus-frontend&env=VITE_WALLETCONNECT_PROJECT_ID&envDescription=Please%20see%20.env.example%20for%20all%20other%20optional%20ENV%20variables&envLink=https%3A%2F%2Fgithub.com%2FOlympusDAO%2Folympus-frontend%2Fblob%2Fdevelop%2F.env.example)
+[![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/OlympusDAO/olympus-frontend)
+
diff --git a/src/helpers/environment/Environment/Environment.ts b/src/helpers/environment/Environment/Environment.ts
index a1aaa1a736..7637567b84 100644
--- a/src/helpers/environment/Environment/Environment.ts
+++ b/src/helpers/environment/Environment/Environment.ts
@@ -37,14 +37,6 @@ export class Environment {
       err: "Please provide an Google Analytics 4 API key in your .env file",
     });
 
-  public static getZapperApiKey = () =>
-    this._get({
-      first: true,
-      key: "VITE_ZAPPER_API",
-      // NOTE: default Zapper API key. Won't work in production with any real volume of usage.
-      fallback: "96e0cc51-a62e-42ca-acee-910ea7d2a241",
-    });
-
   public static getWundergraphNodeUrl = (): string | undefined =>
     this._get({
       first: true,
@@ -136,8 +128,4 @@ export class Environment {
         });
     }
   };
-
-  public static isWalletNewsEnabled() {
-    return this.env.VITE_DISABLE_NEWS !== "true";
-  }
 }
diff --git a/src/helpers/environment/Environment/Environment.unit.test.ts b/src/helpers/environment/Environment/Environment.unit.test.ts
index f550f6765f..4fe5f68a17 100644
--- a/src/helpers/environment/Environment/Environment.unit.test.ts
+++ b/src/helpers/environment/Environment/Environment.unit.test.ts
@@ -44,13 +44,6 @@ describe("Environment", () => {
     });
   });
 
-  describe("Zapper", () => {
-    it("should return a Zapper API key", () => {
-      import.meta.env.VITE_ZAPPER_API = "somekey";
-      expect(Environment.getZapperApiKey()).toEqual("somekey");
-    });
-  });
-
   describe("StagingEnv", () => {
     it("should return a StagingEnv", () => {
       import.meta.env.VITE_STAGING_ENV = "false";
diff --git a/src/hooks/useZapTokenBalances.ts b/src/hooks/useZapTokenBalances.ts
deleted file mode 100644
index 21c2d14a52..0000000000
--- a/src/hooks/useZapTokenBalances.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { BigNumber, ethers } from "ethers";
-import { Environment } from "src/helpers/environment/Environment/Environment";
-import { useAccount } from "wagmi";
-
-interface ZapperResponse {
-  [key: string]: ZapperAddress;
-}
-
-interface ZapperAddress {
-  products: ZapperProduct[];
-}
-
-interface ZapperProduct {
-  assets: ZapperToken[];
-  label: string;
-}
-
-export interface ZapperToken {
-  address: string;
-  decimals: number;
-  hide: boolean;
-  displayProps: {
-    images: string[];
-    label: string;
-  };
-  symbol: string;
-  price: number;
-  network: string;
-  balance: number;
-  balanceRaw: string;
-  balanceUSD: number;
-  tokens: [];
-}
-
-export interface ZapHelperBalancesResponse {
-  balances: { [key: string]: ZapperToken };
-}
-
-export const zapTokenBalancesKey = (address: string) => ["zapTokenBalances", address];
-
-/**
- * Asynchronously fetches the token balances for the current wallet.
- *
- * This hook uses react-query to fetch the token balances via the Zapper API.
- * The Zapper API is used as it returns an exhaustive list of the tokens in
- * the wallet, along with the balances and USD value. Doing this manually would
- * require querying balances for an exhaustive list of token contracts, so the Zapper
- * API is quicker.
- *
- * Caveats:
- * - The Zapper API supports Ethereum mainnet only, which makes it difficult to conduct testing.
- *
- * @returns react-query result
- */
-export const useZapTokenBalances = () => {
-  const { address = "", isConnected } = useAccount();
-
-  const key = zapTokenBalancesKey(address);
-  return useQuery<ZapHelperBalancesResponse, Error>(
-    [key],
-    async () => {
-      // TODO handle missing API key
-      const apiKey = Environment.getZapperApiKey();
-      try {
-        const addressLower = address.toLowerCase();
-        console.debug("Refetching Zap token balances");
-        const response = await fetch(
-          `https://api.zapper.fi/v2/apps/tokens/balances?api_key=${apiKey}&addresses%5B%5D=${addressLower}&newBalances=true`,
-        );
-        const responseJson = await response.json();
-        if (response.ok) {
-          return parseResponse(responseJson.balances, addressLower);
-        } else {
-          throw Error(JSON.stringify(responseJson));
-        }
-      } catch (e) {
-        console.error(e);
-        throw e;
-      }
-    },
-    { enabled: !!address && !!isConnected },
-  );
-};
-
-/**
- * This function formats the `ZapperResponse`.
- *
- * @param response JSON-formatted response from Zapper
- * @param address wallet address (lowercase)
- * @returns ZapHelperBalancesResponse object
- */
-const parseResponse = (response: ZapperResponse, address: string): ZapHelperBalancesResponse => {
-  const parsed = response[address].products.find(product => product.label === "Tokens");
-  const arr = parsed?.assets.map(token => [token.symbol.toLowerCase(), token]) ?? null;
-  const result = { balances: arr == null ? {} : Object.fromEntries(arr) };
-
-  if (result.balances["ohm"]) {
-    result.balances["ohm"].hide = true;
-  }
-
-  for (const key in result.balances) {
-    const balance = result.balances[key];
-    const balanceRaw = balance.balanceRaw;
-    const balanceBigNumber = BigNumber.from(balanceRaw);
-    balance.balanceRaw = ethers.utils.formatUnits(balanceBigNumber, balance.decimals);
-  }
-  return result;
-};
diff --git a/src/hooks/useZeroExSwap.ts b/src/hooks/useZeroExSwap.ts
index c77dca032a..20d42cc3f5 100644
--- a/src/hooks/useZeroExSwap.ts
+++ b/src/hooks/useZeroExSwap.ts
@@ -6,7 +6,6 @@ import { DAO_TREASURY_ADDRESSES, GOHM_ADDRESSES } from "src/constants/addresses"
 import { SOHM_ADDRESSES } from "src/constants/addresses";
 import { trackGAEvent } from "src/helpers/analytics/trackGAEvent";
 import { balanceQueryKey } from "src/hooks/useBalance";
-import { zapTokenBalancesKey } from "src/hooks/useZapTokenBalances";
 import { EthersError } from "src/lib/EthersTypes";
 import { useAccount, useSigner } from "wagmi";
 
@@ -41,7 +40,7 @@ export const useZeroExSwap = () => {
   const client = useQueryClient();
   const { data: signer } = useSigner();
   const { address = "" } = useAccount();
-
+  const zapTokenBalancesKey = (address: string) => ["zapTokenBalances", address];
   return useMutation<ContractReceipt, EthersError, ZapExecuteOptions>(
     /**
      * Ideally the parameters to this async function should be the slippage, etc.