diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-08-14 13:26:18 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-08-14 13:26:18 +0800 |
commit | 61a279204a804ddf4815d0db6103c19c5640bbb9 (patch) | |
tree | f2e1bea86e79f1f43191d05ed18d9e870fb2fc45 /app | |
parent | 4e1d8ba19db729f5c282c4e3c6b43433b562a45e (diff) | |
download | tangerine-wallet-browser-61a279204a804ddf4815d0db6103c19c5640bbb9.tar tangerine-wallet-browser-61a279204a804ddf4815d0db6103c19c5640bbb9.tar.gz tangerine-wallet-browser-61a279204a804ddf4815d0db6103c19c5640bbb9.tar.bz2 tangerine-wallet-browser-61a279204a804ddf4815d0db6103c19c5640bbb9.tar.lz tangerine-wallet-browser-61a279204a804ddf4815d0db6103c19c5640bbb9.tar.xz tangerine-wallet-browser-61a279204a804ddf4815d0db6103c19c5640bbb9.tar.zst tangerine-wallet-browser-61a279204a804ddf4815d0db6103c19c5640bbb9.zip |
legacy and new hd path working
Diffstat (limited to 'app')
-rw-r--r-- | app/_locales/en/messages.json | 6 | ||||
-rw-r--r-- | app/scripts/metamask-controller.js | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 62ec4ce37..a4ee97525 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -538,6 +538,9 @@ "learnMore": { "message": "Learn more" }, + "ledgerAccountRestriction": { + "message": "You need to make use your last account before you can add a new one." + }, "lessThanMax": { "message": "must be less than or equal to $1.", "description": "helper for inputting hex as decimal input" @@ -922,6 +925,9 @@ "selectAnAccountHelp": { "message": "These are the accounts available in your hardware wallet. Select the one you’d like to use in MetaMask." }, + "selectPathHelp": { + "message": "If you don't see your existing Ledger address(es), please try selecting a different HD Path \"Legacy (MEW / MyCrypto)\"" + }, "sendTokensAnywhere": { "message": "Send Tokens to anyone with an Ethereum account" }, diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index beaf04c0d..b1473390b 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -556,10 +556,11 @@ module.exports = class MetamaskController extends EventEmitter { keyring = await this.keyringController.addNewKeyring(keyringName) } if (hdPath) { - console.log('[LEDGER]: HDPATH set', hdPath) keyring.hdPath = hdPath } + keyring.network = this.networkController.getProviderConfig().type + return keyring } |