diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-09-22 06:47:29 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-09-22 06:56:24 +0800 |
| commit | bd117d6b7134a17df9d51d1fd62ec19e5258c973 (patch) | |
| tree | 939801222939bc818d2353196dc2864248dc431c /app | |
| parent | e9043f22dfa7856e3360b312ce480e71f36d9381 (diff) | |
| parent | 73d9434ad63e18a87bd3ed13a285eb37c9c6ae7c (diff) | |
| download | tangerine-wallet-browser-bd117d6b7134a17df9d51d1fd62ec19e5258c973.tar tangerine-wallet-browser-bd117d6b7134a17df9d51d1fd62ec19e5258c973.tar.gz tangerine-wallet-browser-bd117d6b7134a17df9d51d1fd62ec19e5258c973.tar.bz2 tangerine-wallet-browser-bd117d6b7134a17df9d51d1fd62ec19e5258c973.tar.lz tangerine-wallet-browser-bd117d6b7134a17df9d51d1fd62ec19e5258c973.tar.xz tangerine-wallet-browser-bd117d6b7134a17df9d51d1fd62ec19e5258c973.tar.zst tangerine-wallet-browser-bd117d6b7134a17df9d51d1fd62ec19e5258c973.zip | |
Merge branch 'master' into ConfigurableEncryption
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/metamask-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 42248827f..e4fa3518f 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -95,7 +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, + encryptor: opts.platform.encryptor || undefined, }) this.keyringController.on('newAccount', (address) => { this.preferencesController.setSelectedAddress(address) |