aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-09-26 06:23:37 +0800
committerDan Finlay <dan@danfinlay.com>2017-09-26 06:23:37 +0800
commit1968d61431183300298f3ea17b5092865cb915bf (patch)
tree2824dd28b04d885a7cf41d9cf137dbcedaf4df51 /app
parentfeed9a5a17f89ee319dc5558634e8c5c07b2ce65 (diff)
downloadtangerine-wallet-browser-1968d61431183300298f3ea17b5092865cb915bf.tar
tangerine-wallet-browser-1968d61431183300298f3ea17b5092865cb915bf.tar.gz
tangerine-wallet-browser-1968d61431183300298f3ea17b5092865cb915bf.tar.bz2
tangerine-wallet-browser-1968d61431183300298f3ea17b5092865cb915bf.tar.lz
tangerine-wallet-browser-1968d61431183300298f3ea17b5092865cb915bf.tar.xz
tangerine-wallet-browser-1968d61431183300298f3ea17b5092865cb915bf.tar.zst
tangerine-wallet-browser-1968d61431183300298f3ea17b5092865cb915bf.zip
Make encryptor configurable for keyring-controller
Diffstat (limited to 'app')
-rw-r--r--app/scripts/keyring-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 2a1af6e29..34e008ec4 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -37,7 +37,7 @@ class KeyringController extends EventEmitter {
})
this.accountTracker = opts.accountTracker
- this.encryptor = encryptor
+ this.encryptor = opts.encryptor || encryptor
this.keyrings = []
this.getNetwork = opts.getNetwork
}