From 8bda6632111c1606be0191cd7dff3db28f41db31 Mon Sep 17 00:00:00 2001
From: gamalielhere <gamalielgad1234@gmail.com>
Date: Wed, 13 Jun 2018 08:21:09 -0700
Subject: [PATCH 1/2] Add OJX, BTT in eth and CTGA in rinkeby

---
 CHANGELOG.md                          |  1 +
 app/scripts/tokens/ethTokens.json     | 14 +++++++++++++-
 app/scripts/tokens/rinkebyTokens.json |  6 ++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2daa44122e..52fd638ec8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### Release v3.21.14
 ### New
+- Add OJX, and BTT in eth list. Add CTGA to rin. [#1904](https://github.com/kvhnuke/etherwallet/pull/1904)
 - Add WORK token [#1902](https://github.com/kvhnuke/etherwallet/pull/1902)
 
 ### Release v3.21.13
diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json
index a0361d4681..84fd03af5d 100644
--- a/app/scripts/tokens/ethTokens.json
+++ b/app/scripts/tokens/ethTokens.json
@@ -613,10 +613,16 @@
 	},
 	{
 		"address": "0x080aa07e2c7185150d7e4da98838a8d2feac3dfc",
-		"symbol": "BTT",
+		"symbol": "BTT (Bitether)",
 		"decimal": 0,
 		"type": "default"
 	},
+	{
+		"address": "0xFA456Cf55250A839088b27EE32A424d7DAcB54Ff",
+		"symbol": "BTT (Blocktrade)",
+		"decimal": 18,
+		"type": "default"
+	},
 	{
 		"address": "0xca3c18a65b802ec267f8f4802545e7f53d24c75e",
 		"symbol": "BUC",
@@ -2603,6 +2609,12 @@
 		"decimal": 18,
 		"type": "default"
 	},
+	{
+		"address": "0xbeef546ac8a4e0a80dc1e2d696968ef54138f1d4",
+		"symbol": "OJX",
+		"decimal": 18,
+		"type": "default"
+	},
 	{
 		"address": "0xc66ea802717bfb9833400264dd12c2bceaa34a6d",
 		"symbol": "OLD_MKR",
diff --git a/app/scripts/tokens/rinkebyTokens.json b/app/scripts/tokens/rinkebyTokens.json
index 8e7dfda9df..ba7f0cb93f 100644
--- a/app/scripts/tokens/rinkebyTokens.json
+++ b/app/scripts/tokens/rinkebyTokens.json
@@ -11,6 +11,12 @@
 		"decimal": 0,
 		"type": "default"
 	},
+	{
+		"symbol": "CTGA",
+		"address": "0x8b65d4b7ee3fffa986c577f0f4b70a21bae3dd54",
+		"decimals": 18,
+		"type": "default"
+	},
   {
 		"address": "0x275a5b346599b56917e7b1c9de019dcf9ead861a",
 		"symbol": "KC",

From 018d9ff2d6ecb5341baee7330e45b60ffa1d47a5 Mon Sep 17 00:00:00 2001
From: gamalielhere <gamalielgad1234@gmail.com>
Date: Wed, 13 Jun 2018 08:22:06 -0700
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52fd638ec8..97d037a6c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ### Release v3.21.14
 ### New
-- Add OJX, and BTT in eth list. Add CTGA to rin. [#1904](https://github.com/kvhnuke/etherwallet/pull/1904)
+- Add OJX, and BTT in eth list. Add CTGA to rin. [#1905](https://github.com/kvhnuke/etherwallet/pull/1905)
 - Add WORK token [#1902](https://github.com/kvhnuke/etherwallet/pull/1902)
 
 ### Release v3.21.13