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

Merge pull request #5423 from JDonadio/bug/timeline

Browse source 
Fix timeline item order
This commit is contained in:
Gustavo Maximiliano Cortez 2017-01-10 10:51:08 -03:00 • committed by GitHub
commit dafd46c3a2
4 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,6 +56,10 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
by: action.copayerName by: action.copayerName
}); });
}); });
$timeout(function() {
$scope.actionList.reverse();
}, 10);
}; };
function checkPaypro() { function checkPaypro() {

4
src/js/controllers/tx-details.js
View file

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

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

@ -129,7 +129,7 @@
</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' :true 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 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>

2
www/views/tx-details.html
View file

@ -91,7 +91,7 @@
</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' :true 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 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>