Merge pull request #245 from blocknative/develop

Release 1.3.5
blocknative · Mar 10, 2020 · ab5d0f6 · ab5d0f6
2 parents 65dd697 + 13fba75
commit ab5d0f6
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 51 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "Onboard users to web3 by allowing them to select a wallet, get that wallet ready to transact and have access to synced wallet state.",
   "keywords": [
     "ethereum",

diff --git a/src/utilities.ts b/src/utilities.ts
@@ -5,23 +5,23 @@ import { WalletInterface } from './interfaces'
 
 export function getNetwork(provider: any): Promise<number | any> {
   return new Promise((resolve, reject) => {
-    // web3.js sometimes deletes sendAsync method
-    const method = provider.sendAsync || provider.send
-
-    if (method) {
-      method(
-        {
-          jsonrpc: '2.0',
-          method: 'net_version',
-          params: [],
-          id: 42
-        },
-        (e: any, res: any) => {
-          e && reject(e)
-          const result = res && res.result
-          resolve(result && Number(result))
-        }
-      )
+    const params = {
+      jsonrpc: '2.0',
+      method: 'net_version',
+      params: [],
+      id: 42
+    }
+
+    const callback = (e: any, res: any) => {
+      e && reject(e)
+      const result = res && res.result
+      resolve(result && Number(result))
+    }
+
+    if (typeof provider.sendAsync === 'function') {
+      provider.sendAsync(params, callback)
+    } else if (typeof provider.send === 'function') {
+      provider.send(params, callback)
     } else {
       resolve(null)
     }
@@ -30,23 +30,23 @@ export function getNetwork(provider: any): Promise<number | any> {
 
 export function getAddress(provider: any): Promise<string | any> {
   return new Promise((resolve, reject) => {
-    // web3.js sometimes deletes sendAsync method
-    const method = provider.sendAsync || provider.send
-
-    if (method) {
-      method(
-        {
-          jsonrpc: '2.0',
-          method: 'eth_accounts',
-          params: [],
-          id: 42
-        },
-        (e: any, res: any) => {
-          e && reject(e)
-          const result = res && res.result && res.result[0]
-          resolve(result)
-        }
-      )
+    const params = {
+      jsonrpc: '2.0',
+      method: 'eth_accounts',
+      params: [],
+      id: 42
+    }
+
+    const callback = (e: any, res: any) => {
+      e && reject(e)
+      const result = res && res.result && res.result[0]
+      resolve(result)
+    }
+
+    if (typeof provider.sendAsync === 'function') {
+      provider.sendAsync(params, callback)
+    } else if (typeof provider.send === 'function') {
+      provider.send(params, callback)
     } else {
       resolve(null)
     }
@@ -62,23 +62,23 @@ export function getBalance(provider: any): Promise<string | any> {
       return
     }
 
-    // web3.js sometimes deletes sendAsync method
-    const method = provider.sendAsync || provider.send
+    const params = {
+      jsonrpc: '2.0',
+      method: 'eth_getBalance',
+      params: [currentAddress, 'latest'],
+      id: 42
+    }
+
+    const callback = (e: any, res: any) => {
+      e && reject(e)
+      const result = res && res.result
+      resolve(result && new BigNumber(result).toString(10))
+    }
 
-    if (method) {
-      method(
-        {
-          jsonrpc: '2.0',
-          method: 'eth_getBalance',
-          params: [currentAddress, 'latest'],
-          id: 42
-        },
-        (e: any, res: any) => {
-          e && reject(e)
-          const result = res && res.result
-          resolve(result && new BigNumber(result).toString(10))
-        }
-      )
+    if (typeof provider.sendAsync === 'function') {
+      provider.sendAsync(params, callback)
+    } else if (typeof provider.send === 'function') {
+      provider.send(params, callback)
     } else {
       resolve(null)
     }