diff --git a/public/views/includes/walletActivity.html b/public/views/includes/walletActivity.html index b44f7515d..7e50b47d2 100644 --- a/public/views/includes/walletActivity.html +++ b/public/views/includes/walletActivity.html @@ -19,7 +19,9 @@ - {{x.message}} + + {{x.amountStr}} + {{x.message}} @@ -30,10 +32,10 @@
- + + · - {{ x.creatorName}}@{{x.wallet.name}} - · + {{ x.creatorName}}@{{x.wallet.name}}
diff --git a/public/views/tab-home.html b/public/views/tab-home.html index 32eec4355..502d87cc2 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -5,12 +5,11 @@ -

Activity

+

Recent Activity

-
Updating activity. Please stand by
@@ -25,7 +24,7 @@
- No recent activity + Nothing to show here.
diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 0012cfec0..b8b006e7e 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -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;