Skip to content

Commit 7cd83b6

Browse files
Adamj1232Adamj1232
committed
Handle conflicts from main
2 parents 5b8da81 + 4116b63 commit 7cd83b6

File tree

18 files changed

+143
-0
lines changed

18 files changed

+143
-0
lines changed

‎packages/dcent/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/dcent",
3+
<<<<<<< HEAD
34
"version": "2.0.6",
5+
=======
6+
"version": "2.0.5",
7+
>>>>>>> v2-web3-onboard
48
"description": "D'CENT 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.",
59
"keywords": [
610
"Ethereum",
@@ -54,7 +58,11 @@
5458
"typescript": "^4.5.5"
5559
},
5660
"dependencies": {
61+
<<<<<<< HEAD
5762
"@web3-onboard/common": "^2.1.6",
63+
=======
64+
"@web3-onboard/common": "^2.1.5",
65+
>>>>>>> v2-web3-onboard
5866
"@ethereumjs/common": "^2.6.1",
5967
"@ethereumjs/tx": "^3.4.0",
6068
"@ethersproject/providers": "^5.5.0",

‎packages/demo/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,13 @@
2323
},
2424
"dependencies": {
2525
"@web3-onboard/coinbase": "^2.0.8",
26+
<<<<<<< HEAD
2627
"@web3-onboard/core": "^2.4.1-alpha.1",
2728
"@web3-onboard/dcent": "^2.0.5",
29+
=======
30+
"@web3-onboard/core": "^2.4.0",
31+
"@web3-onboard/dcent": "^2.0.6",
32+
>>>>>>> v2-web3-onboard
2833
"@web3-onboard/fortmatic": "^2.0.6",
2934
"@web3-onboard/gnosis": "^2.0.5",
3035
"@web3-onboard/injected-wallets": "^2.0.12",

‎packages/fortmatic/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/fortmatic",
3+
<<<<<<< HEAD
34
"version": "2.0.8",
5+
=======
6+
"version": "2.0.7",
7+
>>>>>>> v2-web3-onboard
48
"description": "Fortmatic 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.",
59
"keywords": [
610
"Ethereum",
@@ -57,7 +61,11 @@
5761
"typescript": "^4.5.5"
5862
},
5963
"dependencies": {
64+
<<<<<<< HEAD
6065
"@web3-onboard/common": "^2.1.6",
66+
=======
67+
"@web3-onboard/common": "^2.1.5",
68+
>>>>>>> v2-web3-onboard
6169
"fortmatic": "^2.2.1"
6270
}
6371
}

‎packages/gnosis/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/gnosis",
3+
<<<<<<< HEAD
34
"version": "2.0.7",
5+
=======
6+
"version": "2.0.6",
7+
>>>>>>> v2-web3-onboard
48
"description": "Gnosis Safe 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.",
59
"keywords": [
610
"Ethereum",
@@ -59,6 +63,10 @@
5963
"dependencies": {
6064
"@gnosis.pm/safe-apps-provider": "^0.9.2",
6165
"@gnosis.pm/safe-apps-sdk": "^6.1.1",
66+
<<<<<<< HEAD
6267
"@web3-onboard/common": "^2.1.6"
68+
=======
69+
"@web3-onboard/common": "^2.1.5"
70+
>>>>>>> v2-web3-onboard
6371
}
6472
}

‎packages/injected/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/injected-wallets",
3+
<<<<<<< HEAD
34
"version": "2.0.14",
5+
=======
6+
"version": "2.0.13",
7+
>>>>>>> v2-web3-onboard
48
"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.",
59
"keywords": [
610
"Ethereum",
@@ -62,7 +66,11 @@
6266
"window": "^4.2.7"
6367
},
6468
"dependencies": {
69+
<<<<<<< HEAD
6570
"@web3-onboard/common": "^2.1.6",
71+
=======
72+
"@web3-onboard/common": "^2.1.5",
73+
>>>>>>> v2-web3-onboard
6674
"joi": "^17.4.2",
6775
"lodash.uniqby": "^4.7.0"
6876
}

‎packages/keepkey/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/keepkey",
3+
<<<<<<< HEAD
34
"version": "2.1.6",
5+
=======
6+
"version": "2.1.5",
7+
>>>>>>> v2-web3-onboard
48
"description": "KeepKey hardware 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.",
59
"keywords": [
610
"Ethereum",
@@ -63,7 +67,11 @@
6367
"@ethersproject/providers": "^5.5.0",
6468
"@shapeshiftoss/hdwallet-core": "^1.15.2",
6569
"@shapeshiftoss/hdwallet-keepkey-webusb": "^1.15.2",
70+
<<<<<<< HEAD
6671
"@web3-onboard/common": "^2.1.6",
72+
=======
73+
"@web3-onboard/common": "^2.1.5",
74+
>>>>>>> v2-web3-onboard
6775
"ethereumjs-util": "^7.1.3"
6876
}
6977
}

‎packages/keystone/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/keystone",
3+
<<<<<<< HEAD
34
"version": "2.1.7",
5+
=======
6+
"version": "2.1.6",
7+
>>>>>>> v2-web3-onboard
48
"description": "Keystone hardware 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.",
59
"keywords": [
610
"Ethereum",
@@ -57,6 +61,10 @@
5761
"@ethereumjs/tx": "^3.4.0",
5862
"@ethersproject/providers": "^5.5.0",
5963
"@keystonehq/eth-keyring": "^0.14.0-alpha.10.3",
64+
<<<<<<< HEAD
6065
"@web3-onboard/common": "^2.1.6"
66+
=======
67+
"@web3-onboard/common": "^2.1.5"
68+
>>>>>>> v2-web3-onboard
6169
}
6270
}

‎packages/ledger/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/ledger",
3+
<<<<<<< HEAD
34
"version": "2.1.6",
5+
=======
6+
"version": "2.1.5",
7+
>>>>>>> v2-web3-onboard
48
"description": "Ledger hardare 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.",
59
"keywords": [
610
"Ethereum",
@@ -63,7 +67,11 @@
6367
"@ledgerhq/hw-transport-u2f": "^5.36.0-deprecated",
6468
"@ledgerhq/hw-transport-webusb": "^6.19.0",
6569
"@metamask/eth-sig-util": "^4.0.0",
70+
<<<<<<< HEAD
6671
"@web3-onboard/common": "^2.1.6",
72+
=======
73+
"@web3-onboard/common": "^2.1.5",
74+
>>>>>>> v2-web3-onboard
6775
"buffer": "^6.0.3",
6876
"ethereumjs-util": "^7.1.3"
6977
}

‎packages/magic/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/magic",
3+
<<<<<<< HEAD
34
"version": "2.0.9",
5+
=======
6+
"version": "2.0.8",
7+
>>>>>>> v2-web3-onboard
48
"description": "Magic 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.",
59
"keywords": [
610
"Ethereum",
@@ -78,7 +82,11 @@
7882
"typescript": "^4.5.5"
7983
},
8084
"dependencies": {
85+
<<<<<<< HEAD
8186
"@web3-onboard/common": "^2.1.6",
87+
=======
88+
"@web3-onboard/common": "^2.1.5",
89+
>>>>>>> v2-web3-onboard
8290
"joi": "^17.4.2",
8391
"magic-sdk": "^8.1.0",
8492
"rxjs": "^7.5.2"

‎packages/mew/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/mew",
3+
<<<<<<< HEAD
34
"version": "2.0.6",
5+
=======
6+
"version": "2.0.5",
7+
>>>>>>> v2-web3-onboard
48
"description": "MEW (My Ether 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 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.",
59
"keywords": [
610
"Ethereum",
@@ -59,7 +63,11 @@
5963
"@myetherwallet/mewconnect-web-client": "^2.2.0-beta.14"
6064
},
6165
"dependencies": {
66+
<<<<<<< HEAD
6267
"@web3-onboard/common": "^2.1.6",
68+
=======
69+
"@web3-onboard/common": "^2.1.5",
70+
>>>>>>> v2-web3-onboard
6371
"rxjs": "^7.5.2"
6472
}
6573
}

‎packages/portis/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/portis",
3+
<<<<<<< HEAD
34
"version": "2.0.6",
5+
=======
6+
"version": "2.0.5",
7+
>>>>>>> v2-web3-onboard
48
"description": "Portis 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.",
59
"keywords": [
610
"Ethereum",
@@ -57,6 +61,10 @@
5761
},
5862
"dependencies": {
5963
"@portis/web3": "^4.0.6",
64+
<<<<<<< HEAD
6065
"@web3-onboard/common": "^2.1.6"
66+
=======
67+
"@web3-onboard/common": "^2.1.5"
68+
>>>>>>> v2-web3-onboard
6169
}
6270
}

‎packages/react/package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/react",
3+
<<<<<<< HEAD
34
"version": "2.2.4",
5+
=======
6+
"version": "2.2.3",
7+
>>>>>>> v2-web3-onboard
48
"description": "A collection of React hooks for integrating Web3-Onboard in to React and Next.js projects. 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, 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.",
59
"keywords": [
610
"Ethereum",
@@ -59,8 +63,13 @@
5963
"typescript": "^4.5.5"
6064
},
6165
"dependencies": {
66+
<<<<<<< HEAD
6267
"@web3-onboard/core": "^2.4.1",
6368
"@web3-onboard/common": "^2.1.6",
69+
=======
70+
"@web3-onboard/core": "^2.4.0",
71+
"@web3-onboard/common": "^2.1.5",
72+
>>>>>>> v2-web3-onboard
6473
"use-sync-external-store": "1.0.0"
6574
},
6675
"peerDependencies": {

‎packages/torus/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/torus",
3+
<<<<<<< HEAD
34
"version": "2.0.7",
5+
=======
6+
"version": "2.0.6",
7+
>>>>>>> v2-web3-onboard
48
"description": "Torus 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.",
59
"keywords": [
610
"Ethereum",
@@ -57,6 +61,10 @@
5761
},
5862
"dependencies": {
5963
"@toruslabs/torus-embed": "^1.18.3",
64+
<<<<<<< HEAD
6065
"@web3-onboard/common": "^2.1.6"
66+
=======
67+
"@web3-onboard/common": "^2.1.5"
68+
>>>>>>> v2-web3-onboard
6169
}
6270
}

‎packages/trezor/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/trezor",
3+
<<<<<<< HEAD
34
"version": "2.1.6",
5+
=======
6+
"version": "2.1.5",
7+
>>>>>>> v2-web3-onboard
48
"description": "Trezor hardware 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.",
59
"keywords": [
610
"Ethereum",
@@ -58,7 +62,11 @@
5862
"dependencies": {
5963
"@ethereumjs/tx": "^3.4.0",
6064
"@ethersproject/providers": "^5.5.0",
65+
<<<<<<< HEAD
6166
"@web3-onboard/common": "^2.1.6",
67+
=======
68+
"@web3-onboard/common": "^2.1.5",
69+
>>>>>>> v2-web3-onboard
6270
"buffer": "^6.0.3",
6371
"eth-crypto": "^2.1.0",
6472
"ethereumjs-util": "^7.1.3",

‎packages/vue/package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/vue",
3+
<<<<<<< HEAD
34
"version": "2.1.4",
5+
=======
6+
"version": "2.1.3",
7+
>>>>>>> v2-web3-onboard
48
"description": "A collection of Vue Composables for integrating Web3-Onboard in to a Vue or Nuxt project. 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, 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.",
59
"keywords": [
610
"Ethereum",
@@ -59,8 +63,13 @@
5963
"dependencies": {
6064
"@vueuse/core": "^8.4.2",
6165
"@vueuse/rxjs": "^8.2.0",
66+
<<<<<<< HEAD
6267
"@web3-onboard/common": "^2.1.6",
6368
"@web3-onboard/core": "^2.4.1",
69+
=======
70+
"@web3-onboard/common": "^2.1.5",
71+
"@web3-onboard/core": "^2.4.0",
72+
>>>>>>> v2-web3-onboard
6473
"vue-demi": "^0.12.4"
6574
},
6675
"peerDependencies": {

‎packages/walletconnect/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/walletconnect",
3+
<<<<<<< HEAD
34
"version": "2.0.7",
5+
=======
6+
"version": "2.0.6",
7+
>>>>>>> v2-web3-onboard
48
"description": "WalletConnect SDK 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.",
59
"keywords": [
610
"Ethereum",
@@ -59,7 +63,11 @@
5963
"@ethersproject/providers": "^5.5.0",
6064
"@walletconnect/client": "^1.7.1",
6165
"@walletconnect/qrcode-modal": "^1.7.1",
66+
<<<<<<< HEAD
6267
"@web3-onboard/common": "^2.1.6",
68+
=======
69+
"@web3-onboard/common": "^2.1.5",
70+
>>>>>>> v2-web3-onboard
6371
"rxjs": "^7.5.2"
6472
}
6573
}

‎packages/walletlink/package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"name": "@web3-onboard/walletlink",
3+
<<<<<<< HEAD
34
"version": "2.0.6",
5+
=======
6+
"version": "2.0.5",
7+
>>>>>>> v2-web3-onboard
48
"description": "(DEPRECATED. Use @web3-onboard/coinbase instead) WalletLink 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.",
59
"keywords": [
610
"Ethereum",
@@ -56,7 +60,11 @@
5660
"typescript": "^4.5.5"
5761
},
5862
"dependencies": {
63+
<<<<<<< HEAD
5964
"@web3-onboard/common": "^2.1.6",
65+
=======
66+
"@web3-onboard/common": "^2.1.5",
67+
>>>>>>> v2-web3-onboard
6068
"walletlink": "^2.5.0"
6169
}
6270
}

0 commit comments

Comments
 (0)