diff --git a/public/views/tab-home.html b/public/views/tab-home.html index a31f00002..d01eb6b2f 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -19,7 +19,7 @@ -
+
Recent Activity @@ -28,7 +28,7 @@
Updating activity. Please stand by
-
+
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 4bd0612b0..e13af5c93 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -30,7 +30,7 @@ angular.module('copayApp.services') root.updateWalletSettings = function(wallet) { var defaults = configService.getDefaults(); - configService.whenAvailable(function(config){ + configService.whenAvailable(function(config) { wallet.usingCustomBWS = config.bwsFor && config.bwsFor[wallet.id] && (config.bwsFor[wallet.id] != defaults.bws.url); wallet.name = (config.aliasFor && config.aliasFor[wallet.id]) || wallet.credentials.walletName; wallet.color = (config.colorFor && config.colorFor[wallet.id]) || '#4A90E2'; @@ -77,7 +77,7 @@ angular.module('copayApp.services') var opts = opts || {}; var walletId = wallet.credentials.walletId; - if ((root.wallet[walletId] && root.wallet[walletId].started) && !opts.force) { + if ((root.wallet[walletId] && root.wallet[walletId].started) && !opts.force) { return false; } @@ -762,7 +762,7 @@ angular.module('copayApp.services') var TIME_STAMP = 60 * 60 * 24 * 7; var MAX = 100; - var ignored = { + var typeFilter1 = { 'NewBlock': 1, 'BalanceUpdated': 1, 'NewOutgoingTxByThirdParty': 1, @@ -771,6 +771,12 @@ angular.module('copayApp.services') 'TxProposalFinallyRejected': 1, }; + var typeFilter2 = { + 'TxProposalAcceptedBy': 1, + 'TxProposalRejectedBy': 1, + 'NewTxProposal': 1, + } + var w = root.getWallets(); if (lodash.isEmpty(w)) return cb(); @@ -868,9 +874,15 @@ angular.module('copayApp.services') $log.warn('Error updating notifications:' + err); } else { var n = lodash.filter(wallet.cachedActivity.n, function(x) { - return !ignored[x.type]; + return !typeFilter1[x.type]; }); + if (wallet.n == 1) { + var n = lodash.filter(n, function(x) { + return !typeFilter2[x.type]; + }); + } + var idToName = {}; if (wallet.cachedStatus) { lodash.each(wallet.cachedStatus.wallet.copayers, function(c) { @@ -911,7 +923,7 @@ angular.module('copayApp.services') txps = txps.concat(x.pendingTxps); }); txps = lodash.sortBy(txps, 'pendingForUs', 'createdOn'); - txps = lodash.compact(lodash.flatten(txps)).slice(0,MAX); + txps = lodash.compact(lodash.flatten(txps)).slice(0, MAX); var n = txps.length; return cb(null, txps, n); };