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

Merge branch 'master' of https://github.com/bitpay/copay

Browse source
This commit is contained in:
magmahindenburg 2017-06-20 15:10:53 +09:00
commit 9f9eaa0bf1
6 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/controllers/bitpayCard.js
View file

@ -80,6 +80,8 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
txs[i].desc = _processDescription(txs[i]);
txs[i].price = _price(txs[i]);
txs[i].runningBalance = runningBalance;
txs[i].pending = txs[i].status.toLowerCase() == 'pending';
_runningBalance(txs[i]);
if (txs[i].merchant.city && txs[i].merchant.state) {
@ -92,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;
}
};