Merge pull request #365 from gre/more-coins

Libcore will now suggest new account to create

package.json

@@ -41,7 +41,7 @@
     "@ledgerhq/hw-app-xrp": "^4.12.0",
     "@ledgerhq/hw-transport": "^4.12.0",
     "@ledgerhq/hw-transport-node-hid": "^4.12.0",
-    "@ledgerhq/ledger-core": "^1.2.0",
+    "@ledgerhq/ledger-core": "^1.2.1",
     "@ledgerhq/live-common": "^2.9.1",
     "axios": "^0.18.0",
     "babel-runtime": "^6.26.0",

src/helpers/getAddressForCurrency/btc.js

@@ -11,8 +11,8 @@ export default async (
     segwit = true,
     verify = false,
   }: {
-    segwit: boolean,
-    verify: boolean,
+    segwit?: boolean,
+    verify?: boolean,
   },
 ) => {
   const btc = new Btc(transport)

src/helpers/getAddressForCurrency/index.js

@@ -21,6 +21,11 @@ const all = {
   bitcoin: btc,
   bitcoin_testnet: btc,
 
+  zcash: btc,
+  bitcoin_cash: btc,
+  bitcoin_gold: btc,
+  zencash: btc,
+
   ethereum,
   ethereum_testnet: ethereum,
   ethereum_classic: ethereum,

src/internals/accounts/scanAccountsOnDevice.js

@@ -35,13 +35,13 @@ export default function scanAccountsOnDevice(props: Props): Promise<AccountRaw[]
     }
 
     // scan segwit AND non-segwit accounts
-    const segwitAccounts = await scanAccountsOnDeviceBySegwit({ ...commonParams, isSegwit: true })
     const nonSegwitAccounts = await scanAccountsOnDeviceBySegwit({
       ...commonParams,
       isSegwit: false,
     })
+    const segwitAccounts = await scanAccountsOnDeviceBySegwit({ ...commonParams, isSegwit: true })
 
-    const accounts = [...segwitAccounts, ...nonSegwitAccounts]
+    const accounts = [...nonSegwitAccounts, ...segwitAccounts]
 
     return accounts
   })
@@ -154,16 +154,18 @@ async function scanNextAccount(props: {
     ops,
   })
 
-  // returns if the current index points on an account with no ops
-  if (ops.length === 0) {
-    return accounts
-  }
+  const isEmpty = ops.length === 0
 
   // trigger event
   onAccountScanned(account)
 
   accounts.push(account)
 
+  // returns if the current index points on an account with no ops
+  if (isEmpty) {
+    return accounts
+  }
+
   return scanNextAccount({ ...props, accountIndex: accountIndex + 1 })
 }
 
@@ -259,7 +261,9 @@ async function buildAccountRaw({
     id: xpub, // FIXME for account id you might want to prepend the crypto currency id to this because it's not gonna be unique.
     xpub,
     path: walletPath,
-    name: `Account ${accountIndex}${isSegwit ? ' (segwit)' : ''}`, // TODO: placeholder name?
+    name: `${operations.length === 0 ? 'New ' : ''}Account ${accountIndex}${
+      isSegwit ? ' (segwit)' : ''
+    }`, // TODO: placeholder name?
     isSegwit,
     freshAddress,
     freshAddressPath,