Merge pull request #222 from blocknative/develop

Release 1.3.1
blocknative · Feb 26, 2020 · 75d74b9 · 75d74b9
2 parents 0c3f01a + fb036b6
commit 75d74b9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.3.0",
+  "version": "1.3.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",

diff --git a/src/modules/check/accounts.ts b/src/modules/check/accounts.ts
@@ -5,14 +5,14 @@ type AccountsAndBalances = Array<{ balance: string; address: string }>
 function accountSelect(): WalletCheckModule | never {
   let completed: boolean = false
   let loadingAccounts: boolean = false
-  let accountsAndBalances: AccountsAndBalances
+  let accountsAndBalances: AccountsAndBalances = []
 
   return async (stateAndHelpers: StateAndHelpers) => {
     const { wallet, BigNumber, address, balance } = stateAndHelpers
     const { provider, type } = wallet
 
     if (type === 'hardware' && !completed) {
-      if (!accountsAndBalances && !loadingAccounts) {
+      if (accountsAndBalances.length <= 1 && !loadingAccounts) {
         accountsAndBalances = [{ address, balance }]
       }
 

diff --git a/src/modules/select/wallets/ledger.ts b/src/modules/select/wallets/ledger.ts
@@ -158,7 +158,7 @@ async function ledgerProvider(options: {
           paths.push(ledgerLive, legacy)
         }
       } else {
-        paths.push(`${basePath}/0'/0`, `${basePath}/0'/0/0`)
+        paths.push(`${basePath}/0'/0`)
       }
 
       let transport

diff --git a/src/modules/select/wallets/torus.ts b/src/modules/select/wallets/torus.ts
@@ -1,4 +1,3 @@
-import Torus from '@toruslabs/torus-embed'
 import { networkName } from '../../../utilities'
 import {
   TorusOptions,
@@ -27,6 +26,7 @@ function torus(options: TorusOptions & CommonWalletOptions): WalletModule {
     svg: svg || torusIcon,
     iconSrc,
     wallet: async () => {
+      const { default: Torus } = await import('@toruslabs/torus-embed')
       const instance = new Torus({
         buttonPosition: buttonPosition // default: bottom-left
       })

diff --git a/src/modules/select/wallets/trust.ts b/src/modules/select/wallets/trust.ts
@@ -3,7 +3,7 @@ import { WalletModule, Helpers, CommonWalletOptions } from '../../../interfaces'
 
 import trustIcon from '../wallet-icons/icon-trust'
 
-function trust(options: CommonWalletOptions): WalletModule {
+function trust (options: CommonWalletOptions): WalletModule {
   const { preferred, label, iconSrc, svg } = options
 
   return {
@@ -24,7 +24,7 @@ function trust(options: CommonWalletOptions): WalletModule {
       }
     },
     type: 'injected',
-    link: `https://links.trustwalletapp.com/a/key_live_lfvIpVeI9TFWxPCqwU8rZnogFqhnzs4D?&event=openURL&url=${window.location.href}`,
+    link: `https://link.trustwallet.com/open_url?coin_id=60&url=${window.location.href}`,
     installMessage: mobileWalletInstallMessage,
     mobile: true,
     preferred