Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use correct loading message when connecting to Kovan #5189

Merged
merged 6 commits into from
Sep 6, 2018
Merged

Use correct loading message when connecting to Kovan #5189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f98e0f
Use correct loading message when connecting to Kovan
eugeneiiim Sep 3, 2018
2c1c3da
Update CHANGELOG.md
eugeneiiim Sep 3, 2018
3b05098
Update CHANGELOG.md
eugeneiiim Sep 3, 2018
31b45d3
Merge branch 'develop' into patch-1
eugeneiiim Sep 5, 2018
a509faf
Update CHANGELOG.md
eugeneiiim Sep 5, 2018
da0c29f
Merge remote-tracking branch 'base/develop' into patch-1
Sep 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ui/app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,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 {
Expand Down