From ae2ad55be6ed24c1729904cde0c1e070da27d0cd Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Thu, 7 Apr 2016 14:48:13 -0300
Subject: [PATCH 1/3] prevent tap on delete button if another wallet is in
 delete process

---
 public/views/preferencesDeleteWallet.html |  2 +-
 src/js/controllers/preferencesDelete.js   | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html
index 73a55fde0..61ce65cd7 100644
--- a/public/views/preferencesDeleteWallet.html
+++ b/public/views/preferencesDeleteWallet.html
@@ -12,7 +12,7 @@
     <div class="m20b" translate>Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED</div>
   </div>
   <ul class="no-bullet m0">
-    <li ng-click="preferences.deleteWallet()">
+    <li ng-click="isDeletingWallet || preferences.deleteWallet()">
       <div class="right" ng-style="{'color':index.backgroundColor}">
         {{index.walletName}} <span ng-show="index.alias">({{index.alias}})</span>
       </div>
diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js
index e70f83eaf..9b1e46fec 100644
--- a/src/js/controllers/preferencesDelete.js
+++ b/src/js/controllers/preferencesDelete.js
@@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
   function($scope, $rootScope, $filter, $timeout, $modal, $log, storageService, notification, profileService, isCordova, go, gettext, gettextCatalog, animationService) {
     this.isCordova = isCordova;
     this.error = null;
+    $scope.isDeletingWallet = false;
 
     var delete_msg = gettextCatalog.getString('Are you sure you want to delete this wallet?');
     var accept_msg = gettextCatalog.getString('Accept');
@@ -38,7 +39,10 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
 
       modalInstance.result.then(function(ok) {
         if (ok) {
-          _deleteWallet();
+          $timeout(function() {
+            $scope.isDeletingWallet = true;
+            _deleteWallet();
+          }, 100);
         }
       });
     };
@@ -50,6 +54,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
       var self = this;
 
       profileService.deleteWalletFC({}, function(err) {
+        $scope.isDeletingWallet = false;
         if (err) {
           self.error = err.message || err;
         } else {
@@ -67,7 +72,10 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
           delete_msg,
           function(buttonIndex) {
             if (buttonIndex == 1) {
-              _deleteWallet();
+              $timeout(function() {
+                $scope.isDeletingWallet = true;
+                _deleteWallet();
+              }, 100);
             }
           },
           confirm_msg, [accept_msg, cancel_msg]

From d13379e2d16ce73b29fd10032686221657a7645b Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Thu, 7 Apr 2016 15:24:39 -0300
Subject: [PATCH 2/3] remove wallet name-alias

---
 public/views/preferencesDeleteWallet.html | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html
index 61ce65cd7..6a2c2d6c6 100644
--- a/public/views/preferencesDeleteWallet.html
+++ b/public/views/preferencesDeleteWallet.html
@@ -6,6 +6,18 @@
 
 
 <div class="content preferences" ng-controller="preferencesDeleteWalletController as preferences">
+  <div class="onGoingProcess" ng-show="isDeletingWallet">
+    <div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
+    <div class="spinner">
+      <div class="rect1"></div>
+      <div class="rect2"></div>
+      <div class="rect3"></div>
+      <div class="rect4"></div>
+      <div class="rect5"></div>
+    </div>
+    <span translate>Deleting Wallet...</span>
+    </div>
+  </div>
 
   <div class="text-center text-gray m20t size-12">
     <div class="text-warning size-18 m10b" translate>Warning!</div>
@@ -13,7 +25,7 @@
   </div>
   <ul class="no-bullet m0">
     <li ng-click="isDeletingWallet || preferences.deleteWallet()">
-      <div class="right" ng-style="{'color':index.backgroundColor}">
+      <div class="right" ng-style="{'color':index.backgroundColor}" ng-show="!isDeletingWallet">
         {{index.walletName}} <span ng-show="index.alias">({{index.alias}})</span>
       </div>
       <div translate>Delete wallet</div>

From 2d8663171c463c1033645d210e84fe6f89268139 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Mon, 11 Apr 2016 11:14:49 -0300
Subject: [PATCH 3/3] fix prevent click

---
 public/views/preferencesDeleteWallet.html |  2 +-
 src/js/controllers/preferencesDelete.js   | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html
index 6a2c2d6c6..d4e2808f6 100644
--- a/public/views/preferencesDeleteWallet.html
+++ b/public/views/preferencesDeleteWallet.html
@@ -24,7 +24,7 @@
     <div class="m20b" translate>Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED</div>
   </div>
   <ul class="no-bullet m0">
-    <li ng-click="isDeletingWallet || preferences.deleteWallet()">
+    <li ng-click="preferences.deleteWallet()">
       <div class="right" ng-style="{'color':index.backgroundColor}" ng-show="!isDeletingWallet">
         {{index.walletName}} <span ng-show="index.alias">({{index.alias}})</span>
       </div>
diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js
index 9b1e46fec..7322dc078 100644
--- a/src/js/controllers/preferencesDelete.js
+++ b/src/js/controllers/preferencesDelete.js
@@ -39,15 +39,13 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
 
       modalInstance.result.then(function(ok) {
         if (ok) {
-          $timeout(function() {
-            $scope.isDeletingWallet = true;
-            _deleteWallet();
-          }, 100);
+          _deleteWallet();
         }
       });
     };
 
     var _deleteWallet = function() {
+      $scope.isDeletingWallet = true;
       var fc = profileService.focusedClient;
       var name = fc.credentials.walletName;
       var walletName = (fc.alias || '') + ' [' + name + ']';
@@ -67,15 +65,13 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
     };
 
     this.deleteWallet = function() {
+      if ($scope.isDeletingWallet) return;
       if (isCordova) {
         navigator.notification.confirm(
           delete_msg,
           function(buttonIndex) {
             if (buttonIndex == 1) {
-              $timeout(function() {
-                $scope.isDeletingWallet = true;
-                _deleteWallet();
-              }, 100);
+              _deleteWallet();
             }
           },
           confirm_msg, [accept_msg, cancel_msg]