From 2f98e0fcee9e18f2819e69b0d3eed0716087acb2 Mon Sep 17 00:00:00 2001 From: Eugene Marinelli Date: Mon, 3 Sep 2018 12:09:45 -0400 Subject: [PATCH 1/4] Use correct loading message when connecting to Kovan --- ui/app/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/app.js b/ui/app/app.js index e0bdac3590e5..1ced9a0b6d94 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -228,7 +228,7 @@ class App extends Component { } else if (providerName === 'ropsten') { name = this.context.t('connectingToRopsten') } else if (providerName === 'kovan') { - name = this.context.t('connectingToRopsten') + name = this.context.t('connectingToKovan') } else if (providerName === 'rinkeby') { name = this.context.t('connectingToRinkeby') } else { From 2c1c3da63dab23b799691abf1d6debde86ec4dc0 Mon Sep 17 00:00:00 2001 From: Eugene Marinelli Date: Mon, 3 Sep 2018 12:20:08 -0400 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 097d57cdf8a1..d3dff1735d01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Current Develop Branch - (#4606)[https://github.com/MetaMask/metamask-extension/pull/4606]: Add new metamask_watchAsset method. +- (#5189)[https://github.com/MetaMask/metamask-extension/pull/5189]: Fix bug where Ropsten loading message is shown when connecting to Kovan. ## 4.9.3 Wed Aug 15 2018 From 3b05098df92ca84016f992d6ea410060146b87ba Mon Sep 17 00:00:00 2001 From: Eugene Marinelli Date: Mon, 3 Sep 2018 12:21:49 -0400 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3dff1735d01..d6704c2c97ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## Current Develop Branch - (#4606)[https://github.com/MetaMask/metamask-extension/pull/4606]: Add new metamask_watchAsset method. -- (#5189)[https://github.com/MetaMask/metamask-extension/pull/5189]: Fix bug where Ropsten loading message is shown when connecting to Kovan. +- [#5189](https://github.com/MetaMask/metamask-extension/pull/5189): Fix bug where Ropsten loading message is shown when connecting to Kovan. ## 4.9.3 Wed Aug 15 2018 From a509faf553b3a79c1def61caafc0f415ec1ec5fe Mon Sep 17 00:00:00 2001 From: Eugene Marinelli Date: Tue, 4 Sep 2018 17:22:58 -0700 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9d8942552f7..7a73467203c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,8 @@ ## Current Develop Branch -- [#5189](https://github.com/MetaMask/metamask-extension/pull/5189): Fix bug where Ropsten loading message is shown when connecting to Kovan. - [#4606](https://github.com/MetaMask/metamask-extension/pull/4606): Add new metamask_watchAsset method. +- [#5189](https://github.com/MetaMask/metamask-extension/pull/5189): Fix bug where Ropsten loading message is shown when connecting to Kovan. ## 4.9.3 Wed Aug 15 2018