Release: v3.9.6.6

MyEtherWallet · Jun 28, 2017 · a5969a4 · a5969a4
1 parent 8d84a6a
commit a5969a4
Show file tree

Hide file tree

Showing 17 changed files with 102,121 additions and 118,080 deletions.
diff --git a/app/includes/footer.tpl b/app/includes/footer.tpl
@@ -2,111 +2,94 @@
 
   <article class="block__wrap" style="max-width: 1780px; margin: auto;">
 
-      <section class="footer--left">
-        <a href="https://www.myetherwallet.com/"><img src="images/logo-myetherwallet.svg" height="55px" width="auto" alt="Ether Wallet" class="footer--logo"/></a>
-
-        <ul>
-          <li>
-            <span translate="FOOTER_1">Free, open-source, client-side tool for easily &amp; securely interacting with the Ethereum network.</span>
-            <span translate="FOOTER_1b">Created by</span> <a aria-label="kvhnuke's github" href="https://github.com/kvhnuke" target="_blank" rel="noopener">kvhnuke</a> &amp; <a aria-label="tayvano's github" href="https://github.com/tayvano" target="_blank" rel="noopener">tayvano</a>.
-          </li>
-        </ul>
-        <ul>
-
-          <li><a href="https://www.myetherwallet.com/signmsg.html" target="_blank" rel="noopener" role="link" tabindex="0">
-             Sign Message
-          </a></li>
-
-          <li ng-show="showBlocks">Latest Block#: {{currentBlockNumber}} </li>
-
-          <li> <a role="link" tabindex="0" data-toggle="modal" data-target="#disclaimerModal" translate="FOOTER_4"> Disclaimer </a> </li>
-
-        </ul>
-
-      </section>
-
-      <section class="footer--cent">
-
-        <div>
-          <h5> <i aria-hidden="true">👫</i> You can support us by supporting our blockchain-family.</h5>
-          <ul>
-            <li>Consider using our affiliate links to...</li>
-            <li><a aria-label="Swap Ether or Bitcoin via Bity.com" href="https://bity.com/af/jshkb37v" target="_blank" rel="noopener">Swap ETH/BTC/EUR/CHF via Bity.com</a></li>
-            <li><a href="https://www.ledgerwallet.com/r/fa4b?path=/products/" target="_blank" rel="noopener">Buy a Ledger Nano S</a>
-            &nbsp;&middot;&nbsp;
-            <a href="https://trezor.io/?a=myetherwallet.com" target="_blank" rel="noopener">Buy a TREZOR</a></li>
-          </ul>
-        </div>
-        <div>
-          <h5> <i aria-hidden="true">💝</i> Donations are always appreciated!</h5>
-          <ul>
-            <li> ETH: <span class="mono wrap">0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8</span></li>
-            <li> BTC: <span class="mono wrap">1MEWT2SGbqtz6mPCgFcnea8XmWV5Z4Wc6</span></li>
-          </ul>
-        </div>
-        <div>
-          <h5> <i ng-hide="curLang=='en'">🏅</i> <span translate="Translator_Desc"> Thank you to our translators </span></h5>
-          <ul><li>
-            <span translate="TranslatorName_1"></span>
-            <span translate="TranslatorName_2"></span>
-            <span translate="TranslatorName_3"></span>
-            <span translate="TranslatorName_4"></span>
-            <span translate="TranslatorName_5"></span>
-          </li></ul>
-        </div>
-      </section>
-
-      <section class="footer--righ">
-
-        <h5><i aria-hidden="true">🌎</i> Helpful Links </h5>
-        <ul>
-          <li><a aria-label="Help Center" href="https://myetherwallet.groovehq.com/help_center" target="_blank" rel="noopener" role="link" tabindex="0">
-             Help Center
-          </a></li>
-
-          <li><a href="https://www.myetherwallet.com/helpers.html" target="_blank" rel="noopener" role="link" tabindex="0">
-             Utils &amp; ENS Debugging
-          </a></li>
-
-          <li><a aria-label="my ether wallet.com" href="https://www.MyEtherWallet.com" target="_blank" rel="noopener" role="link" tabindex="0">
-            www.MyEtherWallet.com
-          </a></li>
-
-          <li><a aria-label="my ether wallet github" href="https://github.com/kvhnuke/etherwallet" target="_blank" rel="noopener" role="link" tabindex="0">
-            Github: MyEtherWallet v3
-          </a></li>
-
-          <li><a aria-label="our organization on github" href="https://github.com/MyEtherWallet" target="_blank" rel="noopener" role="link" tabindex="0">
-            Github: MyEtherWallet
-          </a></li>
-
-          <li>
-            <a aria-label="join our slack" href="https://myetherwallet.herokuapp.com/" target="_blank" rel="noopener" role="link" tabindex="0">
-              Slack
-            </a>
-            &middot;
-            <a aria-label="twitter" href="https://twitter.com/myetherwallet" target="_blank" rel="noopener" role="link" tabindex="0">
-              Twitter
-            </a>
-            &middot;
-            <a aria-label="facebook" href="https://www.facebook.com/MyEtherWallet/" target="_blank" rel="noopener" role="link" tabindex="0">
-              Facebook
-            </a>
-            &middot;
-            <a aria-label="reddit" href="https://www.reddit.com/r/MyEtherWallet/" target="_blank" rel="noopener" role="link" tabindex="0">
-              Reddit
-            </a>
-          </li>
-        </ul>
-
-      </section>
-
-      </article>
-
-  </div>
-
-  @@if (site === 'mew' ) { @@include( './footer-disclaimer-modal.tpl',   { "site": "mew" } ) }
-  @@if (site === 'cx'  ) { @@include( './footer-disclaimer-modal.tpl',   { "site": "cx"  } ) }
+    <section class="footer--left">
+
+      <a href="https://www.myetherwallet.com/"><img src="images/logo-myetherwallet.svg" height="55px" width="auto" alt="Ether Wallet" class="footer--logo"/></a>
+
+      <p><span translate="FOOTER_1">Free, open-source, client-side tool for easily &amp; securely interacting with the Ethereum network.</span></p>
+
+      <p><span translate="FOOTER_1b">Created by</span> <a aria-label="kvhnuke's github" href="https://github.com/kvhnuke" target="_blank" rel="noopener">kvhnuke</a> &amp; <a aria-label="tayvano's github" href="https://github.com/tayvano" target="_blank" rel="noopener">tayvano</a>.</p>
+
+      <p><a href="https://www.myetherwallet.com/signmsg.html" target="_blank" rel="noopener" role="link" tabindex="0">Sign Message</a></p>
+
+      <p><a href="https://www.myetherwallet.com/helpers.html" target="_blank" rel="noopener" role="link" tabindex="0">Helpers &amp; ENS Debugging</a></p>
+
+      <p><a role="link" tabindex="0" data-toggle="modal" data-target="#disclaimerModal" translate="FOOTER_4"> Disclaimer </a></p>
+
+    </section>
+
+    <section class="footer--cent">
+
+        <h5> <i aria-hidden="true">👫</i> You can support us by supporting our blockchain-family.</h5>
+        <p>Consider using our affiliate links to...</p>
+        <p><a aria-label="Swap Ether or Bitcoin via Bity.com" href="https://bity.com/af/jshkb37v" target="_blank" rel="noopener">Swap ETH/BTC/EUR/CHF via Bity.com</a></p>
+        <p><a href="https://www.ledgerwallet.com/r/fa4b?path=/products/" target="_blank" rel="noopener">Buy a Ledger Nano S</a>
+          &nbsp;&middot;&nbsp;
+          <a href="https://trezor.io/?a=myetherwallet.com" target="_blank" rel="noopener">Buy a TREZOR</a></p>
+
+        <h5> <i aria-hidden="true">💝</i> Donations are always appreciated!</h5>
+        <p> ETH: <span class="mono wrap">0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8</span> </p>
+        <p> BTC: <span class="mono wrap">1MEWT2SGbqtz6mPCgFcnea8XmWV5Z4Wc6</span> </p>
+
+        <h5 ng-hide="curLang=='en'"> <i>🏅</i> <span translate="Translator_Desc"> Thank you to our translators </span></h5>
+        <p ng-hide="curLang=='en'">
+          <span translate="TranslatorName_1"></span>
+          <span translate="TranslatorName_2"></span>
+          <span translate="TranslatorName_3"></span>
+          <span translate="TranslatorName_4"></span>
+          <span translate="TranslatorName_5"></span>
+        </p>
+
+    </section>
+
+    <section class="footer--righ">
+
+      <h5><i aria-hidden="true">🌎</i> Helpful Links </h5>
+
+      <p><a aria-label="Help Center" href="https://myetherwallet.groovehq.com/help_center" target="_blank" rel="noopener" role="link" tabindex="0">
+         Knowledge Base
+      </a></p>
+
+      <p><a aria-label="my ether wallet.com" href="https://www.MyEtherWallet.com" target="_blank" rel="noopener" role="link" tabindex="0">
+        www.MyEtherWallet.com
+      </a></p>
+
+      <p><a aria-label="my ether wallet github" href="https://github.com/kvhnuke/etherwallet" target="_blank" rel="noopener" role="link" tabindex="0">
+        Github: MyEtherWallet v3
+      </a></p>
+
+      <p><a aria-label="our organization on github" href="https://github.com/MyEtherWallet" target="_blank" rel="noopener" role="link" tabindex="0">
+        Github: MyEtherWallet
+      </a></p>
+
+      <p>
+        <a aria-label="join our slack" href="https://myetherwallet.herokuapp.com/" target="_blank" rel="noopener" role="link" tabindex="0">
+          Slack
+        </a>
+        &middot;
+        <a aria-label="twitter" href="https://twitter.com/myetherwallet" target="_blank" rel="noopener" role="link" tabindex="0">
+          Twitter
+        </a>
+        &middot;
+        <a aria-label="facebook" href="https://www.facebook.com/MyEtherWallet/" target="_blank" rel="noopener" role="link" tabindex="0">
+          Facebook
+        </a>
+        &middot;
+        <a aria-label="reddit" href="https://www.reddit.com/r/MyEtherWallet/" target="_blank" rel="noopener" role="link" tabindex="0">
+          Reddit
+        </a>
+      </p>
+
+      <p ng-show="showBlocks">Latest Block#: {{currentBlockNumber}} </p>
+
+    </section>
+
+  </article>
+
+</div>
+
+@@if (site === 'mew' ) { @@include( './footer-disclaimer-modal.tpl',   { "site": "mew" } ) }
+@@if (site === 'cx'  ) { @@include( './footer-disclaimer-modal.tpl',   { "site": "cx"  } ) }
 
 
 </footer>

diff --git a/app/includes/header.tpl b/app/includes/header.tpl
@@ -61,7 +61,7 @@
 
       <div class="tagline">
 
-        <span>v3.9.6.5</span>
+        <span>v3.9.6.6</span>
 
         <span class="dropdown dropdown-lang" ng-cloak>
           <a tabindex="0"  aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle  btn btn-white" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>
@@ -142,6 +142,7 @@
         @@if (site === 'cx' ) {
         <li ng-repeat="tab in tabNames track by $index" class="nav-item {{tab.name}}" ng-class="{active: $index==gService.currentTab}" ng-show="tab.cx" ng-click="tabClick($index)"> <a tabindex="0" aria-label="nav item: {{tab.name | translate}}" translate="{{tab.name}}"></a></li>
         }
+        <li class="nav-item help"><a href="https://myetherwallet.groovehq.com/help_center" target="_blank" rel="noopener">Help</a></li>
       </ul>
     </div>
     <a aria-hidden="true" ng-show="showRightArrow" class="nav-arrow-right" ng-click="scrollRight(100);" ng-mouseover="scrollHoverIn(false,2);" ng-mouseleave="scrollHoverOut()">&#187;</a>

diff --git a/app/layouts/cx-wallet.html b/app/layouts/cx-wallet.html
@@ -22,8 +22,6 @@
 
     @@include( '../includes/txStatus.tpl',           { "site": "cx" } )
 
-    @@include( '../includes/help.tpl',               { "site": "cx" } )
-
     @@include( '../includes/print.tpl',              { "site": "cx" } )
 
   </div>

diff --git a/app/manifest.json b/app/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "MyEtherWallet CX",
-  "version": "3.9.6.5",
+  "version": "3.9.6.6",
   "manifest_version": 2,
   "description": "MyEtherWallet Chrome Extension",
   "homepage_url": "https://www.myetherwallet.com/",

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "MyEtherWallet",
-    "version": "3.9.6.5",
+    "version": "3.9.6.6",
     "description": "An NPM dist of MyEtherWallet. For easier downloading & updating via CLI.",
     "author": "MyEtherWallet",
     "license": "ISC",

diff --git a/app/scripts/customGas.js b/app/scripts/customGas.js
@@ -26,20 +26,6 @@ module.exports = [
   data:       '',
   msg:        'DCORP. Ends June 30, 2017.'
 },
-{
-  // Status
-  to:         '0x55d34b686aa8C04921397c5807DB9ECEdba00a4c',
-  gasLimit:   200000,
-  data:       '',
-  msg:        '⚠ The Status.im Contribution Period has ENDED. Please stop clogging the blockchain with your FOMO. Thanks! 🤗'
-},
-{
-  // Status
-  to:         '0x0000',
-  gasLimit:   200000,
-  data:       '',
-  msg:        'Fun Fair. Starts June 22, 2017'
-},
 {
   // TenX PAY
   to:         '0xd43d09ec1bc5e57c8f3d0c64020d403b04c7f783',
@@ -82,6 +68,13 @@ module.exports = [
   data:       '',
   msg:        'Santiment. Starts June 30, 2017.'
 },
+{
+  // iDice
+  to:         '0x5a84969bb663fb64F6d015DcF9F622Aedc796750',
+  gasLimit:   -1,
+  data:       '',
+  msg:        'iDice. *** Reminder: Always do your due diligence & understand risks before sending. - MEW ***'
+},
 {
   // Moeda
   to:         '0x4870E705a3def9DDa6da7A953D1cd3CCEDD08573',

diff --git a/app/scripts/services/globalService.js b/app/scripts/services/globalService.js
@@ -76,22 +76,15 @@ var tabs = {
     mew: true,
     cx: false
   },
-  help: {
-    id: 10,
-    name: "NAV_Help",
-    url: "help",
-    mew: true,
-    cx: true
-  },
   signMsg: {
-    id: 11,
+    id: 10,
     name: "NAV_SignMsg",
     url: "sign-message",
     mew: false,
     cx: false
   },
   bulkGenerate: {
-    id: 12,
+    id: 11,
     name: "NAV_BulkGenerate",
     url: "bulk-generate",
     mew: false,

diff --git a/chrome-extension/css/etherwallet-master.min.css b/chrome-extension/css/etherwallet-master.min.css