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

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MyEtherWallet/etherwallet
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: db04a156a403dd4c5c330b6f07268054773ccd1c
Choose a base ref
..
head repository: MyEtherWallet/etherwallet
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a48ac4713dcaf212faf36b2a18eb0197e8d93ba5
Choose a head ref
Showing with 55,331 additions and 54,575 deletions.
  1. +9 −0 CHANGELOG.md
  2. +1 −1 app/includes/footer.tpl
  3. +3 −3 app/includes/header.tpl
  4. +1 −1 app/manifest.json
  5. +3,473 −3,457 app/scripts/constants/darkListConst.js
  6. +17 −0 app/scripts/controllers/decryptWalletCtrl.js
  7. +5 −5 app/scripts/directives/walletDecryptDrtv.html
  8. +39 −2 app/scripts/nodes.js
  9. +20 −2 app/scripts/tokens/ethTokens.json
  10. +3 −3 chrome-extension/contest.html
  11. +1 −1 chrome-extension/css/etherwallet-master.min.css
  12. +3 −3 chrome-extension/cx-wallet.html
  13. +3 −3 chrome-extension/helpers.html
  14. +16 −0 chrome-extension/images/coins/akroma.svg
  15. +15 −0 chrome-extension/images/coins/atheios.svg
  16. +1 −0 chrome-extension/images/coins/callisto.svg
  17. +7 −0 chrome-extension/images/coins/egem.svg
  18. +1 −0 chrome-extension/images/coins/ella.svg
  19. +3 −0 chrome-extension/images/coins/eosc.svg
  20. +19 −0 chrome-extension/images/coins/ethereum-classic.svg
  21. +8 −0 chrome-extension/images/coins/ethereum.svg
  22. +1 −0 chrome-extension/images/coins/ethersocial.svg
  23. +44 −0 chrome-extension/images/coins/etho.svg
  24. +1 −0 chrome-extension/images/coins/etsc.svg
  25. +1 −0 chrome-extension/images/coins/exp.svg
  26. +3 −0 chrome-extension/images/coins/gochain.svg
  27. +1 −0 chrome-extension/images/coins/music.svg
  28. +6 −0 chrome-extension/images/coins/pirl.svg
  29. +1 −0 chrome-extension/images/coins/poa.svg
  30. +15 −0 chrome-extension/images/coins/tomo.svg
  31. +1 −0 chrome-extension/images/coins/ubiq.svg
  32. +25,602 −25,417 chrome-extension/js/etherwallet-master.js
  33. +1 −1 chrome-extension/manifest.json
  34. +3 −3 chrome-extension/phishing.html
  35. +1 −2 dist/README.md
  36. +3 −3 dist/contest.html
  37. +1 −1 dist/css/etherwallet-master.min.css
  38. +3 −3 dist/helpers.html
  39. +16 −0 dist/images/coins/akroma.svg
  40. +15 −0 dist/images/coins/atheios.svg
  41. +1 −0 dist/images/coins/callisto.svg
  42. +7 −0 dist/images/coins/egem.svg
  43. +1 −0 dist/images/coins/ella.svg
  44. +3 −0 dist/images/coins/eosc.svg
  45. +19 −0 dist/images/coins/ethereum-classic.svg
  46. +8 −0 dist/images/coins/ethereum.svg
  47. +1 −0 dist/images/coins/ethersocial.svg
  48. +44 −0 dist/images/coins/etho.svg
  49. +1 −0 dist/images/coins/etsc.svg
  50. +1 −0 dist/images/coins/exp.svg
  51. +3 −0 dist/images/coins/gochain.svg
  52. +1 −0 dist/images/coins/music.svg
  53. +6 −0 dist/images/coins/pirl.svg
  54. +1 −0 dist/images/coins/poa.svg
  55. +15 −0 dist/images/coins/tomo.svg
  56. +1 −0 dist/images/coins/ubiq.svg
  57. +3 −3 dist/index.html
  58. +25,602 −25,417 dist/js/etherwallet-master.js
  59. +3 −3 dist/phishing.html
  60. +242 −240 package-lock.json
  61. +1 −1 package.json
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
### Release v3.21.23
### New
- Add Metamask breaking change [#2048](https://github.com/kvhnuke/etherwallet/pull/2048)
- Add 0xinfra nodes [#2045](https://github.com/kvhnuke/etherwallet/pull/2045)
- nodes: add remote.akroma.io [#2046](https://github.com/kvhnuke/etherwallet/pull/2046)
- Add STB token and Add electrominer scammer address [#2047](https://github.com/kvhnuke/etherwallet/pull/2047)
- Add Ledger support for Musicoin, Add Trezor support for Pirl, Ether-1 and Atheios [#2040](https://github.com/kvhnuke/etherwallet/pull/2040)
- Add IMT token [#2043](https://github.com/kvhnuke/etherwallet/pull/2043)
- Update darklist from eth-list, update ledger affiliate links [#2042](https://github.com/kvhnuke/etherwallet/pull/2042)
- Add USD//Coin (USDC) token [#2036](https://github.com/kvhnuke/etherwallet/pull/2036)
- Add LCT token [#2035](https://github.com/kvhnuke/etherwallet/pull/2035)
- BUG FIX: Fix missing break after bad merge conflict resolution [#2034](https://github.com/kvhnuke/etherwallet/pull/2034)
- Enable Ledger Hardware Wallet support for Callisto (CLO) [#2032](https://github.com/kvhnuke/etherwallet/pull/2032)
2 changes: 1 addition & 1 deletion app/includes/footer.tpl
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@
</div>
<p> Buy a... </p>
<div class="footer__pill-wrap footer__pill-custom-wrap">
<a class="footer__pill" href="https://www.ledgerwallet.com/r/fa4b?path=/products/" target="_blank" rel="noopener">Ledger Wallet</a>
<a class="footer__pill" href="https://www.ledger.com/products/ledger-nano-s?r=fa4b" target="_blank" rel="noopener">Ledger Wallet</a>
<a class="footer__pill" href="https://trezor.io/?a=myetherwallet.com" target="_blank" rel="noopener">TREZOR</a>
<a class="footer__pill" href="http://shiftcrypto.ositracker.com/91316/7114" target="_blank" rel="noopener">Digital Bitbox</a>
<a class="footer__pill" href="https://ether.cards/?utm_source=mew&utm_medium=cpm&utm_campaign=site" target="_blank" rel="noopener">ether.card</a>
6 changes: 3 additions & 3 deletions app/includes/header.tpl
Original file line number Diff line number Diff line change
@@ -90,18 +90,18 @@
@@if (site === 'mew' ) {
<a class="brand" href="/" aria-label="Go to homepage">
<img src="images/@@sitelogo" height="64px" width="245px" alt="@@sitename" />
<p class="small visible-xs">3.21.22</p>
<p class="small visible-xs">3.21.23</p>
</a>
}
@@if (site === 'cx' ) {
<a class="brand" href="/cx-wallet.html" aria-label="Go to homepage">
<img src="images/@@sitelogocx" height="64px" width="245px" alt="@@sitename" />
<p class="small visible-xs">3.21.22</p>
<p class="small visible-xs">3.21.23</p>
</a>
}
<div class="tagline">
<span class="hidden-xs">3.21.22</span>
<span class="hidden-xs">3.21.23</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" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>
2 changes: 1 addition & 1 deletion app/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MyEtherWallet",
"version": "3.21.22",
"version": "3.21.23",
"manifest_version": 2,
"description": "MyEtherWallet Chrome Extension",
"homepage_url": "https://www.myetherwallet.com/",
Loading