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

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

@ -19,7 +19,9 @@
<span ng-if="x.types.indexOf('TxProposalRemoved') == -1 && x.types.indexOf('TxProposalRejected') == -1">
<span ng-if="x.types.indexOf('NewTxProposal')>=0 ">
<i class="icon ion-arrow-up-c size-21" ng-style="{'color':x.wallet.color}"></i>
{{x.message}}
{{x.amountStr}}
<i>{{x.message}}</i>
</span>
<span ng-if="x.types.indexOf('TxProposalAcceptedBy')>=0 && x.types.indexOf('NewTxProposal') == -1 ">
<i class="icon ion-checkmark-round size-21" ng-style="{'color':x.wallet.color}"></i>
@ -30,10 +32,10 @@
<div class="item-note">
<!-- {{x.types}} -->
<!-- {{x.types}} -->
<time>{{ x.createdOn * 1000 | amTimeAgo}}</time>
&middot;
<i class="ion-briefcase" ng-style="{'color':x.wallet.color}"></i>
{{ x.creatorName}}@{{x.wallet.name}}
&middot; <time>{{ x.createdOn * 1000 | amTimeAgo}}</time>
<span ng-if="x.creatorName">{{ x.creatorName}}@</span>{{x.wallet.name}}
</div>

5
public/views/tab-home.html
View file

@ -5,12 +5,11 @@
</ion-nav-bar>
<ion-content class="padding" ng-controller="tabHomeController">
<h3 class="title" translate>Activity</h3>
<h3 class="title" translate>Recent Activity</h3>
<div ng-if="fetchingNotifications" class="updatingHistory">
<div class="text-center">
<ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
<div translate>Updating activity. Please stand by</div>
</div>
</div>
@ -25,7 +24,7 @@
</a>
<div class="item" ng-show="!notifications[0]">
<span translate>No recent activity</span>
<span translate>Nothing to show here.</span>
</div>
</div>
</div>

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;