Merge pull request #1052 from MetaMask/hotfix1048

hotfix - dont assume hd keyring position
feature/default_network_editable
kumavis 8 years ago committed by GitHub
commit 44d0fcf0af
  1. 8
      app/scripts/keyring-controller.js
  2. 4
      ui/app/actions.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) {
const ring = this.keyrings[keyRingNum]
return ring.addAccounts(1)
addNewAccount () {
const hdKeyrings = this.keyrings.filter((keyring) => keyring.type === 'HD Key Tree')
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))

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

Loading…
Cancel
Save