diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 7a3fd83f8..020716608 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -194,6 +194,7 @@ 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(); @@ -225,6 +226,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', } if (++j == i) { updateTxps(); + $scope.walletsFinished = true; } }); }); @@ -252,6 +254,7 @@ 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 3886ba7ee..a35975664 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -53,6 +53,44 @@ } } } + .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 4fa2cc894..bca92b8f0 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 6d2ec9247..8022dc529 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -39,76 +39,100 @@ On this screen you can see all your wallets, accounts, and assets. - -
- - {{'Payment Proposals'|translate}} - - {{txpsN}} - - -
- +
+
+ +
+
- - - -
-
- Wallets - -
-
- - - - - Create bitcoin wallet +
+ + + + + -
-
-
-
+

+ + 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}} + +   +

+ + +
+
+
+
+
+
+
diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 644af8e0f..56c390bf8 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -90,7 +90,7 @@ {{wallet.name || wallet.id}} - {{wallet.status.availableBalanceStr}} + {{wallet.status.availableBalanceStr || '...'}}
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index cfc054614..76c76ec7b 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -47,22 +47,25 @@ - - - - {{'Language' | translate}} - - {{currentLanguageName|translate}} - - - + + + + {{'Language' | translate}} + + {{currentLanguageName | translate}} + + + ... + + + {{'Bitcoin Unit' | translate}} - {{unitName}} + {{unitName || '...'}} @@ -73,7 +76,7 @@ {{'Alternative Currency' | translate}} - {{selectedAlternative.name}} + {{selectedAlternative.name || '...'}} @@ -84,7 +87,10 @@ {{'Bitcoin Network Fee Policy' | translate}} - {{feeOpts[currentFeeLevel]|translate}} + {{feeOpts[currentFeeLevel] | translate}} + + + ...