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

fix timeline order

Browse source
This commit is contained in:
Javier 2016-10-19 14:21:05 -03:00
commit 57a062b2b1
4 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/modals/txDetails.js
View file

@ -83,8 +83,6 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
time: $scope.btx.time, time: $scope.btx.time,
description: actionDescriptions['broadcasted'], description: actionDescriptions['broadcasted'],
}); });
$scope.actionList.reverse();
}; };
$scope.showCommentPopup = function() { $scope.showCommentPopup = function() {

2
src/js/controllers/modals/txpDetails.js
View file

@ -59,8 +59,6 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
by: action.copayerName by: action.copayerName
}); });
}); });
$scope.actionList.reverse();
}; };
$scope.$on('accepted', function(event) { $scope.$on('accepted', function(event) {

4
www/views/modals/tx-details.html
View file

@ -156,10 +156,10 @@
<div ng-if="actionList[0]"> <div ng-if="actionList[0]">
<div class="item item-divider" translate>Timeline</div> <div class="item item-divider" translate>Timeline</div>
<div class="item" ng-class="{'action-created' : a.type == 'created' || a.type == 'accept', 'action-rejected' : a.type == 'reject'}" ng-repeat="a in actionList track by $index"> <div class="item" ng-class="{'action-created' : a.type == 'created' || a.type == 'accept', 'action-rejected' : a.type == 'reject'}" ng-repeat="a in actionList | orderBy: 'time' :true track by $index">
<div class="row"> <div class="row">
<div class="col col-10"> <div class="col col-10">
<span id="timeline-icon">{{$index + 1}}</span> <span id="timeline-icon">{{actionList.length - $index}}</span>
</div> </div>
<div class="col"> <div class="col">
<div>{{a.description}}</div> <div>{{a.description}}</div>

4
www/views/modals/txp-details.html
View file

@ -129,11 +129,11 @@
</div> </div>
<div ng-if="actionList[0]"> <div ng-if="actionList[0]">
<div class="item item-divider" translate>Timeline</div> <div class="item item-divider" translate>Timeline</div>
<div class="item timeline-item" ng-class="{'action-created' : a.type == 'created' || a.type == 'accept', 'action-rejected' : a.type == 'reject'}" ng-repeat="a in actionList | orderBy: 'time' track by $index"> <div class="item timeline-item" ng-class="{'action-created' : a.type == 'created' || a.type == 'accept', 'action-rejected' : a.type == 'reject'}" ng-repeat="a in actionList | orderBy: 'time' :true track by $index">
<div class="timeline-content"> <div class="timeline-content">
<div class="timeline-content__icon"> <div class="timeline-content__icon">
<div class="rejected" ng-if="a.type === 'reject'">!</div> <div class="rejected" ng-if="a.type === 'reject'">!</div>
<div ng-if="a.type !== 'reject'">{{$index + 1}}</div> <div ng-if="a.type !== 'reject'">{{actionList.length - $index}}</div>
</div> </div>
<div class="timeline-content__label"> <div class="timeline-content__label">
<div class="action">{{a.description}}</div> <div class="action">{{a.description}}</div>