From c20cccedc2905f6ee31b9682fa8f01a4177bd96f Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Fri, 30 Oct 2015 12:17:28 -0300
Subject: [PATCH] feedback and history update

---
 public/views/preferencesInformation.html     |  2 +-
 public/views/walletHome.html                 |  1 +
 src/js/controllers/index.js                  | 15 ++++++++++++++-
 src/js/controllers/preferencesInformation.js |  4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html
index 56eedefc4..05b3e2758 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();">
+        <button class="black round small expand"  ng-style="{'background-color':index.backgroundColor}" ng-click="info.clearTransactionHistory(); index.clearHistoryFeedback();">
           <span translate>Clear history</span>
         </button>
       </li>
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 5aa184a59..5bf80d76a 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -43,6 +43,7 @@
         || index.onGoingProcessName == 'updatingStatus'
         || index.onGoingProcessName == 'updatingBalance'
         || index.onGoingProcessName == 'updatingPendingTxps'
+        || index.onGoingProcessName == 'deletingHistory'
         "> Updating Wallet... </span>
       <span translate ng-show="index.onGoingProcessName == 'scanning'">Scanning Wallet funds...</span>
       <span translate ng-show="index.onGoingProcessName == 'recreating'">Recreating Wallet...</span>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 470a3ef85..a96a20c71 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -910,6 +910,19 @@ 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;
@@ -1256,4 +1269,4 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       self.setFocusedWallet();
     });
   });
-});
\ No newline at end of file
+});
diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js
index b2ec211ec..6cf9f08e8 100644
--- a/src/js/controllers/preferencesInformation.js
+++ b/src/js/controllers/preferencesInformation.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesInformation',
-  function($scope, $log, $timeout, isMobile, gettextCatalog, lodash, profileService, storageService) {
+  function($scope, $log, $timeout, isMobile, gettextCatalog, lodash, profileService, storageService, go) {
     var base = 'xpub';
     var fc = profileService.focusedClient;
     var c = fc.credentials;
@@ -96,7 +96,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
 
     this.clearTransactionHistory = function() {
       storageService.removeTxHistory(c.walletId, function() {
-        $log.info('The wallet transaction history has been deleted');
+        return;
       });
     }
   });