From 7fd7c47f18a02d541e9a37000d40fc97e2da9dc3 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 17 Jan 2017 12:27:00 -0300
Subject: [PATCH] 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.
       </div>
 
-      <div class="item item-divider" translate>Experimental Features</div>
-      <div class="settings-explanation">
-        <div class="settings-description" translate>
-          These features aren't quite ready for primetime. They may change, stop working, or disappear at any time.
-        </div>
-      </div>
-
       <ion-toggle class="has-comment" ng-show="!isWP" ng-model="recentTransactionsEnabled.value" toggle-class="toggle-balanced" ng-change="recentTransactionsChange()">
         <span class="toggle-label" translate>Recent Transaction Card</span>
       </ion-toggle>
@@ -51,22 +44,6 @@
         If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab.
       </div>
 
-      <ion-toggle class="has-comment" ng-model="global.developmentUtilitiesEnabled.value" toggle-class="toggle-balanced" ng-change="toggledDevelopmentUtils()">
-        <span class="toggle-label" translate>Development Utilities</span>
-      </ion-toggle>
-      <div class="comment" translate>
-        These features make it easier to test complex functionality on all devices. They may be unstable.
-      </div>
-
-      <!-- disable frequently used for this release -->
-
-      <!-- <ion-toggle ng-show="!isWP" ng-model="frequentlyUsedEnabled.value" toggle-class="toggle-balanced" ng-change="frequentlyUsedChange()">
-        <span class="toggle-label" translate>Frequently Used Card</span>
-      </ion-toggle>
-      <div ng-style="{'padding':'15px', 'background-color': '#fff', 'color': 'rgba(74, 74, 74, 0.8)'}">
-        <span transaction>If enabled, the Frequently Used card - a list of the most commonly chosen recipients - will appear in the Send tab.</span>
-      </div> -->
-
     </div>
   </ion-content>
 </ion-view>
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 @@
 
         <div ng-show="updateStatusError">
           <span class="size-12 db m10">{{updateStatusError}}</span>
-          <a class="button button-outline button-light button-small" ng-click='update()' translate>Tap to retry</a>
+          <a class="button button-outline button-light button-small" ng-click='updateAll(true)' translate>Tap to retry</a>
         </div>
 
         <div ng-show="walletNotRegistered">
@@ -36,14 +36,9 @@
           <a class="button button-outline button-light button-small" ng-click='recreate()' translate>Recreate</a>
         </div>
 
-        <div ng-show="wallet.walletScanStatus == 'error'" ng-click='retryScan()'>
-          <span translate>Scan status finished with error</span>
-          <br><span translate>Tap to retry</span>
-        </div>
-
         <div
           ng-click='updateAll(true)'
-          ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !wallet.balanceHidden"
+          ng-show="!updateStatusError && !wallet.balanceHidden"
           on-hold="hideToggle()"
           ng-style="{'transform': amountScale}"
           ng-class="{amount__balance: amountIsCollapsible}">
@@ -59,7 +54,7 @@
 
         <div ng-style="{'transform': amountScale}"
         class="amount__balance"
-        ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && wallet.balanceHidden"
+        ng-show="!updateStatusError && wallet.balanceHidden"
         on-hold="hideToggle()">
           <strong class="size-24" translate>[Balance Hidden]</strong>
           <div ng-style="{opacity: altAmountOpacity}" class="size-14 amount-alternative" translate>