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

devop/sync-repo
MyEtherWallet · May 7, 2018 · 387f6fa · 387f6fa
2 parents 5ba6a16 + 6ef0115
commit 387f6fa
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,12 @@
 ### Release v3.21.10
 ### Update
+- Remove WCN and SS tokens [#1832](https://github.com/kvhnuke/etherwallet/pull/1832)
 - Update japanese translations [#1831](https://github.com/kvhnuke/etherwallet/pull/1831)
 - Update spanish translations [#1830](https://github.com/kvhnuke/etherwallet/pull/1830)
 - Update OPEN token [#1827](https://github.com/kvhnuke/etherwallet/pull/1827)
 
 ### New
+- Add JOY, MRL, 2DC and GET token [#1832](https://github.com/kvhnuke/etherwallet/pull/1832)
 - Add Kyber support email [#1829](https://github.com/kvhnuke/etherwallet/pull/1829)
 
 ### Release v3.21.09

diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json
@@ -17,6 +17,12 @@
 		"decimal": 8,
 		"type": "default"
 	},
+	{
+		"address": "0x9fC0583220eB44fAeE9e2dc1E63F39204DDD9090",
+		"symbol": "2DC",
+		"decimal": 18,
+		"type": "default"
+	},
 	{
 		"address": "0xaEc98A708810414878c3BCDF46Aad31dEd4a4557",
 		"symbol": "300",
@@ -1445,6 +1451,12 @@
 		"decimal": 18,
 		"type": "default"
 	},
+	{
+		"address": "0x8a854288a5976036a725879164ca3e91d30c6a1b",
+		"symbol": "GET",
+		"decimal": 18,
+		"type": "default"
+	},
 	{
 		"address": "0xFcD862985628b254061F7A918035B80340D045d3",
 		"symbol": "GIF",
@@ -1793,6 +1805,12 @@
 		"decimal": 18,
 		"type": "default"
 	},
+	{
+		"address": "0xDDe12a12A6f67156e0DA672be05c374e1B0a3e57",
+		"symbol": "JOY",
+		"decimal": 6,
+		"type": "default"
+	},
 	{
 		"address": "0x0D6DD9f68d24EC1d5fE2174f3EC8DAB52B52BaF5",
 		"symbol": "KC",
@@ -2129,6 +2147,12 @@
 		"decimal": 0,
 		"type": "default"
 	},
+	{
+		"address": "0x82125AFe01819Dff1535D0D6276d57045291B6c0",
+		"symbol": "MRL",
+		"decimal": 18,
+		"type": "default"
+	},
 	{
 		"address": "0x21f0F0fD3141Ee9E11B3d7f13a1028CD515f459c",
 		"symbol": "MRP",
@@ -3035,12 +3059,6 @@
 		"decimal": 18,
 		"type": "default"
 	},
-	{
-		"address": "0xB15fE5a123e647ba594CEa7A1E648646f95EB4AA",
-		"symbol": "SS",
-		"decimal": 18,
-		"type": "default"
-	},
 	{
 		"address": "0xbbFF862d906E348E9946Bfb2132ecB157Da3D4b4",
 		"symbol": "SS (Sharder)",
@@ -3425,12 +3443,6 @@
 		"decimal": 7,
 		"type": "default"
 	},
-	{
-		"address": "0x8f936fe0faf0604c9c0ef2406bde0a65365515d6",
-		"symbol": "WCN",
-		"decimal": 18,
-		"type": "default"
-	},
 	{
 		"address": "0x6a0a97e47d15aad1d132a1ac79a480e3f2079063",
 		"symbol": "WCT",