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

better wallet order

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-25 18:13:20 -03:00
commit db9750b263
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
5 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/copayers.html
View file

@ -68,7 +68,7 @@
</div> </div>
<div class="text-center"> <div class="text-center">
<button class="tiny round outline dark-gray warning" ng-click="showDeletePopup()"> <button class="button button-block button-assertive" ng-click="showDeletePopup()">
<i class="fi-trash"></i> <span translate>Cancel and delete the wallet</span> <i class="fi-trash"></i> <span translate>Cancel and delete the wallet</span>
</button> </button>
</div> </div>

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

@ -29,6 +29,7 @@
<div class="item-note"> <div class="item-note">
<!-- {{x.types}} --> <!-- {{x.types}} -->
&middot; &middot;
<i class="ion-briefcase" ng-style="{'color':x.wallet.color}"></i> <i class="ion-briefcase" ng-style="{'color':x.wallet.color}"></i>

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

@ -48,7 +48,7 @@
ui-sref="wallet.details({'walletId': item.id})"> ui-sref="wallet.details({'walletId': item.id})">
<i class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i> <i class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
{{item.name || item.id}} {{item.name || item.id}}
<span ng-show="item.n > 1" class="text-gray"> <span ng-show="item.n > 1" class="text-light">
{{item.m}}-of-{{item.n}} {{item.m}}-of-{{item.n}}
</span> </span>
<span class="badge badge-assertive" ng-show="!item.isComplete()" translate> <span class="badge badge-assertive" ng-show="!item.isComplete()" translate>

5
public/views/walletDetails.html
View file

@ -23,9 +23,8 @@
<div ng-show="!wallet.isComplete()"> <div ng-show="!wallet.isComplete()">
Wallet Incomplete. <a class="button button-block button-assertive" href ui-sref="wallet.copayers" class="button">
<a href ui-sref="wallet.copayers" class="button"> Wallet Incomplete
Wait for Copayers
</a> </a>
</div> </div>

3
src/js/services/profileService.js
View file

@ -716,9 +716,10 @@ angular.module('copayApp.services')
ret = lodash.filter(ret, function(w) { ret = lodash.filter(ret, function(w) {
return w.isComplete(); return w.isComplete();
}); });
} else {
} }
return lodash.sortBy(ret, 'name'); return lodash.sortBy(ret, [ function(x) { return x.isComplete(); }, 'createdOn', 'name']);
}; };
return root; return root;