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

Merge pull request #50 from ssotomayor/fixes1592

Browse source 
New addresses are now added at bottom of the list instead of at the top
This commit is contained in:
Matias Alejo Garcia 2014-10-29 14:56:59 -03:00
commit a93a48dc60
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/controllers/addresses.js
View file

@ -84,6 +84,7 @@ angular.module('copayApp.controllers').controller('AddressesController',
for (var i = 0; i < addrInfos.length; i++) { for (var i = 0; i < addrInfos.length; i++) {
var addrinfo = addrInfos[i]; var addrinfo = addrInfos[i];
$scope.addresses.push({ $scope.addresses.push({
'index': i,
'address': addrinfo.addressStr, 'address': addrinfo.addressStr,
'balance': $rootScope.balanceByAddr ? $rootScope.balanceByAddr[addrinfo.addressStr] : 0, 'balance': $rootScope.balanceByAddr ? $rootScope.balanceByAddr[addrinfo.addressStr] : 0,
'isChange': addrinfo.isChange, 'isChange': addrinfo.isChange,

2
js/models/PublicKeyRing.js
View file

@ -493,7 +493,7 @@ PublicKeyRing.prototype.getAddressesInfoForIndex = function(index, opts, copayer
var isOwned = index.copayerIndex === HDPath.SHARED_INDEX || index.copayerIndex === copayerIndex; var isOwned = index.copayerIndex === HDPath.SHARED_INDEX || index.copayerIndex === copayerIndex;
var ret = []; var ret = [];
var appendAddressInfo = function(address, isChange) { var appendAddressInfo = function(address, isChange) {
ret.unshift({ ret.push({
address: address, address: address,
addressStr: address.toString(), addressStr: address.toString(),
isChange: isChange, isChange: isChange,

4
views/addresses.html
View file

@ -6,13 +6,13 @@
</div> </div>
<div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length"> <div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">
<div class="large-12 medium-12"> <div class="large-12 medium-12">
<div class="oh" ng-repeat="addr in addresses|removeEmpty"> <div class="oh" ng-repeat="addr in addresses|removeEmpty|orderBy:'-index':true">
<div class="panel radius show-for-large-up"> <div class="panel radius show-for-large-up">
<div class="row collapse"> <div class="row collapse">
<div class="large-7 medium-9 column"> <div class="large-7 medium-9 column">
<div class="list-addr"> <div class="list-addr">
<span> <span>
<contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"> <contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right" />
</span> </span>
<span class="btn-copy" clip-copy="addr.address"> </span> <span class="btn-copy" clip-copy="addr.address"> </span>
<small translate class="label" ng-if="addr.isChange">change</small> <small translate class="label" ng-if="addr.isChange">change</small>