Skip to content

Commit 2787f8c

Browse files
Adamj1232Adamj1232
authored
Merge branch 'develop' into feat-keplr
2 parents bdaef45 + a4d30b9 commit 2787f8c

File tree

14 files changed

+121
-72
lines changed

14 files changed

+121
-72
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ For full documentation, check out the README.md for each package or the [docs pa
128128
- [Blocto](packages/blocto/README.md)
129129
- [Particle Network](packages/particle-network/README.md)
130130
- [MetaMask](packages/metamask/README.md)
131+
- [Bitget](packages/bitget/README.md)
131132

132133
**Hardware Wallets**
133134

‎docs/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"prettier-plugin-svelte": "^2.8.1",
3737
"react": "^18.2.0",
3838
"react-dom": "^18.2.0",
39-
"rollup-plugin-polyfill-node": "^0.13.0",
4039
"shiki": "^0.12.0",
4140
"stream-browserify": "^3.0.0",
4241
"stream-http": "^3.2.0",
@@ -46,14 +45,16 @@
4645
"tslib": "^2.4.1",
4746
"typescript": "^5.4.5",
4847
"unplugin-icons": "^0.14.0",
49-
"vite": "^4.5.3"
48+
"vite": "^4.5.3",
49+
"vite-plugin-node-polyfills": "^0.22.0"
5050
},
5151
"type": "module",
5252
"dependencies": {
5353
"@safe-global/safe-apps-provider": "^0.18.0",
5454
"@safe-global/safe-apps-sdk": "^8.1.0",
5555
"@web3-onboard/bitget": "^2.1.1",
5656
"@web3-onboard/blocto": "^2.1.1",
57+
"@web3-onboard/capsule": "^2.3.0-alpha.1",
5758
"@web3-onboard/cede-store": "^2.3.1",
5859
"@web3-onboard/coinbase": "^2.3.1",
5960
"@web3-onboard/core": "^2.22.1",

‎docs/src/lib/services/onboard.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const intiOnboard = async (theme) => {
5959
const { default: bloctoModule } = await import('@web3-onboard/blocto')
6060
const { default: venlyModule } = await import('@web3-onboard/venly')
6161
const { default: bitgetModule } = await import('@web3-onboard/bitget')
62-
// // const { default: capsuleModule, Environment } = await import('@web3-onboard/capsule')
62+
const { default: capsuleModule, Environment } = await import('@web3-onboard/capsule')
6363
const { default: particleAuthModule } = await import('@web3-onboard/particle-network')
6464
const INFURA_ID = '8b60d52405694345a99bcb82e722e0af'
6565

@@ -133,10 +133,10 @@ const intiOnboard = async (theme) => {
133133
environment: 'staging'
134134
})
135135

136-
// // const capsule = capsuleModule({
137-
// // environment: Environment.DEVELOPMENT,
138-
// // apiKey: '992bbd9146d5de8ad0419f141d9a7ca7'
139-
// // })
136+
const capsule = capsuleModule({
137+
environment: Environment.DEVELOPMENT,
138+
apiKey: '992bbd9146d5de8ad0419f141d9a7ca7'
139+
})
140140

141141
const particle = particleAuthModule({
142142
projectId: 'b385ccf0-73c3-485a-9941-159b7855b806',
@@ -176,8 +176,8 @@ const intiOnboard = async (theme) => {
176176
infinityWallet,
177177
blocto,
178178
particle,
179-
venly
180-
// capsule
179+
venly,
180+
capsule
181181
],
182182
chains: [
183183
{

‎docs/vite.config.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { sveltekit } from '@sveltejs/kit/vite'
22
import icons from 'unplugin-icons/vite'
33
import kitDocs from '@svelteness/kit-docs/node'
4-
import nodePolyfills from 'rollup-plugin-polyfill-node'
4+
import {nodePolyfills} from 'vite-plugin-node-polyfills'
55
import react from '@vitejs/plugin-react';
66

77
/** @type {import('vite').UserConfig} */
88
const config = {
9-
plugins: [react(), icons({ compiler: 'svelte' }), kitDocs(), sveltekit()],
9+
plugins: [react(), icons({ compiler: 'svelte' }), kitDocs(), sveltekit(), nodePolyfills()],
1010
resolve: {
1111
alias: {
1212
crypto: 'crypto-browserify',
@@ -19,7 +19,6 @@ const config = {
1919
build: {
2020
rollupOptions: {
2121
external: ['@web3-onboard/*'],
22-
plugins: [nodePolyfills({ crypto: true, http: true })]
2322
},
2423
commonjsOptions: {
2524
transformMixedEsModules: true

‎packages/capsule/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@web3-onboard/capsule",
3-
"version": "2.2.0",
3+
"version": "2.3.0-alpha.1",
44
"description": "Capsule 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
"module": "dist/index.js",
66
"browser": "dist/index.js",
@@ -57,8 +57,8 @@
5757
],
5858
"dependencies": {
5959
"@tanstack/react-query": "^5.29.0",
60-
"@usecapsule/react-sdk": "^3.7.0",
61-
"@usecapsule/wagmi-v2-integration": "^2.8.0",
60+
"@usecapsule/react-sdk": "^3.17.0",
61+
"@usecapsule/wagmi-v2-integration": "^2.18.0",
6262
"@wagmi/chains": "^1.8.0",
6363
"@web3-onboard/common": "^2.4.1",
6464
"react-dom": "^18.2.0",

‎packages/demo/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"@web3-onboard/bitget": "2.1.1",
3333
"@web3-onboard/blocto": "^2.1.1",
3434
"@web3-onboard/bloom": "2.0.0",
35+
"@web3-onboard/capsule": "^2.3.0-alpha.1",
3536
"@web3-onboard/cede-store": "^2.3.1",
3637
"@web3-onboard/core": "2.22.2",
3738
"@web3-onboard/coinbase": "^2.4.1",

‎packages/demo/src/App.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
environment: Environment.DEVELOPMENT,
278278
apiKey: '992bbd9146d5de8ad0419f141d9a7ca7',
279279
modalProps: {
280-
oAuthMethods: [OAuthMethod.GOOGLE, OAuthMethod.TWITTER]
280+
oAuthMethods: [OAuthMethod.GOOGLE, OAuthMethod.TWITTER, OAuthMethod.APPLE,OAuthMethod.DISCORD]
281281
},
282282
constructorOpts: {
283283
portalBackgroundColor: '#5e5656',

‎packages/injected/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@web3-onboard/injected-wallets",
3-
"version": "2.11.1",
3+
"version": "2.11.2-alpha.1",
44
"description": "Injected wallet module for connecting browser extension and mobile wallets 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",

‎packages/injected/src/icons/trust.ts

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
export default `
2-
<svg width="100%" height="100%"
3-
viewBox="0 0 40 40"
4-
xmlns="http://www.w3.org/2000/svg"
5-
>
6-
<path d="m1.36250526 6.825c-1.36250526 2.675-1.36250526 6.175-1.36250526 13.175s0 10.5 1.36250526 13.1750526c1.2 2.35 3.11249474 4.2624211 5.46249474 5.4624211 2.675 1.3625263 6.175 1.3625263 13.175 1.3625263s10.5 0 13.1750526-1.3625263c2.35-1.2 4.2624211-3.1124211 5.4624211-5.4624211 1.3625263-2.6750526 1.3625263-6.1750526 1.3625263-13.1750526s0-10.5-1.3625263-13.175c-1.2-2.35-3.1124211-4.26249474-5.4624211-5.46249474-2.6750526-1.36250526-6.1750526-1.36250526-13.1750526-1.36250526s-10.5 0-13.175 1.36250526c-2.35 1.2-4.26249474 3.11249474-5.46249474 5.46249474zm28.61875794 3.9624737c.35 0 .6812631.1437895.9250526.3875789.2436842.25.3812631.5874737.3751557.9311579-.0626294 3.7250527-.2064189 6.5750527-.4751557 8.8312632-.2625263 2.2563158-.6563158 3.9312631-1.25 5.2875789-.4.9062106-.8937895 1.6562106-1.4750526 2.2936842-.7812632.8437895-1.6749474 1.4563158-2.65 2.037579-.4168421.2492631-.8502106.4953684-1.3048421.7535789-.97.5508421-2.0365264 1.1565264-3.2451579 1.9651579-.4374737.2936842-1.0062106.2936842-1.4436843 0-1.2271578-.8181052-2.3077894-1.4312631-3.2866315-1.9865263-.2176842-.1234737-.4303158-.2441052-.6384211-.3634737-1.1436842-.6625263-2.1749474-1.2937894-3.0749474-2.2063158-.6-.6-1.1187368-1.3312631-1.5312631-2.2-.5625158-1.1625263-.94376843-2.5687368-1.22501054-4.3874736-.37501052-2.4312632-.56250526-5.6125264-.63146616-10.0250527-.0060391-.3436842.12521353-.6811579.3689609-.9311579.24374737-.2437894.5812526-.3875789.9312526-.3875789h.5375263c1.6562106.0063158 5.3124211-.1562105 8.4749474-2.61871581.4687369-.36250526 1.1250526-.36250526 1.5937895 0 3.1625263 2.46250531 6.8187368 2.62503161 8.4812631 2.61871581zm-2.9062106 14.6063158c.4062106-.837579.7437895-1.9937895 1-3.6563158.3062106-1.9874737.4937895-4.6874737.5812632-8.3624211-1.95-.0563158-5.3-.4312631-8.4937895-2.5812631-3.1936842 2.1436842-6.5436842 2.5187368-8.4874737 2.5812631.0687369 3.0374737.2062106 5.4.4249474 7.2562106.25 2.1125263.6063158 3.5437894 1.05 4.55.2937895.6687368.6188421 1.15 1.0063158 1.5749473.5187368.5688421 1.1749474 1.037579 2.0687368 1.5750527.3707369.222421.7794737.4537894 1.2244211.7056842.7927368.4486315 1.7003158.9623158 2.7130526 1.6068421.9941053-.634 1.8886316-1.1424211 2.6721053-1.5877895.2362105-.1342105.4622105-.2627368.6778947-.3872632 1.1-.6312631 1.9125263-1.1562105 2.5187369-1.7687368.4063157-.4187368.7375789-.8749474 1.0437894-1.5062105z" fill="#3375bb" fill-rule="evenodd"/>
7-
</svg>
2+
<svg width="39" height="43" viewBox="0 0 39 43" fill="none"
3+
xmlns="http://www.w3.org/2000/svg" exponent="92384" class="mt-4 h-auto w-[180px]">
4+
<path d="M0.710815 6.67346L19.4317 0.606445V42.6064C6.05944 37.0059 0.710815 26.2727 0.710815 20.207V6.67346Z" fill="#0500FF"></path>
5+
<path d="M38.1537 6.67346L19.4329 0.606445V42.6064C32.8051 37.0059 38.1537 26.2727 38.1537 20.207V6.67346Z" fill="url(#paint0_linear_524_7586892384)"></path>
6+
<defs>
7+
<linearGradient id="paint0_linear_524_7586892384" x1="33.1809" y1="-2.33467" x2="19.115" y2="42.0564" gradientUnits="userSpaceOnUse">
8+
<stop offset="0.02" stop-color="#0000FF"></stop>
9+
<stop offset="0.08" stop-color="#0094FF"></stop>
10+
<stop offset="0.16" stop-color="#48FF91"></stop>
11+
<stop offset="0.42" stop-color="#0094FF"></stop>
12+
<stop offset="0.68" stop-color="#0038FF"></stop>
13+
<stop offset="0.9" stop-color="#0500FF"></stop>
14+
</linearGradient>
15+
</defs>
16+
</svg>
817
`
18+
19+

‎packages/passport/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@web3-onboard/passport",
3-
"version": "2.1.1",
3+
"version": "2.1.2-alpha.1",
44
"description": "passport",
55
"module": "dist/index.js",
66
"browser": "dist/index.js",

‎packages/passport/src/index.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ function passport(options: PassportOptions): WalletInit {
202202
return {
203203
label: 'Passport',
204204
getIcon: async () => (await import('./icon')).default,
205-
getInterface: async () => {
205+
getInterface: async ({ EventEmitter }) => {
206206
const { Passport, Network } = await import('@0xpass/passport')
207207
const { createPassportClient } = await import('@0xpass/passport-viem')
208208
const { http } = await import('viem')
@@ -288,6 +288,9 @@ function passport(options: PassportOptions): WalletInit {
288288

289289
const provider = createEIP1193Provider(client)
290290

291+
const events = new EventEmitter()
292+
provider.on = events.on.bind(events)
293+
291294
return {
292295
instance: passport,
293296
provider: provider

‎packages/trust/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@web3-onboard/trust",
3-
"version": "2.1.1",
3+
"version": "2.1.2-alpha.1",
44
"description": "Trust Wallet SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized 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",

‎packages/trust/src/icon.ts

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
export default `
2-
<svg width="100%" height="100%"
3-
viewBox="0 0 40 40"
4-
xmlns="http://www.w3.org/2000/svg"
5-
>
6-
<path d="m1.36250526 6.825c-1.36250526 2.675-1.36250526 6.175-1.36250526 13.175s0 10.5 1.36250526 13.1750526c1.2 2.35 3.11249474 4.2624211 5.46249474 5.4624211 2.675 1.3625263 6.175 1.3625263 13.175 1.3625263s10.5 0 13.1750526-1.3625263c2.35-1.2 4.2624211-3.1124211 5.4624211-5.4624211 1.3625263-2.6750526 1.3625263-6.1750526 1.3625263-13.1750526s0-10.5-1.3625263-13.175c-1.2-2.35-3.1124211-4.26249474-5.4624211-5.46249474-2.6750526-1.36250526-6.1750526-1.36250526-13.1750526-1.36250526s-10.5 0-13.175 1.36250526c-2.35 1.2-4.26249474 3.11249474-5.46249474 5.46249474zm28.61875794 3.9624737c.35 0 .6812631.1437895.9250526.3875789.2436842.25.3812631.5874737.3751557.9311579-.0626294 3.7250527-.2064189 6.5750527-.4751557 8.8312632-.2625263 2.2563158-.6563158 3.9312631-1.25 5.2875789-.4.9062106-.8937895 1.6562106-1.4750526 2.2936842-.7812632.8437895-1.6749474 1.4563158-2.65 2.037579-.4168421.2492631-.8502106.4953684-1.3048421.7535789-.97.5508421-2.0365264 1.1565264-3.2451579 1.9651579-.4374737.2936842-1.0062106.2936842-1.4436843 0-1.2271578-.8181052-2.3077894-1.4312631-3.2866315-1.9865263-.2176842-.1234737-.4303158-.2441052-.6384211-.3634737-1.1436842-.6625263-2.1749474-1.2937894-3.0749474-2.2063158-.6-.6-1.1187368-1.3312631-1.5312631-2.2-.5625158-1.1625263-.94376843-2.5687368-1.22501054-4.3874736-.37501052-2.4312632-.56250526-5.6125264-.63146616-10.0250527-.0060391-.3436842.12521353-.6811579.3689609-.9311579.24374737-.2437894.5812526-.3875789.9312526-.3875789h.5375263c1.6562106.0063158 5.3124211-.1562105 8.4749474-2.61871581.4687369-.36250526 1.1250526-.36250526 1.5937895 0 3.1625263 2.46250531 6.8187368 2.62503161 8.4812631 2.61871581zm-2.9062106 14.6063158c.4062106-.837579.7437895-1.9937895 1-3.6563158.3062106-1.9874737.4937895-4.6874737.5812632-8.3624211-1.95-.0563158-5.3-.4312631-8.4937895-2.5812631-3.1936842 2.1436842-6.5436842 2.5187368-8.4874737 2.5812631.0687369 3.0374737.2062106 5.4.4249474 7.2562106.25 2.1125263.6063158 3.5437894 1.05 4.55.2937895.6687368.6188421 1.15 1.0063158 1.5749473.5187368.5688421 1.1749474 1.037579 2.0687368 1.5750527.3707369.222421.7794737.4537894 1.2244211.7056842.7927368.4486315 1.7003158.9623158 2.7130526 1.6068421.9941053-.634 1.8886316-1.1424211 2.6721053-1.5877895.2362105-.1342105.4622105-.2627368.6778947-.3872632 1.1-.6312631 1.9125263-1.1562105 2.5187369-1.7687368.4063157-.4187368.7375789-.8749474 1.0437894-1.5062105z" fill="#3375bb" fill-rule="evenodd"/>
2+
<svg width="39" height="43" viewBox="0 0 39 43" fill="none"
3+
xmlns="http://www.w3.org/2000/svg" exponent="92384" class="mt-4 h-auto w-[180px]">
4+
<path d="M0.710815 6.67346L19.4317 0.606445V42.6064C6.05944 37.0059 0.710815 26.2727 0.710815 20.207V6.67346Z" fill="#0500FF"></path>
5+
<path d="M38.1537 6.67346L19.4329 0.606445V42.6064C32.8051 37.0059 38.1537 26.2727 38.1537 20.207V6.67346Z" fill="url(#paint0_linear_524_7586892384)"></path>
6+
<defs>
7+
<linearGradient id="paint0_linear_524_7586892384" x1="33.1809" y1="-2.33467" x2="19.115" y2="42.0564" gradientUnits="userSpaceOnUse">
8+
<stop offset="0.02" stop-color="#0000FF"></stop>
9+
<stop offset="0.08" stop-color="#0094FF"></stop>
10+
<stop offset="0.16" stop-color="#48FF91"></stop>
11+
<stop offset="0.42" stop-color="#0094FF"></stop>
12+
<stop offset="0.68" stop-color="#0038FF"></stop>
13+
<stop offset="0.9" stop-color="#0500FF"></stop>
14+
</linearGradient>
15+
</defs>
716
</svg>
817
`

0 commit comments

Comments
 (0)