diff --git a/package-lock.json b/package-lock.json index 0e188eab4..b248a261f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5782,9 +5782,9 @@ } }, "node_modules/@toruslabs/openlogin": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/@toruslabs/openlogin/-/openlogin-4.5.3.tgz", - "integrity": "sha512-VOaQeigpHFK9Sg+OBiGkC9ZV5Aa+I6OX/HGBreKuuElR150yWKRigxoKfN/W/Z2c9EWYMsDsGV2VjtLVaBby+g==", + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/@toruslabs/openlogin/-/openlogin-4.5.4.tgz", + "integrity": "sha512-nNN4JRjAvMZ/Dt2I50C2kJtAJyKX7Q198lcbj5WjuQZJ95ZaDKhcMCSxAK60LZTvtJSFK0XpvZ7yVDg4ZiY8Jw==", "dependencies": { "@toruslabs/broadcast-channel": "^7.0.0", "@toruslabs/eccrypto": "^3.0.0", @@ -5922,9 +5922,9 @@ } }, "node_modules/@toruslabs/torus-embed": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@toruslabs/torus-embed/-/torus-embed-2.1.0.tgz", - "integrity": "sha512-QDHYpy7YsH3Wxx692fa1jQM9xwV45gr5rHprhTjsfyjv48ZUtILsWW+idklmGultjgCOysCcDiUQfkVjWXZ8SQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@toruslabs/torus-embed/-/torus-embed-2.1.1.tgz", + "integrity": "sha512-Qwtlv8royI0ixZ/yqHPLAkuVUUy0jU38QcitEpMBAX4YYZ+oSpHXZ2oFaAGrXhPqAuP2dT6a4W1x8hIfFlYEXQ==", "dependencies": { "@toruslabs/http-helpers": "^4.0.0", "@toruslabs/openlogin-jrpc": "^4.5.1", @@ -6336,9 +6336,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.9", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.9.tgz", - "integrity": "sha512-pL3JAesUkF7PEQGxh5XOwdXGV907te6m1/Qe1ERJLgomojS6Ne790QiA7GUl434JEkFA2aAaB6qJ5z4e1zJn/w==", + "version": "18.2.11", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.11.tgz", + "integrity": "sha512-+hsJr9hmwyDecSMQAmX7drgbDpyE+EgSF6t7+5QEBAn1tQK7kl1vWZ4iRf6SjQ8lk7dyEULxUmZOIpN0W5baZA==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -16801,15 +16801,6 @@ "node": ">=0.10.0" } }, - "node_modules/klona": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", - "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, "node_modules/language-subtag-registry": { "version": "0.3.22", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", @@ -22429,14 +22420,13 @@ } }, "node_modules/postcss-loader": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.2.tgz", - "integrity": "sha512-c7qDlXErX6n0VT+LUsW+nwefVtTu3ORtVvK8EXuUIDcxo+b/euYqpuHlJAvePb0Af5e8uMjR/13e0lTuYifaig==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.3.3.tgz", + "integrity": "sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==", "dev": true, "dependencies": { - "cosmiconfig": "^8.1.3", + "cosmiconfig": "^8.2.0", "jiti": "^1.18.2", - "klona": "^2.0.6", "semver": "^7.3.8" }, "engines": { @@ -29856,7 +29846,7 @@ "version": "6.0.1-alpha.0", "license": "ISC", "dependencies": { - "@toruslabs/openlogin": "^4.5.3", + "@toruslabs/openlogin": "^4.5.4", "@toruslabs/openlogin-utils": "^4.5.1", "@web3auth/base": "^6.0.1-alpha.0", "@web3auth/base-provider": "^6.0.1-alpha.0", @@ -29944,7 +29934,7 @@ "version": "6.0.1-alpha.0", "license": "ISC", "dependencies": { - "@toruslabs/torus-embed": "^2.1.0", + "@toruslabs/torus-embed": "^2.1.1", "@web3auth/base": "^6.0.1-alpha.0", "@web3auth/base-evm-adapter": "^6.0.1-alpha.0" }, @@ -30032,7 +30022,7 @@ "license": "ISC", "dependencies": { "@toruslabs/http-helpers": "^4.0.0", - "@toruslabs/openlogin": "^4.5.3", + "@toruslabs/openlogin": "^4.5.4", "@toruslabs/openlogin-jrpc": "^4.5.1", "@toruslabs/openlogin-utils": "^4.5.1", "jwt-decode": "^3.1.2", @@ -30089,7 +30079,7 @@ "version": "6.0.2-alpha.0", "license": "ISC", "dependencies": { - "@toruslabs/openlogin": "^4.5.3", + "@toruslabs/openlogin": "^4.5.4", "@toruslabs/openlogin-jrpc": "^4.5.1", "@toruslabs/openlogin-utils": "^4.5.1", "@web3auth/base": "^6.0.1-alpha.0", @@ -30143,7 +30133,7 @@ "version": "6.0.2-alpha.0", "license": "ISC", "dependencies": { - "@toruslabs/torus-embed": "^2.1.0", + "@toruslabs/torus-embed": "^2.1.1", "@web3auth/base": "^6.0.1-alpha.0", "@web3auth/base-plugin": "^6.0.1-alpha.0", "@web3auth/no-modal": "^6.0.2-alpha.0", @@ -30276,7 +30266,7 @@ "license": "ISC", "dependencies": { "@toruslabs/http-helpers": "^4.0.0", - "@toruslabs/openlogin": "^4.5.3", + "@toruslabs/openlogin": "^4.5.4", "@toruslabs/openlogin-jrpc": "^4.5.1", "@toruslabs/openlogin-utils": "^4.5.1", "@web3auth/base": "^6.0.1-alpha.0", @@ -30299,7 +30289,7 @@ "@toruslabs/isomorphic-style-loader": "^5.3.3", "@types/lodash.clonedeep": "^4.5.7", "@types/lodash.merge": "^4.6.7", - "@types/react": "^18.2.9", + "@types/react": "^18.2.11", "@types/react-dom": "^18.2.4", "@typescript-eslint/eslint-plugin": "^5.59.9", "autoprefixer": "^10.4.14", @@ -30311,7 +30301,7 @@ "eslint-plugin-simple-import-sort": "^10.0.0", "live-server": "^1.2.2", "postcss": "^8.4.24", - "postcss-loader": "^7.3.2", + "postcss-loader": "^7.3.3", "postcss-prefix-selector": "^1.16.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/adapters/metamask-adapter/src/metamaskAdapter.ts b/packages/adapters/metamask-adapter/src/metamaskAdapter.ts index 40b60206e..f298f7a03 100644 --- a/packages/adapters/metamask-adapter/src/metamaskAdapter.ts +++ b/packages/adapters/metamask-adapter/src/metamaskAdapter.ts @@ -75,6 +75,25 @@ class MetamaskAdapter extends BaseEvmAdapter { async connect(): Promise { super.checkConnectionRequirements(); if (!this.metamaskProvider) throw WalletLoginError.notConnectedError("Not able to connect with metamask"); + const { ethereum } = window as any; + const isPhantom = Boolean("isPhantom" in ethereum); + // check which is the active provider + if (ethereum && ethereum.isMetaMask && isPhantom) { + // this means phantom is the active provider. + if (ethereum.providers && ethereum.providers.length > 0) { + const provider = ethereum.providers.find((p: any) => p.isMetaMask && !p.overrideIsMetaMask); + + if (provider) { + ethereum.setProvider(provider); + } + } + } else if (ethereum && (ethereum.providers || []).length > 0) { + // this means that there are another providers than metamask (like coinbase). + const provider = ethereum.providers.find((p: any) => p.isMetaMask); + if (provider) { + ethereum.setSelectedProvider(provider); + } + } this.status = ADAPTER_STATUS.CONNECTING; this.emit(ADAPTER_EVENTS.CONNECTING, { adapter: WALLET_ADAPTERS.METAMASK }); diff --git a/packages/adapters/openlogin-adapter/package.json b/packages/adapters/openlogin-adapter/package.json index 4d2faefe1..f6943b672 100644 --- a/packages/adapters/openlogin-adapter/package.json +++ b/packages/adapters/openlogin-adapter/package.json @@ -39,7 +39,7 @@ "@types/lodash.merge": "^4.6.7" }, "dependencies": { - "@toruslabs/openlogin": "^4.5.3", + "@toruslabs/openlogin": "^4.5.4", "@toruslabs/openlogin-utils": "^4.5.1", "@web3auth/base": "^6.0.1-alpha.0", "@web3auth/base-provider": "^6.0.1-alpha.0", diff --git a/packages/adapters/openlogin-adapter/src/openloginAdapter.ts b/packages/adapters/openlogin-adapter/src/openloginAdapter.ts index ca40a3d96..35faeb6be 100644 --- a/packages/adapters/openlogin-adapter/src/openloginAdapter.ts +++ b/packages/adapters/openlogin-adapter/src/openloginAdapter.ts @@ -1,4 +1,4 @@ -import OpenLogin, { getHashQueryParams } from "@toruslabs/openlogin"; +import OpenLogin from "@toruslabs/openlogin"; import { LoginParams, OPENLOGIN_NETWORK, OpenLoginOptions, SUPPORTED_KEY_CURVES, UX_MODE } from "@toruslabs/openlogin-utils"; import { ADAPTER_CATEGORY, @@ -86,14 +86,8 @@ export class OpenloginAdapter extends BaseAdapter { super.checkInitializationRequirements(); if (!this.clientId) throw WalletInitializationError.invalidParams("clientId is required before openlogin's initialization"); if (!this.openloginOptions) throw WalletInitializationError.invalidParams("openloginOptions is required before openlogin's initialization"); - let isRedirectResult = false; + const isRedirectResult = this.openloginOptions.uxMode === UX_MODE.REDIRECT; - if (this.openloginOptions.uxMode === UX_MODE.REDIRECT) { - const redirectResult = getHashQueryParams(); - if (Object.keys(redirectResult).length > 0 && redirectResult.sessionId) { - isRedirectResult = true; - } - } this.openloginOptions = { ...this.openloginOptions, replaceUrlOnRedirect: isRedirectResult, diff --git a/packages/adapters/torus-evm-adapter/package.json b/packages/adapters/torus-evm-adapter/package.json index 8351985a6..290529dab 100644 --- a/packages/adapters/torus-evm-adapter/package.json +++ b/packages/adapters/torus-evm-adapter/package.json @@ -35,7 +35,7 @@ "@babel/runtime": "^7.x" }, "dependencies": { - "@toruslabs/torus-embed": "^2.1.0", + "@toruslabs/torus-embed": "^2.1.1", "@web3auth/base": "^6.0.1-alpha.0", "@web3auth/base-evm-adapter": "^6.0.1-alpha.0" }, diff --git a/packages/adapters/wallet-connect-v2-adapter/package.json b/packages/adapters/wallet-connect-v2-adapter/package.json index 2f4e5ccf3..ccf294a79 100644 --- a/packages/adapters/wallet-connect-v2-adapter/package.json +++ b/packages/adapters/wallet-connect-v2-adapter/package.json @@ -45,9 +45,9 @@ }, "devDependencies": { "@types/lodash.merge": "^4.6.7", - "@walletconnect/sign-client": "^2.7.8", - "@walletconnect/types": "^2.7.8", - "@walletconnect/utils": "^2.7.8" + "@walletconnect/sign-client": "^2.8.0", + "@walletconnect/types": "^2.8.0", + "@walletconnect/utils": "^2.8.0" }, "lint-staged": { "!(*d).ts": [ diff --git a/packages/base/package.json b/packages/base/package.json index 7d31ac791..c9428e6b5 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@toruslabs/http-helpers": "^4.0.0", - "@toruslabs/openlogin": "^4.5.3", + "@toruslabs/openlogin": "^4.5.4", "@toruslabs/openlogin-jrpc": "^4.5.1", "@toruslabs/openlogin-utils": "^4.5.1", "jwt-decode": "^3.1.2", diff --git a/packages/no-modal/package.json b/packages/no-modal/package.json index 7608f3233..88a821caf 100644 --- a/packages/no-modal/package.json +++ b/packages/no-modal/package.json @@ -35,7 +35,7 @@ "@babel/runtime": "^7.x" }, "dependencies": { - "@toruslabs/openlogin": "^4.5.3", + "@toruslabs/openlogin": "^4.5.4", "@toruslabs/openlogin-jrpc": "^4.5.1", "@toruslabs/openlogin-utils": "^4.5.1", "@web3auth/base": "^6.0.1-alpha.0", diff --git a/packages/plugins/torus-wallet-connector-plugin/package.json b/packages/plugins/torus-wallet-connector-plugin/package.json index 13d92da45..25fc7d284 100644 --- a/packages/plugins/torus-wallet-connector-plugin/package.json +++ b/packages/plugins/torus-wallet-connector-plugin/package.json @@ -35,7 +35,7 @@ "eth-rpc-errors": "^4.0.3" }, "dependencies": { - "@toruslabs/torus-embed": "^2.1.0", + "@toruslabs/torus-embed": "^2.1.1", "@web3auth/base": "^6.0.1-alpha.0", "@web3auth/base-plugin": "^6.0.1-alpha.0", "@web3auth/no-modal": "^6.0.2-alpha.0", diff --git a/packages/ui/package.json b/packages/ui/package.json index c11f317c9..47736c2ae 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -47,7 +47,7 @@ "@toruslabs/isomorphic-style-loader": "^5.3.3", "@types/lodash.clonedeep": "^4.5.7", "@types/lodash.merge": "^4.6.7", - "@types/react": "^18.2.9", + "@types/react": "^18.2.11", "@types/react-dom": "^18.2.4", "@typescript-eslint/eslint-plugin": "^5.59.9", "autoprefixer": "^10.4.14", @@ -59,7 +59,7 @@ "eslint-plugin-simple-import-sort": "^10.0.0", "live-server": "^1.2.2", "postcss": "^8.4.24", - "postcss-loader": "^7.3.2", + "postcss-loader": "^7.3.3", "postcss-prefix-selector": "^1.16.0", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -70,7 +70,7 @@ }, "dependencies": { "@toruslabs/http-helpers": "^4.0.0", - "@toruslabs/openlogin": "^4.5.3", + "@toruslabs/openlogin": "^4.5.4", "@toruslabs/openlogin-jrpc": "^4.5.1", "@toruslabs/openlogin-utils": "^4.5.1", "@web3auth/base": "^6.0.1-alpha.0",