Skip to content

Commit 2667a89

Browse files
authored
chore(web3-react): fix connectEagerly for MetaMask mobile (#4101)
* chore(web3-react): fix connectEagerly for MetaMask mobile * fix
1 parent 6512960 commit 2667a89

File tree

3 files changed

+10
-15
lines changed

3 files changed

+10
-15
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"@web3-react/eip1193": "^8.0.26-beta.0",
139139
"@web3-react/empty": "^8.0.20-beta.0",
140140
"@web3-react/gnosis-safe": "^8.0.6-beta.0",
141-
"@web3-react/metamask": "^8.0.27-beta.0",
141+
"@web3-react/metamask": "^8.0.28-beta.0",
142142
"@web3-react/network": "^8.0.27-beta.0",
143143
"@web3-react/types": "^8.0.20-beta.0",
144144
"@web3-react/url": "^8.0.25-beta.0",

src/hooks/useEagerlyConnect.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { Connector } from '@web3-react/types'
2-
import { gnosisSafeConnection, injectedConnection, networkConnection } from 'connection'
3-
import { getConnection, getIsMetaMask } from 'connection/utils'
2+
import { gnosisSafeConnection, networkConnection } from 'connection'
3+
import { getConnection } from 'connection/utils'
44
import { useEffect } from 'react'
55
import { BACKFILLABLE_WALLETS } from 'state/connection/constants'
66
import { useAppSelector } from 'state/hooks'
7-
import { isMobile } from 'utils/userAgent'
87

98
async function connect(connector: Connector) {
109
try {
@@ -22,15 +21,11 @@ export default function useEagerlyConnect() {
2221
const selectedWalletBackfilled = useAppSelector((state) => state.user.selectedWalletBackfilled)
2322
const selectedWallet = useAppSelector((state) => state.user.selectedWallet)
2423

25-
const isMetaMask = getIsMetaMask()
26-
2724
useEffect(() => {
2825
connect(gnosisSafeConnection.connector)
2926
connect(networkConnection.connector)
3027

31-
if (isMobile && isMetaMask) {
32-
injectedConnection.connector.activate()
33-
} else if (selectedWallet) {
28+
if (selectedWallet) {
3429
connect(getConnection(selectedWallet).connector)
3530
} else if (!selectedWalletBackfilled) {
3631
BACKFILLABLE_WALLETS.map(getConnection)

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4789,10 +4789,10 @@
47894789
"@gnosis.pm/safe-apps-sdk" "^7.5.0"
47904790
"@web3-react/types" "^8.0.20-beta.0"
47914791

4792-
"@web3-react/metamask@^8.0.27-beta.0":
4793-
version "8.0.27-beta.0"
4794-
resolved "https://registry.yarnpkg.com/@web3-react/metamask/-/metamask-8.0.27-beta.0.tgz#a2871a776365c8aac4798cc28d53a0e6173f6688"
4795-
integrity sha512-x97x3sy/kKoqoGRZ8+Dld1XEEQ9iv6/bY2gyjadJL99RXoEcvAPbZqCWSJGSySyzTFkq7M7rounkuGmaCMC8lg==
4792+
"@web3-react/metamask@^8.0.28-beta.0":
4793+
version "8.0.28-beta.0"
4794+
resolved "https://registry.yarnpkg.com/@web3-react/metamask/-/metamask-8.0.28-beta.0.tgz#f7e9e0de446727a961745cbec75c8cbf6c961388"
4795+
integrity sha512-IXuVyj6vhRAhfGQ/sN4qgET8EEdqX844pB4kCDG9kjPD3LLm5kq47ykBosgTr9YCUtdHAXN0UaUimD0TbLMRFg==
47964796
dependencies:
47974797
"@metamask/detect-provider" "^1.2.0"
47984798
"@web3-react/types" "^8.0.20-beta.0"
@@ -15096,7 +15096,7 @@ react-redux@^8.0.2:
1509615096
"@types/use-sync-external-store" "^0.0.3"
1509715097
hoist-non-react-statics "^3.3.2"
1509815098
react-is "^18.0.0"
15099-
use-sync-external-store "^1.1.0"
15099+
use-sync-external-store "^1.0.0"
1510015100

1510115101
react-refresh@^0.8.3:
1510215102
version "0.8.3"
@@ -17782,7 +17782,7 @@ use-sidecar@^1.0.1:
1778217782
detect-node-es "^1.1.0"
1778317783
tslib "^1.9.3"
1778417784

17785-
use-sync-external-store@1.1.0:
17785+
use-sync-external-store@1.1.0, use-sync-external-store@^1.1.0:
1778617786
version "1.1.0"
1778717787
resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.1.0.tgz#3343c3fe7f7e404db70f8c687adf5c1652d34e82"
1778817788
integrity sha512-SEnieB2FPKEVne66NpXPd1Np4R1lTNKfjuy3XdIoPQKYBAFdzbzSZlSn1KJZUiihQLQC5Znot4SBz1EOTBwQAQ==

0 commit comments

Comments
 (0)