Merge pull request #4 from Uniswap/upgrade-react

bump react
This commit is contained in:
Ian Lapham 2021-02-15 11:59:59 -05:00 committed by GitHub
commit ba647d9d6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 4186 additions and 5091 deletions

@ -24,9 +24,9 @@
"@types/multicodec": "^1.0.0", "@types/multicodec": "^1.0.0",
"@types/node": "^13.13.5", "@types/node": "^13.13.5",
"@types/qs": "^6.9.2", "@types/qs": "^6.9.2",
"@types/react": "^16.9.34", "@types/react": "^17.0.2",
"@types/react-dom": "^16.9.7", "@types/react-dom": "^17.0.1",
"@types/react-redux": "^7.1.8", "@types/react-redux": "^7.1.16",
"@types/react-router-dom": "^5.0.0", "@types/react-router-dom": "^5.0.0",
"@types/react-virtualized-auto-sizer": "^1.0.0", "@types/react-virtualized-auto-sizer": "^1.0.0",
"@types/react-window": "^1.8.2", "@types/react-window": "^1.8.2",
@ -54,7 +54,7 @@
"copy-to-clipboard": "^3.2.0", "copy-to-clipboard": "^3.2.0",
"cross-env": "^7.0.2", "cross-env": "^7.0.2",
"cypress": "^4.11.0", "cypress": "^4.11.0",
"eslint": "^6.8.0", "eslint": "^7.11.0",
"eslint-config-prettier": "^6.11.0", "eslint-config-prettier": "^6.11.0",
"eslint-plugin-prettier": "^3.1.3", "eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-react": "^7.19.0", "eslint-plugin-react": "^7.19.0",
@ -72,18 +72,18 @@
"node-vibrant": "^3.1.5", "node-vibrant": "^3.1.5",
"polished": "^3.3.2", "polished": "^3.3.2",
"qs": "^6.9.4", "qs": "^6.9.4",
"react": "^16.13.1", "react": "^17.0.1",
"react-confetti": "^6.0.0", "react-confetti": "^6.0.0",
"react-device-detect": "^1.6.2", "react-device-detect": "^1.6.2",
"react-dom": "^16.13.1", "react-dom": "^17.0.1",
"react-feather": "^2.0.8", "react-feather": "^2.0.8",
"react-ga": "^2.5.7", "react-ga": "^2.5.7",
"react-i18next": "^10.7.0", "react-i18next": "^10.7.0",
"react-markdown": "^4.3.1", "react-markdown": "^4.3.1",
"react-popper": "^2.2.3", "react-popper": "^2.2.3",
"react-redux": "^7.2.0", "react-redux": "^7.2.2",
"react-router-dom": "^5.0.0", "react-router-dom": "^5.0.0",
"react-scripts": "^3.4.1", "react-scripts": "^4.0.2",
"react-spring": "^8.0.27", "react-spring": "^8.0.27",
"react-use-gesture": "^6.0.14", "react-use-gesture": "^6.0.14",
"react-virtualized-auto-sizer": "^1.0.2", "react-virtualized-auto-sizer": "^1.0.2",

@ -153,7 +153,7 @@ const LineChart = ({
chart.timeScale().fitContent() chart.timeScale().fitContent()
setChart(chart) setChart(chart)
} }
}, [chartCreated, currenValue, data, height, setValue, textColor, theme.bg1]) }, [color, chartCreated, currenValue, data, height, setValue, textColor, theme.bg1])
return ( return (
<Wrapper> <Wrapper>

@ -1,17 +1,16 @@
import { Token, TokenAmount, WETH } from '@uniswap/sdk'
import React, { useContext } from 'react' import React, { useContext } from 'react'
import { Link, RouteComponentProps, withRouter } from 'react-router-dom' import { Link, RouteComponentProps, withRouter } from 'react-router-dom'
import { Token, TokenAmount, WETH } from '@uniswap/sdk'
import { Text } from 'rebass' import { Text } from 'rebass'
import { AutoColumn } from '../Column' import { ThemeContext } from 'styled-components'
import { useActiveWeb3React } from '../../hooks'
import { ButtonSecondary } from '../Button' import { ButtonSecondary } from '../Button'
import { AutoColumn } from '../Column'
import DoubleCurrencyLogo from '../DoubleLogo'
import { RowBetween, RowFixed } from '../Row' import { RowBetween, RowFixed } from '../Row'
import { FixedHeightRow, HoverCard } from './index' import { FixedHeightRow, HoverCard } from './index'
import DoubleCurrencyLogo from '../DoubleLogo'
import { useActiveWeb3React } from '../../hooks'
import { ThemeContext } from 'styled-components'
interface PositionCardProps extends RouteComponentProps<{}> { interface PositionCardProps extends RouteComponentProps<Record<string, any>> {
token: Token token: Token
V1LiquidityBalance: TokenAmount V1LiquidityBalance: TokenAmount
} }

@ -102,7 +102,12 @@ class MiniRpcProvider implements AsyncSendable {
} }
public readonly sendAsync = ( public readonly sendAsync = (
request: { jsonrpc: '2.0'; id: number | string | null; method: string; params?: unknown[] | object }, request: {
jsonrpc: '2.0'
id: number | string | null
method: string
params?: unknown[] | Record<string, unknown>
},
callback: (error: any, response: any) => void callback: (error: any, response: any) => void
): void => { ): void => {
this.request(request.method, request.params) this.request(request.method, request.params)
@ -112,7 +117,7 @@ class MiniRpcProvider implements AsyncSendable {
public readonly request = async ( public readonly request = async (
method: string | { method: string; params: unknown[] }, method: string | { method: string; params: unknown[] },
params?: unknown[] | object params?: unknown[] | Record<string, unknown>
): Promise<unknown> => { ): Promise<unknown> => {
if (typeof method !== 'string') { if (typeof method !== 'string') {
return this.request(method.method, method.params) return this.request(method.method, method.params)

@ -5,10 +5,13 @@ import { useAddPopup, useBlockNumber } from '../application/hooks'
import { AppDispatch, AppState } from '../index' import { AppDispatch, AppState } from '../index'
import { checkedTransaction, finalizeTransaction } from './actions' import { checkedTransaction, finalizeTransaction } from './actions'
export function shouldCheck( interface TxInterface {
lastBlockNumber: number, addedTime: number
tx: { addedTime: number; receipt?: {}; lastCheckedBlockNumber?: number } receipt?: Record<string, any>
): boolean { lastCheckedBlockNumber?: number
}
export function shouldCheck(lastBlockNumber: number, tx: TxInterface): boolean {
if (tx.receipt) return false if (tx.receipt) return false
if (!tx.lastCheckedBlockNumber) return true if (!tx.lastCheckedBlockNumber) return true
const blocksSinceCheck = lastBlockNumber - tx.lastCheckedBlockNumber const blocksSinceCheck = lastBlockNumber - tx.lastCheckedBlockNumber

@ -19,7 +19,7 @@
"moduleResolution": "node", "moduleResolution": "node",
"resolveJsonModule": true, "resolveJsonModule": true,
"isolatedModules": true, "isolatedModules": true,
"jsx": "preserve", "jsx": "react",
"downlevelIteration": true, "downlevelIteration": true,
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
"types": ["react-spring", "jest"], "types": ["react-spring", "jest"],

9224
yarn.lock

File diff suppressed because it is too large Load Diff