[Hotfix 🔥 ] - 1.15.1 Fix USD estimation issue (#671)

* check native and use wrapped address * fix ETH price getting
cowprotocol · Jun 10, 2022 · 031f8fa · 031f8fa
1 parent 30ac9c0
commit 031f8fa
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/custom/api/coingecko/index.ts b/src/custom/api/coingecko/index.ts
@@ -62,6 +62,7 @@ function _get(chainId: ChainId, url: string): Promise<Response> {
 export interface CoinGeckoUsdPriceParams {
   chainId: ChainId
   tokenAddress: string
+  isNative: boolean
 }
 
 interface CoinGeckoUsdQuote {
@@ -70,7 +71,9 @@ interface CoinGeckoUsdQuote {
   }
 }
 
-export async function getUSDPriceQuote(params: CoinGeckoUsdPriceParams): Promise<CoinGeckoUsdQuote | null> {
+export async function getUSDPriceQuote(
+  params: Omit<CoinGeckoUsdPriceParams, 'isNative'>
+): Promise<CoinGeckoUsdQuote | null> {
   const { chainId, tokenAddress } = params
   // ethereum/xdai (chains)
   const assetPlatform = _getCoinGeckoAssetPlatform(chainId)
@@ -93,10 +96,10 @@ export async function getUSDPriceQuote(params: CoinGeckoUsdPriceParams): Promise
 }
 
 export function useGetCoingeckoUsdPrice(params: Partial<CoinGeckoUsdPriceParams>, options = SWR_OPTIONS) {
-  const { chainId, tokenAddress } = params
+  const { chainId, tokenAddress, isNative } = params
 
   return useSWR<PriceInformation | null>(
-    ['getUSDPriceQuote', chainId, tokenAddress],
+    ['getUSDPriceQuote', chainId, tokenAddress, isNative],
     () => {
       if (chainId && tokenAddress) {
         return getUSDPriceQuote({ chainId, tokenAddress }).then(toPriceInformation)

diff --git a/src/custom/hooks/useUSDCPrice/index.ts b/src/custom/hooks/useUSDCPrice/index.ts
@@ -207,13 +207,20 @@ export function useCoingeckoUsdPrice(currency?: Currency) {
   const currencyRef = useRef(currency)
   currencyRef.current = currency
 
-  const tokenAddress = currencyRef.current ? currencyId(currencyRef.current) : undefined
+  const isNative = !!currency?.isNative
+  // use wrapped address equivalent if native (DONT USE "ETH" or "XDAI")
+  const tokenAddress = currencyRef.current
+    ? isNative
+      ? currency.wrapped.address
+      : currencyId(currencyRef.current)
+    : undefined
 
   const chainIdSupported = supportedChainId(chainId)
   // get SWR cached coingecko usd price
   const { data: priceResponse, error: errorResponse } = useGetCoingeckoUsdPrice({
     chainId: chainIdSupported,
     tokenAddress,
+    isNative,
   })
 
   useEffect(() => {

diff --git a/src/custom/pages/Swap/SwapMod.tsx b/src/custom/pages/Swap/SwapMod.tsx
@@ -204,7 +204,10 @@ export default function Swap({
   } = useDerivedSwapInfo()
 
   // detects trade load
-  const { quote, isGettingNewQuote } = useGetQuoteAndStatus({ token: INPUT.currencyId, chainId })
+  const { quote, isGettingNewQuote } = useGetQuoteAndStatus({
+    token: currencies.INPUT?.isNative ? currencies.INPUT.wrapped.address : INPUT.currencyId,
+    chainId,
+  })
 
   // Log all trade information
   // logTradeDetails(v2Trade, allowedSlippage)