anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6316 from cmgustavo/bug/bitpay-card-sendmax

Browse source 
Ref topup. Fix sendmax
This commit is contained in:
Gabriel Edgardo Bazán 2017-06-28 16:16:26 -03:00 • committed by GitHub
commit 758c4abdcf
6 changed files with 295 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

90
www/views/topup.html
View file

@ -2,25 +2,27 @@
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-title>Add funds</ion-nav-title>
<ion-nav-title>
{{'Add funds' | translate}}
</ion-nav-title>
</ion-nav-bar>
<ion-content class="add-bottom-for-cta">
<!-- SELL -->
<div class="list" ng-if="cardInfo">
<div class="list">
<div class="item head">
<div class="sending-label">
<i class="icon big-icon-svg">
<div class="bg icon-bitpay-card"></div>
</i>
<span>BitPay Card - Visa &reg; Prepaid Debit</span>
<span>BitPay Visa&reg; Card ({{lastFourDigits}})</span>
</div>
<div class="amount-label">
<div class="amount-final">{{amountUnitStr}}</div>
<div class="alternative">
<div class="alternative" ng-show="amountUnitStr">
<span ng-if="rate">@
{{rate | currency:cardInfo.currencySymbol:2}} per BTC</span>
{{rate | currency:currencySymbol:2}} {{currencyIsoCode}} per BTC</span>
<span ng-if="!rate">...</span>
</div>
</div>
@ -39,45 +41,39 @@
<i class="icon bp-arrow-right"></i>
</div>
<div class="item item-divider" translate>
Deposit into
<div ng-show="totalAmountStr">
<div class="item item-divider" translate>
Details
</div>
<div class="item">
<span translate>Funds to be added</span>
<span class="item-note">
<span ng-if="amount">{{amount | currency:currencySymbol:2}} {{currencyIsoCode}}</span>
<span ng-if="!amount">...</span>
</span>
</div>
<div class="item">
<span translate>Invoice Fee</span>
<span class="item-note">
<span ng-if="invoiceFee">{{invoiceFee | currency:currencySymbol:2}} {{currencyIsoCode}}</span>
<span ng-if="!invoiceFee">...</span>
</span>
</div>
<div class="item">
<span translate>Network Fee</span>
<span class="item-note">
<span ng-if="networkFee">{{networkFee | currency:currencySymbol:2}} {{currencyIsoCode}}</span>
<span ng-if="!networkFee">...</span>
</span>
</div>
<div class="item">
<span translate>Total</span>
<span class="item-note">
<span ng-if="totalAmount">{{totalAmount | currency:currencySymbol:2}} {{currencyIsoCode}}</span>
<span ng-if="totalAmountStr">({{totalAmountStr}})</span>
</span>
</div>
</div>
<div class="item">
<span translate>Card</span>
<span class="item-note">
xxxx-xxxx-xxxx-{{cardInfo.lastFourDigits}}
</span>
</div>
<div class="item">
<span translate>Account</span>
<span class="item-note">
{{cardInfo.email}}
</span>
</div>
<div class="item item-divider" translate>
Invoice
</div>
<div class="item">
<span translate>Expire in</span>
<span class="item-note" ng-if="expirationTime">
<timer countdown="expirationTime" interval="1000" active="true" output-format="mm:ss"
on-zero-callback="invoiceExpired">{{formatted}}</timer>
</span>
</div>
<div class="item">
<span translate>Fee</span>
<span class="item-note">
{{invoice.buyerPaidBtcMinerFee}}
</span>
</div>
<div class="item">
<span translate>Total</span>
<span class="item-note total">
{{invoice.buyerTotalBtcAmount}}
</span>
</div>
<div class="item item-divider"></div>
</div>
</div>
@ -85,16 +81,16 @@
<click-to-accept
ng-click="topUpConfirm()"
ng-if="!isCordova && cardInfo"
ng-if="!isCordova"
click-send-status="sendStatus"
is-disabled="!cardInfo || !wallet">
is-disabled="!wallet || !totalAmountStr">
Add funds
</click-to-accept>
<slide-to-accept
ng-if="isCordova && cardInfo"
ng-if="isCordova && (!wallet || !totalAmountStr)"
slide-on-confirm="topUpConfirm()"
slide-send-status="sendStatus"
is-disabled="!cardInfo || !wallet">
is-disabled="!wallet || !totalAmountStr">
Slide to confirm
</slide-to-accept>
<slide-to-accept-success