diff --git a/.circleci/config.yml b/.circleci/config.yml
index 41e06eecc..755afac11 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -285,6 +285,12 @@ jobs:
     working_directory: ~/web3-onboard-monorepo/packages/vue
     steps:
       - node-build-steps
+  build-gas:
+    docker:
+      - image: cimg/node:16.13.1
+    working_directory: ~/web3-onboard-monorepo/packages/gas
+    steps:
+      - node-build-steps
 
   # Build staging/Alpha releases
   build-staging-core:
@@ -407,6 +413,12 @@ jobs:
     working_directory: ~/web3-onboard-monorepo/packages/vue
     steps:
       - node-staging-build-steps
+  build-staging-gas:
+    docker:
+      - image: cimg/node:16.13.1
+    working_directory: ~/web3-onboard-monorepo/packages/gas
+    steps:
+      - node-staging-build-steps
 
 workflows:
   version: 2
@@ -531,3 +543,9 @@ workflows:
           <<: *deploy_production_filters
       - build-staging-vue:
           <<: *deploy_staging_filters
+  gas:
+    jobs:
+      - build-gas:
+          <<: *deploy_production_filters
+      - build-staging-gas:
+          <<: *deploy_staging_filters
diff --git a/package.json b/package.json
index 7690d46d7..9cb7ca1a4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web3-onboard-monorepo",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "private": true,
   "workspaces": [
     "./packages/*"
diff --git a/packages/coinbase/package.json b/packages/coinbase/package.json
index 9f84cb034..12425e1f5 100644
--- a/packages/coinbase/package.json
+++ b/packages/coinbase/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/coinbase",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "Coinbase 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",
@@ -59,6 +59,6 @@
   },
   "dependencies": {
     "@coinbase/wallet-sdk": "^3.0.5",
-    "@web3-onboard/common": "^2.1.6"
+    "@web3-onboard/common": "^2.1.7"
   }
 }
diff --git a/packages/common/package.json b/packages/common/package.json
index 0878ce05c..16e286f55 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/common",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "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",
@@ -73,6 +73,7 @@
     "prettier-plugin-svelte": "^2.4.0",
     "rollup": "^2.3.4",
     "rollup-plugin-svelte": "^7.0.0",
+    "rollup-plugin-terser": "^7.0.2",
     "svelte": "^3.42.5",
     "svelte-check": "^2.2.6",
     "svelte-preprocess": "^4.9.4",
@@ -81,6 +82,7 @@
   },
   "dependencies": {
     "@ethereumjs/common": "2.6.2",
+    "bignumber.js": "^9.0.0",
     "ethers": "5.5.4",
     "joi": "^17.4.2",
     "rxjs": "^7.5.2"
diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js
index aa41939bf..1925d6540 100644
--- a/packages/common/rollup.config.js
+++ b/packages/common/rollup.config.js
@@ -4,6 +4,7 @@ import replace from '@rollup/plugin-replace'
 import json from '@rollup/plugin-json'
 import sveltePreprocess from 'svelte-preprocess'
 import typescript from '@rollup/plugin-typescript'
+import { terser } from 'rollup-plugin-terser'
 
 const production = !process.env.ROLLUP_WATCH
 
@@ -11,7 +12,8 @@ export default {
   input: 'src/index.ts',
   output: {
     format: 'esm',
-    dir: 'dist/'
+    dir: 'dist/',
+    sourcemap: true,
   },
   plugins: [
     json(),
@@ -33,7 +35,19 @@ export default {
     typescript({
       sourceMap: !production,
       inlineSources: !production
+    }),
+    production && terser({
+      ecma: 2017,
+      mangle: { toplevel: true },
+      compress: {
+        module: true,
+        toplevel: true,
+        unsafe_arrows: true,
+        drop_console: production,
+        drop_debugger: production
+      },
+      output: { quote_style: 1 }
     })
   ],
-  external: ['joi', 'rxjs', 'ethers', '@ethereumjs/common']
+  external: ['joi', 'rxjs', 'ethers', '@ethereumjs/common', 'bignumber.js']
 }
diff --git a/packages/common/src/elements/AddressTable.svelte b/packages/common/src/elements/AddressTable.svelte
index 704098e1a..99cacce03 100644
--- a/packages/common/src/elements/AddressTable.svelte
+++ b/packages/common/src/elements/AddressTable.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { Account, AccountsList } from '../types'
-  import { utils } from 'ethers'
+  import { weiToEth } from '../utils'
 
   export let accountsListObject: AccountsList | undefined
   export let accountSelected: Account | undefined = undefined
@@ -120,7 +120,7 @@
             >
             <td>{account.derivationPath}</td>
             <td class="asset-td"
-              >{utils.formatEther(account.balance.value)}
+              >{weiToEth(account.balance.value.toString())}
               {account.balance.asset}</td
             >
           </tr>
diff --git a/packages/common/src/hdwallets.ts b/packages/common/src/hdwallets.ts
index 30656536b..e8d53b1b8 100644
--- a/packages/common/src/hdwallets.ts
+++ b/packages/common/src/hdwallets.ts
@@ -1,7 +1,7 @@
 import type Common from '@ethereumjs/common'
-import type { BigNumber } from 'ethers'
 import type { CustomNetwork, EIP1193Provider, RPCResponse } from './types'
 import type { TransactionRequest } from '@ethersproject/providers'
+import type { BigNumber } from 'ethers'
 
 /**
  * Creates the common instance used for signing
diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
index 4a024f5c2..bf7240ce7 100644
--- a/packages/common/src/index.ts
+++ b/packages/common/src/index.ts
@@ -1,62 +1,3 @@
-import type {
-  RequestPatch,
-  AccountSelectAPI,
-  SelectAccountOptions,
-  BasePath,
-  DerivationPath,
-  Asset,
-  ScanAccounts,
-  ScanAccountsOptions,
-  AccountAddress,
-  Account,
-  AccountsList,
-  AppMetadata,
-  RecommendedInjectedWallets,
-  WalletInit,
-  WalletHelpers,
-  APIKey,
-  Device,
-  WalletModule,
-  GetInterfaceHelpers,
-  Platform,
-  DeviceOS,
-  DeviceBrowser,
-  DeviceOSName,
-  DeviceBrowserName,
-  DeviceType,
-  ChainId,
-  RpcUrl,
-  WalletInterface,
-  ProviderMessage,
-  ProviderInfo,
-  ProviderAccounts,
-  ProviderEvent,
-  SimpleEventEmitter,
-  ConnectListener,
-  DisconnectListener,
-  MessageListener,
-  ChainListener,
-  AccountsListener,
-  Balance,
-  EthAccountsRequest,
-  EthBalanceRequest,
-  EIP1102Request,
-  SelectAccountsRequest,
-  EIP3326Request,
-  EIP3085Request,
-  EthChainIdRequest,
-  EthSignTransactionRequest,
-  EthSignMessageRequest,
-  EIP712Request,
-  AddChainParams,
-  EIP1193Provider,
-  Chain,
-  TokenSymbol,
-  CustomNetwork,
-  TransactionObject,
-  RPCResponse
-} from './types'
-
 export { ProviderRpcErrorCode } from './types'
 export { ProviderRpcError } from './errors'
 export { createEIP1193Provider } from './eip-1193'
@@ -68,62 +9,6 @@ export {
   bigNumberFieldsToStrings,
   getHardwareWalletProvider
 } from './hdwallets'
+export { weiToEth } from './utils'
 
-export type {
-  RequestPatch,
-  AccountSelectAPI,
-  SelectAccountOptions,
-  BasePath,
-  DerivationPath,
-  Asset,
-  ScanAccounts,
-  ScanAccountsOptions,
-  AccountAddress,
-  Account,
-  AccountsList,
-  AppMetadata,
-  RecommendedInjectedWallets,
-  WalletInit,
-  WalletHelpers,
-  APIKey,
-  Device,
-  WalletModule,
-  GetInterfaceHelpers,
-  Platform,
-  DeviceOS,
-  DeviceBrowser,
-  DeviceOSName,
-  DeviceBrowserName,
-  DeviceType,
-  ChainId,
-  RpcUrl,
-  WalletInterface,
-  ProviderMessage,
-  ProviderInfo,
-  ProviderAccounts,
-  ProviderEvent,
-  SimpleEventEmitter,
-  ConnectListener,
-  DisconnectListener,
-  MessageListener,
-  ChainListener,
-  AccountsListener,
-  Balance,
-  EthAccountsRequest,
-  EthBalanceRequest,
-  EIP1102Request,
-  SelectAccountsRequest,
-  EIP3326Request,
-  EIP3085Request,
-  EthChainIdRequest,
-  EthSignTransactionRequest,
-  EthSignMessageRequest,
-  EIP712Request,
-  AddChainParams,
-  EIP1193Provider,
-  Chain,
-  TokenSymbol,
-  CustomNetwork,
-  TransactionObject,
-  RPCResponse
-}
+export * from './types'
diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts
index c54fc3ddf..3ad1c2518 100644
--- a/packages/common/src/types.ts
+++ b/packages/common/src/types.ts
@@ -1,7 +1,7 @@
-import type { ethers, BigNumber } from 'ethers'
 import type { ConnectionInfo } from 'ethers/lib/utils'
 import type EventEmitter from 'eventemitter3'
 import type { TypedData as EIP712TypedData } from 'eip-712'
+import type { ethers } from 'ethers'
 export type { TypedData as EIP712TypedData } from 'eip-712'
 
 /**
@@ -116,7 +116,7 @@ export type Account = {
   derivationPath: DerivationPath
   balance: {
     asset: Asset['label']
-    value: BigNumber
+    value: ethers.BigNumber
   }
 }
 
@@ -238,6 +238,8 @@ export type GetInterfaceHelpers = {
 
 export type ChainId = string
 
+export type DecimalChainId = number
+
 export type RpcUrl = string
 
 export type WalletInterface = {
@@ -434,6 +436,8 @@ export interface Chain {
   blockExplorerUrl?: string
 }
 
+export type ChainWithDecimalId = Omit<Chain, 'id'> & { id: DecimalChainId }
+
 export type TokenSymbol = string // eg ETH
 
 export interface CustomNetwork {
diff --git a/packages/common/src/utils.ts b/packages/common/src/utils.ts
new file mode 100644
index 000000000..caf1e5b60
--- /dev/null
+++ b/packages/common/src/utils.ts
@@ -0,0 +1,5 @@
+import BigNumber from 'bignumber.js'
+
+export function weiToEth(wei: string): string {
+   return new BigNumber(wei).div(1e18).toString(10)
+}
\ No newline at end of file
diff --git a/packages/common/src/validation.ts b/packages/common/src/validation.ts
index fcbdaf1f3..904ffb3d4 100644
--- a/packages/common/src/validation.ts
+++ b/packages/common/src/validation.ts
@@ -9,7 +9,9 @@ const basePaths = Joi.array().items(basePath)
 
 const chain = Joi.object({
   namespace: Joi.string(),
-  id: Joi.string().required(),
+  id: Joi.string()
+    .pattern(/^0x[0-9a-fA-F]+$/)
+    .required(),
   rpcUrl: Joi.string().required(),
   label: Joi.string().required(),
   token: Joi.string().required(),
diff --git a/packages/common/src/views/AccountSelect.svelte b/packages/common/src/views/AccountSelect.svelte
index f0e70e15d..e3fa29733 100644
--- a/packages/common/src/views/AccountSelect.svelte
+++ b/packages/common/src/views/AccountSelect.svelte
@@ -3,8 +3,6 @@
   import CloseButton from '../elements/CloseButton.svelte'
   import AddressTable from '../elements/AddressTable.svelte'
   import TableHeader from '../elements/TableHeader.svelte'
-  import { utils } from 'ethers'
-
   import type { Subject } from 'rxjs'
   import type {
     ScanAccountsOptions,
@@ -12,6 +10,7 @@
     Account,
     AccountsList
   } from '../types'
+  import { weiToEth } from '../utils'
 
   export let selectAccountOptions: SelectAccountOptions
   export let accounts$: Subject<Account[]>
@@ -61,7 +60,7 @@
       accountsListObject = {
         all: allAccounts,
         filtered: allAccounts.filter(account => {
-          return parseFloat(utils.formatEther(account.balance.value)) > 0
+          return parseFloat(weiToEth(account.balance.value.toString())) > 0
         })
       }
       loadingAccounts = false
diff --git a/packages/core/README.md b/packages/core/README.md
index fe658dee2..eb057bdc3 100644
--- a/packages/core/README.md
+++ b/packages/core/README.md
@@ -105,6 +105,7 @@ export type AccountCenter = {
   position?: AccountCenterPosition // default: 'topRight'
   expanded?: boolean // default: true
   minimal?: boolean // enabled by default for mobile
+  containerElement?: string // defines the DOM container element for svelte to attach
 }
 
 export type AccountCenterOptions = {
@@ -640,14 +641,15 @@ setTimeout(
 **`preflightNotifications`**
 Notify can be used to deliver standard notifications along with preflight information by passing a `PreflightNotificationsOptions` object to the `preflightNotifications` action. This will return a a promise that resolves to the transaction hash (if `sendTransaction` resolves the transaction hash and is successful), the internal notification id (if no `sendTransaction` function is provided) or return nothing if an error occurs or `sendTransaction` is not provided or doesn't resolve to a string.
 
-Preflight event types include 
- - `txRequest` : Alert user there is a transaction request awaiting confirmation by their wallet
- - `txAwaitingApproval` : A previous transaction is awaiting confirmation
- - `txConfirmReminder` : Reminder to confirm a transaction to continue - configurable with the `txApproveReminderTimeout` property; defaults to 15 seconds
- - `nsfFail` : The user has insufficient funds for transaction (requires `gasPrice`, `estimateGas`, `balance`, `txDetails.value`)
- - `txError` : General transaction error (requires `sendTransaction`)
- - `txSendFail` : The user rejected the transaction (requires `sendTransaction`)
- - `txUnderpriced` : The gas price for the transaction is too low (requires `sendTransaction`)
+Preflight event types include
+
+- `txRequest` : Alert user there is a transaction request awaiting confirmation by their wallet
+- `txAwaitingApproval` : A previous transaction is awaiting confirmation
+- `txConfirmReminder` : Reminder to confirm a transaction to continue - configurable with the `txApproveReminderTimeout` property; defaults to 15 seconds
+- `nsfFail` : The user has insufficient funds for transaction (requires `gasPrice`, `estimateGas`, `balance`, `txDetails.value`)
+- `txError` : General transaction error (requires `sendTransaction`)
+- `txSendFail` : The user rejected the transaction (requires `sendTransaction`)
+- `txUnderpriced` : The gas price for the transaction is too low (requires `sendTransaction`)
 
 ```typescript
 interface PreflightNotificationsOptions {
@@ -678,8 +680,7 @@ const sendTransaction = () => {
   return signer.sendTransaction(txDetails).then(tx => tx.hash)
 }
 
-const gasPrice = () =>
-  ethersProvider.getGasPrice().then(res => res.toString())
+const gasPrice = () => ethersProvider.getGasPrice().then(res => res.toString())
 
 const estimateGas = () => {
   return ethersProvider.estimateGas(txDetails).then(res => res.toString())
@@ -811,7 +812,7 @@ The Onboard styles can customized via [CSS variables](https://developer.mozilla.
   --account-center-app-btn-text-color
   --account-center-app-btn-background
   --account-center-app-btn-font-family
-  
+
   /* CUSTOMIZE SECTIONS OF THE CONNECT MODAL */
   --onboard-connect-content-width
   --onboard-connect-content-height
diff --git a/packages/core/package.json b/packages/core/package.json
index 983eee850..921961c23 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/core",
-  "version": "2.5.0",
+  "version": "2.6.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",
@@ -68,6 +68,7 @@
     "@types/lodash.partition": "^4.6.6",
     "@typescript-eslint/eslint-plugin": "^4.31.1",
     "@typescript-eslint/parser": "^4.31.1",
+    "@web3-onboard/gas": "^2.0.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-svelte3": "^3.2.1",
@@ -75,13 +76,14 @@
     "prettier-plugin-svelte": "^2.4.0",
     "rollup": "^2.3.4",
     "rollup-plugin-svelte": "^7.0.0",
+    "rollup-plugin-terser": "^7.0.2",
     "svelte-check": "^2.2.6",
     "svelte-preprocess": "^4.9.4",
     "tslib": "^2.0.0",
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.1.6",
+    "@web3-onboard/common": "^2.1.7",
     "bignumber.js": "^9.0.0",
     "bnc-sdk": "^4.4.1",
     "bowser": "^2.11.0",
diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js
index 0995d1e78..075ec01b7 100644
--- a/packages/core/rollup.config.js
+++ b/packages/core/rollup.config.js
@@ -5,6 +5,7 @@ import json from '@rollup/plugin-json'
 import sveltePreprocess from 'svelte-preprocess'
 import typescript from '@rollup/plugin-typescript'
 import copy from '@rollup-extras/plugin-copy'
+import { terser } from 'rollup-plugin-terser'
 
 const production = !process.env.ROLLUP_WATCH
 
@@ -12,7 +13,8 @@ export default {
   input: 'src/index.ts',
   output: {
     format: 'es',
-    dir: 'dist/'
+    dir: 'dist/',
+    sourcemap: true,
   },
   plugins: [
     json(),
@@ -38,6 +40,18 @@ export default {
     copy({
       src: 'src/i18n/en.json',
       dest: 'i18n'
+    }),
+    production && terser({
+      ecma: 2017,
+      mangle: { toplevel: true },
+      compress: {
+        module: true,
+        toplevel: true,
+        unsafe_arrows: true,
+        drop_console: production,
+        drop_debugger: production
+      },
+      output: { quote_style: 1 }
     })
   ],
   external: [
diff --git a/packages/core/src/chain.ts b/packages/core/src/chain.ts
index 85750dc81..6efd9175b 100644
--- a/packages/core/src/chain.ts
+++ b/packages/core/src/chain.ts
@@ -6,9 +6,10 @@ import { state } from './store'
 import { switchChainModal$ } from './streams'
 import { validateSetChainOptions } from './validation'
 import type { WalletState } from './types'
+import { toHexString } from './utils'
 
 async function setChain(options: {
-  chainId: string
+  chainId: string | number
   chainNamespace?: string
   wallet?: WalletState['label']
 }): Promise<boolean> {
@@ -20,10 +21,11 @@ async function setChain(options: {
 
   const { wallets, chains } = state.get()
   const { chainId, chainNamespace = 'evm', wallet: walletToSet } = options
+  const chainIdHex = toHexString(chainId)
 
   // validate that chainId has been added to chains
   const chain = chains.find(
-    ({ namespace, id }) => namespace === chainNamespace && id === chainId
+    ({ namespace, id }) => namespace === chainNamespace && id === chainIdHex
   )
 
   if (!chain) {
@@ -50,13 +52,13 @@ async function setChain(options: {
   // check if wallet is already connected to chainId
   if (
     walletConnectedChain.namespace === chainNamespace &&
-    walletConnectedChain.id === chainId
+    walletConnectedChain.id === chainIdHex
   ) {
     return true
   }
 
   try {
-    await switchChain(wallet.provider, chainId)
+    await switchChain(wallet.provider, chainIdHex)
     return true
   } catch (error) {
     const { code } = error as { code: number }
@@ -69,7 +71,7 @@ async function setChain(options: {
       // chain has not been added to wallet
       try {
         await addNewChain(wallet.provider, chain)
-        await switchChain(wallet.provider, chainId)
+        await switchChain(wallet.provider, chainIdHex)
         return true
       } catch (error) {
         // display notification to user to switch chain
diff --git a/packages/core/src/configuration.ts b/packages/core/src/configuration.ts
index 1bb47bdbe..f274c4ed8 100644
--- a/packages/core/src/configuration.ts
+++ b/packages/core/src/configuration.ts
@@ -6,7 +6,8 @@ export let configuration: Configuration = {
   appMetadata: null,
   apiKey: null,
   device: getDevice(),
-  initialWalletInit: []
+  initialWalletInit: [],
+  gas: null
 }
 
 export function updateConfiguration(update: Partial<Configuration>): void {
diff --git a/packages/core/src/connect.ts b/packages/core/src/connect.ts
index af870690b..2cda51c65 100644
--- a/packages/core/src/connect.ts
+++ b/packages/core/src/connect.ts
@@ -25,8 +25,8 @@ async function connect(
   if (!chains.length)
     throw new Error(
       'At least one chain must be set before attempting to connect a wallet'
-    )
-
+  )
+  
   const { autoSelect } = options || {
     autoSelect: { label: '', disableModals: false }
   }
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 58cc463e0..46cd0d349 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -4,16 +4,20 @@ import disconnectWallet from './disconnect'
 import setChain from './chain'
 import { state } from './store'
 import { reset$ } from './streams'
-import {
-  validateInitOptions,
-  validateNotify,
-  validateNotifyOptions
-} from './validation'
 import initI18N from './i18n'
 import App from './views/Index.svelte'
 import type { InitOptions, Notify } from './types'
 import { APP_INITIAL_STATE } from './constants'
 import { configuration, updateConfiguration } from './configuration'
+import updateBalances from './update-balances'
+import { chainIdToHex } from './utils'
+import { preflightNotifications } from './preflight-notifications'
+
+import {
+  validateInitOptions,
+  validateNotify,
+  validateNotifyOptions
+} from './validation'
 
 import {
   addChains,
@@ -25,9 +29,6 @@ import {
   setWalletModules
 } from './store/actions'
 
-import updateBalances from './update-balances'
-import { preflightNotifications } from './preflight-notifications'
-
 const API = {
   connectWallet,
   disconnectWallet,
@@ -85,12 +86,12 @@ function init(options: InitOptions): OnboardAPI {
     i18n,
     accountCenter,
     apiKey,
-    notify
+    notify,
+    gas
   } = options
 
   initI18N(i18n)
-  addChains(chains)
-
+  addChains(chainIdToHex(chains))
   const { device, svelteInstance } = configuration
 
   // update accountCenter
@@ -129,6 +130,7 @@ function init(options: InitOptions): OnboardAPI {
       ) {
         notify.desktop.position = accountCenter.desktop.position
       }
+
       if (
         (!notify.mobile || (notify.mobile && !notify.mobile.position)) &&
         accountCenter &&
@@ -137,6 +139,7 @@ function init(options: InitOptions): OnboardAPI {
       ) {
         notify.mobile.position = accountCenter.mobile.position
       }
+
       let notifyUpdate: Partial<Notify>
 
       if (device.type === 'mobile' && notify.mobile) {
@@ -150,9 +153,11 @@ function init(options: InitOptions): OnboardAPI {
           ...notify.desktop
         }
       }
+
       if (!apiKey || !notifyUpdate.enabled) {
         notifyUpdate.enabled = false
       }
+
       updateNotify(notifyUpdate)
     } else {
       const error = validateNotify(notify as Notify)
@@ -160,6 +165,7 @@ function init(options: InitOptions): OnboardAPI {
       if (error) {
         throw error
       }
+
       const notifyUpdate: Partial<Notify> = {
         ...APP_INITIAL_STATE.notify,
         ...notify
@@ -168,6 +174,7 @@ function init(options: InitOptions): OnboardAPI {
       if (!apiKey || !notifyUpdate.enabled) {
         notifyUpdate.enabled = false
       }
+
       updateNotify(notifyUpdate)
     }
   } else {
@@ -176,6 +183,7 @@ function init(options: InitOptions): OnboardAPI {
     if (!apiKey) {
       notifyUpdate.enabled = false
     }
+
     updateNotify(notifyUpdate)
   }
 
@@ -191,7 +199,8 @@ function init(options: InitOptions): OnboardAPI {
     appMetadata,
     svelteInstance: app,
     apiKey,
-    initialWalletInit: wallets
+    initialWalletInit: wallets,
+    gas
   })
 
   return API
@@ -214,6 +223,7 @@ function mountApp() {
   styleEl.innerHTML = `
     ${SofiaProRegular}
   `
+
   document.body.appendChild(styleEl)
 
   // add to DOM
@@ -317,7 +327,9 @@ function mountApp() {
 
   const containerElementQuery =
     state.get().accountCenter.containerElement || 'body'
+
   const containerElement = document.querySelector(containerElementQuery)
+
   if (!containerElement) {
     throw new Error(
       `Element with query ${state.get().accountCenter} does not exist.`
diff --git a/packages/core/src/provider.ts b/packages/core/src/provider.ts
index b3e3bc313..05f4acf2d 100644
--- a/packages/core/src/provider.ts
+++ b/packages/core/src/provider.ts
@@ -1,7 +1,7 @@
 import { fromEventPattern, Observable } from 'rxjs'
 import { filter, takeUntil, take, share, switchMap } from 'rxjs/operators'
 import partition from 'lodash.partition'
-import { utils, providers } from 'ethers'
+import { providers } from 'ethers'
 
 import type {
   ChainId,
@@ -14,6 +14,7 @@ import type {
   SelectAccountsRequest
 } from '@web3-onboard/common'
 
+import { weiToEth } from '@web3-onboard/common'
 import { disconnectWallet$ } from './streams'
 import type { Account, Address, Balances, Ens, WalletState } from './types'
 import { updateAccount, updateWallet } from './store/actions'
@@ -339,14 +340,15 @@ export async function getBalance(
 ): Promise<Balances | null> {
   // chain we don't recognize and don't have a rpcUrl for requests
   if (!chain) return null
-
-  const provider = getProvider(chain)
+  
+  const { wallets } = state.get()
 
   try {
-    const balanceWei = await provider.getBalance(address)
-
-    return balanceWei
-      ? { [chain.token || 'eth']: utils.formatEther(balanceWei) }
+    const wallet = wallets.find(wallet => !!wallet.provider)
+    const provider = wallet.provider
+    const balanceHex = await provider.request({ method: 'eth_getBalance', params:[address,'latest'] })
+    return balanceHex
+      ? { [chain.token || 'eth']: weiToEth(balanceHex) }
       : null
   } catch (error) {
     console.error(error)
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index d23557b8e..fd61471b7 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -7,9 +7,12 @@ import type {
   EIP1193Provider,
   WalletModule,
   Chain,
-  TokenSymbol
+  TokenSymbol,
+  ChainWithDecimalId
 } from '@web3-onboard/common'
 
+import type gas from '@web3-onboard/gas'
+
 import type en from './i18n/en.json'
 import type { EthereumTransactionData, Network } from 'bnc-sdk'
 
@@ -21,7 +24,7 @@ export interface InitOptions {
   /**
    * The chains that your app works with
    */
-  chains: Chain[]
+  chains: Chain[] | ChainWithDecimalId[]
   /**
    * Additional metadata about your app to be displayed in the Onboard UI
    */
@@ -43,6 +46,8 @@ export interface InitOptions {
    * Transaction notification options
    */
   notify?: Partial<NotifyOptions> | Partial<Notify>
+  /**Gas module */
+  gas?: typeof gas
 }
 
 export interface ConnectOptions {
@@ -116,10 +121,11 @@ export interface AppState {
 
 export type Configuration = {
   svelteInstance: SvelteComponent | null
-  appMetadata: AppMetadata | null
   device: Device | DeviceNotBrowser
-  apiKey: string
   initialWalletInit: WalletInit[]
+  appMetadata?: AppMetadata | null
+  apiKey?: string
+  gas?: typeof gas
 }
 
 export type Locale = string
@@ -141,7 +147,7 @@ export type AccountCenter = {
   position?: AccountCenterPosition
   expanded?: boolean
   minimal?: boolean
-  containerElement: string
+  containerElement?: string
 }
 
 export type AccountCenterOptions = {
diff --git a/packages/core/src/update-balances.ts b/packages/core/src/update-balances.ts
index 6a9f90a26..d93a95a8b 100644
--- a/packages/core/src/update-balances.ts
+++ b/packages/core/src/update-balances.ts
@@ -19,7 +19,6 @@ async function updateBalances(addresses?: string[]): Promise<void> {
             )
           ) {
             const updatedBalance = await getBalance(account.address, chain)
-
             return { ...account, balance: updatedBalance }
           }
           return account
diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
index 4c59e3ea5..23204f0a9 100644
--- a/packages/core/src/utils.ts
+++ b/packages/core/src/utils.ts
@@ -8,7 +8,8 @@ import type {
   ChainId,
   Chain,
   WalletInit,
-  WalletModule
+  WalletModule,
+  ChainWithDecimalId
 } from '@web3-onboard/common'
 
 import ethereumIcon from './icons/ethereum'
@@ -92,6 +93,16 @@ export async function copyWalletAddress(text: string): Promise<void> {
   }
 }
 
+export const toHexString = (val: number | string): string => typeof val === 'number' ? `0x${val.toString(16)}` : val
+
+export function chainIdToHex(chains : Chain[] | ChainWithDecimalId[] ): 
+Chain[] {
+  return chains.map(({ id, ...rest }) => { 
+    const hexId = toHexString(id)
+    return { id: hexId, ...rest }
+  })  
+} 
+
 export const chainIdToLabel: Record<string, string> = {
   '0x1': 'Ethereum',
   '0x3': 'Ropsten',
@@ -243,5 +254,5 @@ export const defaultNotifyEventStyles: Record<string, NotifyEventStyles> = {
   }
 }
 
-export const wait = (time: number) =>
+export const wait = (time: number): Promise<void> =>
   new Promise(resolve => setTimeout(resolve, time))
diff --git a/packages/core/src/validation.ts b/packages/core/src/validation.ts
index 71f5b1b92..8b0097acf 100644
--- a/packages/core/src/validation.ts
+++ b/packages/core/src/validation.ts
@@ -2,6 +2,7 @@ import Joi, { ObjectSchema, Schema } from 'joi'
 import type {
   Chain,
   ChainId,
+  DecimalChainId,
   WalletInit,
   WalletModule
 } from '@web3-onboard/common'
@@ -22,7 +23,11 @@ import type {
   PreflightNotificationsOptions
 } from './types'
 
-const chainId = Joi.string().pattern(/^0x[0-9a-fA-F]+$/)
+// const chainId = Joi.string().pattern(/^0x[0-9a-fA-F]+$/)
+const chainId = Joi.alternatives().try(
+  Joi.string().pattern(/^0x[0-9a-fA-F]+$/),
+  Joi.number().positive()
+)
 const chainNamespace = Joi.string().valid('evm')
 const unknownObject = Joi.object().unknown()
 
@@ -150,6 +155,21 @@ const notifyOptions = Joi.object({
   mobile: notify
 })
 
+const accountCenterInitOptions = Joi.object({
+  enabled: Joi.boolean(),
+  position: commonPositions,
+  minimal: Joi.boolean(),
+  containerElement: Joi.string()
+})
+
+const accountCenter = Joi.object({
+  enabled: Joi.boolean(),
+  position: commonPositions,
+  expanded: Joi.boolean(),
+  minimal: Joi.boolean(),
+  containerElement: Joi.string()
+})
+
 const initOptions = Joi.object({
   wallets: walletInit,
   chains: chains.required(),
@@ -157,20 +177,14 @@ const initOptions = Joi.object({
   i18n: Joi.object().unknown(),
   apiKey: Joi.string(),
   accountCenter: Joi.object({
-    desktop: Joi.object({
-      enabled: Joi.boolean(),
-      minimal: Joi.boolean(),
-      position: commonPositions,
-      containerElement: Joi.string()
-    }),
-    mobile: Joi.object({
-      enabled: Joi.boolean(),
-      minimal: Joi.boolean(),
-      position: commonPositions,
-      containerElement: Joi.string()
-    })
+    desktop: accountCenterInitOptions,
+    mobile: accountCenterInitOptions
   }),
-  notify: [notifyOptions, notify]
+  notify: [notifyOptions, notify],
+  gas: Joi.object({
+    get: Joi.function().required(),
+    stream: Joi.function().required()
+  })
 })
 
 const connectOptions = Joi.object({
@@ -195,14 +209,6 @@ const setChainOptions = Joi.object({
   wallet: Joi.string()
 })
 
-const accountCenter = Joi.object({
-  enabled: Joi.boolean(),
-  position: commonPositions,
-  expanded: Joi.boolean(),
-  minimal: Joi.boolean(),
-  containerElement: Joi.string()
-})
-
 const customNotificationUpdate = Joi.object({
   key: Joi.string().required(),
   type: Joi.string().allow('pending', 'error', 'success', 'hint'),
@@ -218,15 +224,9 @@ const preflightNotifications = Joi.object({
   sendTransaction: Joi.function(),
   estimateGas: Joi.function(),
   gasPrice: Joi.function(),
-  balance: Joi.alternatives(
-    Joi.string(),
-    Joi.number()
-  ),
+  balance: Joi.alternatives(Joi.string(), Joi.number()),
   txDetails: Joi.object({
-    value: Joi.alternatives(
-      Joi.string(),
-      Joi.number()
-    ),
+    value: Joi.alternatives(Joi.string(), Joi.number()),
     to: Joi.string(),
     from: Joi.string()
   }),
@@ -305,7 +305,7 @@ export function validateString(str: string, label?: string): ValidateReturn {
 }
 
 export function validateSetChainOptions(data: {
-  chainId: ChainId
+  chainId: ChainId | DecimalChainId
   chainNamespace?: string
   wallet?: WalletState['label']
 }): ValidateReturn {
diff --git a/packages/core/src/views/connect/Index.svelte b/packages/core/src/views/connect/Index.svelte
index 958667450..4328664bf 100644
--- a/packages/core/src/views/connect/Index.svelte
+++ b/packages/core/src/views/connect/Index.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import { ProviderRpcErrorCode, WalletModule } from '@web3-onboard/common'
-  import { BigNumber } from 'ethers'
   import { BehaviorSubject, takeUntil } from 'rxjs'
   import EventEmitter from 'eventemitter3'
   import { _ } from 'svelte-i18n'
@@ -20,7 +19,7 @@
   import Sidebar from './Sidebar.svelte'
   import { configuration } from '../../configuration'
   import { getBlocknativeSdk } from '../../services'
-
+  import { BigNumber } from 'ethers'
   import {
     getChainId,
     requestAccounts,
@@ -51,12 +50,6 @@
   let windowWidth: number
   let scrollContainer: HTMLElement
 
-  let walletToAutoSelect =
-    autoSelect.label &&
-    walletModules.find(
-      ({ label }) => label.toLowerCase() === autoSelect.label.toLowerCase()
-    )
-
   const modalStep$ = new BehaviorSubject<keyof i18n['connect']>(
     'selectingWallet'
   )
@@ -209,13 +202,13 @@
       // user rejected account access
       if (code === ProviderRpcErrorCode.ACCOUNT_ACCESS_REJECTED) {
         connectionRejected = true
-        if (walletToAutoSelect) {
-          walletToAutoSelect = null
 
-          if (autoSelect.disableModals) {
-            connectWallet$.next({ inProgress: false })
-          }
+        if (autoSelect.disableModals) {
+          connectWallet$.next({ inProgress: false })
+        } else if (autoSelect.label) {
+          autoSelect.label = ''
         }
+
         return
       }
 
@@ -263,8 +256,17 @@
   modalStep$.pipe(takeUntil(onDestroy$)).subscribe(step => {
     switch (step) {
       case 'selectingWallet': {
-        if (walletToAutoSelect) {
-          autoSelectWallet(walletToAutoSelect)
+        if (autoSelect.label) {
+          const walletToAutoSelect = walletModules.find(
+            ({ label }) =>
+              label.toLowerCase() === autoSelect.label.toLowerCase()
+          )
+
+          if (walletToAutoSelect) {
+            autoSelectWallet(walletToAutoSelect)
+          } else if (autoSelect.disableModals) {
+            connectWallet$.next({ inProgress: false })
+          }
         } else {
           loadWalletsForSelection()
         }
diff --git a/packages/dcent/package.json b/packages/dcent/package.json
index 61728fc7e..abcdcbbad 100644
--- a/packages/dcent/package.json
+++ b/packages/dcent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/dcent",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "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,7 +56,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.1.6",
+    "@web3-onboard/common": "^2.1.7",
     "@ethereumjs/common": "^2.6.1",
     "@ethereumjs/tx": "^3.4.0",
     "@ethersproject/providers": "^5.5.0",
diff --git a/packages/demo/package.json b/packages/demo/package.json
index f93258f6d..49c820021 100644
--- a/packages/demo/package.json
+++ b/packages/demo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "demo",
-  "version": "2.0.5",
+  "version": "2.0.8",
   "devDependencies": {
     "assert": "^2.0.0",
     "buffer": "^6.0.3",
@@ -22,21 +22,21 @@
     "webpack-dev-server": "4.7.4"
   },
   "dependencies": {
-    "@web3-onboard/coinbase": "^2.0.8",
-    "@web3-onboard/core": "^2.4.1-alpha.1",
-    "@web3-onboard/dcent": "^2.0.5",
-    "@web3-onboard/fortmatic": "^2.0.6",
-    "@web3-onboard/gnosis": "^2.0.5",
-    "@web3-onboard/injected-wallets": "^2.0.12",
-    "@web3-onboard/keepkey": "^2.1.4",
-    "@web3-onboard/keystone": "^2.1.5",
-    "@web3-onboard/ledger": "^2.1.4",
-    "@web3-onboard/magic": "^2.0.7",
-    "@web3-onboard/portis": "^2.0.4",
-    "@web3-onboard/torus": "^2.0.5",
-    "@web3-onboard/trezor": "^2.1.4",
-    "@web3-onboard/walletconnect": "^2.0.5",
-    "@web3-onboard/web3auth": "^2.0.3",
+    "@web3-onboard/coinbase": "^2.0.10",
+    "@web3-onboard/core": "^2.6.0",
+    "@web3-onboard/dcent": "^2.0.7",
+    "@web3-onboard/fortmatic": "^2.0.9",
+    "@web3-onboard/gnosis": "^2.0.8",
+    "@web3-onboard/injected-wallets": "^2.0.15",
+    "@web3-onboard/keepkey": "^2.1.7",
+    "@web3-onboard/keystone": "^2.1.8",
+    "@web3-onboard/ledger": "^2.1.7",
+    "@web3-onboard/magic": "^2.0.10",
+    "@web3-onboard/portis": "^2.0.7",
+    "@web3-onboard/torus": "^2.0.8",
+    "@web3-onboard/trezor": "^2.1.7",
+    "@web3-onboard/walletconnect": "^2.0.8",
+    "@web3-onboard/web3auth": "^2.0.6",
     "vconsole": "^3.9.5"
   },
   "license": "MIT",
diff --git a/packages/demo/src/App.svelte b/packages/demo/src/App.svelte
index 5b73b811a..8ecd45536 100644
--- a/packages/demo/src/App.svelte
+++ b/packages/demo/src/App.svelte
@@ -62,7 +62,9 @@
 
   const coinbaseWallet = coinbaseModule()
 
-  const walletConnect = walletConnectModule()
+  const walletConnect = walletConnectModule({
+    connectFirstChainId: true
+  })
   const portis = portisModule({
     apiKey: 'b2b7586f-2b1e-4c30-a7fb-c2d1533b153b'
   })
@@ -122,19 +124,19 @@
         rpcUrl: 'https://mainnet.infura.io/v3/17c1e1500e384acfb6a72c5d2e67742e'
       },
       {
-        id: '0x3',
+        id: 3,
         token: 'tROP',
         label: 'Ropsten',
         rpcUrl: 'https://ropsten.infura.io/v3/17c1e1500e384acfb6a72c5d2e67742e'
       },
       {
-        id: '0x4',
+        id: 4,
         token: 'rETH',
         label: 'Rinkeby',
         rpcUrl: 'https://rinkeby.infura.io/v3/17c1e1500e384acfb6a72c5d2e67742e'
       },
       {
-        id: '0x89',
+        id: 137,
         token: 'MATIC',
         label: 'Polygon',
         rpcUrl: 'https://matic-mainnet.chainstacklabs.com'
@@ -146,7 +148,7 @@
         rpcUrl: 'https://matic-mumbai.chainstacklabs.com	'
       },
       {
-        id: '0xa',
+        id: 10,
         token: 'OETH',
         label: 'Optimism',
         rpcUrl: 'https://mainnet.optimism.io'
diff --git a/packages/fortmatic/package.json b/packages/fortmatic/package.json
index 02d1cf87f..e2be3a36b 100644
--- a/packages/fortmatic/package.json
+++ b/packages/fortmatic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/fortmatic",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "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.",
   "keywords": [
     "Ethereum",
@@ -59,7 +59,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.1.6",
+    "@web3-onboard/common": "^2.1.7",
     "fortmatic": "^2.2.1"
   }
 }
diff --git a/packages/gas/README.md b/packages/gas/README.md
new file mode 100644
index 000000000..ceca031cf
--- /dev/null
+++ b/packages/gas/README.md
@@ -0,0 +1,55 @@
+# @web3-onboard/gas
+
+## A module for requesting streams or single requests of gas price estimates from the [Blocknative Gas Platform API](https://docs.blocknative.com/gas-platform).
+
+### Install
+
+**NPM**
+`npm i @web3-onboard/gas`
+
+**Yarn**
+`yarn add @web3-onboard/gas`
+
+### Standalone Usage
+
+```typescript
+import gas from '@web3-onboard/gas'
+
+// subscribe to a single chain for estimates using the default poll rate of 5 secs
+// API key is optional and if provided allows for faster poll rates
+const ethMainnetGasBlockPrices = gas.stream({
+  chains: ['0x1'],
+  apiKey: '<OPTIONAL_API_KEY>',
+  endpoint: 'blockPrices'
+})
+
+const { unsubscribe: ethGasUnsub } = ethMainnetGasBlockPrices.subscribe(
+  estimates => console.log(estimates)
+)
+
+// .... sometime later, unsubscribe to stop polling
+setTimeout(ethGasUnsub, 10000)
+
+// OR you can subscribe to multiple chains at once:
+const gasBlockPrices = gas.stream({
+  chains: ['0x1', '0x89'],
+  apiKey: '<OPTIONAL_API_KEY>',
+  endpoint: 'blockPrices',
+  // can override default poll rate as well
+  poll: 1000
+})
+
+const { unsubscribe } = gasBlockPrices.subscribe(estimates =>
+  console.log(estimates)
+)
+
+// .... sometime later, unsubscribe to stop polling
+setTimeout(unsubscribe, 10000)
+
+// Can also just do a one time get rather than a stream
+const gasBlockPrices = await gas.get({
+  chains: ['0x1', '0x89'],
+  apiKey: '<OPTIONAL_API_KEY>',
+  endpoint: 'blockPrices'
+})
+```
diff --git a/packages/gas/package.json b/packages/gas/package.json
new file mode 100644
index 000000000..3c22b3635
--- /dev/null
+++ b/packages/gas/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "@web3-onboard/gas",
+  "version": "2.0.0",
+  "description": "Gas",
+  "keywords": [
+    "gas"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/blocknative/web3-onboard.git",
+    "directory": "packages/gas"
+  },
+  "homepage": "https://www.blocknative.com/onboard",
+  "bugs": "https://github.com/blocknative/web3-onboard/issues",
+  "module": "dist/index.js",
+  "typings": "dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "type": "module",
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsc -w",
+    "type-check": "tsc --noEmit"
+  },
+  "license": "MIT",
+  "devDependencies": {
+    "typescript": "^4.5.5"
+  },
+  "dependencies": {
+    "rxjs": "^7.5.2",
+    "joi": "^17.4.2"
+  }
+}
diff --git a/packages/gas/src/get.ts b/packages/gas/src/get.ts
new file mode 100644
index 000000000..7bffd98a4
--- /dev/null
+++ b/packages/gas/src/get.ts
@@ -0,0 +1,30 @@
+import { firstValueFrom, zip } from 'rxjs'
+import { ajax } from 'rxjs/ajax'
+import { getRequestUrl } from './utils'
+import { RequestOptions, ChainId, GasPlatformResponse } from './types'
+import { validateRequest } from './validation'
+
+function get(options: RequestOptions): Promise<GasPlatformResponse[]> {
+  const invalid = validateRequest(options)
+
+  if (invalid) {
+    throw invalid
+  }
+
+  const { chains, endpoint, apiKey } = options
+
+  const requestUrls = chains.map(chainId =>
+    getRequestUrl({ chainId, apiKey, endpoint })
+  )
+
+  return firstValueFrom(
+    // get data
+    zip(
+      requestUrls.map(({ url, headers }) =>
+        ajax.getJSON<GasPlatformResponse>(url, headers)
+      )
+    )
+  )
+}
+
+export default get
diff --git a/packages/gas/src/index.ts b/packages/gas/src/index.ts
new file mode 100644
index 000000000..549e1271b
--- /dev/null
+++ b/packages/gas/src/index.ts
@@ -0,0 +1,9 @@
+import get from './get'
+import stream from './stream'
+
+export * from './types'
+
+export default {
+  get,
+  stream
+}
diff --git a/packages/gas/src/stream.ts b/packages/gas/src/stream.ts
new file mode 100644
index 000000000..ed4839e00
--- /dev/null
+++ b/packages/gas/src/stream.ts
@@ -0,0 +1,34 @@
+import { Observable, timer, zip } from 'rxjs'
+import { switchMap } from 'rxjs/operators'
+import { ajax } from 'rxjs/ajax'
+import { getRequestUrl } from './utils'
+import { StreamOptions, GasPlatformResponse } from './types'
+import { validateRequest } from './validation'
+
+function stream(options: StreamOptions): Observable<GasPlatformResponse[]> {
+  const invalid = validateRequest(options)
+
+  if (invalid) {
+    throw invalid
+  }
+
+  const { chains, endpoint, apiKey, poll = 5000 } = options
+
+  const requestUrls = chains.map(chainId =>
+    getRequestUrl({ chainId, apiKey, endpoint })
+  )
+
+  // start polling
+  return timer(0, poll).pipe(
+    switchMap(() =>
+      // combine results of all chains request in to one stream emission
+      zip(
+        requestUrls.map(({ url, headers }) =>
+          ajax.getJSON<GasPlatformResponse>(url, headers)
+        )
+      )
+    )
+  )
+}
+
+export default stream
diff --git a/packages/gas/src/types.ts b/packages/gas/src/types.ts
new file mode 100644
index 000000000..c12996c40
--- /dev/null
+++ b/packages/gas/src/types.ts
@@ -0,0 +1,51 @@
+export type RequestEndpoint = 'blockPrices'
+
+export type RequestOptions = {
+  chains: ChainId[]
+  endpoint: RequestEndpoint
+  apiKey?: string
+}
+
+export type StreamOptions = RequestOptions & { poll?: number }
+
+export type ChainId = string
+
+export type GasPrice = {
+  confidence: number
+  price: number | null
+  maxFeePerGas: number | null
+  maxPriorityFeePerGas: number | null
+}
+
+export type BlockPrices = {
+  blockNumber: number
+  estimatedTransactionCount: number
+  baseFeePerGas: number
+  estimatedPrices: GasPrice[]
+}
+
+export type EstimatedBaseFee = {
+  confidence: number
+  baseFee: number
+}
+
+export type EstimatedBaseFees = [
+  { ['pending+1']: [EstimatedBaseFee] },
+  { ['pending+2']: [EstimatedBaseFee] },
+  { ['pending+3']: [EstimatedBaseFee] },
+  { ['pending+4']: [EstimatedBaseFee] },
+  { ['pending+5']: [EstimatedBaseFee] }
+]
+
+export type BlockPricesResponse = {
+  system: string
+  network: string
+  unit: string
+  maxPrice: number
+  currentBlockNumber: number
+  msSinceLastBlock: number
+  blockPrices: BlockPrices[]
+  estimatedBaseFees?: EstimatedBaseFees
+}
+
+export type GasPlatformResponse = BlockPricesResponse
diff --git a/packages/gas/src/utils.ts b/packages/gas/src/utils.ts
new file mode 100644
index 000000000..5a4ec7450
--- /dev/null
+++ b/packages/gas/src/utils.ts
@@ -0,0 +1,28 @@
+import { ChainId, RequestEndpoint } from './types'
+
+export function getRequestUrl({
+  chainId,
+  endpoint,
+  apiKey
+}: {
+  chainId: ChainId
+  endpoint: RequestEndpoint
+  apiKey?: string
+}): { url: string; headers: { authorization?: string } } {
+  switch (endpoint) {
+    case 'blockPrices':
+      return {
+        url: `https://api.blocknative.com/gasprices/blockprices?chainid=${parseInt(
+          chainId,
+          16
+        )}`,
+        headers: apiKey
+          ? {
+              authorization: apiKey
+            }
+          : {}
+      }
+    default:
+      throw new Error(`Unrecognized request endpoint: ${endpoint}`)
+  }
+}
diff --git a/packages/gas/src/validation.ts b/packages/gas/src/validation.ts
new file mode 100644
index 000000000..1eb720b75
--- /dev/null
+++ b/packages/gas/src/validation.ts
@@ -0,0 +1,20 @@
+import Joi from 'joi'
+import { RequestOptions, StreamOptions } from 'types'
+
+const requestOptions = Joi.object({
+  endpoint: Joi.string().valid('blockPrices').required(),
+  chains: Joi.array().items(Joi.string().valid('0x1', '0x89')).required(),
+  apiKey: Joi.string(),
+  poll: Joi.number().min(1000).max(5000)
+})
+
+type ValidateReturn = Joi.ValidationResult | null
+
+const validate = (validator: Joi.Schema, data: unknown): ValidateReturn => {
+  const result = validator.validate(data)
+  return result.error ? result : null
+}
+
+export const validateRequest = (
+  request: RequestOptions | StreamOptions
+): ValidateReturn => validate(requestOptions, request)
diff --git a/packages/gas/tsconfig.json b/packages/gas/tsconfig.json
new file mode 100644
index 000000000..592d71e8f
--- /dev/null
+++ b/packages/gas/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": ["src/**/*"],
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src",
+    "declarationDir": "dist",
+    "paths": {
+      "*": ["./src/*", "./node_modules/*"]
+    },
+    "typeRoots": ["node_modules/@types"],
+    "strict": false,
+    "allowSyntheticDefaultImports": true
+  }
+}
diff --git a/packages/gnosis/package.json b/packages/gnosis/package.json
index 63985b21d..63daf760d 100644
--- a/packages/gnosis/package.json
+++ b/packages/gnosis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/gnosis",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "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.",
   "keywords": [
     "Ethereum",
@@ -59,6 +59,6 @@
   "dependencies": {
     "@gnosis.pm/safe-apps-provider": "^0.9.2",
     "@gnosis.pm/safe-apps-sdk": "^6.1.1",
-    "@web3-onboard/common": "^2.1.6"
+    "@web3-onboard/common": "^2.1.7"
   }
 }
diff --git a/packages/injected/package.json b/packages/injected/package.json
index f3eea5496..ad37d9540 100644
--- a/packages/injected/package.json
+++ b/packages/injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/injected-wallets",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "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.",
   "keywords": [
     "Ethereum",
@@ -62,7 +62,7 @@
     "window": "^4.2.7"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.1.6",
+    "@web3-onboard/common": "^2.1.7",
     "joi": "^17.4.2",
     "lodash.uniqby": "^4.7.0"
   }
diff --git a/packages/injected/src/constants.ts b/packages/injected/src/constants.ts
index a8c6219b2..793b72dd9 100644
--- a/packages/injected/src/constants.ts
+++ b/packages/injected/src/constants.ts
@@ -11,5 +11,6 @@ export const WALLET_NAMES: { [key: string]: string } = {
   metamask: 'MetaMask',
   detected: 'Detected Wallet',
   meetone: 'MeetOne',
-  frame: 'Frame'
+  frame: 'Frame',
+  bitkeep: 'BitKeep',
 }
diff --git a/packages/injected/src/icons/bitkeep.ts b/packages/injected/src/icons/bitkeep.ts
new file mode 100644
index 000000000..d124f81da
--- /dev/null
+++ b/packages/injected/src/icons/bitkeep.ts
@@ -0,0 +1,5 @@
+export default `<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18 0C27.942 0 36 8.05967 36 18C36 27.942 27.942 36 18 36C8.05967 36 0 27.9413 0 18C0 8.05967 8.05967 0 18 0Z" fill="#7524F9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28 13.1817V14.2863C28.0002 14.3931 27.9714 14.4981 27.9165 14.5907C27.8616 14.6833 27.7826 14.7601 27.6875 14.8135L24.0242 16.8686L27.2969 18.6995C27.5108 18.8196 27.6884 18.9924 27.8118 19.2005C27.9353 19.4085 28.0002 19.6445 28 19.8847V22.8302C28.0003 23.0705 27.9355 23.3066 27.812 23.5148C27.6886 23.723 27.5109 23.8959 27.2969 24.0161L18.6898 28.8168C18.4761 28.9368 18.2336 29 17.9867 29C17.7399 29 17.4974 28.9368 17.2836 28.8168L14.4672 27.235C14.4196 27.2084 14.3802 27.17 14.3527 27.1238C14.3253 27.0776 14.3108 27.0252 14.3108 26.9718C14.3108 26.9184 14.3253 26.866 14.3527 26.8198C14.3802 26.7736 14.4196 26.7352 14.4672 26.7086L23.7641 21.5052C23.7877 21.4918 23.8074 21.4727 23.8211 21.4496C23.8347 21.4265 23.8419 21.4004 23.8419 21.3738C23.8419 21.3472 23.8347 21.321 23.8211 21.2979C23.8074 21.2749 23.7877 21.2557 23.7641 21.2423L20.3125 19.3035C20.2175 19.2502 20.1097 19.2221 20 19.2221C19.8903 19.2221 19.7825 19.2502 19.6875 19.3035L10.2445 24.5927C10.1733 24.6327 10.0924 24.6538 10.0102 24.6538C9.92788 24.6538 9.84704 24.6327 9.77578 24.5927L8.70625 23.9979C8.4913 23.8779 8.31277 23.7048 8.18875 23.4961C8.06472 23.2875 7.99961 23.0507 8 22.8096V21.6055C7.99995 21.5254 8.02158 21.4468 8.06273 21.3774C8.10387 21.3081 8.16307 21.2505 8.23438 21.2104L21.7734 13.6443C21.7971 13.631 21.8168 13.6118 21.8304 13.5887C21.8441 13.5657 21.8513 13.5395 21.8513 13.5129C21.8513 13.4863 21.8441 13.4601 21.8304 13.4371C21.8168 13.414 21.7971 13.3948 21.7734 13.3815L18.3164 11.4358C18.2214 11.3825 18.1136 11.3544 18.0039 11.3544C17.8942 11.3544 17.7864 11.3825 17.6914 11.4358L8.46875 16.5936C8.42127 16.6202 8.36741 16.6343 8.31258 16.6343C8.25775 16.6343 8.20389 16.6203 8.15639 16.5937C8.10889 16.567 8.06944 16.5287 8.04199 16.4826C8.01454 16.4364 8.00006 16.384 8 16.3307V13.1672C7.99971 12.9269 8.06454 12.6907 8.18798 12.4825C8.31142 12.2743 8.4891 12.1015 8.70313 11.9813L17.3086 7.18212C17.5219 7.0628 17.7637 7 18.0098 7C18.2558 7 18.4976 7.0628 18.7109 7.18212L27.2969 11.998C27.5106 12.118 27.688 12.2905 27.8114 12.4983C27.9349 12.706 27.9999 12.9417 28 13.1817Z" fill="white"/>
+</svg>
+`
diff --git a/packages/injected/src/types.ts b/packages/injected/src/types.ts
index d075e6125..705dbee9e 100644
--- a/packages/injected/src/types.ts
+++ b/packages/injected/src/types.ts
@@ -43,7 +43,8 @@ export enum ProviderIdentityFlag {
   BraveWallet = 'isBraveWallet',
   Rabby = 'isRabby',
   MathWallet = 'isMathWallet',
-  GameStop = 'isGamestop'
+  GameStop = 'isGamestop',
+  BitKeep = 'isBitKeep'
 }
 
 export enum ProviderLabel {
@@ -78,7 +79,8 @@ export enum ProviderLabel {
   Tally = 'Tally Wallet',
   Rabby = 'Rabby',
   MathWallet = 'MathWallet',
-  GameStop = 'GameStop Wallet'
+  GameStop = 'GameStop Wallet',
+  BitKeep = 'BitKeep'
 }
 
 export interface MeetOneProvider extends ExternalProvider {
@@ -98,7 +100,8 @@ export enum InjectedNameSpace {
   Web3 = 'web3',
   Arbitrum = 'arbitrum',
   XFI = 'xfi',
-  GameStop = 'gamestop'
+  GameStop = 'gamestop',
+  BitKeep = 'bitkeep'
 }
 
 export interface CustomWindow extends Window {
@@ -110,7 +113,10 @@ export interface CustomWindow extends Window {
   xfi: {
     ethereum: InjectedProvider
   }
-  gamestop: InjectedProvider
+  gamestop: InjectedProvider,
+  bitkeep: {
+    ethereum: InjectedProvider
+  }
 }
 
 export type InjectedProvider = ExternalProvider &
diff --git a/packages/injected/src/wallets.ts b/packages/injected/src/wallets.ts
index 7be24561a..6f839289e 100644
--- a/packages/injected/src/wallets.ts
+++ b/packages/injected/src/wallets.ts
@@ -1,11 +1,16 @@
 import type {
   EIP1193Provider,
   ChainListener,
-  SimpleEventEmitter
+  SimpleEventEmitter,
+  ChainId
 } from '@web3-onboard/common'
 
 import { createEIP1193Provider } from '@web3-onboard/common'
-import type { InjectedWalletModule, CustomWindow } from './types.js'
+import type {
+  InjectedWalletModule,
+  CustomWindow,
+  BinanceProvider
+} from './types.js'
 
 import {
   InjectedNameSpace,
@@ -65,11 +70,11 @@ const binance: InjectedWalletModule = {
     !!provider && !!provider[ProviderIdentityFlag.Binance],
   getIcon: async () => (await import('./icons/binance.js')).default,
   getInterface: async () => {
-    // We add this to the BinanceChain provider as there is currently
-    // no way to determine if the wallet is unlocked
-    if (window.BinanceChain) {
-      window.BinanceChain.isUnlocked = false
+    // Replace the provider as the BNB provider is readonly
+    let tempBNBProvider: BinanceProvider = {
+      ...window.BinanceChain
     }
+    window.BinanceChain = tempBNBProvider
 
     const addListener: SimpleEventEmitter['on'] = window.BinanceChain.on.bind(
       window.BinanceChain
@@ -78,9 +83,9 @@ const binance: InjectedWalletModule = {
     window.BinanceChain.on = (event, func) => {
       // intercept chainChanged event and format string
       if (event === 'chainChanged') {
-        addListener(event, (chainId: string) => {
+        addListener(event, (chainId: ChainId) => {
           const cb = func as ChainListener
-          cb(`0x${parseInt(chainId).toString(16)}`)
+          cb(`0x${parseInt(chainId as string).toString(16)}`)
         })
       } else {
         addListener(event, func)
@@ -88,21 +93,12 @@ const binance: InjectedWalletModule = {
     }
 
     const provider = createEIP1193Provider(window.BinanceChain, {
-      // If the wallet is unlocked then we don't need to patch this request
-      ...(!window.BinanceChain.isUnlocked && {
-        eth_accounts: () => Promise.resolve([])
-      }),
-      eth_requestAccounts: ({ baseRequest }) =>
-        baseRequest({ method: 'eth_requestAccounts' }).then(accts => {
-          window.BinanceChain.isUnlocked = true
-          return accts
-        }),
-      eth_selectAccounts: UNSUPPORTED_METHOD,
       eth_chainId: ({ baseRequest }) =>
-        baseRequest({ method: 'eth_chainId' }).then(
-          id => `0x${parseInt(id).toString(16)}`
+        baseRequest({ method: 'eth_chainId' }).then(id =>
+          `0x${parseInt(id as string).toString(16)}`
         ),
       // Unsupported method -- will throw error
+      eth_selectAccounts: UNSUPPORTED_METHOD,
       wallet_switchEthereumChain: UNSUPPORTED_METHOD
     })
 
@@ -463,7 +459,7 @@ const tokenary: InjectedWalletModule = {
   getInterface: async () => ({
     provider: createEIP1193Provider(window.ethereum)
   }),
-  platforms: ['mobile']
+  platforms: ['all']
 }
 
 const tally: InjectedWalletModule = {
@@ -512,6 +508,18 @@ const gamestop: InjectedWalletModule = {
   platforms: ['desktop']
 }
 
+const bitkeep: InjectedWalletModule = {
+  label: ProviderLabel.BitKeep,
+  injectedNamespace: InjectedNameSpace.BitKeep,
+  checkProviderIdentity: ({ provider }) =>
+    !!provider && !!provider["ethereum"][ProviderIdentityFlag.BitKeep],
+  getIcon: async () => (await import('./icons/bitkeep.js')).default,
+  getInterface: async () => ({
+    provider: window.bitkeep && window.bitkeep.ethereum,
+  }),
+  platforms: ['all']
+}
+
 const wallets = [
   exodus,
   metamask,
@@ -542,7 +550,8 @@ const wallets = [
   tally,
   rabby,
   mathwallet,
-  gamestop
+  gamestop,
+  bitkeep
 ]
 
 export default wallets
diff --git a/packages/keepkey/package.json b/packages/keepkey/package.json
index af108c770..73c17fd5e 100644
--- a/packages/keepkey/package.json
+++ b/packages/keepkey/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/keepkey",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "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.",
   "keywords": [
     "Ethereum",
@@ -63,7 +63,7 @@
     "@ethersproject/providers": "^5.5.0",
     "@shapeshiftoss/hdwallet-core": "^1.15.2",
     "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.15.2",
-    "@web3-onboard/common": "^2.1.6",
+    "@web3-onboard/common": "^2.1.7",
     "ethereumjs-util": "^7.1.3"
   }
 }
diff --git a/packages/keystone/package.json b/packages/keystone/package.json
index 13e728245..df1ed2d86 100644
--- a/packages/keystone/package.json
+++ b/packages/keystone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/keystone",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "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.",
   "keywords": [
     "Ethereum",
@@ -39,6 +39,7 @@
   "homepage": "https://www.blocknative.com/onboard",
   "bugs": "https://github.com/blocknative/web3-onboard/issues",
   "module": "dist/index.js",
+  "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
     "dist"
@@ -57,6 +58,6 @@
     "@ethereumjs/tx": "^3.4.0",
     "@ethersproject/providers": "^5.5.0",
     "@keystonehq/eth-keyring": "^0.14.0-alpha.10.3",
-    "@web3-onboard/common": "^2.1.6"
+    "@web3-onboard/common": "^2.1.7"
   }
 }
diff --git a/packages/ledger/package.json b/packages/ledger/package.json
index 019f1c6d8..6d272da07 100644
--- a/packages/ledger/package.json
+++ b/packages/ledger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/ledger",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "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.",
   "keywords": [
     "Ethereum",
@@ -65,7 +65,7 @@
     "@ledgerhq/hw-transport-u2f": "^5.36.0-deprecated",
     "@ledgerhq/hw-transport-webusb": "^6.19.0",
     "@metamask/eth-sig-util": "^4.0.0",
-    "@web3-onboard/common": "^2.1.6",
+    "@web3-onboard/common": "^2.1.7",
     "buffer": "^6.0.3",
     "ethereumjs-util": "^7.1.3"
   }
diff --git a/packages/magic/package.json b/packages/magic/package.json
index 7bf00f7e9..023d40a67 100644
--- a/packages/magic/package.json
+++ b/packages/magic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/magic",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "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.",
   "keywords": [
     "Ethereum",
@@ -80,7 +80,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.1.6",
+    "@web3-onboard/common": "^2.1.7",
     "joi": "^17.4.2",
     "magic-sdk": "^8.1.0",
     "rxjs": "^7.5.2"
diff --git a/packages/mew/package.json b/packages/mew/package.json
index c9aca7f3a..ab316c05f 100644
--- a/packages/mew/package.json
+++ b/packages/mew/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/mew",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "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.",
   "keywords": [
     "Ethereum",
@@ -59,7 +59,7 @@
     "@myetherwallet/mewconnect-web-client": "^2.2.0-beta.14"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.1.6",
+    "@web3-onboard/common": "^2.1.7",
     "rxjs": "^7.5.2"
   }
 }
diff --git a/packages/portis/package.json b/packages/portis/package.json
index 8460b2c40..1d3ed4b2b 100644
--- a/packages/portis/package.json
+++ b/packages/portis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/portis",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "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.",
   "keywords": [
     "Ethereum",
@@ -57,6 +57,6 @@
   },
   "dependencies": {
     "@portis/web3": "^4.0.6",
-    "@web3-onboard/common": "^2.1.6"
+    "@web3-onboard/common": "^2.1.7"
   }
 }
diff --git a/packages/react/package.json b/packages/react/package.json
index 6a3e1f839..2443841c3 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/react",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "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.",
   "keywords": [
     "Ethereum",
@@ -62,8 +62,8 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.1.6",
-    "@web3-onboard/core": "^2.5.0",
+    "@web3-onboard/core": "^2.6.0",
+    "@web3-onboard/common": "^2.1.7",
     "use-sync-external-store": "1.0.0"
   },
   "peerDependencies": {
diff --git a/packages/torus/package.json b/packages/torus/package.json
index b266e7ed8..db7c5501f 100644
--- a/packages/torus/package.json
+++ b/packages/torus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/torus",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "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.",
   "keywords": [
     "Ethereum",
@@ -57,6 +57,6 @@
   },
   "dependencies": {
     "@toruslabs/torus-embed": "^1.18.3",
-    "@web3-onboard/common": "^2.1.6"
+    "@web3-onboard/common": "^2.1.7"
   }
 }
diff --git a/packages/trezor/package.json b/packages/trezor/package.json
index 8680bad9d..f34636f4b 100644
--- a/packages/trezor/package.json
+++ b/packages/trezor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/trezor",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "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.",
   "keywords": [
     "Ethereum",
@@ -60,7 +60,7 @@
   "dependencies": {
     "@ethereumjs/tx": "^3.4.0",
     "@ethersproject/providers": "^5.5.0",
-    "@web3-onboard/common": "^2.1.6",
+    "@web3-onboard/common": "^2.1.7",
     "buffer": "^6.0.3",
     "eth-crypto": "^2.1.0",
     "ethereumjs-util": "^7.1.3",
diff --git a/packages/trezor/src/index.ts b/packages/trezor/src/index.ts
index ab17d16dc..ba290cfbc 100644
--- a/packages/trezor/src/index.ts
+++ b/packages/trezor/src/index.ts
@@ -284,7 +284,7 @@ function trezor(options: TrezorOptions): WalletInit {
               maxFeePerGas: transactionData.maxFeePerGas!,
               maxPriorityFeePerGas: transactionData.maxPriorityFeePerGas!,
               nonce: transactionData.nonce!,
-              chainId: parseInt(currentChain.id),
+              chainId: Number(currentChain.id),
               data: transactionData.hasOwnProperty('data')
                 ? transactionData.data
                 : ''
@@ -296,7 +296,7 @@ function trezor(options: TrezorOptions): WalletInit {
             gasPrice: transactionData.gasPrice!,
             gasLimit: gasLimit!,
             nonce: transactionData.nonce!,
-            chainId: parseInt(currentChain.id),
+            chainId: Number(currentChain.id),
             data: transactionData.hasOwnProperty('data')
               ? transactionData.data
               : ''
@@ -353,6 +353,15 @@ function trezor(options: TrezorOptions): WalletInit {
           ) {
             populatedTransaction.nonce = populatedTransaction.nonce.toString(16)
           }
+          if (
+            populatedTransaction.hasOwnProperty('nonce') &&
+            typeof populatedTransaction.nonce === 'string'
+          ) {
+            // Adds "0x" to a given `String` if it does not already start with "0x".
+            populatedTransaction.nonce = ethUtil.addHexPrefix(
+              populatedTransaction.nonce
+            )
+          }
 
           const updateBigNumberFields =
             bigNumberFieldsToStrings(populatedTransaction)
@@ -363,7 +372,7 @@ function trezor(options: TrezorOptions): WalletInit {
           )
 
           const chainId = currentChain.hasOwnProperty('id')
-            ? Number.parseInt(currentChain.id)
+            ? Number(currentChain.id)
             : 1
           const common = await getCommon({ customNetwork, chainId })
 
@@ -386,7 +395,7 @@ function trezor(options: TrezorOptions): WalletInit {
 
           // EIP155 support. check/recalc signature v value.
           const rv = parseInt(v, 16)
-          let cv = parseInt(currentChain.id) * 2 + 35
+          let cv = Number(currentChain.id) * 2 + 35
           if (rv !== cv && (rv & cv) !== rv) {
             cv += 1 // add signature v bit.
           }
diff --git a/packages/vue/package.json b/packages/vue/package.json
index 280194da7..1c8cbed57 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/vue",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "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.",
   "keywords": [
     "Ethereum",
@@ -62,8 +62,8 @@
   "dependencies": {
     "@vueuse/core": "^8.4.2",
     "@vueuse/rxjs": "^8.2.0",
-    "@web3-onboard/common": "^2.1.6",
-    "@web3-onboard/core": "^2.5.0",
+    "@web3-onboard/common": "^2.1.7",
+    "@web3-onboard/core": "^2.6.0",
     "vue-demi": "^0.12.4"
   },
   "peerDependencies": {
diff --git a/packages/walletconnect/README.md b/packages/walletconnect/README.md
index 6600310fa..8af878a1d 100644
--- a/packages/walletconnect/README.md
+++ b/packages/walletconnect/README.md
@@ -29,7 +29,7 @@ const walletConnect = walletConnectModule({
   bridge: 'YOUR_CUSTOM_BRIDGE_SERVER',
   qrcodeModalOptions: {
     mobileLinks: ['rainbow', 'metamask', 'argent', 'trust', 'imtoken', 'pillar']
-  }
+  },
   connectFirstChainId: true
 })
 
diff --git a/packages/walletconnect/package.json b/packages/walletconnect/package.json
index 71aa64cdc..1e38d2b98 100644
--- a/packages/walletconnect/package.json
+++ b/packages/walletconnect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/walletconnect",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "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.",
   "keywords": [
     "Ethereum",
@@ -61,7 +61,7 @@
     "@ethersproject/providers": "^5.5.0",
     "@walletconnect/client": "^1.7.1",
     "@walletconnect/qrcode-modal": "^1.7.1",
-    "@web3-onboard/common": "^2.1.6",
+    "@web3-onboard/common": "^2.1.7",
     "rxjs": "^7.5.2"
   }
 }
diff --git a/packages/web3auth/package.json b/packages/web3auth/package.json
index 975813955..eb060a300 100644
--- a/packages/web3auth/package.json
+++ b/packages/web3auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/web3auth",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Web3Auth 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",
@@ -56,7 +56,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.1.6",
+    "@web3-onboard/common": "^2.1.7",
     "@web3auth/web3auth": "^1.0.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index b5be41b09..109165e31 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14,6 +14,13 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
+"@babel/code-frame@^7.10.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
+  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+  dependencies:
+    "@babel/highlight" "^7.18.6"
+
 "@babel/code-frame@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
@@ -113,6 +120,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
   integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
 
+"@babel/helper-validator-identifier@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
+  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
+
 "@babel/helper-validator-option@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
@@ -127,6 +139,15 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
+  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.18.6"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/parser@^7.16.4":
   version "7.17.8"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240"
@@ -818,6 +839,46 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+
+"@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+
+"@jridgewell/source-map@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
+  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+
+"@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
+  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@keepkey/device-protocol@^7.2.4":
   version "7.7.0"
   resolved "https://registry.yarnpkg.com/@keepkey/device-protocol/-/device-protocol-7.7.0.tgz#2bdf2da48c1a12cb731b7e4769662372f87e563a"
@@ -6629,6 +6690,15 @@ jest-changed-files@^24.9.0:
     execa "^1.0.0"
     throat "^4.0.0"
 
+jest-worker@^26.2.1:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
+
 jest-worker@^27.4.5:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
@@ -8647,6 +8717,16 @@ rollup-plugin-svelte@^7.0.0:
     require-relative "^0.8.7"
     rollup-pluginutils "^2.8.2"
 
+rollup-plugin-terser@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
+  integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    jest-worker "^26.2.1"
+    serialize-javascript "^4.0.0"
+    terser "^5.0.0"
+
 rollup-pluginutils@^2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
@@ -8908,6 +8988,13 @@ send@0.17.2:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
+
 serialize-javascript@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
@@ -9441,7 +9528,7 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.1.0:
+supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
@@ -9584,6 +9671,16 @@ terser-webpack-plugin@^5.1.3:
     source-map "^0.6.1"
     terser "^5.7.2"
 
+terser@^5.0.0:
+  version "5.14.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10"
+  integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==
+  dependencies:
+    "@jridgewell/source-map" "^0.3.2"
+    acorn "^8.5.0"
+    commander "^2.20.0"
+    source-map-support "~0.5.20"
+
 terser@^5.7.2:
   version "5.11.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.11.0.tgz#2da5506c02e12cd8799947f30ce9c5b760be000f"