aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Huang <tmashuang@users.noreply.github.com>2018-06-07 02:37:17 +0800
committerGitHub <noreply@github.com>2018-06-07 02:37:17 +0800
commit00f24339524850f7aa3a587914a9d33a10ccc539 (patch)
tree1ce59249dc76244d14202db0b0824d9dddaf2823
parent191c3df108562d3f72d6206dfdcd591ad5c80e73 (diff)
parent39a7702c8f0aa2c2e7fdf2bcf913e76bb8b827f4 (diff)
downloadtangerine-wallet-browser-00f24339524850f7aa3a587914a9d33a10ccc539.tar
tangerine-wallet-browser-00f24339524850f7aa3a587914a9d33a10ccc539.tar.gz
tangerine-wallet-browser-00f24339524850f7aa3a587914a9d33a10ccc539.tar.bz2
tangerine-wallet-browser-00f24339524850f7aa3a587914a9d33a10ccc539.tar.lz
tangerine-wallet-browser-00f24339524850f7aa3a587914a9d33a10ccc539.tar.xz
tangerine-wallet-browser-00f24339524850f7aa3a587914a9d33a10ccc539.tar.zst
tangerine-wallet-browser-00f24339524850f7aa3a587914a9d33a10ccc539.zip
Merge pull request #4515 from MetaMask/master
Merge Master into Develop
-rw-r--r--CHANGELOG.md12
-rw-r--r--app/manifest.json2
2 files changed, 12 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4c2abd4d..19287f046 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,17 @@
## Current Master
-- Fixes issue where old nicknames were kept around causing errors.
+## 4.7.4 Tue Jun 05 2018
+
+- Add diagnostic reporting for users with multiple HD keyrings
+- Throw explicit error when selected account is unset
+
+## 4.7.3 Mon Jun 04 2018
+
+- Hide token now uses new modal
+- Indicate the current selected account on the popup account view
+- Reduce height of notice container in onboarding
+- Fixes issue where old nicknames were kept around causing errors
## 4.7.2 Sun Jun 03 2018
diff --git a/app/manifest.json b/app/manifest.json
index c1f26d2ea..e3a7fd963 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "__MSG_appName__",
- "version": "4.7.2",
+ "version": "4.7.4",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "__MSG_appDescription__",