diff --git a/public/views/copayers.html b/public/views/copayers.html index 350f5e6de..66f9133d3 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -68,7 +68,7 @@
-
diff --git a/public/views/includes/walletActivity.html b/public/views/includes/walletActivity.html index 408e78c1c..b44f7515d 100644 --- a/public/views/includes/walletActivity.html +++ b/public/views/includes/walletActivity.html @@ -29,6 +29,7 @@
+ · diff --git a/public/views/tab-home.html b/public/views/tab-home.html index 70dd9d2e7..32eec4355 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -48,7 +48,7 @@ ui-sref="wallet.details({'walletId': item.id})"> {{item.name || item.id}} - + {{item.m}}-of-{{item.n}} diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html index 66c42428e..268ae1482 100644 --- a/public/views/walletDetails.html +++ b/public/views/walletDetails.html @@ -23,9 +23,8 @@
- Wallet Incomplete. - - Wait for Copayers + + Wallet Incomplete
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 03fd53ad6..5e70afc61 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -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;