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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/bitpayCard.js
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) {

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;
}
};