Updated useActiveWeb3React imports

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'
 

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'
 

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'

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 {

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'
 

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'

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

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'

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<TokenList> {
   const { chainId, library } = useActiveWeb3React()

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'
 

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<ClaimCommonTypes, 'hasClaims' | 'isClaimed'> & {

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() {

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'