Skip to content

Commit 6d8ab05

Browse files
authored
Merge branch 'develop' into feature/finoa-web3-onboard-integration
2 parents 55ef4ce + 48fa68f commit 6d8ab05

File tree

40 files changed

+580
-946
lines changed

40 files changed

+580
-946
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ For full documentation, check out the README.md for each package or the [docs pa
127127
- [Frame](packages/frame/README.md)
128128
- [Blocto](packages/blocto/README.md)
129129
- [Particle Network](packages/particle-network/README.md)
130+
- [MetaMask](packages/metamask/README.md)
131+
- [Bitget](packages/bitget/README.md)
130132
- [FinoaConnect](packages/finoaconnect/README.md)
131133

132134
**Hardware Wallets**

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
@@ -60,7 +60,7 @@ const intiOnboard = async (theme) => {
6060
const { default: venlyModule } = await import('@web3-onboard/venly')
6161
const { default: bitgetModule } = await import('@web3-onboard/bitget')
6262
const { default: finoaConnectModule } = await import('@web3-onboard/finoaconnect')
63-
// // const { default: capsuleModule, Environment } = await import('@web3-onboard/capsule')
63+
const { default: capsuleModule, Environment } = await import('@web3-onboard/capsule')
6464
const { default: particleAuthModule } = await import('@web3-onboard/particle-network')
6565
const INFURA_ID = '8b60d52405694345a99bcb82e722e0af'
6666

@@ -137,10 +137,10 @@ const intiOnboard = async (theme) => {
137137
environment: 'staging'
138138
})
139139

140-
// // const capsule = capsuleModule({
141-
// // environment: Environment.DEVELOPMENT,
142-
// // apiKey: '992bbd9146d5de8ad0419f141d9a7ca7'
143-
// // })
140+
const capsule = capsuleModule({
141+
environment: Environment.DEVELOPMENT,
142+
apiKey: '992bbd9146d5de8ad0419f141d9a7ca7'
143+
})
144144

145145
const particle = particleAuthModule({
146146
projectId: 'b385ccf0-73c3-485a-9941-159b7855b806',
@@ -181,8 +181,8 @@ const intiOnboard = async (theme) => {
181181
blocto,
182182
particle,
183183
venly,
184-
finoaconnect
185-
// capsule
184+
finoaconnect,
185+
capsule
186186
],
187187
chains: [
188188
{

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@ const sendTransaction = async () => {
441441
console.log(result)
442442
}
443443
```
444+
444445
---
445446

446447
#### disableFontDownload
@@ -1902,7 +1903,9 @@ export default {
19021903
'@web3-onboard/gas',
19031904
'@web3-onboard/sequence',
19041905
'js-sha3',
1905-
'@ethersproject/bignumber'
1906+
'@ethersproject/bignumber',
1907+
'@safe-global/safe-apps-sdk',
1908+
'@safe-global/safe-apps-provider'
19061909
],
19071910
esbuildOptions: {
19081911
// Node.js global to browser globalThis

0 commit comments

Comments
 (0)