Merge in latest develop changes

Author: Adamj1232

docs/package.json

@@ -52,41 +52,41 @@
   "dependencies": {
     "@safe-global/safe-apps-provider": "^0.18.0",
     "@safe-global/safe-apps-sdk": "^8.1.0",
-    "@web3-onboard/bitget": "^2.1.0-alpha.2",
-    "@web3-onboard/blocto": "^2.1.0-alpha.2",
-    "@web3-onboard/cede-store": "^2.3.0-alpha.2",
-    "@web3-onboard/coinbase": "^2.3.0-alpha.2",
-    "@web3-onboard/core": "^2.22.0-alpha.7",
-    "@web3-onboard/dcent": "^2.2.8-alpha.1",
-    "@web3-onboard/enkrypt": "^2.1.0-alpha.2",
-    "@web3-onboard/fortmatic": "^2.1.0-alpha.2",
-    "@web3-onboard/frame": "^2.1.0-alpha.2",
-    "@web3-onboard/frontier": "^2.1.0-alpha.2",
-    "@web3-onboard/gas": "^2.2.0-alpha.2",
-    "@web3-onboard/gnosis": "^2.3.0-alpha.2",
-    "@web3-onboard/infinity-wallet": "^2.1.0-alpha.2",
-    "@web3-onboard/injected-wallets": "^2.11.0-alpha.2",
-    "@web3-onboard/keepkey": "^2.3.8-alpha.1",
-    "@web3-onboard/keystone": "^2.3.8-alpha.1",
-    "@web3-onboard/ledger": "^2.7.0-alpha.2",
-    "@web3-onboard/magic": "^2.2.0-alpha.2",
-    "@web3-onboard/metamask": "^2.1.0-alpha.2",
-    "@web3-onboard/mew-wallet": "^2.1.0-alpha.2",
-    "@web3-onboard/particle-network": "^2.1.0-alpha.2",
-    "@web3-onboard/phantom": "^2.1.0-alpha.2",
-    "@web3-onboard/portis": "^2.2.0-alpha.2",
-    "@web3-onboard/sequence": "^2.1.0-alpha.2",
-    "@web3-onboard/taho": "^2.1.0-alpha.2",
-    "@web3-onboard/torus": "^2.3.0-alpha.2",
-    "@web3-onboard/transaction-preview": "^2.1.0-alpha.3",
-    "@web3-onboard/trezor": "^2.4.4-alpha.1",
-    "@web3-onboard/trust": "^2.1.0-alpha.2",
-    "@web3-onboard/uauth": "^2.2.0-alpha.2",
-    "@web3-onboard/venly": "^2.1.0-alpha.2",
-    "@web3-onboard/walletconnect": "^2.6.0-alpha.2",
-    "@web3-onboard/web3auth": "^2.3.0-alpha.2",
-    "@web3-onboard/xdefi": "^2.1.0-alpha.2",
-    "@web3-onboard/zeal": "^2.1.0-alpha.2",
+    "@web3-onboard/bitget": "^2.1.0",
+    "@web3-onboard/blocto": "^2.1.0",
+    "@web3-onboard/cede-store": "^2.3.0",
+    "@web3-onboard/coinbase": "^2.3.0",
+    "@web3-onboard/core": "^2.22.0",
+    "@web3-onboard/dcent": "^2.2.8",
+    "@web3-onboard/enkrypt": "^2.1.0",
+    "@web3-onboard/fortmatic": "^2.1.0",
+    "@web3-onboard/frame": "^2.1.0",
+    "@web3-onboard/frontier": "^2.1.0",
+    "@web3-onboard/gas": "^2.2.0",
+    "@web3-onboard/gnosis": "^2.3.0",
+    "@web3-onboard/infinity-wallet": "^2.1.0",
+    "@web3-onboard/injected-wallets": "^2.11.0",
+    "@web3-onboard/keepkey": "^2.3.8",
+    "@web3-onboard/keystone": "^2.3.8",
+    "@web3-onboard/ledger": "^2.7.0",
+    "@web3-onboard/magic": "^2.2.0",
+    "@web3-onboard/metamask": "^2.1.0",
+    "@web3-onboard/mew-wallet": "^2.1.0",
+    "@web3-onboard/particle-network": "^2.1.0",
+    "@web3-onboard/phantom": "^2.1.0",
+    "@web3-onboard/portis": "^2.2.0",
+    "@web3-onboard/sequence": "^2.1.0",
+    "@web3-onboard/taho": "^2.1.0",
+    "@web3-onboard/torus": "^2.3.0",
+    "@web3-onboard/transaction-preview": "^2.1.0",
+    "@web3-onboard/trezor": "^2.4.4",
+    "@web3-onboard/trust": "^2.1.0",
+    "@web3-onboard/uauth": "^2.2.0",
+    "@web3-onboard/venly": "^2.1.0",
+    "@web3-onboard/walletconnect": "^2.6.0",
+    "@web3-onboard/web3auth": "^2.3.0",
+    "@web3-onboard/xdefi": "^2.1.0",
+    "@web3-onboard/zeal": "^2.1.0",
     "animejs": "^3.2.1",
     "bnc-sdk": "^4.6.6",
     "ethers": "^5.7.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "web3-onboard-monorepo",
-  "version": "2.25.6",
+  "version": "2.26.0",
   "private": true,
   "workspaces": {
     "packages": [

packages/arcana-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/arcana-auth",
-  "version": "2.1.0-alpha.2",
+  "version": "2.1.0",
   "license": "MIT",
   "description": "Arcana wallet is a built-in, secure Web3 wallet that users can access instantly when logging into an app integrated with the Arcana Auth SDK. It offers a customizable interface that can be branded to match the app's style. Users don't need to generate or manage cryptographic keys or remember passphrases. The wallet uses advanced distributed key generation, giving users full control over their wallets while onboarding Web3 apps using familiar Web2 authentication methods. It is user-friendly, secure, and puts users in control of their Web3 experience.",
   "private": false,
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@arcana/auth": "^1.0.10",
-    "@web3-onboard/common": "2.4.0-alpha.2"
+    "@web3-onboard/common": "2.4.0"
   },
   "devDependencies": {
     "typescript": "^5.4.5"

packages/bitget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/bitget",
-  "version": "2.1.0-alpha.2",
+  "version": "2.1.0",
   "description": "bitget-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.",
   "keywords": [
     "Ethereum",
@@ -62,6 +62,6 @@
   },
   "dependencies": {
     "@bitget-wallet/web3-sdk": "^0.0.8",
-    "@web3-onboard/common": "^2.4.0-alpha.2"
+    "@web3-onboard/common": "^2.4.0"
   }
 }

packages/bitkeep/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/bitkeep",
-  "version": "2.1.0-alpha.2",
+  "version": "2.1.0",
   "description": "Bitkeep 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.",
   "keywords": [
     "Ethereum",
@@ -62,6 +62,6 @@
   },
   "dependencies": {
     "@bitget-wallet/web3-sdk": "^0.0.8",
-    "@web3-onboard/common": "^2.4.0-alpha.2"
+    "@web3-onboard/common": "^2.4.0"
   }
 }

packages/blocto/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/blocto",
-  "version": "2.1.0-alpha.2",
+  "version": "2.1.0",
   "description": "Blocto 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.",
   "keywords": [
     "Ethereum",
@@ -64,7 +64,7 @@
     "window": "^4.2.7"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.4.0-alpha.2",
+    "@web3-onboard/common": "^2.4.0",
     "@blocto/sdk": "^0.9.1"
   }
 }

packages/capsule/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/capsule",
-  "version": "2.1.0-alpha.2",
+  "version": "2.1.0",
   "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.",
   "module": "dist/index.js",
   "browser": "dist/index.js",
@@ -60,7 +60,7 @@
     "@usecapsule/react-sdk": "^2.3.1",
     "@usecapsule/wagmi-v2-integration": "^1.7.1",
     "@wagmi/chains": "^1.8.0",
-    "@web3-onboard/common": "^2.4.0-alpha.2",
+    "@web3-onboard/common": "^2.4.0",
     "react-dom": "^18.2.0",
     "viem": "2.9.15",
     "wagmi": "2.5.19"

packages/cede-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/cede-store",
-  "version": "2.3.0-alpha.2",
+  "version": "2.3.0",
   "description": "cede.store 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.",
   "keywords": [
     "Ethereum",
@@ -70,6 +70,6 @@
   },
   "dependencies": {
     "@cedelabs/providers": "^1.5.0",
-    "@web3-onboard/common": "^2.4.0-alpha.2"
+    "@web3-onboard/common": "^2.4.0"
   }
 }

packages/coinbase/package.json

@@ -60,6 +60,6 @@
   },
   "dependencies": {
     "@coinbase/wallet-sdk": "4.0.3",
-    "@web3-onboard/common": "^2.4.0-alpha.3"
+    "@web3-onboard/common": "^2.4.0"
   }
 }

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/common",
-  "version": "2.4.0-alpha.3",
+  "version": "2.4.0",
   "description": "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.",
   "keywords": [
     "Ethereum",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/core",
-  "version": "2.22.0-alpha.7",
+  "version": "2.22.0",
   "description": "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.",
   "keywords": [
     "Ethereum",
@@ -71,9 +71,9 @@
     "@typescript-eslint/eslint-plugin": "^4.31.1",
     "@typescript-eslint/parser": "^4.31.1",
     "@web3-onboard/gas": "^2.1.5",
-    "@web3-onboard/wagmi": "2.0.0-alpha.6",
+    "@web3-onboard/wagmi": "2.0.0",
     "@web3-onboard/transaction-preview": "^2.0.5",
-    "@web3-onboard/unstoppable-resolution": "^2.0.0-alpha.1",
+    "@web3-onboard/unstoppable-resolution": "^2.0.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-svelte3": "^3.2.1",
@@ -87,7 +87,7 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@web3-onboard/common": "2.4.0-alpha.3",
+    "@web3-onboard/common": "2.4.0",
     "bnc-sdk": "^4.6.7",
     "bowser": "^2.11.0",
     "eventemitter3": "^4.0.7",

packages/core/src/provider.ts

@@ -12,7 +12,12 @@ import { configuration } from './configuration.js'
 import { updateSecondaryTokens } from './update-balances'
 
 import type { Uns } from '@web3-onboard/unstoppable-resolution'
-import type { PublicClient, GetEnsTextReturnType } from 'viem'
+import {
+  type PublicClient,
+  type GetEnsTextReturnType,
+  isHex,
+  toHex
+} from 'viem'
 import type {
   Address,
   ChainId,
@@ -260,7 +265,9 @@ export function trackWallet(
     if (!wallet) return // Add null check for wallet
     const { chains, accounts } = wallet
     const [connectedWalletChain] = chains
-
+    if (!isHex(chainId)) {
+      chainId = toHex(chainId)
+    }
     if (chainId === connectedWalletChain.id) return
 
     if (state.get().notify.enabled) {
@@ -321,7 +328,9 @@ export function trackWallet(
         const { wallets, chains } = state.get()
         const primaryWallet = wallets.find(wallet => wallet.label === label)
         const accounts = primaryWallet?.accounts || []
-
+        if (!isHex(chainId)) {
+          chainId = toHex(chainId)
+        }
         const chain = chains.find(
           ({ namespace, id }) => namespace === 'evm' && id === chainId
         )

packages/dcent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/dcent",
-  "version": "2.2.8-alpha.1",
+  "version": "2.2.9",
   "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.",
   "keywords": [
     "Ethereum",
@@ -56,8 +56,8 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.4.0-alpha.1",
-    "@web3-onboard/hw-common": "^2.3.2-alpha.1",
+    "@web3-onboard/common": "^2.4.0",
+    "@web3-onboard/hw-common": "^2.3.2",
     "@ethereumjs/tx": "^3.4.0",
     "@ethersproject/providers": "^5.5.0",
     "eth-dcent-keyring": "^0.2.2"

packages/demo/package.json

@@ -27,45 +27,45 @@
     "@blocto/dappauth": "^2.1.0",
     "@safe-global/safe-apps-provider": "^0.18.0",
     "@safe-global/safe-apps-sdk": "^8.1.0",
-    "@web3-onboard/arcana-auth": "^2.1.0-alpha.2",
-    "@web3-onboard/bitget": "2.1.0-alpha.2",
-    "@web3-onboard/blocto": "^2.1.0-alpha.2",
-    "@web3-onboard/capsule": "2.1.0-alpha.2",
-    "@web3-onboard/cede-store": "^2.3.0-alpha.2",
-    "@web3-onboard/core": "2.22.0-alpha.7",
+    "@web3-onboard/arcana-auth": "^2.1.0",
+    "@web3-onboard/bitget": "2.1.0",
+    "@web3-onboard/blocto": "^2.1.0",
+    "@web3-onboard/capsule": "2.1.0",
+    "@web3-onboard/cede-store": "^2.3.0",
+    "@web3-onboard/core": "2.22.0",
     "@web3-onboard/coinbase": "^2.4.0-alpha.1",
     "@web3-onboard/dcent": "^2.2.7",
-    "@web3-onboard/enkrypt": "^2.1.0-alpha.2",
-    "@web3-onboard/fortmatic": "^2.1.0-alpha.2",
-    "@web3-onboard/frame": "^2.1.0-alpha.2",
-    "@web3-onboard/frontier": "^2.1.0-alpha.2",
-    "@web3-onboard/gas": "^2.2.0-alpha.2",
-    "@web3-onboard/wagmi": "^2.0.0-alpha.6",
-    "@web3-onboard/gnosis": "^2.3.0-alpha.2",
-    "@web3-onboard/infinity-wallet": "^2.1.0-alpha.2",
-    "@web3-onboard/injected-wallets": "^2.11.0-alpha.2",
+    "@web3-onboard/enkrypt": "^2.1.0",
+    "@web3-onboard/fortmatic": "^2.1.0",
+    "@web3-onboard/frame": "^2.1.0",
+    "@web3-onboard/frontier": "^2.1.0",
+    "@web3-onboard/gas": "^2.2.0",
+    "@web3-onboard/wagmi": "^2.0.0",
+    "@web3-onboard/gnosis": "^2.3.0",
+    "@web3-onboard/infinity-wallet": "^2.1.0",
+    "@web3-onboard/injected-wallets": "^2.11.0",
     "@web3-onboard/keepkey": "^2.3.8",
     "@web3-onboard/keystone": "^2.3.8",
-    "@web3-onboard/ledger": "^2.7.0-alpha.2",
-    "@web3-onboard/magic": "^2.2.0-alpha.2",
-    "@web3-onboard/metamask": "^2.1.0-alpha.2",
-    "@web3-onboard/mew-wallet": "^2.1.0-alpha.2",
-    "@web3-onboard/particle-network": "^2.1.0-alpha.2",
-    "@web3-onboard/phantom": "^2.1.0-alpha.2",
-    "@web3-onboard/portis": "^2.2.0-alpha.2",
-    "@web3-onboard/sequence": "^2.1.0-alpha.2",
-    "@web3-onboard/taho": "^2.1.0-alpha.2",
-    "@web3-onboard/torus": "^2.3.0-alpha.2",
-    "@web3-onboard/transaction-preview": "^2.1.0-alpha.2",
+    "@web3-onboard/ledger": "^2.7.0",
+    "@web3-onboard/magic": "^2.2.0",
+    "@web3-onboard/metamask": "^2.1.0",
+    "@web3-onboard/mew-wallet": "^2.1.0",
+    "@web3-onboard/particle-network": "^2.1.0",
+    "@web3-onboard/phantom": "^2.1.0",
+    "@web3-onboard/portis": "^2.2.0",
+    "@web3-onboard/sequence": "^2.1.0",
+    "@web3-onboard/taho": "^2.1.0",
+    "@web3-onboard/torus": "^2.3.0",
+    "@web3-onboard/transaction-preview": "^2.1.0",
     "@web3-onboard/trezor": "^2.4.4",
-    "@web3-onboard/trust": "^2.1.0-alpha.2",
-    "@web3-onboard/uauth": "^2.2.0-alpha.2",
-    "@web3-onboard/venly": "^2.1.0-alpha.2",
-    "@web3-onboard/walletconnect": "^2.6.0-alpha.2",
-    "@web3-onboard/web3auth": "^2.3.0-alpha.2",
-    "@web3-onboard/xdefi": "^2.1.0-alpha.2",
-    "@web3-onboard/zeal": "^2.1.0-alpha.2",
-    "@web3-onboard/passport": "^2.1.0-alpha.2",
+    "@web3-onboard/trust": "^2.1.0",
+    "@web3-onboard/uauth": "^2.2.0",
+    "@web3-onboard/venly": "^2.1.0",
+    "@web3-onboard/walletconnect": "^2.6.0",
+    "@web3-onboard/web3auth": "^2.3.0",
+    "@web3-onboard/xdefi": "^2.1.0",
+    "@web3-onboard/zeal": "^2.1.0",
+    "@web3-onboard/passport": "^2.1.0",
     "@0xpass/webauthn-signer": "2.0.0",
     "vconsole": "^3.15.1"
   },

packages/demo/src/App.svelte

@@ -260,8 +260,8 @@
 
   const onboard = Onboard({
     wallets: [
-      metamaskSDKWallet,
-      coinbaseWallet,
+      // metamaskSDKWallet,
+      // coinbaseWallet,
       injected,
       ledger,
       trezor,

packages/enkrypt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/enkrypt",
-  "version": "2.1.0-alpha.2",
+  "version": "2.1.0",
   "description": "Enkrypt 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.",
   "keywords": [
     "Ethereum",
@@ -63,6 +63,6 @@
     "window": "^4.2.7"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.4.0-alpha.2"
+    "@web3-onboard/common": "^2.4.0"
   }
 }