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

devop/sync-repo
MyEtherWallet · May 9, 2018 · 44bcc37 · 44bcc37
2 parents 1332c4a + 73a9d0a
commit 44bcc37
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ### Release v3.21.10
 ### Update
+- Add GEN and AMO tokens [#1838](https://github.com/kvhnuke/etherwallet/pull/1838)
+- Update license [#1837](https://github.com/kvhnuke/etherwallet/pull/1837)
 - Sort alphabetically [#1834](https://github.com/kvhnuke/etherwallet/pull/1834)
 - Formatting update [#1833](https://github.com/kvhnuke/etherwallet/pull/1833)
 - Remove WCN and SS tokens [#1832](https://github.com/kvhnuke/etherwallet/pull/1832)

diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json
@@ -149,6 +149,12 @@
 		"decimal": 18,
 		"type": "default"
 	},
+	{
+		"address": "0x38c87aa89b2b8cd9b95b736e1fa7b612ea972169",
+		"symbol": "AMO",
+		"decimal": 18,
+		"type": "default"
+	},
 	{
 		"address": "0x84936cF7630AA3e27Dd9AfF968b140d5AEE49F5a",
 		"symbol": "AMTC",
@@ -1481,6 +1487,12 @@
 		"decimal": 18,
 		"type": "default"
 	},
+	{
+		"address": "0x543Ff227F64Aa17eA132Bf9886cAb5DB55DCAddf",
+		"symbol": "GEN",
+		"decimal": 18,
+		"type": "default"
+	},
 	{
 		"address": "0x8a854288a5976036a725879164ca3e91d30c6a1b",
 		"symbol": "GET",