diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-01-21 06:09:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-21 06:09:06 +0800 |
| commit | 03c58343a333bde9e4204e7dd9d302fb67746837 (patch) | |
| tree | 1b18ab344d173f919ff06f7985c1e4fe80ca8a53 | |
| parent | a09332f9379400204cae885345a8fd975e887098 (diff) | |
| parent | 56d400b0f85afe1c0f37caec5f1eba652f790d1c (diff) | |
| download | tangerine-wallet-browser-03c58343a333bde9e4204e7dd9d302fb67746837.tar tangerine-wallet-browser-03c58343a333bde9e4204e7dd9d302fb67746837.tar.gz tangerine-wallet-browser-03c58343a333bde9e4204e7dd9d302fb67746837.tar.bz2 tangerine-wallet-browser-03c58343a333bde9e4204e7dd9d302fb67746837.tar.lz tangerine-wallet-browser-03c58343a333bde9e4204e7dd9d302fb67746837.tar.xz tangerine-wallet-browser-03c58343a333bde9e4204e7dd9d302fb67746837.tar.zst tangerine-wallet-browser-03c58343a333bde9e4204e7dd9d302fb67746837.zip | |
Merge pull request #1039 from MetaMask/upToDate
Keep dev up to date with master
| -rw-r--r-- | app/scripts/keyring-controller.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index e609403cc..86c93f5a3 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -172,7 +172,9 @@ module.exports = class KeyringController extends EventEmitter { // Used when creating a first vault, to allow confirmation. // Also used when revealing the seed words in the confirmation view. placeSeedWords () { - const firstKeyring = this.keyrings[0] + 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.serialize() .then((serialized) => { const seedWords = serialized.mnemonic |