aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorbrunobar79 <brunobar79@gmail.com>2018-08-12 13:34:01 +0800
committerbrunobar79 <brunobar79@gmail.com>2018-08-12 13:34:01 +0800
commit0b9b892c6b27c55a016378387cb8d227957f8528 (patch)
tree4a712f3e7536a2b8852863d893887b73a31a9291 /app/scripts/metamask-controller.js
parent2355573340d0287582d0cd6a467e13126fbddd7c (diff)
downloadtangerine-wallet-browser-0b9b892c6b27c55a016378387cb8d227957f8528.tar
tangerine-wallet-browser-0b9b892c6b27c55a016378387cb8d227957f8528.tar.gz
tangerine-wallet-browser-0b9b892c6b27c55a016378387cb8d227957f8528.tar.bz2
tangerine-wallet-browser-0b9b892c6b27c55a016378387cb8d227957f8528.tar.lz
tangerine-wallet-browser-0b9b892c6b27c55a016378387cb8d227957f8528.tar.xz
tangerine-wallet-browser-0b9b892c6b27c55a016378387cb8d227957f8528.tar.zst
tangerine-wallet-browser-0b9b892c6b27c55a016378387cb8d227957f8528.zip
this should be ready to go
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index c79e5141e..fed00077e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -49,7 +49,7 @@ const seedPhraseVerifier = require('./lib/seed-phrase-verifier')
const cleanErrorStack = require('./lib/cleanErrorStack')
const log = require('loglevel')
const TrezorKeyring = require('eth-trezor-keyring')
-const LedgerKeyring = require('./eth-ledger-keyring-listener')
+const LedgerBridgeKeyring = require('eth-ledger-bridge-keyring')
module.exports = class MetamaskController extends EventEmitter {
@@ -128,7 +128,7 @@ module.exports = class MetamaskController extends EventEmitter {
})
// key mgmt
- const additionalKeyrings = [TrezorKeyring, LedgerKeyring]
+ const additionalKeyrings = [TrezorKeyring, LedgerBridgeKeyring]
this.keyringController = new KeyringController({
keyringTypes: additionalKeyrings,
initState: initState.KeyringController,
@@ -546,7 +546,7 @@ module.exports = class MetamaskController extends EventEmitter {
keyringName = TrezorKeyring.type
break
case 'ledger':
- keyringName = LedgerKeyring.type
+ keyringName = LedgerBridgeKeyring.type
break
default:
throw new Error('MetamaskController:connectHardware - Unknown device')