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

bettet activity

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-25 18:40:53 -03:00
commit f7e04c70c6
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/services/walletService.js
View file

@ -1004,7 +1004,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
if (err) return cb(err);
notifications = lodash.filter(notifications, function(x) {
return x.type != 'NewBlock' && x.type != 'BalanceUpdated';
return x.type != 'NewBlock' && x.type != 'BalanceUpdated' && x.type !='NewOutgoingTxByThirdParty';
});
var idToName = {};
@ -1098,10 +1098,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
lodash.each(shown, function(x) {
if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId) {
if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId && prev.creatorId && prev.creatorId === x.creatorId) {
prev.types.push(x.type);
prev.data = lodash.assign(prev.data, x.data);
prev.txid = prev.txid || x.txid;
prev.amountStr = prev.amountStr || x.amountStr;
prev.creatorName = prev.creatorName || x.creatorName;
} else {
finale.push(x);
prev = x;