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

include own notifications in ticker

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-31 15:23:44 -03:00
commit d14f5306e3
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
public/views/includes/walletActivity.html
View file

@ -1,5 +1,15 @@
<span class="wallet-activity"> <span class="wallet-activity">
<div ng-if="x.types.indexOf('NewOutgoingTx')>=0">
<span>Payment Sent </span>
<div class="wallet-activity-amount">
{{x.amountStr}}
</div>
</div>
<div ng-if="x.types.indexOf('NewIncomingTx')>=0"> <div ng-if="x.types.indexOf('NewIncomingTx')>=0">
<span>Payment Received</span> <span>Payment Received</span>
<div class="wallet-activity-amount"> <div class="wallet-activity-amount">
@ -39,4 +49,3 @@
<time class="wallet-activity-note-child">{{ x.createdOn * 1000 | amTimeAgo}}</time> <time class="wallet-activity-note-child">{{ x.createdOn * 1000 | amTimeAgo}}</time>
</p> </p>
</span> </span>

3
src/js/controllers/activity.js
View file

@ -29,7 +29,8 @@ angular.module('copayApp.controllers').controller('activityController',
lodash.each($scope.wallets, function(wallet) { lodash.each($scope.wallets, function(wallet) {
walletService.getNotifications(wallet, { walletService.getNotifications(wallet, {
timeSpan: timeSpan includeOwn: true,
timeSpan: timeSpan,
}, function(err, n) { }, function(err, n) {
if (err) { if (err) {
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO