From 414056fe39df05c7c8d76d293ef3ffe8eebf8743 Mon Sep 17 00:00:00 2001 From: Leandro Date: Fri, 4 Mar 2022 14:33:51 -0800 Subject: [PATCH] Updated useActiveWeb3React imports --- src/custom/api/gnosisProtocol/hooks.ts | 2 +- src/custom/components/AccountDetails/Transaction/index.tsx | 2 +- src/custom/components/AccountDetails/TransactionMod.tsx | 2 +- src/custom/components/ExplorerLink/index.tsx | 2 +- src/custom/components/Header/URLWarning/index.tsx | 2 +- .../SearchModal/TokenImportCard/TokenImportCardMod.tsx | 2 +- src/custom/hooks/index.tsx | 3 ++- src/custom/hooks/useApproveCallback/index.ts | 2 +- .../hooks/useFetchListCallback/useFetchListCallbackMod.ts | 6 +++--- src/custom/hooks/useGetGpPriceStrategy.ts | 2 +- src/custom/pages/Claim/ClaimSummary.tsx | 2 +- src/custom/state/claim/updater.tsx | 2 +- src/custom/state/lists/updater/updaterMod.ts | 1 + 13 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/custom/api/gnosisProtocol/hooks.ts b/src/custom/api/gnosisProtocol/hooks.ts index 92bf04f7d1..45e03884cc 100644 --- a/src/custom/api/gnosisProtocol/hooks.ts +++ b/src/custom/api/gnosisProtocol/hooks.ts @@ -1,6 +1,6 @@ import useSWR from 'swr' -import { useActiveWeb3React } from 'hooks/web3' +import useActiveWeb3React from 'hooks/useActiveWeb3React' import { getOrders, OrderMetaData } from 'api/gnosisProtocol/api' import { AMOUNT_OF_ORDERS_TO_FETCH } from 'constants/index' diff --git a/src/custom/components/AccountDetails/Transaction/index.tsx b/src/custom/components/AccountDetails/Transaction/index.tsx index 2f936599f8..433482f668 100644 --- a/src/custom/components/AccountDetails/Transaction/index.tsx +++ b/src/custom/components/AccountDetails/Transaction/index.tsx @@ -1,6 +1,6 @@ import React, { useMemo } from 'react' -import { useActiveWeb3React } from 'hooks/web3' +import useActiveWeb3React from 'hooks/useActiveWeb3React' import { getEtherscanLink } from 'utils' import { RowFixed } from 'components/Row' diff --git a/src/custom/components/AccountDetails/TransactionMod.tsx b/src/custom/components/AccountDetails/TransactionMod.tsx index 7dbd3230b6..e7a32cd96a 100644 --- a/src/custom/components/AccountDetails/TransactionMod.tsx +++ b/src/custom/components/AccountDetails/TransactionMod.tsx @@ -1,7 +1,7 @@ import { CheckCircle, Triangle } from 'react-feather' import styled from 'styled-components/macro' -import { useActiveWeb3React } from 'hooks/web3' +import useActiveWeb3React from 'hooks/useActiveWeb3React' import { useAllTransactions } from 'state/enhancedTransactions/hooks' import { ExternalLink } from 'theme' import { getEtherscanLink } from 'utils' diff --git a/src/custom/components/ExplorerLink/index.tsx b/src/custom/components/ExplorerLink/index.tsx index 3a3d08ef1f..5ba69d8c1d 100644 --- a/src/custom/components/ExplorerLink/index.tsx +++ b/src/custom/components/ExplorerLink/index.tsx @@ -1,5 +1,5 @@ import { ExternalLink } from 'theme' -import { useActiveWeb3React } from '@src/hooks/web3' +import { useActiveWeb3React } from 'hooks/web3' import { BlockExplorerLinkType, getExplorerLabel, getEtherscanLink } from 'utils' interface Props { diff --git a/src/custom/components/Header/URLWarning/index.tsx b/src/custom/components/Header/URLWarning/index.tsx index c2992246b9..da6aeada18 100644 --- a/src/custom/components/Header/URLWarning/index.tsx +++ b/src/custom/components/Header/URLWarning/index.tsx @@ -6,7 +6,7 @@ import { useAnnouncementVisible, useCloseAnnouncement } from 'state/profile/hook import { hashCode } from 'utils/misc' import useFetchFile from 'hooks/useFetchFile' import { Markdown } from 'components/Markdown' -import { useActiveWeb3React } from '@src/hooks/web3' +import useActiveWeb3React from 'hooks/useActiveWeb3React' import { ChainId } from '@uniswap/sdk' import { isBarn } from 'utils/environments' diff --git a/src/custom/components/SearchModal/TokenImportCard/TokenImportCardMod.tsx b/src/custom/components/SearchModal/TokenImportCard/TokenImportCardMod.tsx index 6b577b64b1..d1aad84391 100644 --- a/src/custom/components/SearchModal/TokenImportCard/TokenImportCardMod.tsx +++ b/src/custom/components/SearchModal/TokenImportCard/TokenImportCardMod.tsx @@ -6,7 +6,7 @@ import { AutoColumn } from 'components/Column' import CurrencyLogo from 'components/CurrencyLogo' import ListLogo from 'components/ListLogo' import { RowFixed } from 'components/Row' -import { useActiveWeb3React } from 'hooks/web3' +import useActiveWeb3React from 'hooks/useActiveWeb3React' import { transparentize } from 'polished' import { AlertCircle } from 'react-feather' import styled, { useTheme } from 'styled-components/macro' diff --git a/src/custom/hooks/index.tsx b/src/custom/hooks/index.tsx index 18ed6254c8..52bfb4825b 100644 --- a/src/custom/hooks/index.tsx +++ b/src/custom/hooks/index.tsx @@ -1,9 +1,10 @@ import { useMemo } from 'react' import { Web3Provider } from '@ethersproject/providers' -import { useActiveWeb3React } from '@src/hooks/web3' +import { useActiveWeb3React } from 'hooks/web3' export * from '@src/hooks/web3' +// TODO: I think this might not be really necessary, consider removing it /** * Provides a Web3Provider instance for active web3 connection, if any * Contrary to `getNetworkLibrary` that returns it for the default chainId diff --git a/src/custom/hooks/useApproveCallback/index.ts b/src/custom/hooks/useApproveCallback/index.ts index 2b958691a4..fe80f54238 100644 --- a/src/custom/hooks/useApproveCallback/index.ts +++ b/src/custom/hooks/useApproveCallback/index.ts @@ -1,5 +1,5 @@ import { Currency, CurrencyAmount, MaxUint256, Percent } from '@uniswap/sdk-core' -import { useActiveWeb3React } from '@src/hooks/web3' +import useActiveWeb3React from 'hooks/useActiveWeb3React' import { Field } from '@src/state/swap/actions' import { computeSlippageAdjustedAmounts } from 'utils/prices' import { useMemo } from 'react' diff --git a/src/custom/hooks/useFetchListCallback/useFetchListCallbackMod.ts b/src/custom/hooks/useFetchListCallback/useFetchListCallbackMod.ts index c938d4e069..bacc235dd7 100644 --- a/src/custom/hooks/useFetchListCallback/useFetchListCallbackMod.ts +++ b/src/custom/hooks/useFetchListCallback/useFetchListCallbackMod.ts @@ -1,13 +1,13 @@ import { nanoid } from '@reduxjs/toolkit' import { TokenList } from '@uniswap/token-lists' +import useActiveWeb3React from 'hooks/useActiveWeb3React' +import getTokenList from 'lib/hooks/useTokenList/fetchTokenList' +import resolveENSContentHash from 'lib/utils/resolveENSContentHash' import { useCallback } from 'react' import { useAppDispatch } from 'state/hooks' import { getNetworkLibrary } from 'connectors' import { fetchTokenList } from 'state/lists/actions' -import getTokenList from 'utils/getTokenList' -import resolveENSContentHash from 'utils/resolveENSContentHash' -import { useActiveWeb3React } from 'hooks/web3' export function useFetchListCallback(): (listUrl: string, sendDispatch?: boolean) => Promise { const { chainId, library } = useActiveWeb3React() diff --git a/src/custom/hooks/useGetGpPriceStrategy.ts b/src/custom/hooks/useGetGpPriceStrategy.ts index 1252226b3e..3b79a3a942 100644 --- a/src/custom/hooks/useGetGpPriceStrategy.ts +++ b/src/custom/hooks/useGetGpPriceStrategy.ts @@ -2,7 +2,7 @@ import ms from 'ms.macro' import { useState, useEffect, useCallback } from 'react' import { DEFAULT_GP_PRICE_STRATEGY } from 'constants/index' import { getPriceStrategy, PriceStrategy } from 'api/gnosisProtocol/api' -import { useActiveWeb3React } from 'hooks' +import { useActiveWeb3React } from 'hooks/web3' import { supportedChainId } from 'utils/supportedChainId' import { SupportedChainId } from 'constants/chains' diff --git a/src/custom/pages/Claim/ClaimSummary.tsx b/src/custom/pages/Claim/ClaimSummary.tsx index 04d381b13a..e0ce664f08 100644 --- a/src/custom/pages/Claim/ClaimSummary.tsx +++ b/src/custom/pages/Claim/ClaimSummary.tsx @@ -9,7 +9,7 @@ import { ClaimStatus } from 'state/claim/actions' import { AMOUNT_PRECISION } from 'constants/index' import { useTokenBalance } from 'state/wallet/hooks' import { V_COW } from 'constants/tokens' -import { useActiveWeb3React } from 'hooks' +import { useActiveWeb3React } from 'hooks/web3' import { JSBI } from '@uniswap/sdk' type ClaimSummaryProps = Pick & { diff --git a/src/custom/state/claim/updater.tsx b/src/custom/state/claim/updater.tsx index 7894783942..4a11a5d509 100644 --- a/src/custom/state/claim/updater.tsx +++ b/src/custom/state/claim/updater.tsx @@ -1,7 +1,7 @@ import { useEffect, useMemo } from 'react' import { SupportedChainId } from 'constants/chains' import { ClassifiedUserClaims, useClaimDispatchers, useClaimState, useClassifiedUserClaims } from './hooks' -import { useActiveWeb3React } from 'hooks' +import { useActiveWeb3React } from 'hooks/web3' import { ClaimInfo } from 'state/claim/reducer' export default function Updater() { diff --git a/src/custom/state/lists/updater/updaterMod.ts b/src/custom/state/lists/updater/updaterMod.ts index 6e48c160eb..711bc8d9f0 100644 --- a/src/custom/state/lists/updater/updaterMod.ts +++ b/src/custom/state/lists/updater/updaterMod.ts @@ -1,6 +1,7 @@ import { getVersionUpgrade, minVersionBump, VersionUpgrade } from '@uniswap/token-lists' import { supportedChainId } from 'utils/supportedChainId' import { /* ARBITRUM_LIST, OPTIMISM_LIST, */ DEFAULT_NETWORK_FOR_LISTS, UNSUPPORTED_LIST_URLS } from 'constants/lists' +import useActiveWeb3React from 'hooks/useActiveWeb3React' import { useCallback, useEffect } from 'react' import { useAppDispatch } from 'state/hooks' import { useAllLists } from 'state/lists/hooks'