Merge pull request #1977 from kvhnuke/devop/sync-repo

devop/sync-repo
MyEtherWallet · Jul 27, 2018 · ab580d4 · ab580d4
2 parents 75c75ba + a1f6ad4
commit ab580d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### Release v3.21.18
 ### New  
+- Add EDR token [#1977](https://github.com/kvhnuke/etherwallet/pull/1977)
 - Add HUR and ODEM tokens, remove inactive tokens. [See list here](https://github.com/MyEtherWallet/ethereum-lists/pull/764) [#1974](https://github.com/kvhnuke/etherwallet/pull/1974)
 - Add IST34 and NUG tokens [#1973](https://github.com/kvhnuke/etherwallet/pull/1973)
 - Add CRGO and TICO token, add Havven ABI [#1972](https://github.com/kvhnuke/etherwallet/pull/1972)

diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json
@@ -1391,6 +1391,12 @@
 		"decimal": 18,
 		"type": "default"
 	},
+	{
+		"address": "0xc528c28FEC0A90C083328BC45f587eE215760A0F",
+		"symbol": "EDR",
+		"decimal": 18,
+		"type": "default"
+	},
 	{
 		"address": "0x2a22e5cca00a3d63308fa39f29202eb1b39eef52",
 		"symbol": "EDU",
@@ -1541,12 +1547,6 @@
 		"decimal": 6,
 		"type": "default"
 	},
-	{
-		"address": "0x523630976eB6147621B5c31c781eBe2Ec2a806E0",
-		"symbol": "eUSD",
-		"decimal": 18,
-		"type": "default"
-	},
 	{
 		"address": "0x923108a439C4e8C2315c4f6521E5cE95B44e9B4c",
 		"symbol": "EVE",