diff options
author | Thomas Huang <tmashuang@users.noreply.github.com> | 2019-04-17 03:39:00 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-17 03:39:00 +0800 |
commit | 00133d31b15d070d55dff13f568cf828dad41424 (patch) | |
tree | 2d0a85a31a00f9492e75a3d710209f9d89908325 /app | |
parent | 09f2a2a5476c4c119c7294f496f6590156d8d07a (diff) | |
parent | 33836c04638bd0ef023ed913e4c8ec976ad3caae (diff) | |
download | tangerine-wallet-browser-00133d31b15d070d55dff13f568cf828dad41424.tar.gz tangerine-wallet-browser-00133d31b15d070d55dff13f568cf828dad41424.tar.zst tangerine-wallet-browser-00133d31b15d070d55dff13f568cf828dad41424.zip |
Merge pull request #6444 from MetaMask/localhost-network-dropdown
Fixes #6321 & #6421 - Add Localhost 8545 for network dropdown names
Diffstat (limited to 'app')
-rw-r--r-- | app/_locales/en/messages.json | 3 | ||||
-rw-r--r-- | app/scripts/controllers/network/network.js | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 154925d1a..f9d23f69e 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -308,6 +308,9 @@ "connectingToRinkeby": { "message": "Connecting to Rinkeby Test Network" }, + "connectingToLocalhost": { + "message": "Connecting to Localhost 8545" + }, "connectingToUnknown": { "message": "Connecting to Unknown Network" }, diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js index 47432c1e2..ab1198dd3 100644 --- a/app/scripts/controllers/network/network.js +++ b/app/scripts/controllers/network/network.js @@ -140,10 +140,10 @@ module.exports = class NetworkController extends EventEmitter { this.providerConfig = providerConfig } - async setProviderType (type) { + async setProviderType (type, rpcTarget = '', ticker = 'ETH', nickname = '') { assert.notEqual(type, 'rpc', `NetworkController - cannot call "setProviderType" with type 'rpc'. use "setRpcTarget"`) assert(INFURA_PROVIDER_TYPES.includes(type) || type === LOCALHOST, `NetworkController - Unknown rpc type "${type}"`) - const providerConfig = { type } + const providerConfig = { type, rpcTarget, ticker, nickname } this.providerConfig = providerConfig } |