diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-10-31 07:02:11 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-10-31 07:02:11 +0800 |
| commit | f9409793d8a4413c42e5d11ec0279c893c7c446c (patch) | |
| tree | 632fbdeb190ae0676a5f5ed83a6fd625f016abe4 /app/scripts/lib/idStore.js | |
| parent | 25c46a16364612cd4bcebe375af910c08862b17a (diff) | |
| parent | 18e5173f061c2e21b5acb3e1b329343b5cffc558 (diff) | |
| download | tangerine-wallet-browser-f9409793d8a4413c42e5d11ec0279c893c7c446c.tar tangerine-wallet-browser-f9409793d8a4413c42e5d11ec0279c893c7c446c.tar.gz tangerine-wallet-browser-f9409793d8a4413c42e5d11ec0279c893c7c446c.tar.bz2 tangerine-wallet-browser-f9409793d8a4413c42e5d11ec0279c893c7c446c.tar.lz tangerine-wallet-browser-f9409793d8a4413c42e5d11ec0279c893c7c446c.tar.xz tangerine-wallet-browser-f9409793d8a4413c42e5d11ec0279c893c7c446c.tar.zst tangerine-wallet-browser-f9409793d8a4413c42e5d11ec0279c893c7c446c.zip | |
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
Diffstat (limited to 'app/scripts/lib/idStore.js')
| -rw-r--r-- | app/scripts/lib/idStore.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index 756becce3..c566907b9 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -422,7 +422,9 @@ IdentityStore.prototype._loadIdentities = function () { var addresses = this._getAddresses() addresses.forEach((address, i) => { // // add to ethStore - this._ethStore.addAccount(ethUtil.addHexPrefix(address)) + if (this._ethStore) { + this._ethStore.addAccount(ethUtil.addHexPrefix(address)) + } // add to identities const defaultLabel = 'Account ' + (i + 1) const nickname = configManager.nicknameForWallet(address) |