aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-02-03 08:54:16 +0800
committerkumavis <aaron@kumavis.me>2017-02-03 08:54:16 +0800
commit5c5aa6ea012b6a5d0cb8e8386ac0429f023c9e1a (patch)
tree72f27fc4be5f0b465407da58265b120d7841d3bb
parent296b2785926ffce7f65b86b12d7733111a43d30e (diff)
downloadtangerine-wallet-browser-5c5aa6ea012b6a5d0cb8e8386ac0429f023c9e1a.tar
tangerine-wallet-browser-5c5aa6ea012b6a5d0cb8e8386ac0429f023c9e1a.tar.gz
tangerine-wallet-browser-5c5aa6ea012b6a5d0cb8e8386ac0429f023c9e1a.tar.bz2
tangerine-wallet-browser-5c5aa6ea012b6a5d0cb8e8386ac0429f023c9e1a.tar.lz
tangerine-wallet-browser-5c5aa6ea012b6a5d0cb8e8386ac0429f023c9e1a.tar.xz
tangerine-wallet-browser-5c5aa6ea012b6a5d0cb8e8386ac0429f023c9e1a.tar.zst
tangerine-wallet-browser-5c5aa6ea012b6a5d0cb8e8386ac0429f023c9e1a.zip
keyring - rm config dep
-rw-r--r--app/scripts/keyring-controller.js3
-rw-r--r--app/scripts/metamask-controller.js4
2 files changed, 2 insertions, 5 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index d1d706165..023dcbcab 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -33,7 +33,6 @@ class KeyringController extends EventEmitter {
keyrings: [],
identities: {},
})
- this.configManager = opts.configManager
this.ethStore = opts.ethStore
this.encryptor = encryptor
this.keyrings = []
@@ -80,8 +79,6 @@ class KeyringController extends EventEmitter {
keyringTypes: memState.keyringTypes,
identities: memState.identities,
keyrings: memState.keyrings,
- // configManager
- seedWords: this.configManager.getSeedWords(),
}
return result
}
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a56203a88..695491c2a 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -59,7 +59,6 @@ module.exports = class MetamaskController extends EventEmitter {
this.keyringController = new KeyringController({
initState: initState.KeyringController,
ethStore: this.ethStore,
- configManager: this.configManager,
getNetwork: this.getStateNetwork.bind(this),
})
this.keyringController.on('newAccount', (address) => {
@@ -190,6 +189,7 @@ module.exports = class MetamaskController extends EventEmitter {
conversionRate: this.configManager.getConversionRate(),
conversionDate: this.configManager.getConversionDate(),
isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
+ seedWords: this.configManager.getSeedWords(),
}
)
}
@@ -339,7 +339,7 @@ module.exports = class MetamaskController extends EventEmitter {
.then((serialized) => {
const seedWords = serialized.mnemonic
this.configManager.setSeedWords(seedWords)
- promiseToCallback(this.keyringController.fullUpdate())(cb)
+ cb()
})
}