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

Commit

Permalink
Release: v3.21.09
Browse files Browse the repository at this point in the history
  • Loading branch information
kvhnuke committed May 4, 2018
1 parent 2da4d80 commit 3a3a24f
Show file tree
Hide file tree
Showing 15 changed files with 5,374 additions and 4,581 deletions.
6 changes: 3 additions & 3 deletions app/includes/header.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -98,18 +98,18 @@
@@if (site === 'mew' ) {
<a class="brand" href="/" aria-label="Go to homepage">
<img src="images/logo-myetherwallet.svg" height="64px" width="245px" alt="MyEtherWallet" />
<p class="small visible-xs">3.21.08</p>
<p class="small visible-xs">3.21.09</p>
</a>
}
@@if (site === 'cx' ) {
<a class="brand" href="/cx-wallet.html" aria-label="Go to homepage">
<img src="images/logo-myetherwalletcx.svg" height="64px" width="245px" alt="MyEtherWallet" />
<p class="small visible-xs">3.21.08</p>
<p class="small visible-xs">3.21.09</p>
</a>
}
<div class="tagline">
<span class="hidden-xs">3.21.08</span>
<span class="hidden-xs">3.21.09</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>
Expand Down
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.08",
"version": "3.21.09",
"manifest_version": 2,
"description": "MyEtherWallet Chrome Extension",
"homepage_url": "https://www.myetherwallet.com/",
Expand Down
197 changes: 101 additions & 96 deletions app/scripts/controllers/swapCtrl.js

Large diffs are not rendered by default.

31 changes: 15 additions & 16 deletions chrome-extension/contest.html
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@

<a class="brand" href="/" aria-label="Go to homepage">
<img src="images/logo-myetherwallet.svg" height="64px" width="245px" alt="MyEtherWallet" />
<p class="small visible-xs">3.21.08</p>
<p class="small visible-xs">3.21.09</p>
</a>


<div class="tagline">

<span class="hidden-xs">3.21.08</span>
<span class="hidden-xs">3.21.09</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>
Expand Down Expand Up @@ -330,13 +330,11 @@ <h2>MEW 100K Followers Contest Official Rules</h2>
<p>NO PURCHASE IS NECESSARY TO ENTER OR WIN. A PURCHASE DOES NOT INCREASE THE CHANCES OF WINNING.</p>
<ol type="1" class="contest-content">
<li>
Eligibility: This Campaign is open only to those
who sign up at the who complete
Eligibility: This Campaign is open only to those who complete
the contest requirements and who send an email containing the name, email,
telephone, city and country of residence, along with a link to their video
or blog post to <a href="mailto:[email protected]">[email protected]</a>
and who are 21 years or older
as of the date of entry.The Campaign is only open to legal residents of to
and who are 21 years or older as of the date of entry.The Campaign is only open to legal residents of to
all countries, and is void where prohibited by law. Employees of MyEtherWallet
Inc, its affiliates, subsidiaries, advertising and promotion agencies, and suppliers,
(collectively the “Employees”), and immediate family members and/or those
Expand All @@ -353,10 +351,8 @@ <h2>MEW 100K Followers Contest Official Rules</h2>
</li>
<li>
Campaign Period: Entries will be accepted online starting on April 12 at
12:01am PDT and ending 7 days after the 100,000 Twitter follower threshold
has been reached. The final date will be announced on Twitter with all
entries being required to be received no later than 11:59pm PDT on the
date specified.
12:01am PDT and ending on May 31, 2018 at 11:59pm. MyEtherWallet Inc reserves
the right to extend this date for whatever reason.
</li>
<li>
How to Enter: The Campaign must be entered by submitting an email
Expand All @@ -375,7 +371,7 @@ <h2>MEW 100K Followers Contest Official Rules</h2>
<li>
Prizes: The Winner(s) of the Campaign (the “Winner”) will receive First,
Second & Third Prize: Macbook Pro, or MS Surface Pro + top 25 prizes
(approx $2600 value);Top 25:Ledger Hardware wallet w/MEW Gear Pack;
(approx $2600 value); Top 25: Ledger Hardware wallet w/MEW Gear Pack;
Next 25: MEW Premium Gear Pack; Bottom 25: Standard MEW Gear Pack.
Actual/appraised value may differ at time of prize award. The specifics
of the prize shall be solely determined by MyEtherWallet Inc. No cash or
Expand Down Expand Up @@ -403,7 +399,10 @@ <h2>MEW 100K Followers Contest Official Rules</h2>
contacted, is ineligible, fails to claim the prize within 5 days from the
time award notification was sent, or fails to timely return a completed
and executed declaration and release as required, the prize may be forfeited
and an alternate Winner selected. Receipt by Winner of the prize offered in
and an alternate Winner selected. Should fewer than 100 entries be received,
entrants will be evaluated on the criteria outlined in the contest announcement
and these Official Rules, and prizes will be limited to only those entrants.
Receipt by Winner of the prize offered in
this Campaign is conditioned upon compliance with any and all federal, state,
and local laws and regulations. ANY VIOLATION OF THESE OFFICIAL RULES BY WINNER
(AT MYETHERWALLET’S SOLE DISCRETION) WILL RESULT IN WINNER’S DISQUALIFICATION AS
Expand All @@ -412,14 +411,14 @@ <h2>MEW 100K Followers Contest Official Rules</h2>
<li>
Rights Granted by You: By entering this content (e.g., photo, video, text, etc.),
You understand and agree that MyEtherWallet, Inc , anyone acting on behalf of
MyEtherWallet, Inc, andMyEtherWallet, Inc’s licensees, successors, and assigns,
MyEtherWallet, Inc, andMyEtherWallet, Inc’s licensees, successors, and assigns,
shall have the right, where permitted by law, to print, publish, broadcast,
distribute, and use in any media now known or hereafter developed, in perpetuity
and throughout the World, without limitation, your entry, name, portrait,
picture, voice, likeness, image, statements about the Campaign, and biographical
information for news, publicity, information, trade, advertising, public relations,
and promotional purposes. without any further compensation, notice, review,
or consent. Optional verbiage for Contests: By entering this content, You
or consent. By entering this contest, You
represent and warrant that your entry is an original work of authorship,
and does not violate any third party’s proprietary or intellectual property
rights. If your entry infringes upon the intellectual property right of
Expand All @@ -429,14 +428,14 @@ <h2>MEW 100K Followers Contest Official Rules</h2>
shall, at your sole expense, defend or settle against such claims. You shall
indemnify, defend, and hold harmless MyEtherWallet, Inc from and against any
suit, proceeding, claims, liability, loss, damage, costs or expense, which
MyEtherWallet, Inc may incur, suffer, or be required to pay arising out of
MyEtherWallet, Inc may incur, suffer, or be required to pay arising out of
such infringement or suspected infringement of any third party’s right.
</li>
<li>
Terms & Conditions: MyEtherWallet, Inc reserves the right, in its sole
discretion, to cancel, terminate, modify or suspend the Campaign should
virus, bug, non-authorized human intervention, fraud, or other cause beyond
MyEtherWallet’s control corrupt or affect the administration, security,
MyEtherWallet’s control corrupt or affect the administration, security,
fairness, or proper conduct of the Campaign. In such case, MyEtherWallet, Inc
may select the Winner from all eligible entries received prior to and/or
after (if appropriate) the action taken by MyEtherWallet, Inc.MyEtherWallet, Inc
Expand Down
112 changes: 100 additions & 12 deletions chrome-extension/cx-wallet.html
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@

<a class="brand" href="/cx-wallet.html" aria-label="Go to homepage">
<img src="images/logo-myetherwalletcx.svg" height="64px" width="245px" alt="MyEtherWallet" />
<p class="small visible-xs">3.21.08</p>
<p class="small visible-xs">3.21.09</p>
</a>

<div class="tagline">

<span class="hidden-xs">3.21.08</span>
<span class="hidden-xs">3.21.09</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>
Expand Down Expand Up @@ -2931,11 +2931,18 @@ <h4>{{swapOrder.swapRate | number: 6}} {{swapOrder.swapPair}}</h4>
<div class="progress-circle"><i>3</i></div>
<p>{{kyberOrderResult.input.currency}} <span translate="SWAP_progress_3">Received!</span></p>
</div>
<!--<div class="progress-item {{kyberOrderResult.progress.bar[3]}}">-->
<!--<div class="progress-circle"><i>4</i></div>-->
<!--<p>-->
<!--<span translate="SWAP_progress_4">Sending your </span> {{kyberOrderResult.output.currency}}-->
<!--<br/>-->
<!--</p>-->
<!--</div>-->
<div class="progress-item {{kyberOrderResult.progress.bar[3]}}">
<div class="progress-circle"><i>4</i></div>
<p>
<span translate="SWAP_progress_4">Sending your </span> {{kyberOrderResult.output.currency}}
<br/>
<!--<span translate="SWAP_progress_4">Sending your </span> {{kyberOrderResult.output.currency}} <br/>-->
<span >Broadcasting your </span> {{kyberOrderResult.output.currency}} <span> order</span><br/>
</p>
</div>
<div class="progress-item {{kyberOrderResult.progress.bar[4]}}">
Expand Down Expand Up @@ -3156,7 +3163,7 @@ <h4 class="text-primary">

<section class="clearfix collapse-container" ng-if="!kyberEthToToken">
<div class="text-center" ng-click="adv = !adv">
<a class="collapse-button"><span ng-show="adv">+</span><span ng-show="!adv">-</span></a>
<a class="collapse-button"><span ng-show="!adv">+</span><span ng-show="adv">-</span></a>
<h5>Advanced</h5>
</div>
<table class="table small table-condensed table-hover transaction-modal" ng-show="adv">
Expand Down Expand Up @@ -3276,6 +3283,62 @@ <h5>Advanced</h5>
<td class="small text-right">Data:</td>
<td class="small text-left mono text-width-limit"><p>{{parsedKyberTokenTx.data}}</p></td>
</tr>
<!----------------------------------------------------------------->
<tr ng-show="kyberTransaction.tokenNeedsReset">
<td> Token Approval Reset Transaction<br>
<em><small>Why? The swap will fail to execute <wbr> if token approval is not reset to 0.</small></em></td>
</tr>
<tr ng-show="kyberTransaction.tokenNeedsReset">
<td class="small text-right">To Address:</td>
<td class="small text-left mono">{{parsedKyberResetTokenTx.to}}
<br/>
<em><small>The token ({{swapOrder.fromCoin}}) contract address.</small></em>
</td>
</tr>
<tr ng-show="kyberTransaction.tokenNeedsReset">
<td class="small text-right">From Address:</td>
<td class="small text-left mono">{{parsedKyberResetTokenTx.from}}</td>
</tr>
<tr ng-show="kyberTransaction.tokenNeedsReset">
<td class="small text-right">Amount to Send:</td>
<td class="small text-left mono">0 ETH</td>
</tr>
<tr ng-show="kyberTransaction.tokenNeedsReset">
<td class="small text-right">Current Approve Value:</td>
<td class="small text-left mono">{{kyberTransaction.currentTokenApprovalValue}} {{swapOrder.fromCoin}}</td>
</tr>
<tr ng-show="kyberTransaction.tokenNeedsReset">
<td class="small text-right">Account Balance:</td>
<td class="small text-left mono">{{parsedKyberResetTokenTx.balance}}</td>
</tr>
<tr ng-show="kyberTransaction.tokenNeedsReset">
<td class="small text-right">Network:</td>
<td class="small text-left mono">{{ajaxReq.type}} by {{ajaxReq.service}}</td>
</tr>
<tr ng-show="kyberTransaction.tokenNeedsReset">
<td class="small text-right">Gas Limit:</td>
<td class="small text-left mono">{{parsedKyberResetTokenTx.gasLimit}}</td>
</tr>
<tr ng-show="kyberTransaction.tokenNeedsReset">
<td class="small text-right">Gas Price:</td>
<td class="small text-left mono">{{parsedKyberResetTokenTx.gasPrice.gwei}} GWEI
<small>({{parsedKyberResetTokenTx.gasPrice.eth}} ETH)</small>
</td>
</tr>
<tr ng-show="kyberTransaction.tokenNeedsReset">
<td class="small text-right">Max TX Fee:</td>
<td class="small text-left mono"> {{parsedKyberTokenTx.txFee.eth}} ETH
<small>({{parsedKyberResetTokenTx.txFee.gwei}} GWEI)</small>
</td>
</tr>
<tr ng-show="kyberTransaction.tokenNeedsReset">
<td class="small text-right">Nonce:</td>
<td class="small text-left mono">{{parsedKyberResetTokenTx.nonce}}</td>
</tr>
<tr ng-show="kyberTransaction.tokenNeedsReset">
<td class="small text-right">Data:</td>
<td class="small text-left mono text-width-limit"><p>{{parsedKyberResetTokenTx.data}}</p></td>
</tr>
</tbody>
</table>
</section>
Expand Down Expand Up @@ -3499,33 +3562,53 @@ <h4>{{swapOrder.swapRate | number: 6}} {{swapOrder.swapPair}}</h4>
<div class="col-sm-12">
<h5>Transaction Hash(es):</h5>
</div>
<div class="col-sm-12" ng-if="!kyberEthToToken">
<!-- <div ng-show="kyberOrderResult.progress.status=='TOKENS_APPROVED'">

</div>-->
<!-- Token to ETH -->
<div class="col-sm-12" ng-if="!kyberEthToToken">
<span>
Track your swap transaction:
</span>
<div ng-if="!kyberTransaction.tokenTxHash">
<br>
<span class="text-info">Waiting for token authorization <span ng-repeat="tick in indicatorhacked track by $index">{{tick}}</span></span><br>
<span class="text-danger"> Do Not Navigate Away or Close Your Browser</span>
<span class="text-info"><em><small>Your Swap Waiting for token authorization</small></em> <span ng-repeat="tick in indicatorhacked track by $index">{{tick}}</span></span><br>
<span class="text-danger"><br> Do Not Navigate Away or Close Your Browser</span>

</div>
<a class="strong" ng-href="{{kyberTransaction.tokenTxLink}}" target="_blank" rel="noopener">
<h5>{{kyberTransaction.tokenTxHash}}</h5>
</a>
</div>

<div class="col-sm-12" ng-if="!kyberEthToToken">
<h6>{{orderResult.progress.timeMessage}}</h6>
<span>
View your token authorization transaction:
Track your token authorization transaction:
</span>
<!--{{kyberTransaction.tokenNeedsReset}}-->
<div ng-if="!kyberTransaction.tokenResetTxHash && kyberTransaction.tokenResetTx">
<br>
<span class="text-info"><em><small>Preparing Token State for Token Authorization</small></em> <span ng-repeat="tick in indicatorTokenReset track by $index">{{tick}}</span></span><br>
</div>
<br ng-if="!kyberTransaction.tokenApproveTxLink">
<a class="strong" ng-href="{{kyberTransaction.tokenApproveTxLink}}" target="_blank"
rel="noopener">

<h5>{{kyberTransaction.tokenApproveTxHash}}</h5>
</a>
</div>
<!-- / Token to ETH -->

<!-- Token to ETH ( with reset token allowance) -->
<div class="col-sm-12" ng-if="kyberTransaction.tokenResetTx">
<span>
Track your token approval reset transaction:
</span>
<a class="strong" ng-href="{{kyberTransaction.tokenResetTxLink}}" target="_blank" rel="noopener">
<h5>{{kyberTransaction.tokenResetTxHash}}</h5>
</a>
</div>
<!-- / Token to ETH ( with reset token allowance) -->

<!-- ETH to Token-->
<div class="col-sm-12" ng-if="kyberEthToToken">
<span>
Track your swap transaction:
Expand All @@ -3535,8 +3618,13 @@ <h5>{{kyberTransaction.tokenApproveTxHash}}</h5>
<h5>{{kyberTransaction.ethTxHash}}</h5>
</a>
</div>
<!-- / ETH to Token-->

</section>
</div>
<!--<div ng-repeat="(key, entry) in kyberTransaction track by key">
{{key}}: {{entry}}
</div>-->


</div>
Expand Down
4 changes: 2 additions & 2 deletions chrome-extension/helpers.html
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@

<a class="brand" href="/" aria-label="Go to homepage">
<img src="images/logo-myetherwallet.svg" height="64px" width="245px" alt="MyEtherWallet" />
<p class="small visible-xs">3.21.08</p>
<p class="small visible-xs">3.21.09</p>
</a>


<div class="tagline">

<span class="hidden-xs">3.21.08</span>
<span class="hidden-xs">3.21.09</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>
Expand Down
Loading

0 comments on commit 3a3a24f

Please sign in to comment.