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

Commit

Permalink
Merge pull request #1918 from SteveMieskoski/mercury
Browse files Browse the repository at this point in the history 
kyber network updates
  • Loading branch information
@gamalielhere
gamalielhere authored Jun 22, 2018
2 parents 21538dc + 68fa7be commit c349392
Show file tree
Hide file tree
Showing 13 changed files with 105,355 additions and 99,057 deletions.
57 changes: 57 additions & 0 deletions app/images/Kyber-Network-Main-Logo-Inverted.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions app/images/Kyber-Network-Main-Logo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 29 additions & 8 deletions app/includes/swap-kyber-modal.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,31 +99,52 @@
<td class="small text-right">Network:</td>
<td class="small text-left mono">{{ajaxReq.type}} by {{ajaxReq.service}}</td>
</tr>
<tr>
<tr ng-if="!kyberTransaction.bypassTokenApprove">
<td class="small text-right">Combined Gas Limit:</td>
<td class="small text-left mono">{{parsedTx.totalGasLimit}}</td>
<td class="small text-left mono" >{{parsedTx.totalGasLimit}}</td>
</tr>
<tr>
<tr ng-if="!kyberTransaction.bypassTokenApprove">
<td class="small text-right">Avg. Gas Price:</td>
<td class="small text-left mono">{{parsedTx.avgGasPrice.gwei}} GWEI
<td class="small text-left mono" >{{parsedTx.avgGasPrice.gwei}} GWEI
<small>({{parsedTx.avgGasPrice.eth}} ETH)</small>
<!-- todo: get eth value to display as a decimal not as an exponent-->
<!-- todo: get eth value to display as a decimal not as an exponent-->
</td>
</tr>
<tr>
<tr ng-if="!kyberTransaction.bypassTokenApprove">
<td class="small text-right">Max Combined TX Fee:</td>
<td class="small text-left mono"> {{parsedTx.totalTxFee.eth}} ETH
<small>({{parsedTx.totalTxFee.gwei}} GWEI)</small>
</td>
</tr>
<tr>
<tr ng-if="!kyberTransaction.bypassTokenApprove">
<td class="small text-right">Final Nonce:</td>
<td class="small text-left mono">{{parsedKyberTx.nonce}}</td>
</tr>
<tr ng-if="kyberTransaction.bypassTokenApprove">
<td class="small text-right">Gas Limit:</td>
<td class="small text-left mono" >{{parsedKyberTx.gasLimit}}</td>
</tr>
<tr ng-if="kyberTransaction.bypassTokenApprove">
<td class="small text-right">Gas Price:</td>
<td class="small text-left mono" >{{parsedKyberTx.gasPrice.gwei}} GWEI
<small>({{parsedKyberTx.avgGasPrice.eth}} ETH)</small>
<!-- todo: get eth value to display as a decimal not as an exponent-->
</td>
</tr>
<tr ng-if="kyberTransaction.bypassTokenApprove">
<td class="small text-right">Max TX Fee:</td>
<td class="small text-left mono"> {{parsedKyberTx.txFee.eth}} ETH
<small>({{parsedKyberTx.txFee.gwei}} GWEI)</small>
</td>
</tr>
<tr ng-if="kyberTransaction.bypassTokenApprove">
<td class="small text-right">Nonce:</td>
<td class="small text-left mono">{{parsedKyberTx.nonce}}</td>
</tr>
</tbody>
</table>

<section class="clearfix collapse-container" ng-if="!kyberEthToToken">
<section class="clearfix collapse-container" ng-if="!kyberEthToToken && !kyberTransaction.bypassTokenApprove">
<div class="text-center" ng-click="adv = !adv">
<a class="collapse-button"><span ng-show="!adv">+</span><span ng-show="adv">-</span></a>
<h5>Advanced</h5>
Expand Down
27 changes: 22 additions & 5 deletions app/includes/swap-kyber.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</em>
<a class="link" href="https://home.kyber.network/" target="_blank"
rel="noopener noreferrer">
<img class="pull-right" src="images/logo-kyber.svg" width="200" height="111"/>
<img class="pull-right" src="images/Kyber-Network-Main-Logo.svg" width="200" height="111"/>
</a>
</div>

Expand Down Expand Up @@ -143,7 +143,7 @@
</em>
<a class="link clearfix" href="https://home.kyber.network/" target="_blank"
rel="noopener noreferrer">
<img class="pull-right" src="images/logo-kyber.svg" width="200" height="111"/>
<img class="pull-right" src="images/Kyber-Network-Main-Logo.svg" width="200" height="111"/>
</a>
</div>

Expand Down Expand Up @@ -305,7 +305,7 @@
</em>
<a class="link" href="https://home.kyber.network/" target="_blank"
rel="noopener noreferrer">
<img class="pull-right" src="images/logo-kyber.svg" width="400" height="222"/>
<img class="pull-right" src="images/Kyber-Network-Main-Logo.svg" width="400" height="222"/>
</a>
</div>
<div class="col-sm-10 text-justify">
Expand All @@ -332,7 +332,7 @@
</div>

<!-- Token to ETH -->
<div class="col-sm-12" ng-if="!kyberEthToToken">
<div class="col-sm-12" ng-if="!kyberEthToToken && !kyberTransaction.bypassTokenApprove">
<span>
Track your swap transaction:
</span>
Expand All @@ -347,7 +347,7 @@
</a>
</div>

<div class="col-sm-12" ng-if="!kyberEthToToken">
<div class="col-sm-12" ng-if="!kyberEthToToken && !kyberTransaction.bypassTokenApprove">
<span>
Track your token authorization transaction:
</span>
Expand Down Expand Up @@ -388,6 +388,23 @@
</div>
<!-- / ETH to Token-->

<!-- Token to ETH (no approval needed)-->
<div class="col-sm-12" ng-if="!kyberEthToToken && kyberTransaction.bypassTokenApprove">
<span>
Track your swap transaction:
</span>
<div ng-if="!kyberTransaction.tokenTxHash">
<br>
<!--<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>
<!-- / Token to ETH (no approval needed)-->

</section>
</div>
<!--<div ng-repeat="(key, entry) in kyberTransaction track by key">
Expand Down
2 changes: 1 addition & 1 deletion app/includes/swap-stage-1.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<a class="link bity-logo pull-left" href="https://bity.com/af/jshkb37v" target="_blank" rel="noopener noreferrer"><img src="images/logo-bity-white.svg" width="120" height="49" /></a>
</div>
<div class="col-sm-6">
<a class="link bity-logo pull-right" href="https://home.kyber.network/" target="_blank" rel="noopener noreferrer"><img src="images/logo-kyber.svg" width="200" height="111" /></a>
<a class="link bity-logo pull-right" href="https://home.kyber.network/" target="_blank" rel="noopener noreferrer"><img src="images/Kyber-Network-Main-Logo-Inverted.svg" width="200" height="111" /></a>

</div>
</div>
Expand Down
Loading

0 comments on commit c349392

Please sign in to comment.