diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-09-11 01:16:37 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-09-11 01:16:37 +0800 |
| commit | 26333ee83063f1c21fdabc63b9f20e0cc4a60181 (patch) | |
| tree | c82226c77eacbb1869fa6a1e8ed4d3d24e93029e | |
| parent | a299641a95953f99e33b25fc7583c495b82c0322 (diff) | |
| parent | fdb023381be323bd3198d5e102447e6591e7e73e (diff) | |
| download | tangerine-wallet-browser-26333ee83063f1c21fdabc63b9f20e0cc4a60181.tar.gz tangerine-wallet-browser-26333ee83063f1c21fdabc63b9f20e0cc4a60181.tar.zst tangerine-wallet-browser-26333ee83063f1c21fdabc63b9f20e0cc4a60181.zip | |
fix merge conflicts
| -rw-r--r-- | .yo-rc.json | 3 | ||||
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | package-lock.json | 6 | ||||
| -rw-r--r-- | ui/app/app.js | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/.yo-rc.json b/.yo-rc.json deleted file mode 100644 index 7a2135249..000000000 --- a/.yo-rc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "generator-mocha": {} -}
\ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b7ea17a1..7a7346720 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 diff --git a/package-lock.json b/package-lock.json index 131541c71..cee8b15ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7658,9 +7658,15 @@ } }, "enzyme-adapter-utils": { +<<<<<<< HEAD "version": "1.7.0", "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.7.0.tgz", "integrity": "sha512-K5FVpGxMlakvvWS6TkwogAzvMRE4pgve6grPzCuraVHRBzgrmeasGDF1CS2rQc7uKo7OF0FQZxaQm8oJAKXFVw==", +======= + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.8.0.tgz", + "integrity": "sha512-K9U2RGr1pvWPGEAIRQRVH4UdlqzpfLsKonuHyAK6lxu46yfGsMDVlO3+YvQwQpVjVw8eviEVIOmlFAnMbIhv/w==", +>>>>>>> fdb023381be323bd3198d5e102447e6591e7e73e "dev": true, "requires": { "function.prototype.name": "^1.1.0", diff --git a/ui/app/app.js b/ui/app/app.js index aa051280b..c93f93e75 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -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 { |