Merge pull request #6444 from MetaMask/localhost-network-dropdown

Fixes #6321 & #6421 - Add Localhost 8545 for network dropdown names

3 files changed, 5 insertions, 1 deletions

diff --git a/ui/app/components/app/dropdowns/network-dropdown.js b/ui/app/components/app/dropdowns/network-dropdown.js
index 3d9037a06..7e645725c 100644
--- a/ui/app/components/app/dropdowns/network-dropdown.js
+++ b/ui/app/components/app/dropdowns/network-dropdown.js
@@ -285,6 +285,8 @@ NetworkDropdown.prototype.getNetworkName = function () {
     name = this.context.t('kovan')
   } else if (providerName === 'rinkeby') {
     name = this.context.t('rinkeby')
+  } else if (providerName === 'localhost') {
+    name = this.context.t('localhost')
   } else {
     name = provider.nickname || this.context.t('unknownNetwork')
   }
diff --git a/ui/app/components/app/loading-network-screen/loading-network-screen.component.js b/ui/app/components/app/loading-network-screen/loading-network-screen.component.js
index 348a997c8..b79051d0b 100644
--- a/ui/app/components/app/loading-network-screen/loading-network-screen.component.js
+++ b/ui/app/components/app/loading-network-screen/loading-network-screen.component.js
@@ -45,6 +45,8 @@ export default class LoadingNetworkScreen extends PureComponent {
       name = this.context.t('connectingToKovan')
     } else if (providerName === 'rinkeby') {
       name = this.context.t('connectingToRinkeby')
+    } else if (providerName === 'localhost') {
+      name = this.context.t('connectingToLocalhost')
     } else {
       name = this.context.t('connectingTo', [providerId])
     }
diff --git a/ui/app/components/app/network.js b/ui/app/components/app/network.js
index e18404f42..54065dd73 100644
--- a/ui/app/components/app/network.js
+++ b/ui/app/components/app/network.js
@@ -139,7 +139,7 @@ Network.prototype.render = function () {
                 },
               }),
 
-              h('.network-name', providerNick || context.t('privateNetwork')),
+              h('.network-name', providerName === 'localhost' ? context.t('localhost') : providerNick || context.t('privateNetwork')),
               h('i.fa.fa-chevron-down.fa-lg.network-caret'),
             ])
         }