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

Update Kyber Network Swap #1818

Merged
merged 5 commits into from
May 4, 2018
Merged

Update Kyber Network Swap #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0d4409
send all relevant transactions in series. Avoids users navigating awa…
SteveMieskoski May 2, 2018
128b4c5
send all relevant transactions in series. Avoids users navigating awa…
SteveMieskoski May 2, 2018
7fa5ec7
post pull commit
SteveMieskoski May 2, 2018
16bf53f
Merge branch 'mercury' of https://github.com/kvhnuke/etherwallet into…
SteveMieskoski May 2, 2018
f5727b6
add .idea to gitignore
SteveMieskoski May 2, 2018
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ _ens/
*.zip
cert.pem
key.pem
/scraps/
.idea/

58 changes: 57 additions & 1 deletion app/includes/swap-kyber-modal.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@

<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 @@ -244,6 +244,62 @@
<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
50 changes: 41 additions & 9 deletions app/includes/swap-kyber.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,18 @@
<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 @@ -314,33 +321,53 @@
<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 @@ -350,8 +377,13 @@
<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
Loading