Skip to content

Commit 53cf91f

Browse files
Adamj1232Adamj1232
committed
Merge in latest develop
2 parents 9753a37 + bda3475 commit 53cf91f

File tree

10 files changed

+48
-27
lines changed

10 files changed

+48
-27
lines changed

‎docs/src/routes/docs/[...3]modules/[...1]core/+page.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ This is the core package that contains all of the UI and logic to be able to sea
1919

2020
:::admonition type="tip"
2121
_note: Release 2.24.0 moves the default position of the account center from topRight to bottomRight. To reset your application to topRight, include the following when initializing onboard:_
22+
2223
```typescript
2324
accountCenter: {
2425
desktop: {
@@ -31,6 +32,7 @@ _note: Release 2.24.0 moves the default position of the account center from topR
3132
}
3233
}
3334
```
35+
3436
:::
3537

3638
## Install
@@ -279,6 +281,10 @@ type ConnectModalOptions = {
279281
* Defaults to `https://www.blocknative.com/blog/metamask-wont-connect-web3-wallet-troubleshooting`
280282
*/
281283
wheresMyWalletLink?: string
284+
/**
285+
* Hide the where is my wallet link notice displayed in the connect modal
286+
*/
287+
hideWhereIsMyWallet?: boolean
282288
/**
283289
* @deprecated Has no effect unless `@web3-onboard/unstoppable-resolution`
284290
* package has been added and passed into the web3-onboard initialization

‎examples/with-sveltekit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"svelte-preprocess": "^5.0.1",
2828
"tslib": "^2.5.0",
2929
"typescript": "^4.9.5",
30-
"vite": "^4.0.4"
30+
"vite": "^4.0.5"
3131
},
3232
"type": "module",
3333
"dependencies": {

‎examples/with-sveltekit/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3992,10 +3992,10 @@ valtio@1.10.5:
39923992
proxy-compare "2.5.1"
39933993
use-sync-external-store "1.2.0"
39943994

3995-
vite@^4.0.4:
3996-
version "4.0.4"
3997-
resolved "https://registry.npmjs.org/vite/-/vite-4.0.4.tgz#4612ce0b47bbb233a887a54a4ae0c6e240a0da31"
3998-
integrity sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==
3995+
vite@^4.0.5:
3996+
version "4.0.5"
3997+
resolved "https://registry.yarnpkg.com/vite/-/vite-4.0.5.tgz#634f0bd1edf8bb8468ed42a1c3fd938c67d2f94b"
3998+
integrity sha512-7m87RC+caiAxG+8j3jObveRLqaWA/neAdCat6JAZwMkSWqFHOvg8MYe5fAQxVBRAuKAQ1S6XDh3CBQuLNbY33w==
39993999
dependencies:
40004000
esbuild "^0.16.3"
40014001
postcss "^8.4.20"

‎examples/with-vuejs/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2046,9 +2046,9 @@ scrypt-js@3.0.1:
20462046
integrity sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==
20472047

20482048
semver@^7.3.5, semver@^7.3.6:
2049-
version "7.3.7"
2050-
resolved "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"
2051-
integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
2049+
version "7.5.3"
2050+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
2051+
integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
20522052
dependencies:
20532053
lru-cache "^6.0.0"
20542054

‎packages/core/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
This is the core package that contains all of the UI and logic to be able to seamlessly connect user's wallets to your app and track the state of those wallets. Onboard no longer contains any wallet specific code, so wallets need to be passed in upon initialization.
88

99
_Tip: Release 2.24.0 moves the default position of the account center from topRight to bottomRight. To reset your application to topRight, include the following when initializing onboard:_
10+
1011
```typescript
1112
accountCenter: {
1213
desktop: {
@@ -246,6 +247,10 @@ type ConnectModalOptions = {
246247
* Defaults to `https://www.blocknative.com/blog/metamask-wont-connect-web3-wallet-troubleshooting`
247248
*/
248249
wheresMyWalletLink?: string
250+
/**
251+
* Hide the where is my wallet link notice displayed in the connect modal
252+
*/
253+
hideWhereIsMyWallet?: boolean
249254
/**
250255
* @deprecated Has no effect unless `@web3-onboard/unstoppable-resolution`
251256
* package has been added and passed into the web3-onboard initialization

‎packages/core/src/types.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ export interface AppState {
179179
locale: Locale
180180
notify: Notify
181181
notifications: Notification[]
182-
connect: ConnectModalOptions,
182+
connect: ConnectModalOptions
183183
appMetadata: AppMetadata
184184
}
185185

@@ -243,6 +243,10 @@ export type ConnectModalOptions = {
243243
* metamask-wont-connect-web3-wallet-troubleshooting`
244244
*/
245245
wheresMyWalletLink?: string
246+
/**
247+
* Hide the where is my wallet link notice displayed in the connect modal
248+
*/
249+
hideWhereIsMyWallet?: boolean
246250
/**
247251
* @deprecated Has no effect unless `@web3-onboard/unstoppable-resolution`
248252
* package has been added and passed into the web3-onboard initialization
@@ -429,7 +433,7 @@ export type Action =
429433
| AddNotificationAction
430434
| RemoveNotificationAction
431435
| UpdateAllWalletsAction
432-
| UpdateConnectModalAction
436+
| UpdateConnectModalAction
433437
| UpdateAppMetadataAction
434438

435439
export type AddChainsAction = { type: 'add_chains'; payload: Chain[] }

‎packages/core/src/validation.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ const connectModalOptions = Joi.object({
202202
autoConnectAllPreviousWallet: Joi.boolean(),
203203
iDontHaveAWalletLink: Joi.string(),
204204
wheresMyWalletLink: Joi.string(),
205+
hideWhereIsMyWallet: Joi.boolean(),
205206
disableUDResolution: Joi.boolean()
206207
})
207208

‎packages/core/src/views/connect/SelectingWallet.svelte

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,25 @@
8888
connectingWalletLabel !== wallet.label}
8989
/>
9090
{/each}
91-
<div class="notice-container">
92-
<Warning>
93-
<div>{$_('connect.selectingWallet.whyDontISeeMyWallet', {
94-
default: en.connect.selectingWallet.whyDontISeeMyWallet
95-
})}</div>
96-
<a
97-
class="link pointer"
98-
href={connect.wheresMyWalletLink || wheresMyWalletDefault}
99-
target="_blank"
100-
rel="noreferrer noopener">{$_('connect.selectingWallet.learnMore', {
101-
default: en.connect.selectingWallet.learnMore
102-
})}</a
103-
>
104-
</Warning>
105-
</div>
91+
{#if !connect.hideWhereIsMyWallet}
92+
<div class="notice-container">
93+
<Warning>
94+
<div>
95+
{$_('connect.selectingWallet.whyDontISeeMyWallet', {
96+
default: en.connect.selectingWallet.whyDontISeeMyWallet
97+
})}
98+
</div>
99+
<a
100+
class="link pointer"
101+
href={connect.wheresMyWalletLink || wheresMyWalletDefault}
102+
target="_blank"
103+
rel="noreferrer noopener"
104+
>{$_('connect.selectingWallet.learnMore', {
105+
default: en.connect.selectingWallet.learnMore
106+
})}</a
107+
>
108+
</Warning>
109+
</div>
110+
{/if}
106111
</div>
107112
</div>

‎packages/demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@web3-onboard/cede-store": "^2.0.2",
2828
"@web3-onboard/blocto": "2.0.0",
2929
"@web3-onboard/coinbase": "^2.2.3",
30-
"@web3-onboard/core": "^2.20.3",
30+
"@web3-onboard/core": "^2.20.4-alpha.2",
3131
"@web3-onboard/dcent": "^2.2.7",
3232
"@web3-onboard/enkrypt": "^2.0.3",
3333
"@web3-onboard/fortmatic": "^2.0.18",

‎packages/demo/src/App.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
],
294294
connect: {
295295
// disableClose: true,
296-
autoConnectLastWallet: true,
296+
// hideWhereIsMyWallet: true,
297297
autoConnectAllPreviousWallet: true
298298
},
299299
appMetadata: {

0 commit comments

Comments
 (0)