mirror of https://github.com/BTCPrivate/copay.git
better wallet order
This commit is contained in:
parent
3db1a02bc3
commit
db9750b263
|
@ -68,7 +68,7 @@
|
|||
</div>
|
||||
|
||||
<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>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
|
||||
|
||||
<div class="item-note">
|
||||
|
||||
<!-- {{x.types}} -->
|
||||
·
|
||||
<i class="ion-briefcase" ng-style="{'color':x.wallet.color}"></i>
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
ui-sref="wallet.details({'walletId': item.id})">
|
||||
<i class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
|
||||
{{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}}
|
||||
</span>
|
||||
<span class="badge badge-assertive" ng-show="!item.isComplete()" translate>
|
||||
|
|
|
@ -23,9 +23,8 @@
|
|||
|
||||
|
||||
<div ng-show="!wallet.isComplete()">
|
||||
Wallet Incomplete.
|
||||
<a href ui-sref="wallet.copayers" class="button">
|
||||
Wait for Copayers
|
||||
<a class="button button-block button-assertive" href ui-sref="wallet.copayers" class="button">
|
||||
Wallet Incomplete
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -716,9 +716,10 @@ angular.module('copayApp.services')
|
|||
ret = lodash.filter(ret, function(w) {
|
||||
return w.isComplete();
|
||||
});
|
||||
} else {
|
||||
}
|
||||
|
||||
return lodash.sortBy(ret, 'name');
|
||||
return lodash.sortBy(ret, [ function(x) { return x.isComplete(); }, 'createdOn', 'name']);
|
||||
};
|
||||
|
||||
return root;
|
||||
|
|
Loading…
Reference in New Issue