From 781c089dbbb0f5f5181d145e01e593a752297899 Mon Sep 17 00:00:00 2001
From: Scott Mitchell <scottymitch88@gmail.com>
Date: Thu, 31 Aug 2023 13:37:57 -0400
Subject: [PATCH] Ensure to execute initial fetch only when base contracts are
 loaded (#1804)

---
 dapp-oeth/src/hooks/useTokenPrices.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/dapp-oeth/src/hooks/useTokenPrices.js b/dapp-oeth/src/hooks/useTokenPrices.js
index dca06b5aa8..d493be2d6b 100644
--- a/dapp-oeth/src/hooks/useTokenPrices.js
+++ b/dapp-oeth/src/hooks/useTokenPrices.js
@@ -67,14 +67,6 @@ const stakedFraxPrice = (contract) =>
   contract.previewRedeem(utils.parseEther('1'))
 
 const oraclePrices = async (tokens, contracts) => {
-  if (
-    !contracts.chainlinkEthAggregator ||
-    !contracts.oethOracleRouter ||
-    !contracts.sfrxeth
-  ) {
-    return {}
-  }
-
   // Fetch baseline ETH price for conversion
   const feed = await contracts.chainlinkEthAggregator.latestRoundData()
   const ethPrice = Number(utils.formatUnits(feed?.answer, 8))
@@ -155,7 +147,10 @@ const useTokenPrices = ({ tokens = [] } = {}) => {
   }
 
   return useQuery(queryTokens, fetchTokenPrices, {
-    enabled: contracts !== null,
+    enabled:
+      !!contracts?.chainlinkEthAggregator &&
+      !!contracts?.oethOracleRouter &&
+      !!contracts?.sfrxeth,
   })
 }