From d14f5306e3a1e98ea645d5be3038721fa0fc45a6 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 31 Aug 2016 15:23:44 -0300 Subject: [PATCH] include own notifications in ticker --- public/views/includes/walletActivity.html | 11 ++++++++++- src/js/controllers/activity.js | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/public/views/includes/walletActivity.html b/public/views/includes/walletActivity.html index 149ec0cc5..bdd5d7d9b 100644 --- a/public/views/includes/walletActivity.html +++ b/public/views/includes/walletActivity.html @@ -1,5 +1,15 @@ + +
+ Payment Sent +
+ {{x.amountStr}} +
+
+ + +
Payment Received
@@ -39,4 +49,3 @@

- diff --git a/src/js/controllers/activity.js b/src/js/controllers/activity.js index 897f1f21e..60a1f2cdf 100644 --- a/src/js/controllers/activity.js +++ b/src/js/controllers/activity.js @@ -29,7 +29,8 @@ angular.module('copayApp.controllers').controller('activityController', lodash.each($scope.wallets, function(wallet) { walletService.getNotifications(wallet, { - timeSpan: timeSpan + includeOwn: true, + timeSpan: timeSpan, }, function(err, n) { if (err) { console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO