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

Fix amount process

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-12-12 14:45:12 -03:00
commit 3b0dceccf5
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
5 changed files with 132 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

17
www/views/amount.html
View file

@ -43,7 +43,7 @@
<div class="amount-bar oh">
<div class="title">
<span translate>Amount</span>
<span ng-show="!isCoinbase" translate>Amount</span>
<div class="size-12" ng-show="isGiftCard">Purchase Amount is limited to USD 1000 per day</div>
<div class="size-12" ng-if="cardId" ng-init="getRates()">{{exchangeRate}}</div>
<div ng-show="isGlidera">
@ -68,22 +68,23 @@
</div>
<div ng-show="isCoinbase">
<div class="limits" ng-show="coinbaseBuyPrice && isCoinbase == 'buy'">
1 BTC ~ {{coinbaseBuyPrice.amount}} {{coinbaseBuyPrice.currency}}
</div>
<div class="limits" ng-show="coinbaseSellPrice && isCoinbase == 'sell'">
1 BTC ~ {{coinbaseSellPrice.amount}} {{coinbaseSellPrice.currency}}
</div>
<div class="list select">
<label class="item item-input item-select">
<div class="input-label">
Payment Method
<span ng-show="isCoinbase == 'buy'">Payment Method</span>
<span ng-show="isCoinbase == 'sell'">Deposit into</span>
</div>
<select ng-model="coinbaseSelectedPaymentMethod.id"
ng-options="item.id as item.name for item in coinbasePaymentMethods">
</select>
</label>
</div>
<div class="limits" ng-show="coinbaseBuyPrice && isCoinbase == 'buy'">
1 BTC ~ {{coinbaseBuyPrice.amount}} {{coinbaseBuyPrice.currency}}
</div>
<div class="limits" ng-show="coinbaseSellPrice && isCoinbase == 'sell'">
1 BTC ~ {{coinbaseSellPrice.amount}} {{coinbaseSellPrice.currency}}
</div>
</div>
</div>
</div>

29
www/views/confirm.html
View file

@ -12,10 +12,10 @@
<div class="item head">
<div class="sending-label">
<img src="img/icon-tx-sent-outline.svg">
<span translate ng-if="!useSendMax && !isGlidera">Sending</span>
<span translate ng-if="!useSendMax && !(isGlidera || isCoinbase)">Sending</span>
<span translate ng-if="useSendMax">Sending maximum amount</span>
<span ng-if="isGlidera == 'buy'">Buying</span>
<span ng-if="isGlidera == 'sell'">Selling</span>
<span ng-if="(isGlidera || isCoinbase) == 'buy'">Buying</span>
<span ng-if="(isGlidera || isCoinbase) == 'sell'">Selling</span>
</div>
<div class="amount-label">
<div class="amount">{{displayAmount || '...'}} <span class="unit">{{displayUnit}}</span></div>
@ -30,16 +30,17 @@
<span class="item-note" ng-if="paymentExpired.value" ng-style="{'color': 'red'}" translate>Expired</span>
</div>
<div class="item">
<span class="label" ng-if="!isGlidera" translate>To</span>
<span class="label" ng-if="isGlidera == 'buy'">From</span>
<span class="label" ng-if="isGlidera == 'sell'">To</span>
<span class="label" ng-if="!(isGlidera || isCoinbase)" translate>To</span>
<span class="label" ng-if="(isGlidera || isCoinbase) == 'buy'">From</span>
<span class="label" ng-if="(isGlidera || isCoinbase) == 'sell'">To</span>
<span class="payment-proposal-to">
<img ng-if="!cardId && !isGiftCard && !isGlidera" src="img/icon-bitcoin-small.svg">
<img ng-if="!cardId && !isGiftCard && !isGlidera && !isCoinbase" src="img/icon-bitcoin-small.svg">
<img ng-if="cardId" src="img/icon-card.svg" width="34">
<i ng-if="isGiftCard" class="icon big-icon-svg">
<div class="bg icon-amazon"></div>
</i>
<img ng-if="isGlidera" src="img/glidera-logo.png" width="90"/>
<img ng-if="isCoinbase" src="img/coinbase-logo.png" width="90"/>
<div copy-to-clipboard="toAddress" ng-if="!paypro" class="ellipsis">
<contact ng-if="!toName" address="{{toAddress}}"></contact>
@ -57,9 +58,9 @@
</span>
</div>
<a class="item item-icon-right" ng-hide="!useSendMax && (insufficientFunds || noMatchingWallet)" ng-click="showWalletSelector()">
<span class="label" ng-if="!isGlidera" translate>From</span>
<span class="label" ng-if="isGlidera == 'buy'">To</span>
<span class="label" ng-if="isGlidera == 'sell'">From</span>
<span class="label" ng-if="!(isGlidera || isCoinbase)" translate>From</span>
<span class="label" ng-if="(isGlidera || isCoinbase) == 'buy'">To</span>
<span class="label" ng-if="(isGlidera || isCoinbase) == 'sell'">From</span>
<div class="wallet" ng-if="wallet">
<i class="icon big-icon-svg">
<img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
@ -74,14 +75,14 @@
</div>
<i class="icon bp-arrow-right"></i>
</a>
<a class="item single-line item-icon-right" ng-if="!insufficientFunds && !noMatchingWallet && !isGlidera" ng-click="showDescriptionPopup()">
<a class="item single-line item-icon-right" ng-if="!insufficientFunds && !noMatchingWallet && !(isGlidera || isCoinbase)" ng-click="showDescriptionPopup()">
<span class="label" translate>Add Memo</span>
<span class="item-note m10l">
{{description}}
</span>
<i class="icon bp-arrow-right"></i>
</a>
<div class="item single-line" ng-if="!insufficientFunds && !noMatchingWallet && !isGlidera">
<div class="item single-line" ng-if="!insufficientFunds && !noMatchingWallet && !(isGlidera || isCoinbase)">
<span class="label">{{'Fee' | translate}}: {{feeLevel | translate}}</span>
<span class="item-note">
{{fee || '...'}}
@ -153,6 +154,10 @@
<span ng-show="isGlidera == 'buy'">A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business day</span>
<span ng-show="isGlidera == 'sell'">A transfer has been initiated to your bank account. Should arrive in 4-6 business days</span>
</div>
<div ng-show="isCoinbase" class="glidera-success">
<span ng-show="isCoinbase == 'buy'">Bitcoin purchase completed. Coinbase has queued the transfer to your selected Copay wallet</span>
<span ng-show="isCoinbase == 'sell'">Sale initiated</span>
</div>
</slide-to-accept-success>
<wallet-selector