From 716b341dc470683ade7e293b642dddb021c78fff Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 17 Jan 2017 11:41:39 -0300 Subject: [PATCH 1/2] better spinners at wallet details --- src/js/controllers/walletDetails.js | 4 ++-- src/sass/views/walletDetails.scss | 13 +++++++++++++ www/views/includes/walletInfo.html | 6 ++++-- www/views/walletDetails.html | 24 ++++++++++++++++-------- 4 files changed, 35 insertions(+), 12 deletions(-) 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'}} From 7fd7c47f18a02d541e9a37000d40fc97e2da9dc3 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 17 Jan 2017 12:27:00 -0300 Subject: [PATCH 2/2] better refresh in walletDetails --- src/js/controllers/advancedSettings.js | 11 ----------- src/js/controllers/walletDetails.js | 2 +- src/js/services/configService.js | 10 +--------- src/sass/views/advancedSettings.scss | 1 + www/views/advancedSettings.html | 23 ----------------------- www/views/walletDetails.html | 11 +++-------- 6 files changed, 6 insertions(+), 52 deletions(-) diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js index 2baa43fae..bef368e18 100644 --- a/src/js/controllers/advancedSettings.js +++ b/src/js/controllers/advancedSettings.js @@ -95,17 +95,6 @@ angular.module('copayApp.controllers').controller('advancedSettingsController', }); }; - $scope.frequentlyUsedChange = function() { - var opts = { - frequentlyUsed: { - enabled: $scope.frequentlyUsedEnabled.value - } - }; - configService.set(opts, function(err) { - if (err) $log.debug(err); - }); - }; - $scope.$on("$ionicView.beforeEnter", function(event, data) { updateConfig(); }); diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 796876781..a137077b3 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -352,7 +352,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun listeners = [ $rootScope.$on('bwsEvent', function(e, walletId) { - if (walletId == $scope.wallet.id) + if (walletId == $scope.wallet.id && e.type!='NewAddress') $scope.updateAll(); }), $rootScope.$on('Local/TxAction', function(e, walletId) { diff --git a/src/js/services/configService.js b/src/js/services/configService.js index 5bd6c3cc6..b3396a3ef 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -61,14 +61,9 @@ angular.module('copayApp.services').factory('configService', function(storageSer enabled: true }, - //Experimental Features recentTransactions: { - enabled: false //disabled by default - }, - - frequentlyUsed: { - enabled: true + enabled: true, }, rates: { @@ -214,9 +209,6 @@ angular.module('copayApp.services').factory('configService', function(storageSer if (!configCache.recentTransactions) { configCache.recentTransactions = defaultConfig.recentTransactions; } - if (!configCache.frequentlyUsed) { - configCache.frequentlyUsed = defaultConfig.frequentlyUsed; - } if (!configCache.pushNotifications) { configCache.pushNotifications = defaultConfig.pushNotifications; } diff --git a/src/sass/views/advancedSettings.scss b/src/sass/views/advancedSettings.scss index d86f17101..d4d409494 100644 --- a/src/sass/views/advancedSettings.scss +++ b/src/sass/views/advancedSettings.scss @@ -25,6 +25,7 @@ padding: 15px; background-color: #fff; color: $mid-gray; + font-size:0.9em; } } } diff --git a/www/views/advancedSettings.html b/www/views/advancedSettings.html index f6ee8f328..72651a97e 100644 --- a/www/views/advancedSettings.html +++ b/www/views/advancedSettings.html @@ -37,13 +37,6 @@ If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays.
-
Experimental Features
-
-
- These features aren't quite ready for primetime. They may change, stop working, or disappear at any time. -
-
- Recent Transaction Card @@ -51,22 +44,6 @@ If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab.
- - Development Utilities - -
- These features make it easier to test complex functionality on all devices. They may be unstable. -
- - - - -
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index adb34ffe4..bbcf28774 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -28,7 +28,7 @@
{{updateStatusError}} - Tap to retry + Tap to retry
@@ -36,14 +36,9 @@ Recreate
-
- Scan status finished with error -
Tap to retry -
-
@@ -59,7 +54,7 @@
[Balance Hidden]