Skip to content

Commit e940409

Browse files
authored
Merge pull request #1992 from blocknative/release/2.24.16
Release 2.24.16
2 parents 3f6a901 + f9e7783 commit e940409

File tree

25 files changed

+1109
-344
lines changed

25 files changed

+1109
-344
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ package-lock.json
55
.rpt2_cache
66
.vscode
77
yarn-error.log
8-
.env
8+
.env

assets/metaMaskSDK-connect.gif

74.6 MB
Loading

docs/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"@docsearch/js": "^3.3.3",
2222
"@iconify-json/ri": "^1.0.0",
2323
"@sveltejs/adapter-static": "^2.0.2",
24-
"@sveltejs/kit": "^1.5.0",
25-
"@svelteness/kit-docs": "^1.1.3",
24+
"@sveltejs/kit": "^1.27.2",
25+
"@svelteness/kit-docs": "^1.1.5",
2626
"@tailwindcss/typography": "^0.5.9",
2727
"@types/animejs": "^3.1.7",
2828
"@types/react": "^18.0.37",
@@ -45,14 +45,14 @@
4545
"tslib": "^2.4.1",
4646
"typescript": "^5.0.4",
4747
"unplugin-icons": "^0.14.0",
48-
"vite": "^4.3.9"
48+
"vite": "^4.5.0"
4949
},
5050
"type": "module",
5151
"dependencies": {
5252
"@safe-global/safe-apps-provider": "^0.18.0",
5353
"@safe-global/safe-apps-sdk": "^8.1.0",
5454
"@web3-onboard/arcana-auth": "^2.0.0",
55-
"@web3-onboard/bitget": "^2.0.0-alpha.1",
55+
"@web3-onboard/bitget": "^2.0.0",
5656
"@web3-onboard/blocto": "^2.0.0",
5757
"@web3-onboard/cede-store": "^2.1.0",
5858
"@web3-onboard/coinbase": "^2.2.5",
@@ -65,12 +65,12 @@
6565
"@web3-onboard/gas": "^2.1.8",
6666
"@web3-onboard/gnosis": "^2.1.10",
6767
"@web3-onboard/infinity-wallet": "^2.0.4",
68-
"@web3-onboard/injected-wallets": "^2.10.6",
68+
"@web3-onboard/injected-wallets": "^2.10.9",
6969
"@web3-onboard/keepkey": "^2.3.7",
7070
"@web3-onboard/keystone": "^2.3.7",
7171
"@web3-onboard/ledger": "^2.5.1",
7272
"@web3-onboard/magic": "^2.1.7",
73-
"@web3-onboard/metamask": "^2.0.0-alpha.1",
73+
"@web3-onboard/metamask": "^2.0.1",
7474
"@web3-onboard/mew-wallet": "^2.0.4",
7575
"@web3-onboard/phantom": "^2.0.3",
7676
"@web3-onboard/portis": "^2.1.7",
@@ -82,7 +82,7 @@
8282
"@web3-onboard/trust": "^2.0.4",
8383
"@web3-onboard/uauth": "^2.1.1",
8484
"@web3-onboard/venly": "^2.0.0",
85-
"@web3-onboard/walletconnect": "^2.5.0-alpha.1",
85+
"@web3-onboard/walletconnect": "^2.5.0",
8686
"@web3-onboard/web3auth": "^2.2.3",
8787
"@web3-onboard/xdefi": "^2.0.4",
8888
"@web3-onboard/zeal": "^2.0.4",
74.6 MB
Loading

docs/src/routes/docs/[...1]overview/[...1]introduction/+page.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,13 @@ We recommend you add the [Core Repo](../../modules/core.md#install) and consider
170170
**SDK Wallets**
171171

172172
- [Arcana Auth](../../wallets/arcana.md#install)
173-
- [Blocto](../../docs/wallets/blocto.md#install)
173+
- [Blocto](../../wallets/blocto.md#install)
174174
- [Coinbase](../../wallets/coinbase.md#install)
175175
- [Fortmatic](../../wallets/fortmatic.md#install)
176176
- [Frame](../../wallets/frame.md#install)
177177
- [Safe](../../wallets/gnosis.md#install)
178178
- [Magic](../../wallets/magic.md#login-options)
179+
- [MetaMask](../../wallets/metamask.md#install)
179180
- [MEW](../../wallets/mewwallet.md#install)
180181
- [Portis](../../wallets/portis.md#install)
181182
- [Web3Auth](../../wallets/web3auth.md#install)

docs/src/routes/docs/[...3]modules/[...4]solid/+page.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ if (connectedWallet) {
7878

7979
### `init`
8080

81-
The `init` function initializes `web3-onboard` and makes it available to the `useOnboard()` composable. For references check out the [initialization docs for `@web3-onboard/core`](../core/README.md#initialization)
81+
The `init` function initializes `web3-onboard` and makes it available to the `useOnboard()` composable. For references check out the [initialization docs for `@web3-onboard/core`](/docs/modules/core#initialization)
8282

8383
#### Example usage
8484

@@ -126,11 +126,11 @@ const {
126126

127127
### `connectWallet`
128128

129-
Function to open the onboard modal and connect to a wallet provider. For reference check out the [connecting a wallet for `@web3-onboard/core`](../core/README.md#connecting-a-wallet)
129+
Function to open the onboard modal and connect to a wallet provider. For reference check out the [connecting a wallet for `@web3-onboard/core`](/docs/modules/core#connecting-a-wallet)
130130

131131
#### Example usage
132132

133-
```tsx
133+
```typescript
134134
function SampleConnect() {
135135
const { connectWallet } = useOnboard()
136136

@@ -144,7 +144,7 @@ Property that contains the current chain to which `connectedChain` is connected
144144

145145
#### Example usage
146146

147-
```tsx
147+
```typescript
148148
function SampleConnect() {
149149
const { connectedChain } = useOnboard()
150150

@@ -157,7 +157,7 @@ Property that contains the latest connected wallet
157157
158158
#### Example usage
159159
160-
```tsx
160+
```typescript
161161
function SampleConnect() {
162162
const { connectedWallet } = useOnboard()
163163
return <span>Connected Wallet: {connectedWallet()?.label}</span>
@@ -170,7 +170,7 @@ Function to disconnect the `connectedWallet`
170170
171171
#### Example usage
172172
173-
```tsx
173+
```typescript
174174
import { useOnboard } from '@web3-onboard/solid'
175175
function SampleConnect() {
176176
const { disconnectConnectedWallet } = useOnboard()
@@ -189,7 +189,7 @@ Function that returns the current chain a wallet is connected to
189189
190190
#### Example usage
191191
192-
```tsx
192+
```typescript
193193
import { useOnboard } from '@web3-onboard/solid'
194194
function SampleConnect() {
195195
const { getChain } = useOnboard()
@@ -203,7 +203,7 @@ Function to set the chain of a wallet
203203
204204
#### Example usage
205205
206-
```tsx
206+
```typescript
207207
import { useOnboard } from '@web3-onboard/solid'
208208
function SampleConnect() {
209209
const { setChain } = useOnboard()
@@ -222,7 +222,7 @@ Readonly boolean ref that tracks the status of setting the chain
222222
223223
#### Example usage
224224
225-
```tsx
225+
```typescript
226226
import { useOnboard } from '@web3-onboard/solid'
227227
function SampleConnect() {
228228
const { settingChain } = useOnboard()
@@ -236,7 +236,7 @@ Readonly ref that contains every wallet that has been connected
236236
237237
#### Example usage
238238
239-
```tsx
239+
```typescript
240240
import { useOnboard } from '@web3-onboard/solid'
241241
function SampleConnect() {
242242
const { wallets } = useOnboard()
@@ -260,7 +260,7 @@ Readonly ref that contains the last time that the user connected a wallet in mil
260260
261261
#### Example usage
262262
263-
```tsx
263+
```typescript
264264
import { useOnboard } from '@web3-onboard/solid'
265265
function SampleConnect() {
266266
const { lastConnectedTimestamp } = useOnboard()

docs/src/routes/docs/[...4]wallets/[...13]injected/+page.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ const injected = injectedModule({
339339
- MathWallet - _Desktop & Mobile_
340340
- Gamestop - _Desktop_
341341
- Bitkeep - _Desktop & Mobile_
342+
- BitGet Wallet - _Desktop & Mobile_
342343
- Sequence - _Desktop & Mobile_
343344
- Core - _Desktop_
344345
- Bitski - _Desktop & Mobile_

docs/src/routes/docs/[...4]wallets/[...18]metamask/+page.md

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,23 @@
22
title: MetaMask
33
---
44

5+
<script>
6+
import metaMaskSDKConnect from '$lib/assets/metaMaskSDK-connect.gif'
7+
</script>
8+
59
# {$frontmatter.title}
610

711
## Wallet module for connecting MetaMask Wallet SDK to web3-onboard
812

913
The MetaMask Web3-Onboard module provides a reliable, secure, and seamless connection from your dapp to the MetaMask browser extension and MetaMask Mobile.
1014
See [MetaMask SDK Developer Docs](https://github.com/MetaMask/metamask-sdk)
1115

16+
<img src="{metaMaskSDKConnect}" alt="MetaMask SDK connect flow gif"/>
17+
18+
:::admonition type=tip
19+
When utilizing this package alongside the `@web3-onboard/injected-wallets` module, ensure to list this package prior to the initialized injected-wallets module within the wallets list of the Web3-Onboard init.
20+
21+
This order prioritizes the SDK when a MetaMask browser wallet is detected, allowing the SDK to take precedence.
1222
:::
1323

1424
## Install
@@ -17,14 +27,14 @@ See [MetaMask SDK Developer Docs](https://github.com/MetaMask/metamask-sdk)
1727
<TabPanel value="yarn">
1828

1929
```sh copy
20-
yarn add @web3-onboard/metamask
30+
yarn add @web3-onboard/core @web3-onboard/metamask
2131
```
2232

2333
</TabPanel>
2434
<TabPanel value="npm">
2535

2636
```sh copy
27-
npm install @web3-onboard/metamask
37+
npm install @web3-onboard/core @web3-onboard/metamask
2838
```
2939

3040
</TabPanel>
@@ -36,14 +46,14 @@ npm install @web3-onboard/metamask
3646
// For a complete list of options check https://github.com/MetaMask/metamask-sdk
3747
interface MetaMaskSDKOptions {
3848
dappMetadata: {
39-
url?: string;
40-
name?: string;
41-
base64Icon?: string;
42-
},
49+
url?: string
50+
name?: string
51+
base64Icon?: string
52+
}
4353
/**
4454
* If MetaMask browser extension is detected, directly use it without prompting the user.
4555
*/
46-
extensionOnly?: boolean;
56+
extensionOnly?: boolean
4757
}
4858
```
4959

@@ -66,6 +76,8 @@ const onboard = Onboard({
6676
wallets: [
6777
metamaskSDKWallet
6878
//... other wallets
79+
// Make sure to pass in before or above the injected-wallets module
80+
injectedWalletModule
6981
]
7082
})
7183

0 commit comments

Comments
 (0)