Merge pull request #1051 from MetaMask/hotfix1048

hotfix - addNewAccount  - dont assume hd keyring position

app/scripts/keyring-controller.js

@@ -259,9 +259,11 @@ module.exports = class KeyringController extends EventEmitter {
   // Calls the `addAccounts` method on the Keyring
   // in the kryings array at index `keyringNum`,
   // and then saves those changes.
-  addNewAccount (keyRingNum = 0) {
+  addNewAccount () {
-    const ring = this.keyrings[keyRingNum]
+    const hdKeyrings = this.keyrings.filter((keyring) => keyring.type === 'HD Key Tree')
-    return ring.addAccounts(1)
+    const firstKeyring = hdKeyrings[0]
+    if (!firstKeyring) throw new Error('KeyringController - No HD Key Tree found')
+    return firstKeyring.addAccounts(1)
     .then(this.setupAccounts.bind(this))
     .then(this.persistAllKeyrings.bind(this))
     .then(this.fullUpdate.bind(this))

ui/app/actions.js

@@ -286,8 +286,8 @@ function navigateToNewAccountScreen() {
   }
 }
 
-function addNewAccount (ringNumber = 0) {
+function addNewAccount () {
-  return callBackgroundThenUpdate(background.addNewAccount, ringNumber)
+  return callBackgroundThenUpdate(background.addNewAccount)
 }
 
 function showInfoPage () {