Merge pull request #6259 from ajp8164/bug/fix-card-and-send-views

Bug/fix card and send views
This commit is contained in:
Gabriel Edgardo Bazán 2017-06-16 15:49:28 -03:00 committed by GitHub
commit c9bacc659b
4 changed files with 23 additions and 21 deletions

View File

@ -94,10 +94,10 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
return !tx.pending && tx.type.indexOf('93') == -1;
});
self.bitpayCardTransactionHistoryConfirming = lodash.filter(txs, function(tx) {
return tx.pending;
return tx.pending && tx.type.indexOf('93') == -1;
});
self.bitpayCardTransactionHistoryPreAuth = lodash.includes(txs, function(tx) {
return tx.type.indexOf('93') > -1;
self.bitpayCardTransactionHistoryPreAuth = lodash.filter(txs, function(tx) {
return tx.pending && tx.type.indexOf('93') > -1;
});
lodash.forEach(self.bitpayCardTransactionHistoryConfirming, function(tx) {

View File

@ -133,7 +133,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
};
$scope.searchBlurred = function() {
if ($scope.formData.search == null) {
if ($scope.formData.search == null || $scope.formData.search.length == 0) {
$scope.searchFocus = false;
}
};

View File

@ -13,6 +13,10 @@
color: #727272;
padding: 2px 1rem;
background: #f8f8f9;
i {
position: absolute;
padding-left: 5px;
}
}
.comment {
@ -86,11 +90,15 @@
&.send .svg #-Transaction-icons {
}
&.receive .svg #-Transaction-icons {
&.receive .svg #-Transaction-icons,
&.receive .tx-icon .houston {
stroke: #09C286;
color: #09C286;
}
&.pending .svg #-Transaction-icons {
&.pending .svg #-Transaction-icons,
&.pending .tx-icon .houston {
stroke: $v-bitcoin-orange;
color: $v-bitcoin-orange;
}
}
}

View File

@ -51,18 +51,6 @@
Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.
</div>
</div>
<div ng-if="bitpayCard.bitpayCardTransactionHistoryConfirming[0] && !bitpayCard.underpaidInvoiceInList && bitpayCard.delayedInvoiceInList" class="comment">
<span translate>Confirming transactions take up to 1 block confirmation to proccess.</span>
<a ng-click="bitpayCard.openExternalLink('https://help.bitpay.com/bitpay-card/why-do-you-require-one-blockchain-confirmation-for-bitpay-card-loads')" translate>Learn More</a>
</div>
<div ng-if="bitpayCard.bitpayCardTransactionHistoryConfirming[0] && bitpayCard.underpaidInvoiceInList" class="comment">
<span translate>Confirming load transactions that are underpaid may require at least six blockchain confirmations to process.</span>
<a ng-click="bitpayCard.openExternalLink('https://help.bitpay.com/bitpay-card/why-do-you-require-one-blockchain-confirmation-for-bitpay-card-loads')" translate>Learn More</a>
</div>
<div ng-if="bitpayCard.bitpayCardTransactionHistoryPreAuth[0]" class="comment">
<span translate>(Pre-Auth Holds transactions) The merchant has initiated a hold to make those funds unavailable until your transaction to them has fully settled. Funds are released within 30 days at the latest in the event the merchant decides not to complete the transaction.</span>
<a ng-click="bitpayCard.openExternalLink('https://help.bitpay.com/bitpay-card/why-was-i-overcharged-on-my-bitpay-card-account-why-is-there-a-hold-on-my-account')" translate>Learn More</a>
</div>
<div class="list" ng-show="!bitpayCard.getStarted">
<label class="item item-input item-select activity-header">
<div class="input-label" translate>
@ -75,9 +63,12 @@
</select>
</label>
<div ng-if="bitpayCard.bitpayCardTransactionHistoryConfirming[0]">
<label class="item status-label">
<label class="item status-label" ng-click="bitpayCard.openExternalLink('https://help.bitpay.com/bitpay-card/why-do-you-require-one-blockchain-confirmation-for-bitpay-card-loads')">
<div translate>
Confirming
<i class="icon">
<img src="img/icon-help-support.svg" class="bg"/>
</i>
</div>
</label>
<div ng-repeat="tx in bitpayCard.bitpayCardTransactionHistoryConfirming">
@ -85,9 +76,12 @@
</div>
</div>
<div ng-if="bitpayCard.bitpayCardTransactionHistoryPreAuth[0]">
<label class="item status-label">
<label class="item status-label" ng-click="bitpayCard.openExternalLink('https://help.bitpay.com/bitpay-card/why-was-i-overcharged-on-my-bitpay-card-account-why-is-there-a-hold-on-my-account')">
<div translate>
Pre-Auth Holds
<i class="icon">
<img src="img/icon-help-support.svg" class="bg"/>
</i>
</div>
</label>
<div ng-repeat="tx in bitpayCard.bitpayCardTransactionHistoryPreAuth">
@ -95,7 +89,7 @@
</div>
</div>
<div ng-if="bitpayCard.bitpayCardTransactionHistoryCompleted[0]">
<label ng-if="bitpayCard.bitpayCardTransactionHistoryConfirming[0]" class="item status-label">
<label class="item status-label">
<div translate>
Completed
</div>