Skip to content

Commit 4ccb8db

Browse files
committed
Merge branch 'develop' of github.com:blocknative/web3-onboard into develop
2 parents b26f216 + 76a3823 commit 4ccb8db

File tree

5 files changed

+26
-30
lines changed

5 files changed

+26
-30
lines changed

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"@web3-onboard/keystone": "^2.3.7",
7373
"@web3-onboard/ledger": "^2.6.0",
7474
"@web3-onboard/magic": "^2.1.7",
75-
"@web3-onboard/metamask": "^2.0.6",
75+
"@web3-onboard/metamask": "^2.0.7-alpha.1",
7676
"@web3-onboard/mew-wallet": "^2.0.4",
7777
"@web3-onboard/phantom": "^2.0.3",
7878
"@web3-onboard/portis": "^2.1.7",

packages/demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@web3-onboard/keystone": "^2.3.8",
4848
"@web3-onboard/ledger": "^2.6.0",
4949
"@web3-onboard/magic": "^2.1.6",
50-
"@web3-onboard/metamask": "^2.0.6",
50+
"@web3-onboard/metamask": "^2.0.7-alpha.1",
5151
"@web3-onboard/mew-wallet": "^2.0.3",
5252
"@web3-onboard/phantom": "^2.0.3",
5353
"@web3-onboard/portis": "^2.1.6",

packages/metamask/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@web3-onboard/metamask",
3-
"version": "2.0.6",
3+
"version": "2.0.7-alpha-1",
44
"description": "MetaMask SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
55
"keywords": [
66
"Ethereum",
@@ -60,7 +60,7 @@
6060
"typescript": "^5.2.2"
6161
},
6262
"dependencies": {
63-
"@metamask/sdk": "^0.18.6",
63+
"@metamask/sdk": "^0.20.3",
6464
"@web3-onboard/common": "^2.3.3"
6565
},
6666
"engines": {

packages/metamask/src/index.ts

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function metamask({
4242
label: 'MetaMask',
4343
getIcon: async () => (await import('./icon.js')).default,
4444
getInterface: async ({ appMetadata }) => {
45-
sdk = (window as any).mmsdk || sdk; // Prevent conflict with existing mmsdk instances
45+
sdk = (window as any).mmsdk || sdk // Prevent conflict with existing mmsdk instances
4646

4747
if (sdk) {
4848
// Prevent re-initializing instance as it causes issues with MetaMask sdk mobile provider.
@@ -57,14 +57,11 @@ function metamask({
5757
const appLogoUrl = `data:image/svg+xml;base64,${base64}`
5858
const imports = await importPromise
5959

60-
if (
61-
!imports?.MetaMaskSDKConstructor ||
62-
!imports?.createEIP1193Provider
63-
) {
60+
if (!imports?.MetaMaskSDKConstructor) {
6461
throw new Error('Error importing and initializing MetaMask SDK')
6562
}
6663

67-
const { createEIP1193Provider, MetaMaskSDKConstructor } = imports
64+
const { MetaMaskSDKConstructor } = imports
6865

6966
sdk = new MetaMaskSDKConstructor({
7067
...options,
@@ -76,13 +73,12 @@ function metamask({
7673
_source: 'web3-onboard'
7774
})
7875

79-
await sdk.init();
80-
const provider = sdk.getProvider();
76+
await sdk.init()
77+
const provider = sdk.getProvider()
8178

82-
const _disconnect = sdk.disconnect
83-
if(provider) {
84-
(provider as any).disconnect = () => {
85-
sdk?.terminate();
79+
if (provider) {
80+
;(provider as any).disconnect = () => {
81+
sdk?.terminate()
8682
}
8783
}
8884

yarn.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2459,10 +2459,10 @@
24592459
resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-3.1.1.tgz#e89b840a7af8097a8ed4953d8dc8470d1302d3ef"
24602460
integrity sha512-ihb3B0T/wJm1eUuArYP4lCTSEoZsClHhuWyfo/kMX3m/odpqNcPfsz5O2A3NT7dXCAgWPGDQGPqygCpgeniKMw==
24612461

2462-
"@metamask/sdk-communication-layer@0.18.5":
2463-
version "0.18.5"
2464-
resolved "https://registry.yarnpkg.com/@metamask/sdk-communication-layer/-/sdk-communication-layer-0.18.5.tgz#4d153512172e6d0ff940f8ff6c50c2796ba49ceb"
2465-
integrity sha512-WMf9oJa3rAimjCXMAaaRVFPD0Q6dfZR0r9037KCpD5g9SlVh+TeMISfdQCEKAyhXP3d4CGxmp/Kib8C3mn2YLw==
2462+
"@metamask/sdk-communication-layer@0.20.2":
2463+
version "0.20.2"
2464+
resolved "https://registry.yarnpkg.com/@metamask/sdk-communication-layer/-/sdk-communication-layer-0.20.2.tgz#7f7fd334b2d26abd1a5a1ec1ffadf823a9589344"
2465+
integrity sha512-TN+whYbCClFSkx52Ild1RcjoRyz8YZgwNvZeooIcZIvCfBM6U9W5273KGiY7WLc/oO4KKmFk17d7vMO4gNvhhw==
24662466
dependencies:
24672467
bufferutil "^4.0.8"
24682468
date-fns "^2.29.3"
@@ -2481,10 +2481,10 @@
24812481
utf-8-validate "^6.0.3"
24822482
uuid "^8.3.2"
24832483

2484-
"@metamask/sdk-install-modal-web@0.18.5":
2485-
version "0.18.5"
2486-
resolved "https://registry.yarnpkg.com/@metamask/sdk-install-modal-web/-/sdk-install-modal-web-0.18.5.tgz#f074f0c9a9c4d7272004ebf9792ce816418f13e0"
2487-
integrity sha512-Wygc0dgr1PwIA/Sg9WW9QWAsQr4G2GV6iveXt2xw8VKW/9cRORWqYukH1NZLr71hBKzi9AKYBU54Tk5Dfg41zg==
2484+
"@metamask/sdk-install-modal-web@0.20.2":
2485+
version "0.20.2"
2486+
resolved "https://registry.yarnpkg.com/@metamask/sdk-install-modal-web/-/sdk-install-modal-web-0.20.2.tgz#1cf0eb3c26291de7598190878fa9a893c4eb2d66"
2487+
integrity sha512-0QiaZhV15AGdN1zU2jfTI32eC3YkwEpzDfR9+oiZ9bd2G72c6lYBhTsmDGUd01aP6A+bqJR5PjI8Wh2AWtoLeA==
24882488
dependencies:
24892489
qr-code-styling "^1.6.0-rc.1"
24902490

@@ -2523,15 +2523,15 @@
25232523
util "^0.12.4"
25242524
uuid "^8.3.2"
25252525

2526-
"@metamask/sdk@^0.18.6":
2527-
version "0.18.6"
2528-
resolved "https://registry.yarnpkg.com/@metamask/sdk/-/sdk-0.18.6.tgz#ac6cfb80d35b179ee6efd9b2b2f6b67e27422e0a"
2529-
integrity sha512-ZT8e4BrcWrm44apLb412WR0fDsgeaS8UlI1c0wKRUPu1w/UntpXuUVO+EaY8WDlnOPAiAsjyqWKey64/DfvbXQ==
2526+
"@metamask/sdk@^0.20.3":
2527+
version "0.20.3"
2528+
resolved "https://registry.yarnpkg.com/@metamask/sdk/-/sdk-0.20.3.tgz#73851d68ffe5d45c1872c024182922530b187b7a"
2529+
integrity sha512-HZ9NwA+LxiXzuy0YWbWsuD4xejQtp85bhcCAf8UgpA/0dOyF3RS4dKDdBBXSyRgk3RWPjeJgHxioaH4CmBmiRA==
25302530
dependencies:
25312531
"@metamask/onboarding" "^1.0.1"
25322532
"@metamask/providers" "^15.0.0"
2533-
"@metamask/sdk-communication-layer" "0.18.5"
2534-
"@metamask/sdk-install-modal-web" "0.18.5"
2533+
"@metamask/sdk-communication-layer" "0.20.2"
2534+
"@metamask/sdk-install-modal-web" "0.20.2"
25352535
"@types/dom-screen-wake-lock" "^1.0.0"
25362536
bowser "^2.9.0"
25372537
cross-fetch "^4.0.0"

0 commit comments

Comments
 (0)