From 7c217932361d548b0617359b8617dcc6378f092f Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Fri, 30 Oct 2015 12:47:37 -0300
Subject: [PATCH] refactor clear history method call

---
 public/views/preferencesInformation.html     |  2 +-
 src/js/controllers/index.js                  | 23 +++++++++-----------
 src/js/controllers/preferencesInformation.js |  9 ++++++--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html
index 05b3e2758..56eedefc4 100644
--- a/public/views/preferencesInformation.html
+++ b/public/views/preferencesInformation.html
@@ -113,7 +113,7 @@
     <ul class="no-bullet m0 size-14">
       <h4 class="title m0" translate>Transaction history</h4>
       <li class="line-b p20 oh">
-        <button class="black round small expand"  ng-style="{'background-color':index.backgroundColor}" ng-click="info.clearTransactionHistory(); index.clearHistoryFeedback();">
+        <button class="black round small expand"  ng-style="{'background-color':index.backgroundColor}" ng-click="info.clearTransactionHistory();">
           <span translate>Clear history</span>
         </button>
       </li>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index a96a20c71..521c1ca36 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -910,19 +910,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     });
   };
 
-  self.clearHistoryFeedback = function() {
-    self.txHistory = [];
-    $log.debug('The wallet transaction history has been deleted');
-    self.setOngoingProcess('deletingHistory', true);
-
-    self.updateHistory();
-    go.walletHome();
-
-    $timeout(function() {
-      self.setOngoingProcess('deletingHistory', false);
-    }, 2000);
-  };
-
   self.setUxLanguage = function() {
     var userLang = uxLanguage.update();
     self.defaultLanguageIsoCode = userLang;
@@ -1018,6 +1005,16 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   };
 
   // UX event handlers
+  $rootScope.$on('Local/ClearHistory', function(event, walletId) {
+    storageService.removeTxHistory(walletId, function(err) {
+      if (err) root.showErrorPopup(err);
+
+      $log.debug('The wallet transaction history has been deleted');
+      self.txHistory = [];
+      self.updateHistory();
+    });
+  });
+
   $rootScope.$on('Local/ColorUpdated', function(event) {
     self.updateColor();
     $timeout(function() {
diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js
index 6cf9f08e8..6dc5141be 100644
--- a/src/js/controllers/preferencesInformation.js
+++ b/src/js/controllers/preferencesInformation.js
@@ -95,8 +95,13 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
     };
 
     this.clearTransactionHistory = function() {
-      storageService.removeTxHistory(c.walletId, function() {
-        return;
+      storageService.removeTxHistory(c.walletId, function(err) {
+        if (err) return $log.err(err);
+
+        $timeout(function() {
+          $scope.$emit('Local/ClearHistory');
+          go.walletHome();
+        }, 100);
       });
     }
   });