aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-03-11 02:34:46 +0800
committerKevin Serrano <kevgagser@gmail.com>2017-03-11 02:34:46 +0800
commit7dcab52a9e6aa0532a712cb4e502846a383efc94 (patch)
tree081263abd43898ea0fb29a6e86d29d2b011b11fc /app/scripts/metamask-controller.js
parentc47f7f6a765e748c33ffde6ff38e881199251eda (diff)
downloadtangerine-wallet-browser-7dcab52a9e6aa0532a712cb4e502846a383efc94.tar
tangerine-wallet-browser-7dcab52a9e6aa0532a712cb4e502846a383efc94.tar.gz
tangerine-wallet-browser-7dcab52a9e6aa0532a712cb4e502846a383efc94.tar.bz2
tangerine-wallet-browser-7dcab52a9e6aa0532a712cb4e502846a383efc94.tar.lz
tangerine-wallet-browser-7dcab52a9e6aa0532a712cb4e502846a383efc94.tar.xz
tangerine-wallet-browser-7dcab52a9e6aa0532a712cb4e502846a383efc94.tar.zst
tangerine-wallet-browser-7dcab52a9e6aa0532a712cb4e502846a383efc94.zip
Connect keyring controller to address book to prevent additional duplicates.
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 45905db72..1fcee61da 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -51,11 +51,6 @@ module.exports = class MetamaskController extends EventEmitter {
initState: initState.PreferencesController,
})
- // address book controller
- this.addressBookController = new AddressBookController({
- initState: initState.AddressBookController,
- })
-
// currency controller
this.currencyController = new CurrencyController({
initState: initState.CurrencyController,
@@ -86,6 +81,11 @@ module.exports = class MetamaskController extends EventEmitter {
autoFaucet(address)
})
+ // address book controller
+ this.addressBookController = new AddressBookController({
+ initState: initState.AddressBookController,
+ }, this.keyringController)
+
// tx mgmt
this.txManager = new TxManager({
initState: initState.TransactionManager,