aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorBruno <brunobar79@gmail.com>2018-06-13 13:32:13 +0800
committerBruno <brunobar79@gmail.com>2018-06-13 13:32:13 +0800
commit8763ea898e7838d08315063b0e2181405a2ae3d5 (patch)
tree3acb847a6353e8451dc406d4f3d50f6bf61baebe /app/scripts/metamask-controller.js
parentd4201ae1cc990ba6b69e84586caabc0848c2c38e (diff)
downloadtangerine-wallet-browser-8763ea898e7838d08315063b0e2181405a2ae3d5.tar
tangerine-wallet-browser-8763ea898e7838d08315063b0e2181405a2ae3d5.tar.gz
tangerine-wallet-browser-8763ea898e7838d08315063b0e2181405a2ae3d5.tar.bz2
tangerine-wallet-browser-8763ea898e7838d08315063b0e2181405a2ae3d5.tar.lz
tangerine-wallet-browser-8763ea898e7838d08315063b0e2181405a2ae3d5.tar.xz
tangerine-wallet-browser-8763ea898e7838d08315063b0e2181405a2ae3d5.tar.zst
tangerine-wallet-browser-8763ea898e7838d08315063b0e2181405a2ae3d5.zip
move TrezorKeyring to its own package
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index daab5baa5..abe7ff8a2 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -48,7 +48,7 @@ const seedPhraseVerifier = require('./lib/seed-phrase-verifier')
const cleanErrorStack = require('./lib/cleanErrorStack')
const DiagnosticsReporter = require('./lib/diagnostics-reporter')
const log = require('loglevel')
-const TrezorKeyring = require('./lib/trezorKeyring')
+const TrezorKeyring = require('eth-trezor-keyring')
module.exports = class MetamaskController extends EventEmitter {
@@ -549,7 +549,8 @@ module.exports = class MetamaskController extends EventEmitter {
throw new Error('MetamaskController - No Trezor Hardware Keyring found')
}
- const accounts = page === -1 ? await keyring.getPrevAccountSet(this.provider) : await keyring.getNextAccountSet(this.provider)
+ const accounts = await keyring.getPage(page)
+
this.accountTracker.syncWithAddresses(accounts.map(a => a.address))
return accounts