diff --git a/www/js/controllers/network-controllers.js b/www/js/controllers/network-controllers.js index 170aae747589fd406efbfcc748e1cff91d4fb2e1..874e5fa4fc6cf00feb7a375dce755da71569bcd5 100644 --- a/www/js/controllers/network-controllers.js +++ b/www/js/controllers/network-controllers.js @@ -66,7 +66,10 @@ function NetworkLookupController($scope, $timeout, $state, $ionicHistory, $ionic $scope.node = !BMA.node.same(currency.peer.host, currency.peer.port) ? BMA.instance(currency.peer.host, currency.peer.port) : BMA; if (state && state.stateParams) { - if (state.stateParams.type) { + if (state.stateParams.type && ( + state.stateParams.type === 'mirror' || + state.stateParams.type === 'member' || + state.stateParams.type === 'offline')) { $scope.search.type = state.stateParams.type; } if (state.stateParams.expert) { @@ -163,7 +166,7 @@ function NetworkLookupController($scope, $timeout, $state, $ionicHistory, $ionic $scope.toggleSearchType = function(type){ $scope.hideActionsPopover(); if ($scope.search.type === type || type === 'none') { - $scope.search.type = false; + $scope.search.type = undefined; } else { $scope.search.type = type; diff --git a/www/templates/network/view_network.html b/www/templates/network/view_network.html index 1e0ed8b9529d9db81276159e116b69fe8f39eea7..d54604150b310831fc7cedd2984ad784cf4342d7 100644 --- a/www/templates/network/view_network.html +++ b/www/templates/network/view_network.html @@ -21,24 +21,12 @@ <span ng-if="enableFilter && search.type=='offline'" translate>PEER.OFFLINE</span> <span ng-if="!enableFilter || !search.type" translate>PEER.ALL_PEERS</span> <span ng-if="!search.loading">({{search.results.length}})</span> - + <ion-spinner ng-if="search.loading" class="icon ion-spinner-small" icon="android"></ion-spinner> </h4> - <h5 class="dark" ng-if="!search.loading"> - <i class="icon ion-clock"></i> - {{mainBlock.medianTime | formatDate}} - <span class="gray"> - ({{'NETWORK.VIEW.MEDIAN_TIME'|translate}}) - </span> - </h5> - <h5 class="gray" ng-if="search.loading" > - <ion-spinner class="icon ion-spinner-small" icon="android"></ion-spinner> - <span translate>NETWORK.VIEW.LOADING_PEERS</span> - </h5> </div> <div class="pull-right"> - <div class="pull-right" ng-if="enableFilter"> <a class="button button-text button-small hidden-xs hidden-sm ink" ng-class="{'button-text-positive': search.type=='member'}"