diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-27 00:51:20 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-27 00:51:20 +0800 |
| commit | 16ba2e6a30fc55bb1601d96696bd08ae177f631e (patch) | |
| tree | 013df9dcd147ba3ffd303c7ae3bab7be5e744638 /app/scripts | |
| parent | b22783a223e84e541db9c1e2d411ef27f62d7e62 (diff) | |
| parent | 50633fbba6d5db782efe1bf8e01294354ea6070c (diff) | |
| download | tangerine-wallet-browser-16ba2e6a30fc55bb1601d96696bd08ae177f631e.tar tangerine-wallet-browser-16ba2e6a30fc55bb1601d96696bd08ae177f631e.tar.gz tangerine-wallet-browser-16ba2e6a30fc55bb1601d96696bd08ae177f631e.tar.bz2 tangerine-wallet-browser-16ba2e6a30fc55bb1601d96696bd08ae177f631e.tar.lz tangerine-wallet-browser-16ba2e6a30fc55bb1601d96696bd08ae177f631e.tar.xz tangerine-wallet-browser-16ba2e6a30fc55bb1601d96696bd08ae177f631e.tar.zst tangerine-wallet-browser-16ba2e6a30fc55bb1601d96696bd08ae177f631e.zip | |
Merge branch 'master' into new-currency-test
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/keyring-controller.js | 2 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index fd57fac70..adfa4a813 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -36,7 +36,7 @@ class KeyringController extends EventEmitter { identities: {}, }) this.ethStore = opts.ethStore - this.encryptor = encryptor + this.encryptor = opts.encryptor || encryptor this.keyrings = [] this.getNetwork = opts.getNetwork } diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 19c65680d..42248827f 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -95,6 +95,7 @@ module.exports = class MetamaskController extends EventEmitter { initState: initState.KeyringController, ethStore: this.ethStore, getNetwork: this.networkController.getNetworkState.bind(this.networkController), + encryptor: opts.encryptor || undefined, }) this.keyringController.on('newAccount', (address) => { this.preferencesController.setSelectedAddress(address) |