Merge branch 'v2-web3-onboard-develop' of blocknative.github.com:blocknative/onboard into v2-web3-onboard-develop

Author: Adamj1232

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/core",
-  "version": "2.3.0-alpha.3",
+  "version": "2.3.0-alpha.4",
   "scripts": {
     "build": "rollup -c",
     "dev": "rollup -c -w",

packages/core/src/icons/checkmark.ts

@@ -2,4 +2,4 @@ export default `
 <svg width="14" height="11" viewBox="0 0 14 11" fill="none" xmlns="http://www.w3.org/2000/svg">
   <path d="M4.48076 8.10881L1.33076 4.95881L0.280762 6.00881L4.48076 10.2088L13.4808 1.20881L12.4308 0.158813L4.48076 8.10881Z" fill="#A4F4C6"/>
 </svg>
-`
+`

packages/core/src/icons/close-circle.ts

@@ -2,4 +2,4 @@ export default `
 <svg width="100%" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
   <path d="M10 0C4.47 0 0 4.47 0 10C0 15.53 4.47 20 10 20C15.53 20 20 15.53 20 10C20 4.47 15.53 0 10 0ZM15 13.59L13.59 15L10 11.41L6.41 15L5 13.59L8.59 10L5 6.41L6.41 5L10 8.59L13.59 5L15 6.41L11.41 10L15 13.59Z" fill="currentColor"/>
 </svg>
-`
+`

packages/core/src/icons/error.ts

@@ -1,4 +1,4 @@
 export default `<svg width="16" height="13" viewBox="0 0 16 13" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M0.666992 13.0002H15.3337L8.00033 0.333496L0.666992 13.0002ZM8.66699 11.0002H7.33366V9.66683H8.66699V11.0002ZM8.66699 8.3335H7.33366V5.66683H8.66699V8.3335Z" fill="#FFB3B3"/>
 </svg>
-`
+`

packages/core/src/icons/hourglass.ts

@@ -2,4 +2,4 @@ export default `
 <svg width="100%" height="100%" viewBox="0 0 12 20" fill="none" xmlns="http://www.w3.org/2000/svg">
   <path d="M0 0L0.0100002 6L4 10L0.0100002 14.01L0 20H12V14L8 10L12 6.01V0H0ZM10 14.5V18H2V14.5L6 10.5L10 14.5Z" fill="#929BED"/>
 </svg>
-`
+`

packages/core/src/notify.ts

@@ -161,4 +161,3 @@ export function typeToDismissTimeout(type: string): number {
       return 0
   }
 }
-

packages/core/src/provider.ts

@@ -31,7 +31,7 @@ export function getProvider(chain: Chain): providers.StaticJsonRpcProvider {
 
   if (!ethersProviders[chain.rpcUrl]) {
     ethersProviders[chain.rpcUrl] = new providers.StaticJsonRpcProvider(
-      chain.providerConnectionInfo?.url
+      chain.providerConnectionInfo && chain.providerConnectionInfo.url
         ? chain.providerConnectionInfo
         : chain.rpcUrl
     )
@@ -300,7 +300,7 @@ export async function getEns(
   // chain we don't recognize and don't have a rpcUrl for requests
   if (!chain) return null
 
-  const provider = getProvider(chain);
+  const provider = getProvider(chain)
 
   try {
     const name = await provider.lookupAddress(address)
@@ -340,7 +340,7 @@ export async function getBalance(
   // chain we don't recognize and don't have a rpcUrl for requests
   if (!chain) return null
 
-  const provider = getProvider(chain);
+  const provider = getProvider(chain)
 
   try {
     const balanceWei = await provider.getBalance(address)
@@ -380,7 +380,9 @@ export function addNewChain(
           decimals: 18
         },
         rpcUrls: [chain.publicRpcUrl || chain.rpcUrl],
-        blockExplorerUrls: chain.blockExplorerUrl ? [chain.blockExplorerUrl] : undefined
+        blockExplorerUrls: chain.blockExplorerUrl
+          ? [chain.blockExplorerUrl]
+          : undefined
       }
     ]
   })

packages/core/src/updateBalances.ts

@@ -2,32 +2,31 @@ import { state } from './store'
 import { getBalance } from './provider'
 import { updateAllWallets } from './store/actions'
 
-async function updateBalances(addresses?: string[]): Promise<void>  {
-    const { wallets, chains } = state.get()
+async function updateBalances(addresses?: string[]): Promise<void> {
+  const { wallets, chains } = state.get()
 
-    const updatedWallets = await Promise.all(
-        wallets.map(async wallet => {
-          const chain = chains.find(({ id }) => id === wallet.chains[0].id)
+  const updatedWallets = await Promise.all(
+    wallets.map(async wallet => {
+      const chain = chains.find(({ id }) => id === wallet.chains[0].id)
 
-          const updatedAccounts = await Promise.all(
-            wallet.accounts.map(async account => {
-              // if no provided addresses, we want to update all balances
-              // otherwise check if address is in addresses array
-              if (!addresses || addresses.includes(account.address)) {
+      const updatedAccounts = await Promise.all(
+        wallet.accounts.map(async account => {
+          // if no provided addresses, we want to update all balances
+          // otherwise check if address is in addresses array
+          if (!addresses || addresses.includes(account.address)) {
+            const updatedBalance = await getBalance(account.address, chain)
 
-                const updatedBalance = await getBalance(account.address, chain)
+            return { ...account, balance: updatedBalance }
+          }
 
-                return { ...account, balance: updatedBalance }
-              }
-
-              return account
-            })
-          )
-          return { ...wallet, accounts: updatedAccounts }
+          return account
         })
       )
-        
-    updateAllWallets(updatedWallets)
+      return { ...wallet, accounts: updatedAccounts }
+    })
+  )
+
+  updateAllWallets(updatedWallets)
 }
 
-export default updateBalances
+export default updateBalances

packages/core/src/validation.ts

@@ -1,5 +1,10 @@
 import Joi, { ObjectSchema, Schema } from 'joi'
-import type { Chain, ChainId, WalletInit, WalletModule } from '@web3-onboard/common'
+import type {
+  Chain,
+  ChainId,
+  WalletInit,
+  WalletModule
+} from '@web3-onboard/common'
 
 import type {
   InitOptions,

packages/dcent/src/index.ts

@@ -16,7 +16,7 @@ import type { providers } from 'ethers'
 interface CustomWindow extends Window {
   ethereum: EIP1193Provider
 }
-  
+
 declare const window: CustomWindow
 
 const DEFAULT_BASE_PATH = "m/44'/60'/0'/0/0"