aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-04-05 00:38:56 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-04-05 00:38:56 +0800
commit0a7b388b39d86039e4e4cf5df8dfe5104e7b6137 (patch)
treeb3cc01f702e27ed805f86bcb92e212187a7e838e /app/scripts
parent235a70b9392d8b87eae4fc141e7f0be1d7788ee2 (diff)
downloadtangerine-wallet-browser-0a7b388b39d86039e4e4cf5df8dfe5104e7b6137.tar
tangerine-wallet-browser-0a7b388b39d86039e4e4cf5df8dfe5104e7b6137.tar.gz
tangerine-wallet-browser-0a7b388b39d86039e4e4cf5df8dfe5104e7b6137.tar.bz2
tangerine-wallet-browser-0a7b388b39d86039e4e4cf5df8dfe5104e7b6137.tar.lz
tangerine-wallet-browser-0a7b388b39d86039e4e4cf5df8dfe5104e7b6137.tar.xz
tangerine-wallet-browser-0a7b388b39d86039e4e4cf5df8dfe5104e7b6137.tar.zst
tangerine-wallet-browser-0a7b388b39d86039e4e4cf5df8dfe5104e7b6137.zip
Fix faucet to only autoFaucet first account
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/keyring-controller.js1
-rw-r--r--app/scripts/metamask-controller.js2
2 files changed, 3 insertions, 0 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 72f613641..16df6efa6 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -324,6 +324,7 @@ class KeyringController extends EventEmitter {
if (!firstAccount) throw new Error('KeyringController - No account found on keychain.')
const hexAccount = normalizeAddress(firstAccount)
this.emit('newAccount', hexAccount)
+ this.emit('newVault', hexAccount)
return this.setupAccounts(accounts)
})
.then(this.persistAllKeyrings.bind(this))
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index af8b4688d..5f71fc369 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -79,6 +79,8 @@ module.exports = class MetamaskController extends EventEmitter {
})
this.keyringController.on('newAccount', (address) => {
this.preferencesController.setSelectedAddress(address)
+ })
+ this.keyringController.on('newVault', (address) => {
autoFaucet(address)
})