Merge pull request #862 from yemel/fix/address-list
Fix showing QR code on address list when it shouldn't
This commit is contained in:
commit
5d63741f35
3 changed files with 8 additions and 2 deletions
|
|
@ -410,7 +410,7 @@
|
|||
<div class="addresses" ng-controller="AddressesController">
|
||||
<div ng-show='$root.wallet.isReady()'>
|
||||
<div class="row">
|
||||
<div class="large-9 medium-12 columns" ng-if="addresses[0]">
|
||||
<div class="large-9 medium-12 columns" ng-if="!!(addresses|removeEmpty).length">
|
||||
<div class="large-8 medium-8 columns" ng-init="showAll=0">
|
||||
<a class="panel radius db" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll"
|
||||
ng-click="selectAddress(addr)"
|
||||
|
|
@ -458,7 +458,7 @@
|
|||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="columns text-center m10t" ng-class="{'large-3' : !!addresses[0]}">
|
||||
<div class="columns text-center m10t" ng-class="{'large-3' : !!(addresses|removeEmpty).length}">
|
||||
<p> Create a New <strong> Address </strong> </p>
|
||||
<button class="secondary radius expandi new-address" ng-click="newAddr()"
|
||||
ng-disabled="loading" loading="Creating"> Create </button>
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ angular.module('copayApp.filters', [])
|
|||
})
|
||||
.filter('removeEmpty', function() {
|
||||
return function(elements) {
|
||||
elements = elements || [];
|
||||
// Hide empty addresses from other copayers
|
||||
return elements.filter(function(e) {
|
||||
return e.owned || e.balance > 0;
|
||||
|
|
|
|||
|
|
@ -75,6 +75,11 @@ describe('Unit: Testing Filters', function() {
|
|||
expect(removeEmpty([]).length).to.equal(0);
|
||||
}));
|
||||
|
||||
it('should work with undefined', inject(function($filter) {
|
||||
var removeEmpty = $filter('removeEmpty');
|
||||
expect(removeEmpty(undefined).length).to.equal(0);
|
||||
}));
|
||||
|
||||
it('should filter empty addresses from other copayers', inject(function($filter) {
|
||||
var removeEmpty = $filter('removeEmpty');
|
||||
var addresses = [{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue