Merge branch 'mercury' of github.com:kvhnuke/etherwallet into mercury

MyEtherWallet · Mar 6, 2018 · 7cb2f7e · 7cb2f7e
2 parents b959d10 + 5bc5b46
commit 7cb2f7e
Show file tree

Hide file tree

Showing 2 changed files with 158 additions and 0 deletions.
diff --git a/app/includes/onboardingModal.tpl b/app/includes/onboardingModal.tpl
@@ -518,6 +518,14 @@
                   </a>
                 </li>
               </ul>
+
+              <div class="onboarding__buttons">
+                <a ng-click="onboardModal.close()" class="btn btn-primary col-sm-5 col-sm-offset-7">
+                  <span>
+                    Done &nbsp;
+                  </span>
+                </a>
+              </div>
             </div>
           </section>
         </article>

diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json
@@ -197,6 +197,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0x6339784d9478da43106a429196772a029c2f177d",
+    "symbol": "ATTN",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0xeD247980396B10169BB1d36f6e278eD16700a60f",
     "symbol": "AVA",
@@ -209,6 +215,18 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0x9af2c6B1A28D3d6BC084bd267F70e90d49741D5B",
+    "symbol": "AXP",
+    "decimal": 8,
+    "type": "default"
+  },
+  {
+    "address": "0xf87f0d9153fea549c728ad61cb801595a68b73de",
+    "symbol": "BANX",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x0D8775F648430679A709E98d2b0Cb6250d2887EF",
     "symbol": "BAT",
@@ -245,6 +263,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0x1014613e2b3cbc4d575054d4982e580d9b99d7b1",
+    "symbol": "BCV",
+    "decimal": 8,
+    "type": "default"
+  },
   {
     "address": "0x1961B3331969eD52770751fC718ef530838b6dEE",
     "symbol": "BDG",
@@ -269,6 +293,12 @@
     "decimal": 8,
     "type": "default"
   },
+  {
+    "address": "0x45245bc59219eeaaf6cd3f382e078a461ff9de7b",
+    "symbol": "BKX",
+    "decimal": 8,
+    "type": "default"
+  },
   {
     "address": "0x107c4504cd79C5d2696Ea0030a8dD4e92601B82e",
     "symbol": "BLT",
@@ -395,6 +425,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0xdb8646f5b487b5dd979fac618350e85018f557d4",
+    "symbol": "BTK",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x2accaB9cb7a48c3E82286F0b2f8798D201F4eC3f",
     "symbol": "BTL (Battle)",
@@ -605,6 +641,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0x9e96604445ec19ffed9a5e8dd7b50a29c899a10c",
+    "symbol": "COSS",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0xf44745fbd41f6a1ba151df190db0564c5fcc4410",
     "symbol": "CPY",
@@ -845,6 +887,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0x76974c7b79dc8a6a109fd71fd7ceb9e40eff5382",
+    "symbol": "DOW",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x01b3Ec4aAe1B8729529BEB4965F27d008788B0EB",
     "symbol": "DPP",
@@ -875,6 +923,12 @@
     "decimal": 2,
     "type": "default"
   },
+  {
+    "address": "0x2799d90c6d44cb9aa5fbc377177f16c33e056b82",
+    "symbol": "DRP",
+    "decimal": 0,
+    "type": "default"
+  },
   {
     "address": "0x1e09BD8Cadb441632e441Db3e1D79909EE0A2256",
     "symbol": "DSC",
@@ -971,6 +1025,12 @@
     "decimal": 8,
     "type": "default"
   },
+  {
+    "address": "0x9501BFc48897DCEEadf73113EF635d2fF7ee4B97",
+    "symbol": "EMT",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0xB802b24E0637c2B87D2E8b7784C055BBE921011a",
     "symbol": "EMV",
@@ -983,6 +1043,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0x5BC7e5f0Ab8b2E10D2D0a3F21739FCe62459aeF3",
+    "symbol": "ENTRP",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x86fa049857e0209aa7d9e616f7eb3b3b78ecfdb0",
     "symbol": "EOS",
@@ -1277,6 +1343,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0x5B0751713b2527d7f002c0c4e2a37e1219610A6B",
+    "symbol": "HORSE",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x554C20B7c486beeE439277b4540A434566dC4C02",
     "symbol": "HST",
@@ -1379,6 +1451,12 @@
     "decimal": 10,
     "type": "default"
   },
+  {
+    "address": "0xc72fe8e3dd5bef0f9f31f259399f301272ef2a2d",
+    "symbol": "INSTAR",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0xa8006c4ca56f24d6836727d106349320db7fef82",
     "symbol": "INXT",
@@ -1391,6 +1469,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0x001f0aa5da15585e5b2305dbab2bac425ea71007",
+    "symbol": "IPSX",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x5e6b6d9abad9093fdc861ea1600eba1b355cd940",
     "symbol": "ITC",
@@ -1415,6 +1499,12 @@
     "decimal": 6,
     "type": "default"
   },
+  {
+    "address": "0x0d262e5dc4a06a0f1c90ce79c7a60c09dfc884e4",
+    "symbol": "J8T",
+    "decimal": 8,
+    "type": "default"
+  },
   {
     "address": "0x0Aaf561eFF5BD9c8F911616933F84166A17cfE0C",
     "symbol": "JBX",
@@ -1469,6 +1559,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0xb5c33f965c8899d255c34cdd2a3efa8abcbb3dea",
+    "symbol": "KPR",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x9541FD8B9b5FA97381783783CeBF2F5fA793C262",
     "symbol": "KZN",
@@ -1481,6 +1577,18 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0xfD107B473AB90e8Fbd89872144a3DC92C40Fa8C9",
+    "symbol": "LALA",
+    "decimal": 18,
+    "type": "default"
+  },
+  {
+    "address": "0x5102791ca02fc3595398400bfe0e33d7b6c82267",
+    "symbol": "LDC",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0xd6e354F07319e2474491D8c7c712137bEe6862a2",
     "symbol": "LEMO",
@@ -1547,6 +1655,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0x9c23d67aea7b95d80942e3836bcdf7e708a747c2",
+    "symbol": "LOCI",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x21ae23b882a340a22282162086bc98d3e2b73018",
     "symbol": "LOK",
@@ -1619,6 +1733,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0x5b8d43ffde4a2982b9a5387cdf21d54ead64ac8d",
+    "symbol": "MEST",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x40395044ac3c0c57051906da938b54bd6557f212",
     "symbol": "MGO",
@@ -1739,6 +1859,12 @@
     "decimal": 8,
     "type": "default"
   },
+  {
+    "address": "0x9e46a38f5daabe8683e10793b06749eef7d733d1",
+    "symbol": "NCT",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0xa54ddc7b3cce7fc8b1e3fa0256d0db80d2c10970",
     "symbol": "NDC",
@@ -1811,6 +1937,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0x0235fe624e044a05eed7a43e16e3083bc8a4287a",
+    "symbol": "OCC",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x7F2176cEB16dcb648dc924eff617c3dC2BEfd30d",
     "symbol": "OHNI",
@@ -2333,6 +2465,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0xfdFE8b7aB6CF1bD1E3d14538Ef40686296C42052",
+    "symbol": "SKRP",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x7A5fF295Dc8239d5C2374E4D894202aAF029Cab6",
     "symbol": "SLT",
@@ -2435,6 +2573,12 @@
     "decimal": 18,
     "type": "default"
   },
+  {
+    "address": "0xB15fE5a123e647ba594CEa7A1E648646f95EB4AA",
+    "symbol": "SS",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x9a005c9a89bd72a4bd27721e7a09a3c11d2b03c4",
     "symbol": "STAC",
@@ -2675,6 +2819,12 @@
     "decimal": 0,
     "type": "default"
   },
+  {
+    "address": "0x82BD526bDB718C6d4DD2291Ed013A5186cAE2DCa",
+    "symbol": "VDOC",
+    "decimal": 18,
+    "type": "default"
+  },
   {
     "address": "0x340d2bde5eb28c1eed91b2f790723e3b160613b7",
     "symbol": "VEE",