Merge in dev and handle conflicts

Author: Adamj1232

docs/package.json

@@ -48,35 +48,35 @@
   "type": "module",
   "dependencies": {
     "@web3-onboard/cede-store": "^2.0.2-alpha.1",
-    "@web3-onboard/coinbase": "^2.2.3-alpha.2",
-    "@web3-onboard/core": "^2.18.1-alpha.3",
+    "@web3-onboard/coinbase": "^2.2.4-alpha.1",
+    "@web3-onboard/core": "^2.19.0-alpha.1",
     "@web3-onboard/dcent": "^2.2.7-alpha.1",
-    "@web3-onboard/enkrypt": "^2.0.3-alpha.2",
-    "@web3-onboard/fortmatic": "^2.0.18-alpha.2",
-    "@web3-onboard/frame": "^2.21.2-alpha.1",
-    "@web3-onboard/frontier": "^2.0.3-alpha.2",
-    "@web3-onboard/gas": "^2.1.7-alpha.2",
-    "@web3-onboard/gnosis": "^2.1.9-alpha.2",
-    "@web3-onboard/infinity-wallet": "^2.0.3-alpha.2",
-    "@web3-onboard/injected-wallets": "^2.9.0-alpha.1",
+    "@web3-onboard/enkrypt": "^2.0.4-alpha.1",
+    "@web3-onboard/fortmatic": "^2.0.19-alpha.1",
+    "@web3-onboard/frame": "^2.0.1-alpha.1",
+    "@web3-onboard/frontier": "^2.0.4-alpha.1",
+    "@web3-onboard/gas": "^2.1.8-alpha.1",
+    "@web3-onboard/gnosis": "^2.1.10-alpha.1",
+    "@web3-onboard/infinity-wallet": "^2.0.4-alpha.1",
+    "@web3-onboard/injected-wallets": "^2.9.0-alpha.2",
     "@web3-onboard/keepkey": "^2.3.7-alpha.1",
     "@web3-onboard/keystone": "^2.3.7-alpha.1",
-    "@web3-onboard/ledger": "^2.4.5-alpha.2",
-    "@web3-onboard/magic": "^2.1.6-alpha.2",
-    "@web3-onboard/mew-wallet": "^2.0.3-alpha.2",
-    "@web3-onboard/phantom": "^2.0.1-alpha.2",
-    "@web3-onboard/portis": "^2.1.6-alpha.2",
-    "@web3-onboard/sequence": "^2.0.7-alpha.2",
-    "@web3-onboard/taho": "^2.0.3-alpha.2",
-    "@web3-onboard/torus": "^2.2.4-alpha.2",
-    "@web3-onboard/transaction-preview": "^2.0.7-alpha.2",
-    "@web3-onboard/trezor": "^2.4.2-alpha.2",
-    "@web3-onboard/trust": "^2.0.3-alpha.2",
-    "@web3-onboard/uauth": "^2.0.4-alpha.2",
+    "@web3-onboard/ledger": "^2.4.6-alpha.1",
+    "@web3-onboard/magic": "^2.1.7-alpha.1",
+    "@web3-onboard/mew-wallet": "^2.0.4-alpha.1",
+    "@web3-onboard/phantom": "^2.0.2-alpha.1",
+    "@web3-onboard/portis": "^2.1.7-alpha.1",
+    "@web3-onboard/sequence": "^2.0.8-alpha.1",
+    "@web3-onboard/taho": "^2.0.4-alpha.1",
+    "@web3-onboard/torus": "^2.2.5-alpha.1",
+    "@web3-onboard/transaction-preview": "^2.0.8-alpha.1",
+    "@web3-onboard/trezor": "^2.4.2-alpha.3",
+    "@web3-onboard/trust": "^2.0.4-alpha.1",
+    "@web3-onboard/uauth": "^2.0.5-alpha.1",
     "@web3-onboard/walletconnect": "^2.3.8-alpha.1",
-    "@web3-onboard/web3auth": "^2.2.2-alpha.2",
-    "@web3-onboard/xdefi": "^2.0.3-alpha.2",
-    "@web3-onboard/zeal": "^2.0.3-alpha.2",
+    "@web3-onboard/web3auth": "^2.2.3-alpha.1",
+    "@web3-onboard/xdefi": "^2.0.4-alpha.1",
+    "@web3-onboard/zeal": "^2.0.4-alpha.1",
     "animejs": "^3.2.1",
     "bnc-sdk": "^4.6.6",
     "ethers": "^5.7.0",

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

@@ -51,7 +51,7 @@ web3-onboard supports all EVM networks. Supporting a new network is simply a mat
 - Moonriver
 - All other EVM network
 
-### [Optional] Use an API key to fetch real time transaction data, balances & gas
+### Optional - Use an API key to fetch real time transaction data, balances & gas
 
 Using a Blocknative API key with web3-onboard on the free plan will allow you to gain the benefits of Blocknative balance & transaction services. Blocknative has a free forever plan you can always use.
 

docs/src/routes/docs/[...1]overview/[...2]contribution-guide/+page.md

@@ -19,7 +19,7 @@ If an issue does not already exist, follow the template instructions to create a
 
 Once an issue is created, a Web3 Onboard maintainer will review and respond typically within a few days to share next steps.
 
-## [Pull Requests 🗂️]
+## Pull Requests 🗂️
 
 To create a new feature or change in Web3 Onboard, fork the repo and make a pull request on the [develop branch](https://github.com/blocknative/web3-onboard/tree/develop) to have your changes merged in and released as part of the official packages.
 
@@ -39,7 +39,7 @@ Example : Adding a new injected wallet to the `injected` package -
 Example 2 : Bug fix within the `core` package -
 [Core package.json](https://github.com/blocknative/web3-onboard/blob/8531a73d69365f7d584320f1c4b97a5d90f1c34e/packages/core/package.json#L3) changes: `"version": "2.9.1-alpha.1",` --> `"version": "2.9.1-alpha.2",`
 
-## [How can I add a new wallet? 💳]
+## How can I add a new wallet? 💳
 
 To add a new wallet to the official Web3 Onboard packages and repo, create a [pull request](#pull-requests-🗂️). Web3 Onboard does not require a wallet to be a part of the main code, so a separate wallet module can be created without any changes to the Web3Onboard codebase. Your PR must include a detailed README for the package, keeping in mind that this README is the the first point of contact for dapp devs looking to implement your wallet.
 
@@ -57,7 +57,7 @@ Otherwise, if the wallet you are adding requires dependencies and initialization
 
 If you cannot write the code yourself to add a new wallet, create a new feature request issue to be considered by the maintainers and other contributors in the community.
 
-## [Documentation Contributions 📄]
+## Documentation Contributions 📄
 
 If you contribute to the code, you should definitely document appropriately.
 
@@ -71,11 +71,11 @@ PRs for adding/updating a wallet should include a README (new or updated) for th
 
 We highly encourage the community to help us improve the web3-onboard docs! If you have any questions don't hesitate to reach out.
 
-## [Feedback 💬]
+## Feedback 💬
 
 Did you have trouble integrating? Could the docs be improved? Have a new Feature request?
 Jump in our [Discord](https://discord.com/invite/KZaBVME) and share your feedback.
 
-## [Support 🤓]
+## Support 🤓
 
 For general questions about how to use Web3 Onboard please first check out our [docs](../../overview/introduction.md#features), then head to our [Discord](https://discord.com/invite/KZaBVME) for support from the Blocknative team.

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

@@ -145,7 +145,7 @@ type Chain = {
   icon?: string // the icon to represent the chain
   publicRpcUrl?: string // an optional public RPC used when adding a new chain config to the wallet
   blockExplorerUrl?: string // also used when adding a new config to the wallet
-   secondaryTokens?: SecondaryTokens[] // An optional array of tokens (max of 5) to be available to the dapp in the app state object per wallet within the wallet account and displayed in Account Center (if enabled)
+  secondaryTokens?: SecondaryTokens[] // An optional array of tokens (max of 5) to be available to the dapp in the app state object per wallet within the wallet account and displayed in Account Center (if enabled)
 }
 
 interface SecondaryTokens {