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

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

Browse source
This commit is contained in:
Andy Phillipson 2017-06-16 12:45:11 -04:00
commit 0d4fd06bcc
No known key found for this signature in database
GPG key ID: D813A67D567D6C88
5 changed files with 86 additions and 21 deletions
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;
}
}
}