From 5a66c661ba1fb9aee610b4c09808ba6cb1aa6b0a Mon Sep 17 00:00:00 2001 From: karczu Date: Fri, 9 Dec 2022 16:59:33 +0100 Subject: [PATCH] fix bugs after merge --- package.json | 2 +- src/constants/index.tsx | 1 - src/hooks/usePairTokenPriceByTimestamp.ts | 5 ++--- .../OrderHistoryTransaction/OrderHistoryTransaction.tsx | 4 ++-- src/pages/Swap/Swapbox/Swapbox.tsx | 4 ++-- .../AdvancedTradingView/useAdvancedTradingView.hook.ts | 4 ++-- src/services/AdvancedTradingView/useAllTrades.hook.ts | 4 ++-- yarn.lock | 8 ++++---- 8 files changed, 15 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index dcbdf0374..432c27e7c 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@web3-react/network": "8.0.27-beta.0", "@web3-react/types": "8.0.20-beta.0", "@web3-react/url": "8.0.25-beta.0", - "@web3-react/walletconnect": "8.0.35-beta.0", + "@web3-react/walletconnect": "8.0.36-beta.0", "@uniswap/v3-periphery": "1.4.1", "ajv": "^8.11.0", "ajv-formats": "^2.1.1", diff --git a/src/constants/index.tsx b/src/constants/index.tsx index a8dc32e5d..a238257b9 100644 --- a/src/constants/index.tsx +++ b/src/constants/index.tsx @@ -25,7 +25,6 @@ import { ReactNode } from 'react' import BaoswapLogo from '../assets/images/baoswap-logo.png' import PancakeSwapLogo from '../assets/images/bunny-mono.png' -import Coinbase from '../assets/images/coinbase.svg' import CoWLogo from '../assets/images/cow-protocol.svg' import CurveLogo from '../assets/images/curve-logo.png' import DFYNLogo from '../assets/images/dfyn-logo.svg' diff --git a/src/hooks/usePairTokenPriceByTimestamp.ts b/src/hooks/usePairTokenPriceByTimestamp.ts index 6524c22cb..86fa83974 100644 --- a/src/hooks/usePairTokenPriceByTimestamp.ts +++ b/src/hooks/usePairTokenPriceByTimestamp.ts @@ -10,8 +10,7 @@ import { TIMEFRAME_PROPRETIES, } from '../components/Charts/chartUtils' import { wrappedCurrency } from '../utils/wrappedCurrency' - -import { useActiveWeb3React } from '.' +import { useWeb3ReactCore } from './useWeb3ReactCore' const GET_PAIR_TOKEN_PRICES_QUERY = gql` query getPairTokenPrices($pairAddress: ID, $timestamp: BigInt, $timeframe: PairTokenPriceTimeframe) { @@ -48,7 +47,7 @@ type PairTokenPriceByTimestampProps = { } export function usePairTokenPriceByTimestamp({ currency0, currency1, dateInterval }: PairTokenPriceByTimestampProps) { - const { chainId } = useActiveWeb3React() + const { chainId } = useWeb3ReactCore() const [wrappedToken1, setWrappedToken1] = useState() const [pairAddress, setPairAddress] = useState() diff --git a/src/pages/Swap/AdvancedSwapMode/OrderHistory/OrderHistoryTransaction/OrderHistoryTransaction.tsx b/src/pages/Swap/AdvancedSwapMode/OrderHistory/OrderHistoryTransaction/OrderHistoryTransaction.tsx index 257271c4c..3ffc1994f 100644 --- a/src/pages/Swap/AdvancedSwapMode/OrderHistory/OrderHistoryTransaction/OrderHistoryTransaction.tsx +++ b/src/pages/Swap/AdvancedSwapMode/OrderHistory/OrderHistoryTransaction/OrderHistoryTransaction.tsx @@ -3,7 +3,7 @@ import { ExternalLink } from 'react-feather' import { Text } from 'rebass' import styled, { useTheme } from 'styled-components' -import { useActiveWeb3React } from '../../../../../hooks/index' +import { useWeb3ReactCore } from '../../../../../hooks/useWeb3ReactCore' import { EXPLORER_LINK_TYPE, getExplorerLink } from '../../../../../utils' import { Status } from '../../../../Account/Account.styles' import { Transaction, TransactionTypes } from '../../../../Account/Account.types' @@ -30,7 +30,7 @@ const Wrapper = styled.div` ` export const OrderHistoryTransaction = ({ tx }: { tx: Transaction }) => { - const { chainId } = useActiveWeb3React() + const { chainId } = useWeb3ReactCore() const theme = useTheme() const isSwapTransaction = tx.type === TransactionTypes.Swap diff --git a/src/pages/Swap/Swapbox/Swapbox.tsx b/src/pages/Swap/Swapbox/Swapbox.tsx index bc6e7c751..7d2797241 100644 --- a/src/pages/Swap/Swapbox/Swapbox.tsx +++ b/src/pages/Swap/Swapbox/Swapbox.tsx @@ -12,10 +12,10 @@ import ConfirmSwapModal from '../../../components/Swap/ConfirmSwapModal' import { ArrowWrapper, SwitchTokensAmountsContainer, Wrapper } from '../../../components/Swap/styleds' import SwapButtons from '../../../components/Swap/SwapButtons' import { TradeDetails } from '../../../components/Swap/TradeDetails' -import { useActiveWeb3React } from '../../../hooks' import { ApprovalState, useApproveCallbackFromTrade } from '../../../hooks/useApproveCallback' import { useSwapCallback } from '../../../hooks/useSwapCallback' import { useHigherUSDValue } from '../../../hooks/useUSDValue' +import { useWeb3ReactCore } from '../../../hooks/useWeb3ReactCore' import { useWrapCallback, WrapState, WrapType } from '../../../hooks/useWrapCallback' import { useDerivedSwapInfo, useSwapActionHandlers, useSwapState } from '../../../state/swap/hooks' import { Field } from '../../../state/swap/types' @@ -44,7 +44,7 @@ export function Swapbox() { const [platformOverride, setPlatformOverride] = useState(null) const [showAdvancedSwapDetails, setShowAdvancedSwapDetails] = useAdvancedSwapDetails() - const { chainId } = useActiveWeb3React() + const { chainId } = useWeb3ReactCore() // for expert mode const isExpertMode = useIsExpertMode() diff --git a/src/services/AdvancedTradingView/useAdvancedTradingView.hook.ts b/src/services/AdvancedTradingView/useAdvancedTradingView.hook.ts index beb2eca84..457661961 100644 --- a/src/services/AdvancedTradingView/useAdvancedTradingView.hook.ts +++ b/src/services/AdvancedTradingView/useAdvancedTradingView.hook.ts @@ -3,9 +3,9 @@ import { ChainId, Currency, Token, WETH, WMATIC, WXDAI } from '@swapr/sdk' import { useEffect, useMemo, useRef, useState } from 'react' import { useDispatch } from 'react-redux' -import { useActiveWeb3React } from '../../hooks' import { useToken } from '../../hooks/Tokens' import { useRouter } from '../../hooks/useRouter' +import { useWeb3ReactCore } from '../../hooks/useWeb3ReactCore' import store, { AppState } from '../../state' import { useSwapState } from '../../state/swap/hooks' import { adapters } from './adapters/adapters.config' @@ -44,7 +44,7 @@ const calculateAmountToFetch = (chainId: ChainId | undefined, amountToFetch: num } export const useAdvancedTradingView = () => { - const { chainId } = useActiveWeb3React() + const { chainId } = useWeb3ReactCore() const { navigate } = useRouter() diff --git a/src/services/AdvancedTradingView/useAllTrades.hook.ts b/src/services/AdvancedTradingView/useAllTrades.hook.ts index d5005e360..254acc6b8 100644 --- a/src/services/AdvancedTradingView/useAllTrades.hook.ts +++ b/src/services/AdvancedTradingView/useAllTrades.hook.ts @@ -1,7 +1,7 @@ import { useMemo } from 'react' import { useSelector } from 'react-redux' -import { useActiveWeb3React } from '../../hooks' +import { useWeb3ReactCore } from '../../hooks/useWeb3ReactCore' import { Transaction, TransactionStatus } from '../../pages/Account/Account.types' import { formattedTransactions as formatTransactions } from '../../pages/Account/accountUtils' import { useAllBridgeTransactions, useAllSwapTransactions } from '../../state/transactions/hooks' @@ -19,7 +19,7 @@ export const useAllTrades = (): { liquidityHistory: AdvancedViewTransaction[] hasMore: { hasMoreActivity: boolean; hasMoreTrades: boolean } } => { - const { account } = useActiveWeb3React() + const { account } = useWeb3ReactCore() const hasMore = useSelector(selectHasMoreData) const { uniswapV3LiquidityHistory, uniswapV3TradeHistory } = useSelector(selectUniswapV3AllData) const { baseAdapterTradeHistory, baseAdapterLiquidityHistory } = useSelector(selectAllDataFromAdapters) diff --git a/yarn.lock b/yarn.lock index d37419db8..466430734 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7192,10 +7192,10 @@ "@ethersproject/providers" "^5" "@web3-react/types" "^8.0.20-beta.0" -"@web3-react/walletconnect@8.0.35-beta.0": - version "8.0.35-beta.0" - resolved "https://registry.yarnpkg.com/@web3-react/walletconnect/-/walletconnect-8.0.35-beta.0.tgz#49c6c77447d58bfb295f28fa87c8fbfeec95cff5" - integrity sha512-fUrqcnwAr5oecZ6VUE/7+RSVURrohbAgWMLKYxd8Zo47AtTPzgJ1t5Lydh/EX4xJPLhfK1LqX5YgMwiys3DvhQ== +"@web3-react/walletconnect@8.0.36-beta.0": + version "8.0.36-beta.0" + resolved "https://registry.yarnpkg.com/@web3-react/walletconnect/-/walletconnect-8.0.36-beta.0.tgz#a0dbb5286b9011c6c221cc143322822a7387978f" + integrity sha512-u+yNWCm8nz5pZn8SyU5+9pI5hakKcfhUF1TYwj7HVTTMHdMlLXhk19YyaycsFkgbX9zWzouItwxXF8obGt+rCg== dependencies: "@web3-react/types" "^8.0.20-beta.0" eventemitter3 "^4.0.7"