m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

fixes

Browse Source
This commit is contained in:
brunobar79 2018-06-23 02:52:11 -04:00
parent 4381d3e71d
commit 87dfca0767
3 changed files with 6543 additions and 6552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/metamask-controller.js
View File

@ -539,14 +539,14 @@ module.exports = class MetamaskController extends EventEmitter {
switch (deviceName) { switch (deviceName) {
case 'trezor': case 'trezor':
const keyringController = this.keyringController const keyringController = this.keyringController
const keyring = await keyringController.getKeyringsByType( let keyring = await keyringController.getKeyringsByType(
'Trezor Hardware' 'Trezor Hardware'
)[0] )[0]
if (!keyring) { if (!keyring) {
throw new Error('MetamaskController - No Trezor Hardware Keyring found') keyring = await this.keyringController.addNewKeyring('Trezor Hardware')
} }
const accounts = await keyring.getPage(page) const accounts = page === 1 ? await keyring.getNextPage() : await keyring.getPreviousPage()
this.accountTracker.syncWithAddresses(accounts.map(a => a.address)) this.accountTracker.syncWithAddresses(accounts.map(a => a.address))
return accounts return accounts

13087
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -103,7 +103,7 @@
"eth-query": "^2.1.2", "eth-query": "^2.1.2",
"eth-sig-util": "^1.4.2", "eth-sig-util": "^1.4.2",
"eth-token-tracker": "^1.1.4", "eth-token-tracker": "^1.1.4",
"eth-trezor-keyring": "github:brunobar79/eth-trezor-keyring#753bfd9b7199854eacf716a11b4f414d1a7a33d6", "eth-trezor-keyring": "github:brunobar79/eth-trezor-keyring#287e041c7ff0d4b4baa83caf13917ccd388e119e",
"ethereumjs-abi": "^0.6.4", "ethereumjs-abi": "^0.6.4",
"ethereumjs-tx": "^1.3.0", "ethereumjs-tx": "^1.3.0",
"ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",