diff options
author | frankiebee <frankie.diamond@gmail.com> | 2017-03-29 09:02:39 +0800 |
---|---|---|
committer | frankiebee <frankie.diamond@gmail.com> | 2017-03-29 09:02:39 +0800 |
commit | a20a237282c38da86b03625d08b48c2e58e83523 (patch) | |
tree | 65c58173cf8e0da53dbb6b9f18014ed8c1babf9c /app/scripts/metamask-controller.js | |
parent | 79248ae5cd3fb1314c5a7ff71c05f9dbe7b3a4cd (diff) | |
parent | 7c09bde4120d1063df762076d41d2e9921dd3c0e (diff) | |
download | tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.gz tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.bz2 tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.lz tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.xz tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.zst tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.zip |
Merge branch 'master' into mascara
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r-- | app/scripts/metamask-controller.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 15bf9f436..0393caeab 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -385,7 +385,7 @@ module.exports = class MetamaskController extends EventEmitter { .then((serialized) => { const seedWords = serialized.mnemonic this.configManager.setSeedWords(seedWords) - cb() + cb(null, seedWords) }) } @@ -622,6 +622,10 @@ module.exports = class MetamaskController extends EventEmitter { case '3': url = 'https://faucet.metamask.io/' break + + case '42': + url = 'https://github.com/kovan-testnet/faucet' + break } if (url) extension.tabs.create({ url }) |