Skip to content
This repository has been archived by the owner on Nov 21, 2019. It is now read-only.

devop/sync-repo #2071

Merged
merged 2 commits into from
Sep 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
### New
- Add ERT and PNK tokens [#2071](https://github.com/kvhnuke/etherwallet/pull/2071)
- Hotfix firefox support for MEWconnect [Commit](https://github.com/kvhnuke/etherwallet/commit/d653481b756f425052c5bb20b0a1ff2f1c32b2ae)

### Release v3.22.2
Expand Down
72 changes: 42 additions & 30 deletions app/scripts/tokens/ethTokens.json
Original file line number Diff line number Diff line change
Expand Up @@ -569,12 +569,6 @@
"decimal": 18,
"type": "default"
},
{
"address": "0x5Af2Be193a6ABCa9c8817001F45744777Db30756",
"symbol": "ETHOS",
"decimal": 8,
"type": "default"
},
{
"address": "0x9E77D5a1251b6F7D456722A6eaC6D2d5980bd891",
"symbol": "BRAT",
Expand Down Expand Up @@ -1374,14 +1368,14 @@
"type": "default"
},
{
"address": "0x765f0c16d1ddc279295c1a7c24b0883f62d33f75",
"symbol": "DTX",
"address": "0x82fdedfB7635441aA5A92791D001fA7388da8025",
"symbol": "DTx",
"decimal": 18,
"type": "default"
},
{
"address": "0x82fdedfB7635441aA5A92791D001fA7388da8025",
"symbol": "DTx",
"address": "0x765f0c16d1ddc279295c1a7c24b0883f62d33f75",
"symbol": "DTX",
"decimal": 18,
"type": "default"
},
Expand Down Expand Up @@ -1565,6 +1559,12 @@
"decimal": 4,
"type": "default"
},
{
"address": "0x92A5B04D0ED5D94D7a193d1d334D3D16996f4E13",
"symbol": "ERT",
"decimal": 18,
"type": "default"
},
{
"address": "0xe8a1df958be379045e2b46a31a98b93a2ecdfded",
"symbol": "ESZ",
Expand All @@ -1589,6 +1589,12 @@
"decimal": 8,
"type": "default"
},
{
"address": "0x5Af2Be193a6ABCa9c8817001F45744777Db30756",
"symbol": "ETHOS",
"decimal": 8,
"type": "default"
},
{
"address": "0x6927C69fb4daf2043fbB1Cb7b86c5661416bea29",
"symbol": "ETR",
Expand Down Expand Up @@ -2627,6 +2633,12 @@
"decimal": 0,
"type": "default"
},
{
"address": "0xfbd0d1c77b501796a35d86cf91d65d9778eee695",
"symbol": "MOVED",
"decimal": 3,
"type": "default"
},
{
"address": "0x82125AFe01819Dff1535D0D6276d57045291B6c0",
"symbol": "MRL",
Expand All @@ -2652,14 +2664,14 @@
"type": "default"
},
{
"address": "0xdfdc0d82d96f8fd40ca0cfb4a288955becec2088",
"symbol": "MTC (Mesh Network)",
"address": "0x905E337c6c8645263D3521205Aa37bf4d034e745",
"symbol": "MTC (Medical Token Currency)",
"decimal": 18,
"type": "default"
},
{
"address": "0x905E337c6c8645263D3521205Aa37bf4d034e745",
"symbol": "MTC (Medical Token Currency)",
"address": "0xdfdc0d82d96f8fd40ca0cfb4a288955becec2088",
"symbol": "MTC (Mesh Network)",
"decimal": 18,
"type": "default"
},
Expand Down Expand Up @@ -2952,14 +2964,14 @@
"type": "default"
},
{
"address": "0x77761e63c05aee6648fdaeaa9b94248351af9bcd",
"symbol": "PASS",
"address": "0xea5f88e54d982cbb0c441cde4e79bc305e5b43bc",
"symbol": "PARETO",
"decimal": 18,
"type": "default"
},
{
"address": "0xea5f88e54d982cbb0c441cde4e79bc305e5b43bc",
"symbol": "PARETO",
"address": "0x77761e63c05aee6648fdaeaa9b94248351af9bcd",
"symbol": "PASS",
"decimal": 18,
"type": "default"
},
Expand Down Expand Up @@ -3089,6 +3101,12 @@
"decimal": 18,
"type": "default"
},
{
"address": "0x93ed3fbe21207ec2e8f2d3c3de6e058cb73bc04d",
"symbol": "PNK",
"decimal": 18,
"type": "default"
},
{
"address": "0x0e0989b1f9b8a38983c2ba8053269ca62ec9b195",
"symbol": "POE",
Expand Down Expand Up @@ -3959,12 +3977,6 @@
"decimal": 18,
"type": "default"
},
{
"address": "0xfbd0d1c77b501796a35d86cf91d65d9778eee695",
"symbol": "MOVED",
"decimal": 3,
"type": "default"
},
{
"address": "0x24692791bc444c5cd0b81e3cbcaba4b04acd1f3b",
"symbol": "UKG",
Expand Down Expand Up @@ -3995,18 +4007,18 @@
"decimal": 18,
"type": "default"
},
{
"address": "0xD760ADdFb24D9C01Fe4Bfea7475C5e3636684058",
"symbol": "USDM",
"decimal": 2,
"type": "default"
},
{
"address": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
"symbol": "USDC",
"decimal": 6,
"type": "default"
},
{
"address": "0xD760ADdFb24D9C01Fe4Bfea7475C5e3636684058",
"symbol": "USDM",
"decimal": 2,
"type": "default"
},
{
"address": "0xdac17f958d2ee523a2206206994597c13d831ec7",
"symbol": "USDT",
Expand Down