diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 020716608..7a3fd83f8 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -194,7 +194,6 @@ angular.module('copayApp.controllers').controller('tabHomeController', if (err) $log.error(err); $scope.txps = txps; $scope.txpsN = n; - $scope.txpsFinished = true; $timeout(function() { $ionicScrollDelegate.resize(); $scope.$apply(); @@ -226,7 +225,6 @@ angular.module('copayApp.controllers').controller('tabHomeController', } if (++j == i) { updateTxps(); - $scope.walletsFinished = true; } }); }); @@ -254,7 +252,6 @@ angular.module('copayApp.controllers').controller('tabHomeController', } $scope.notifications = notifications; $scope.notificationsN = total; - $scope.notificationsFinished = true; $timeout(function() { $ionicScrollDelegate.resize(); $scope.$apply(); diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index a35975664..3886ba7ee 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -53,44 +53,6 @@ } } } - .loading-block-title { - height: 20px; - width: 150px; - background:-webkit-radial-gradient(#fff, #f7f7f7); - background-size: 20px 100px; - -webkit-animation: m .6s linear infinite; - } - .loading-block-body { - width: 100%; - height: 160px; - background: -webkit-radial-gradient(#fff, #f7f7f7); - background-size: 25px 100%; - -webkit-animation: m .6s linear infinite; - } - @keyframes m { - 0% { - background-position: 20px 0; - } - 100% { - } - } - } - .card-loading-placeholder { - width: 100%; - margin-bottom: 0; - } - .loading-placeholder { - height: 100%; - .row { - height: 50%; - } - } - .animate-show-hide.ng-hide { - opacity: 0; - } - .animate-show-hide.ng-hide-add, - .animate-show-hide.ng-hide-remove { - transition: all linear 0.2s; } .wallet-details__item.item { padding-top: 0; diff --git a/www/views/includes/wallets.html b/www/views/includes/wallets.html index bca92b8f0..4fa2cc894 100644 --- a/www/views/includes/wallets.html +++ b/www/views/includes/wallets.html @@ -8,7 +8,7 @@ {{wallet.name || wallet.id}} - {{wallet.status.availableBalanceStr || '...'}} + {{wallet.status.availableBalanceStr}} [Balance Hidden] diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 8022dc529..6d2ec9247 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -39,100 +39,76 @@ On this screen you can see all your wallets, accounts, and assets. -
- - Incomplete - - - {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance + (wallet.cachedBalanceUpdatedOn ? ' · ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }} - - [Balance Hidden] - - {{wallet.m}}-of-{{wallet.n}} - - - {{wallet.error}} - - -
- - -+ + Incomplete + + + {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance + (wallet.cachedBalanceUpdatedOn ? ' · ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }} + + [Balance Hidden] + + {{wallet.m}}-of-{{wallet.n}} + + + {{wallet.error}} + + +
+ + +