Revert "Revert "Merge remote-tracking branch 'origin/instantpaymentverification'""

This reverts commit 453f77770d.
This commit is contained in:
Kadir Sekha 2018-03-12 14:12:24 +09:00
commit c4d40110b7
5 changed files with 219 additions and 1 deletions

View file

@ -28,6 +28,7 @@
</div>
</div>
<div class="address-info" ng-if="wallet && wallet.isComplete()">
<div ng-show="!showingPaymentReceived">
<div>
<button ng-show="addr" class="button button-standard button-small" ng-click="requestSpecificAmount()">
<span translate>Request Specific amount</span>
@ -39,17 +40,28 @@
<span translate>Show address</span>
</button>
</span>
<qrcode ng-if="addr" size="220" data="{{ protocolHandler }}:{{addr}}" color="#334"></qrcode>
<div class="address-label">
<span class="ellipsis">{{addr}}</span>
<ion-spinner ng-show="!addr" class="spinner-dark" icon="crescent"></ion-spinner>
</div>
</div>
<div>
<button ng-show="addr" class="button-address" ng-click="setAddress(true)">
<span translate>Generate new address</span>
</button><br/>
</div>
</div>
</div>
<!-- animation for payment received -->
<div ng-show="showingPaymentReceived" ng-click="showingPaymentReceived = false">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 130.2 130.2">
<circle class="path circle" fill="none" stroke="#19B234" stroke-width="6" stroke-miterlimit="10" cx="65.1" cy="65.1" r="62.1"/>
<polyline class="path check" fill="none" stroke="#19B234" stroke-width="6" stroke-linecap="round" stroke-miterlimit="10" points="100.2,40.2 51.5,88.8 29.8,67.5 "/>
</svg>
<p class="success animated fadeIn">Payment Received!<br> <br>Return To Address</p>
</div>
<!-- end of animation -->
<div ng-show="addr && wallet.coin == 'bch'">
<label class="item-input item-select">
<div class="input-label" translate>