BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix the send search bg, mcc icon coloring, pre-auth header.

This commit is contained in:
Andy Phillipson 2017-06-16 12:45:11 -04:00
parent 9b643003a1
commit 0d4fd06bcc
No known key found for this signature in database
GPG Key ID: D813A67D567D6C88
5 changed files with 86 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/controllers/bitpayCard.js
View File

@ -92,10 +92,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) {

2
src/js/controllers/tab-send.js
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;
}
};

12
src/sass/views/bitpayCard.scss
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;
}
}
}

24
www/views/bitpayCard.html
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>

63
www/views/includes/cardActivity.html
View File

@ -4,6 +4,69 @@
<img class="svg" ng-src="img/mcc-icons/{{tx.icon}}.svg">
</div>
</div>
<!-- TESTING ICONS
<div class="tx-icon">
<div class="houston" ng-class="{'no-border': tx.icon.includes('topup')}">
<img class="svg" ng-src="img/mcc-icons/airplane.svg">
<img class="svg" ng-src="img/mcc-icons/art.svg">
<img class="svg" ng-src="img/mcc-icons/bicycle.svg">
<img class="svg" ng-src="img/mcc-icons/bitcoin-topup.svg">
<img class="svg" ng-src="img/mcc-icons/boat.svg">
<img class="svg" ng-src="img/mcc-icons/books.svg">
<img class="svg" ng-src="img/mcc-icons/bowling.svg">
<img class="svg" ng-src="img/mcc-icons/bug.svg">
<img class="svg" ng-src="img/mcc-icons/bus.svg">
<img class="svg" ng-src="img/mcc-icons/camera.svg">
<img class="svg" ng-src="img/mcc-icons/car.svg">
<img class="svg" ng-src="img/mcc-icons/clean.svg">
<img class="svg" ng-src="img/mcc-icons/clock.svg">
<img class="svg" ng-src="img/mcc-icons/cocktail.svg">
<img class="svg" ng-src="img/mcc-icons/coins.svg">
<img class="svg" ng-src="img/mcc-icons/computer.svg">
<img class="svg" ng-src="img/mcc-icons/default.svg">
<img class="svg" ng-src="img/mcc-icons/diamond-ring.svg">
<img class="svg" ng-src="img/mcc-icons/dollar-topup.svg">
<img class="svg" ng-src="img/mcc-icons/euro-topup.svg">
<img class="svg" ng-src="img/mcc-icons/film.svg">
<img class="svg" ng-src="img/mcc-icons/food.svg">
<img class="svg" ng-src="img/mcc-icons/football.svg">
<img class="svg" ng-src="img/mcc-icons/furniture.svg">
<img class="svg" ng-src="img/mcc-icons/game.svg">
<img class="svg" ng-src="img/mcc-icons/gas.svg">
<img class="svg" ng-src="img/mcc-icons/golf.svg">
<img class="svg" ng-src="img/mcc-icons/hotel.svg">
<img class="svg" ng-src="img/mcc-icons/law.svg">
<img class="svg" ng-src="img/mcc-icons/mail.svg">
<img class="svg" ng-src="img/mcc-icons/medical.svg">
<img class="svg" ng-src="img/mcc-icons/money.svg">
<img class="svg" ng-src="img/mcc-icons/motorcycle.svg">
<img class="svg" ng-src="img/mcc-icons/music.svg">
<img class="svg" ng-src="img/mcc-icons/newspaper.svg">
<img class="svg" ng-src="img/mcc-icons/park.svg">
<img class="svg" ng-src="img/mcc-icons/people.svg">
<img class="svg" ng-src="img/mcc-icons/pet.svg">
<img class="svg" ng-src="img/mcc-icons/plant.svg">
<img class="svg" ng-src="img/mcc-icons/purchase.svg">
<img class="svg" ng-src="img/mcc-icons/repair.svg">
<img class="svg" ng-src="img/mcc-icons/sadface.svg">
<img class="svg" ng-src="img/mcc-icons/scissors.svg">
<img class="svg" ng-src="img/mcc-icons/search.svg">
<img class="svg" ng-src="img/mcc-icons/shirt.svg">
<img class="svg" ng-src="img/mcc-icons/shoes.svg">
<img class="svg" ng-src="img/mcc-icons/smiley-face.svg">
<img class="svg" ng-src="img/mcc-icons/suitcase.svg">
<img class="svg" ng-src="img/mcc-icons/telephone.svg">
<img class="svg" ng-src="img/mcc-icons/television.svg">
<img class="svg" ng-src="img/mcc-icons/tent.svg">
<img class="svg" ng-src="img/mcc-icons/ticket.svg">
<img class="svg" ng-src="img/mcc-icons/toy.svg">
<img class="svg" ng-src="img/mcc-icons/truck.svg">
<img class="svg" ng-src="img/mcc-icons/watch.svg">
</div>
</div>
-->
<div class="tx-content">
<div class="tx-title">
<div class="ellipsis">