diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-08-16 01:50:53 +0800 |
---|---|---|
committer | Kevin Serrano <kevgagser@gmail.com> | 2016-08-16 01:50:53 +0800 |
commit | 6895d330ffdf0f071e4df3fb9da47f2ea6fc7491 (patch) | |
tree | 64e170d2bd39434674e0c92bb637fd1d2c57debc /app/scripts/lib/idStore.js | |
parent | cb0c1f25bacab5f6ee9348dbc3dc112f4d77560f (diff) | |
parent | 271e3c4fdf1a86a989d642c18815d7f6537ed951 (diff) | |
download | tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.tar tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.tar.gz tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.tar.bz2 tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.tar.lz tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.tar.xz tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.tar.zst tangerine-wallet-browser-6895d330ffdf0f071e4df3fb9da47f2ea6fc7491.zip |
Merge master.
Diffstat (limited to 'app/scripts/lib/idStore.js')
-rw-r--r-- | app/scripts/lib/idStore.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index 9d8012d54..3272f2d1a 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -156,8 +156,9 @@ IdentityStore.prototype.getNetwork = function (err) { this._currentState.network = 'loading' return this._didUpdate() } - - console.log('web3.getNetwork returned ' + network) + if (global.METAMASK_DEBUG) { + console.log('web3.getNetwork returned ' + network) + } this._currentState.network = network this._didUpdate() }) @@ -478,7 +479,9 @@ IdentityStore.prototype._restoreFromSeed = function (password, seed, derivedKey) keyStore.generateNewAddress(derivedKey, 3) configManager.setWallet(keyStore.serialize()) - console.log('restored from seed. saved to keystore') + if (global.METAMASK_DEBUG) { + console.log('restored from seed. saved to keystore') + } return keyStore } |