diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 6892eceb0..796876781 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -353,11 +353,11 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun listeners = [ $rootScope.$on('bwsEvent', function(e, walletId) { if (walletId == $scope.wallet.id) - updateStatus(); + $scope.updateAll(); }), $rootScope.$on('Local/TxAction', function(e, walletId) { if (walletId == $scope.wallet.id) - updateStatus(); + $scope.updateAll(); }), ]; }); diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 52dd836bc..7928b3bfb 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -218,6 +218,7 @@ bottom: 5px; font-size: 20px; color: #fff; + width:95%; } .wallet-not-backed-up-warning { @@ -234,3 +235,15 @@ a.item { cursor: pointer; } + +.recent svg { + margin-left:5px; + width:0.7em; + height:0.7em; + stroke: #eee; +} + +.updatingHistory { + color: #445; + font-size:0.9em; +} diff --git a/www/views/includes/walletInfo.html b/www/views/includes/walletInfo.html index c9bb75245..d4f1fbc17 100644 --- a/www/views/includes/walletInfo.html +++ b/www/views/includes/walletInfo.html @@ -1,4 +1,7 @@ + + +
Auditable @@ -12,5 +15,4 @@ - - +
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 4ec6c5d3b..adb34ffe4 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -194,28 +194,36 @@
+ ng-show="!txHistory[0] && !updatingTxHistory && !updateTxHistoryError && !updateStatusError" translate> No transactions yet
+ +
+ Could not update transaction history +
+ +
- +
-
Updating transaction history. Please stand by.
-
-
-
{{updatingTxHistoryProgress}} transactions downloaded
+
+ Updating transaction history. Please stand by.
+ {{updatingTxHistoryProgress}} transactions downloaded +
- - Recent + + Recent + {{getDate(btx.time) | amDateFormat:'MMMM'}}