[common-v2.1.7-alpha.5, core-v2.6.0-alpha.8, react-v2.2.5-alpha.7]fix: weifix (#1180)

* weifix
* merge develop

Author: mahmud-bn

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/common",
-  "version": "2.1.7-alpha.5",
+  "version": "2.1.7-alpha.6",
   "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/common/src/elements/AddressTable.svelte

@@ -120,7 +120,7 @@
             >
             <td>{account.derivationPath}</td>
             <td class="asset-td"
-              >{weiToEth(account.balance.value)}
+              >{weiToEth(account.balance.value.toString())}
               {account.balance.asset}</td
             >
           </tr>

packages/common/src/types.ts

@@ -1,7 +1,7 @@
 import type { ConnectionInfo } from 'ethers/lib/utils'
 import type EventEmitter from 'eventemitter3'
 import type { TypedData as EIP712TypedData } from 'eip-712'
-import type BigNumber from 'bignumber.js'
+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
   }
 }
 
@@ -232,7 +232,7 @@ export interface WalletModule {
 export type GetInterfaceHelpers = {
   chains: Chain[]
   appMetadata: AppMetadata | null
-  BigNumber: typeof BigNumber
+  BigNumber: typeof ethers.BigNumber
   EventEmitter: typeof EventEmitter
 }
 

packages/common/src/utils.ts

@@ -1,5 +1,5 @@
-import type BigNumber from 'bignumber.js'
+import BigNumber from 'bignumber.js'
 
-export function weiToEth(wei: BigNumber): string {
-    return wei.div(1e18).toString(10)
+export function weiToEth(wei: string): string {
+   return new BigNumber(wei).div(1e18).toString(10)
 }

packages/common/src/validation.ts

@@ -9,9 +9,9 @@ const basePaths = Joi.array().items(basePath)
 
 const chain = Joi.object({
   namespace: Joi.string(),
-  id: Joi.alternatives()
-        .try(Joi.string().pattern(/^0x[0-9a-fA-F]+$/), 
-        Joi.number().positive()).required,
+  id: Joi.string()
+    .pattern(/^0x[0-9a-fA-F]+$/)
+    .required(),
   rpcUrl: Joi.string().required(),
   label: Joi.string().required(),
   token: Joi.string().required(),

packages/common/src/views/AccountSelect.svelte

@@ -60,7 +60,7 @@
       accountsListObject = {
         all: allAccounts,
         filtered: allAccounts.filter(account => {
-          return parseFloat(weiToEth(account.balance.value)) > 0
+          return parseFloat(weiToEth(account.balance.value.toString())) > 0
         })
       }
       loadingAccounts = false

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/core",
-  "version": "2.6.0-alpha.8",
+  "version": "2.6.0-alpha.9",
   "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",
@@ -83,7 +83,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/common": "^2.1.7-alpha.5",
+    "@web3-onboard/common": "^2.1.7-alpha.6",
     "bignumber.js": "^9.0.0",
     "bnc-sdk": "^4.4.1",
     "bowser": "^2.11.0",

packages/core/src/provider.ts

@@ -22,7 +22,6 @@ import { validEnsChain } from './utils'
 import disconnect from './disconnect'
 import { state } from './store'
 import { getBlocknativeSdk } from './services'
-import BigNumber from 'bignumber.js'
 
 export const ethersProviders: {
   [key: string]: providers.StaticJsonRpcProvider
@@ -348,9 +347,8 @@ export async function getBalance(
     const wallet = wallets.find(wallet => !!wallet.provider)
     const provider = wallet.provider
     const balanceHex = await provider.request({ method: 'eth_getBalance', params:[address,'latest'] })
-    const balanceWei = new BigNumber(parseInt(balanceHex, 16))
-    return balanceWei
-      ? { [chain.token || 'eth']: weiToEth(balanceWei) }
+    return balanceHex
+      ? { [chain.token || 'eth']: weiToEth(balanceHex) }
       : null
   } catch (error) {
     console.error(error)

packages/core/src/views/connect/Index.svelte

@@ -19,7 +19,7 @@
   import Sidebar from './Sidebar.svelte'
   import { configuration } from '../../configuration'
   import { getBlocknativeSdk } from '../../services'
-  import BigNumber from 'bignumber.js'
+  import { BigNumber } from 'ethers'
   import {
     getChainId,
     requestAccounts,

packages/demo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "demo",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "devDependencies": {
     "assert": "^2.0.0",
     "buffer": "^6.0.3",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@web3-onboard/coinbase": "^2.0.8",
-    "@web3-onboard/core": "^2.6.0-alpha.8",
+    "@web3-onboard/core": "^2.6.0-alpha.9",
     "@web3-onboard/dcent": "^2.0.5",
     "@web3-onboard/fortmatic": "^2.0.6",
     "@web3-onboard/gnosis": "^2.0.5",