Skip to content

I
interface
Commit 00b151d7 authored by Zach Pomerantz's avatar Zach Pomerantz Committed by GitHub
Browse files
Options

fix: activation frames (#3711)

parent 5967cf5d
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 79 deletions
src/lib/components/Swap/Toolbar/index.tsx
View file @ 00b151d7
...@@ -28,11 +28,11 @@ export default memo(function Toolbar({ disabled }: { disabled?: boolean }) { ...@@ -28,11 +28,11 @@ export default memo(function Toolbar({ disabled }: { disabled?: boolean }) {
const isAmountPopulated = useIsAmountPopulated() const isAmountPopulated = useIsAmountPopulated()
const { type: wrapType } = useWrapCallback() const { type: wrapType } = useWrapCallback()
const caption = useMemo(() => { const caption = useMemo(() => {
if (disabled) { if (disabled || !chainId) {
return <Caption.ConnectWallet /> return <Caption.ConnectWallet />
} }
if (chainId && !ALL_SUPPORTED_CHAIN_IDS.includes(chainId)) { if (!ALL_SUPPORTED_CHAIN_IDS.includes(chainId)) {
return <Caption.UnsupportedNetwork /> return <Caption.UnsupportedNetwork />
} }
......
src/lib/hooks/useActiveWeb3React.tsx
View file @ 00b151d7
...@@ -7,7 +7,7 @@ import { Url } from '@web3-react/url' ...@@ -7,7 +7,7 @@ import { Url } from '@web3-react/url'
import { useAtom, WritableAtom } from 'jotai' import { useAtom, WritableAtom } from 'jotai'
import { atom } from 'jotai' import { atom } from 'jotai'
import JsonRpcConnector from 'lib/utils/JsonRpcConnector' import JsonRpcConnector from 'lib/utils/JsonRpcConnector'
import { createContext, PropsWithChildren, useContext, useEffect, useMemo, useState } from 'react' import { createContext, PropsWithChildren, useContext, useEffect, useMemo } from 'react'
type Web3ContextType = { type Web3ContextType = {
connector: Connector connector: Connector
...@@ -80,26 +80,13 @@ export function ActiveWeb3Provider({ ...@@ -80,26 +80,13 @@ export function ActiveWeb3Provider({
const library = hooks.useProvider() const library = hooks.useProvider()
// TODO(zzmp): walletconnect returns chainId as a number, so web3-react incorrectly parses it as hex.
const [chainId, setChainId] = useState(hooks.useChainId())
useEffect(() => {
let stale = false
library?.getNetwork().then(({ chainId }) => {
if (!stale) {
setChainId(chainId)
}
})
return () => {
stale = true
}
}, [library])
const accounts = hooks.useAccounts() const accounts = hooks.useAccounts()
const account = hooks.useAccount() const account = hooks.useAccount()
const active = hooks.useIsActive() const active = hooks.useIsActive()
const error = hooks.useError() const chainId = hooks.useChainId()
const ensNames = hooks.useENSNames() const ensNames = hooks.useENSNames()
const ensName = hooks.useENSName() const ensName = hooks.useENSName()
const error = hooks.useError()
const web3 = useMemo(() => { const web3 = useMemo(() => {
if (connector === EMPTY || !active) { if (connector === EMPTY || !active) {
return EMPTY_CONTEXT return EMPTY_CONTEXT
......
src/lib/hooks/useOnSupportedNetwork.ts
View file @ 00b151d7
...@@ -5,7 +5,7 @@ import useActiveWeb3React from './useActiveWeb3React' ...@@ -5,7 +5,7 @@ import useActiveWeb3React from './useActiveWeb3React'
function useOnSupportedNetwork() { function useOnSupportedNetwork() {
const { chainId } = useActiveWeb3React() const { chainId } = useActiveWeb3React()
return useMemo(() => chainId && ALL_SUPPORTED_CHAIN_IDS.includes(chainId), [chainId]) return useMemo(() => Boolean(chainId && ALL_SUPPORTED_CHAIN_IDS.includes(chainId)), [chainId])
} }
export default useOnSupportedNetwork export default useOnSupportedNetwork
yarn.lock
View file @ 00b151d7
...@@ -5235,74 +5235,74 @@ ...@@ -5235,74 +5235,74 @@
dependencies: dependencies:
"@web3-react/types" "^6.0.7" "@web3-react/types" "^6.0.7"
"@web3-react/core@^8.0.22-beta.0": "@web3-react/core@^8.0.23-beta.0":
version "8.0.22-beta.0" version "8.0.23-beta.0"
resolved "https://registry.yarnpkg.com/@web3-react/core/-/core-8.0.22-beta.0.tgz#4a198a1ad9abe76af69d853b07a80dd2f9463b93" resolved "https://registry.yarnpkg.com/@web3-react/core/-/core-8.0.23-beta.0.tgz#3a33234fbe25459ae2ce82b8bada5077386961f1"
integrity sha512-WfMV6VOK+cJ6RoOMtXpcb8PCLRQAUWwZPADzY8n1tYL+5LaH/dkFoeGyAanrIYiNA/EfbvE/T8fP0QD6ooMx7g== integrity sha512-NmVWUKSzYr+Yk0nbZdOLMtidtgXs6qOCR1DcxLF4Aa0zJ/8hRrX23siFfrVNTSpck4fgyURv8QVzE5+VHQx2HA==
dependencies: dependencies:
"@web3-react/store" "^8.0.16-beta.0" "@web3-react/store" "^8.0.17-beta.0"
"@web3-react/types" "^8.0.11-beta.0" "@web3-react/types" "^8.0.12-beta.0"
zustand "^4.0.0-beta.2" zustand "^4.0.0-beta.3"
optionalDependencies: optionalDependencies:
"@ethersproject/providers" "^5" "@ethersproject/providers" "^5"
"@web3-react/eip1193@^8.0.17-beta.0": "@web3-react/eip1193@^8.0.18-beta.0":
version "8.0.17-beta.0" version "8.0.18-beta.0"
resolved "https://registry.yarnpkg.com/@web3-react/eip1193/-/eip1193-8.0.17-beta.0.tgz#84d1eb6bfbc04d4c5be19130daf9be1b3aeb962d" resolved "https://registry.yarnpkg.com/@web3-react/eip1193/-/eip1193-8.0.18-beta.0.tgz#4c1af5c50f19d65bb221bf5d0512bcab9bd16a6f"
integrity sha512-PMy4UXpe/4QM2arKykyYY6iLgO6sQEmiHXuEXUxeU6r6V/G9Eq5bv6Yfo8owd9QJEMlYWgR4v8rpx8VCMqOdKw== integrity sha512-GsPLRP6VUw+uBhesYOrentD51gdj3yDK6oBsUKZLDwgcVaIWgmGjf0J7PTEWyOhs484ezewSaSmoitmWG19rZg==
dependencies: dependencies:
"@web3-react/types" "^8.0.11-beta.0" "@web3-react/types" "^8.0.12-beta.0"
"@web3-react/empty@^8.0.11-beta.0": "@web3-react/empty@^8.0.12-beta.0":
version "8.0.11-beta.0" version "8.0.12-beta.0"
resolved "https://registry.yarnpkg.com/@web3-react/empty/-/empty-8.0.11-beta.0.tgz#2905654cd4e608fa3a7ccfed4e971e446c6768e8" resolved "https://registry.yarnpkg.com/@web3-react/empty/-/empty-8.0.12-beta.0.tgz#e71cb6a6085876177a8aa7bac224de2eee4c3d91"
integrity sha512-/zMps6bgG+17rEQS0b4HCBHqo6xuEtiJnoO9z0uPKFXrS6dJ5X85chyq6MTmZ+rieeG8O/NILn6/eEJPuCAkcg== integrity sha512-gUOuaeOaf5brx3Qi38vPShajOsnBPXeZBDbMNBEIaWmXf5RYYcwLnjdmauLTfRcvja+8FszPuMCs2GLNQOdEag==
dependencies: dependencies:
"@web3-react/types" "^8.0.11-beta.0" "@web3-react/types" "^8.0.12-beta.0"
"@web3-react/metamask@^8.0.18-beta.0": "@web3-react/metamask@^8.0.19-beta.0":
version "8.0.18-beta.0" version "8.0.19-beta.0"
resolved "https://registry.yarnpkg.com/@web3-react/metamask/-/metamask-8.0.18-beta.0.tgz#7ce17c1f86af7ba042e56f0ecc93f0f688c9a646" resolved "https://registry.yarnpkg.com/@web3-react/metamask/-/metamask-8.0.19-beta.0.tgz#7d7c306c1245ada7dff2e1c4bdae871abb126956"
integrity sha512-40sWOJnYIO5u007GMqjiXvgdRAi02WCnlRcMTU2UhJpAtqALNKG14Gyd01vPMAyVYlVmsoGHr5mkFE/i75BpAA== integrity sha512-KRW+uvOnEadQEWAhX//o/OsCHuQCGuHmRUwcH8o5Q1jnjXtelTA9HmjWt8tyLQchPM7PHgrxfY1OH/Li05XTEA==
dependencies: dependencies:
"@metamask/detect-provider" "^1.2.0" "@metamask/detect-provider" "^1.2.0"
"@web3-react/types" "^8.0.11-beta.0" "@web3-react/types" "^8.0.12-beta.0"
"@web3-react/store@^8.0.16-beta.0": "@web3-react/store@^8.0.17-beta.0":
version "8.0.16-beta.0" version "8.0.17-beta.0"
resolved "https://registry.yarnpkg.com/@web3-react/store/-/store-8.0.16-beta.0.tgz#2e76571f6d6443173a89097825f4abe7331eaa6a" resolved "https://registry.yarnpkg.com/@web3-react/store/-/store-8.0.17-beta.0.tgz#a059b6e761598e108c25dfccabb227682b32899d"
integrity sha512-W79ZDgGZ/pyA1CaxbsfWZ56Ud142eHJw4oP8TSwH9lmRqfPXvFeKUCACy9YpKBjmTMDRR3bQ67kEMYQjjGkY6g== integrity sha512-1JGkYs8HCd7ixLB5Yb7TZzz98QmCTvg0vhR+7s2m29wbp9ADsJN/EI9Avr1Kxi0UbRXTrXnEfgvl68HHmAC0GQ==
dependencies: dependencies:
"@ethersproject/address" "^5" "@ethersproject/address" "^5"
"@web3-react/types" "^8.0.11-beta.0" "@web3-react/types" "^8.0.12-beta.0"
zustand "^4.0.0-beta.2" zustand "^4.0.0-beta.3"
"@web3-react/types@^6.0.7", "web3-react-types@npm:@web3-react/types@^6.0.7": "@web3-react/types@^6.0.7", "web3-react-types@npm:@web3-react/types@^6.0.7":
version "6.0.7" version "6.0.7"
resolved "https://registry.yarnpkg.com/@web3-react/types/-/types-6.0.7.tgz#34a6204224467eedc6123abaf55fbb6baeb2809f" resolved "https://registry.yarnpkg.com/@web3-react/types/-/types-6.0.7.tgz#34a6204224467eedc6123abaf55fbb6baeb2809f"
integrity sha512-ofGmfDhxmNT1/P/MgVa8IKSkCStFiyvXe+U5tyZurKdrtTDFU+wJ/LxClPDtFerWpczNFPUSrKcuhfPX1sI6+A== integrity sha512-ofGmfDhxmNT1/P/MgVa8IKSkCStFiyvXe+U5tyZurKdrtTDFU+wJ/LxClPDtFerWpczNFPUSrKcuhfPX1sI6+A==
"@web3-react/types@^8.0.11-beta.0": "@web3-react/types@^8.0.12-beta.0":
version "8.0.11-beta.0" version "8.0.12-beta.0"
resolved "https://registry.yarnpkg.com/@web3-react/types/-/types-8.0.11-beta.0.tgz#9b34ff16dfc8f37f2dbdbc69b89ba7fc66429827" resolved "https://registry.yarnpkg.com/@web3-react/types/-/types-8.0.12-beta.0.tgz#787c7ca8b4dfd66bed0e4801fef7039ba42db59e"
integrity sha512-KFaQn/5+1uA5+pPCGytqRK2zgdkgKJIL/KnzljkAoR3JuBkgqqAkbFlkJyiyzETAJPjwutKnl2st+ufZVPecTw== integrity sha512-BWz8RnpO0gdySjL62iURcn41ZDGxq4kokV2qbgqgASHwst5/uZ7RI2MJHTzn8vH0AUrCsg/y6E8oeTNsCAQvfg==
dependencies: dependencies:
zustand "^4.0.0-beta.2" zustand "^4.0.0-beta.3"
"@web3-react/url@^8.0.16-beta.0": "@web3-react/url@^8.0.17-beta.0":
version "8.0.16-beta.0" version "8.0.17-beta.0"
resolved "https://registry.yarnpkg.com/@web3-react/url/-/url-8.0.16-beta.0.tgz#28b51448072c9cac6b84ea5e5a8f11560a10a829" resolved "https://registry.yarnpkg.com/@web3-react/url/-/url-8.0.17-beta.0.tgz#c972c0e5445902d05a5562bef3cdd3e8f0a32ea5"
integrity sha512-9Lz2/yNottir9ymkH3QmNWr/I7yRS46LHj10TGh6n3ZReEa1116kL/pTw2U7OaP285ieKq93Hev+OaP7upxQOg== integrity sha512-03fGMa22wdabeCNrD2sIr/IePn+VoL0Bbpyz0jJrh9dUfrDEgsLrtcdmktLhfM4LCtGAye1W1FZpi/65mczSXA==
dependencies: dependencies:
"@ethersproject/providers" "^5" "@ethersproject/providers" "^5"
"@web3-react/types" "^8.0.11-beta.0" "@web3-react/types" "^8.0.12-beta.0"
"@web3-react/walletconnect@^8.0.25-beta.0": "@web3-react/walletconnect@^8.0.26-beta.0":
version "8.0.25-beta.0" version "8.0.26-beta.0"
resolved "https://registry.yarnpkg.com/@web3-react/walletconnect/-/walletconnect-8.0.25-beta.0.tgz#52634ea0cd160b7a28baa3164cd0e54b9dd62dd4" resolved "https://registry.yarnpkg.com/@web3-react/walletconnect/-/walletconnect-8.0.26-beta.0.tgz#0dd903bcb90c986876e142a948c8c92d51e65072"
integrity sha512-8On75QWiykvMuMuc6j+Qzb1o4CtJTJRGDNd1hFTYbj99SJJGUFgVJsvhJuHutm2Iv6NuC0wmeggb8S0iqYrahQ== integrity sha512-v7cdAmVjIxqMhH8xTuOFJOKphb089SOYHlk61GhOZCEyLcfbbc+rFuGkKiY0lFtD1/ET3cHJjRok2buXOJRn8g==
dependencies: dependencies:
"@web3-react/types" "^8.0.11-beta.0" "@web3-react/types" "^8.0.12-beta.0"
eventemitter3 "^4.0.7" eventemitter3 "^4.0.7"
"@webassemblyjs/ast@1.9.0": "@webassemblyjs/ast@1.9.0":
...@@ -19617,10 +19617,10 @@ use-sidecar@^1.0.1: ...@@ -19617,10 +19617,10 @@ use-sidecar@^1.0.1:
detect-node-es "^1.1.0" detect-node-es "^1.1.0"
tslib "^1.9.3" tslib "^1.9.3"
use-sync-external-store@1.0.0-rc.1-next-629036a9c-20220224: use-sync-external-store@1.0.0:
version "1.0.0-rc.1-next-629036a9c-20220224" version "1.0.0"
resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.0.0-rc.1-next-629036a9c-20220224.tgz#40cf472454789403c2de6c8471d177459d184dc1" resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.0.0.tgz#d98f4a9c2e73d0f958e7e2d2c2bfb5f618cbd8fd"
integrity sha512-IhuMl0apVVYsT3XPfV+0nuwf0T6+3d4YxQXV4tDRsGpSQcYVG4zoWwfX4zdtouUfuelYg4t2SEmFifIMrxPfIw== integrity sha512-AFVsxg5GkFg8GDcxnl+Z0lMAz9rE8DGJCc28qnBuQF7lac57B5smLcT37aXpXIIPz75rW4g3eXHPjhHwdGskOw==
use@^3.1.0: use@^3.1.0:
version "3.1.1" version "3.1.1"
...@@ -20707,9 +20707,9 @@ yocto-queue@^1.0.0: ...@@ -20707,9 +20707,9 @@ yocto-queue@^1.0.0:
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
zustand@^4.0.0-beta.2: zustand@^4.0.0-beta.3:
version "4.0.0-beta.2" version "4.0.0-beta.3"
resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.0.0-beta.2.tgz#27fdc32b62225cc18976c0cf8866ecee9a9f4a98" resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.0.0-beta.3.tgz#16dc82b48b65ed61fe2bae5dea4501f49bd450c7"
integrity sha512-aJ5ypnOwPIa/uSjdZv/oHChTWPplpFOG/hvWwzkR5ahFiPI5R6ifyObf8Fz1Vi6Obz2wY1N32fT2pNrpT2hzPw== integrity sha512-cVDcspaK0CXgVmGcXB/oenhT7EFaKqD46pTmg30ciMsOoQN0ZuxEuHzpNIy9ejah0gzBL8aqHN89IMT2uFNOaA==
dependencies: dependencies:
use-sync-external-store "1.0.0-rc.1-next-629036a9c-20220224" use-sync-external-store "1.0.0"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment