Merge pull request #267 from blocknative/develop

Release 1.4.1
blocknative · Mar 25, 2020 · 15a7a15 · 15a7a15
2 parents bb7af45 + 388c131
commit 15a7a15
Show file tree

Hide file tree

Showing 6 changed files with 533 additions and 206 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "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",
@@ -46,7 +46,7 @@
     "@walletconnect/web3-provider": "^1.0.0-beta.45",
     "authereum": "^0.0.4-beta.88",
     "bignumber.js": "^9.0.0",
-    "bnc-sdk": "1.1.0",
+    "bnc-sdk": "2.0.0",
     "bowser": "^2.5.2",
     "ethereumjs-tx": "^2.1.2",
     "ethereumjs-util": "^6.2.0",

diff --git a/src/modules/select/wallets/ledger.ts b/src/modules/select/wallets/ledger.ts
@@ -67,6 +67,8 @@ function ledger(options: LedgerOptions & CommonWalletOptions): WalletModule {
     },
     type: 'hardware',
     desktop: true,
+    mobile: true,
+    osExclusions: ['iOS'],
     preferred
   }
 }

diff --git a/src/modules/select/wallets/trezor.ts b/src/modules/select/wallets/trezor.ts
@@ -67,6 +67,8 @@ function trezor(options: TrezorOptions & CommonWalletOptions): WalletModule {
     },
     type: 'hardware',
     desktop: true,
+    mobile: true,
+    osExclusions: ['iOS'],
     preferred
   }
 }

diff --git a/src/services.ts b/src/services.ts
@@ -1,11 +1,12 @@
-import blocknativeApi from 'bnc-sdk'
+import BlocknativeApi from 'bnc-sdk'
 
 let blocknative: any
 
 export function initializeBlocknative(dappId: string, networkId: number): any {
-  blocknative = blocknativeApi({
+  blocknative = new BlocknativeApi({
     dappId,
-    networkId
+    networkId,
+    name: 'Onboard'
   })
 
   return blocknative

diff --git a/src/stores.ts b/src/stores.ts
@@ -271,11 +271,10 @@ function createBalanceStore(initialState: string | null): BalanceStore {
 
             // unsubscribe from previous address
             if (emitterAddress) {
-              blocknative.unsubscribe(blocknative.clientIndex, emitterAddress)
+              blocknative.unsubscribe(emitterAddress)
             }
 
-            emitter = blocknative.account(blocknative.clientIndex, $address)
-              .emitter
+            emitter = blocknative.account($address).emitter
 
             emitter.on('txConfirmed', () => {
               if (stateSyncer.get) {
@@ -297,7 +296,7 @@ function createBalanceStore(initialState: string | null): BalanceStore {
           const blocknative = getBlocknative()
 
           // unsubscribe from previous address
-          blocknative.unsubscribe(blocknative.clientIndex, emitterAddress)
+          blocknative.unsubscribe(emitterAddress)
 
           // no address, so set balance to undefined
           set && set(undefined)