fix: check for ENS name while looking for balances

lifinance · Mar 16, 2023 · ace7070 · ace7070
1 parent 6b62f64
commit ace7070
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/packages/widget/src/hooks/useGasSufficiency.ts b/packages/widget/src/hooks/useGasSufficiency.ts
@@ -16,9 +16,9 @@ export interface GasSufficiency {
 const refetchInterval = 30_000;
 
 export const useGasSufficiency = (route?: Route) => {
-  const { account } = useWallet();
+  const { account, provider } = useWallet();
   const { getChainById } = useChains();
-  const getTokenBalancesWithRetry = useGetTokenBalancesWithRetry();
+  const getTokenBalancesWithRetry = useGetTokenBalancesWithRetry(provider);
 
   const { data: insufficientGas, isInitialLoading } = useQuery(
     ['gas-sufficiency-check', account.address, route?.id],

diff --git a/packages/widget/src/hooks/useGetTokenBalancesWithRetry.ts b/packages/widget/src/hooks/useGetTokenBalancesWithRetry.ts
@@ -1,8 +1,10 @@
+import { isAddress } from '@ethersproject/address';
+import type { Provider } from '@ethersproject/providers';
 import type { Token, TokenAmount } from '@lifi/sdk';
 import { useCallback } from 'react';
 import { useLiFi } from '../providers';
 
-export const useGetTokenBalancesWithRetry = () => {
+export const useGetTokenBalancesWithRetry = (provider?: Provider) => {
   const lifi = useLiFi();
 
   const getTokenBalancesWithRetry = useCallback(
@@ -12,8 +14,12 @@ export const useGetTokenBalancesWithRetry = () => {
       depth = 0,
     ): Promise<TokenAmount[] | undefined> => {
       try {
+        const walletAddress = isAddress(accountAddress)
+          ? accountAddress
+          : await provider?.resolveName(accountAddress);
+
         const tokenBalances = await lifi.getTokenBalances(
-          accountAddress as string,
+          walletAddress as string,
           tokens,
         );
         if (!tokenBalances.every((token) => token.blockNumber)) {
@@ -31,7 +37,7 @@ export const useGetTokenBalancesWithRetry = () => {
         //
       }
     },
-    [lifi],
+    [lifi, provider],
   );
 
   return getTokenBalancesWithRetry;

diff --git a/packages/widget/src/hooks/useTokenBalance.ts b/packages/widget/src/hooks/useTokenBalance.ts
@@ -8,11 +8,11 @@ import { useGetTokenBalancesWithRetry } from './useGetTokenBalancesWithRetry';
 const defaultRefetchInterval = 30_000;
 
 export const useTokenBalance = (token?: Token, accountAddress?: string) => {
-  const { account } = useWallet();
+  const { account, provider } = useWallet();
   const queryClient = useQueryClient();
   const walletAddress = accountAddress || account.address;
 
-  const getTokenBalancesWithRetry = useGetTokenBalancesWithRetry();
+  const getTokenBalancesWithRetry = useGetTokenBalancesWithRetry(provider);
 
   const tokenBalanceQueryKey = useMemo(
     () => ['token-balance', walletAddress, token?.chainId, token?.address],