poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1052 from MetaMask/hotfix1048 

hotfix - dont assume hd keyring position
This commit is contained in:
kumavis 2017-01-24 14:02:26 -08:00 committed by GitHub
parent 85b34e3f2b 745fff0c80
commit 44d0fcf0af
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/scripts/keyring-controller.js
View File

@ -259,9 +259,11 @@ module.exports = class KeyringController extends EventEmitter {
// Calls the `addAccounts` method on the Keyring // Calls the `addAccounts` method on the Keyring
// in the kryings array at index `keyringNum`, // in the kryings array at index `keyringNum`,
// and then saves those changes. // 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.setupAccounts.bind(this))
.then(this.persistAllKeyrings.bind(this)) .then(this.persistAllKeyrings.bind(this))
.then(this.fullUpdate.bind(this)) .then(this.fullUpdate.bind(this))

4
ui/app/actions.js
View File

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