From 1e44ce2cc7ec840a7bde7a696d985a284e55d26f Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Mon, 21 Jul 2014 16:24:41 -0300
Subject: [PATCH 1/4] add delete option in intermediate screen

---
 index.html               |  7 +++++--
 js/controllers/header.js | 13 +++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 13c84811b..48aa9ee72 100644
--- a/index.html
+++ b/index.html
@@ -138,8 +138,11 @@
           </div>
           <div class="large-12 medium-12 small-12 columns">
             <div class="line-dashed">
-              <a ng-click="dowloadBackup()"
-                 ng-show="!$root.wallet.publicKeyRing.isComplete()">Save seed backup</a>
+              <div ng-show="!$root.wallet.publicKeyRing.isComplete()">
+              <a ng-click="dowloadBackup()">Save seed backup</a>
+              |
+              <a ng-click="deleteWallet()">Delete wallet</a>
+              </div>
               <button class="button primary radius right"
                 ng-click="backup()"
                 ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
diff --git a/js/controllers/header.js b/js/controllers/header.js
index 3da4cc23e..e20b412a2 100644
--- a/js/controllers/header.js
+++ b/js/controllers/header.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('HeaderController',
-  function($scope, $rootScope, $location, notification, $http, $sce, controllerUtils, backupService) {
+  function($scope, $rootScope, $location, notification, $http, $sce, controllerUtils, backupService, walletFactory) {
     $scope.menu = [{
       'title': 'Addresses',
       'icon': 'fi-address-book',
@@ -96,7 +96,16 @@ angular.module('copayApp.controllers').controller('HeaderController',
     $scope.dowloadBackup = function() {
       var w = $rootScope.wallet;
       backupService.download(w);
-    }
+    };
+    
+    $scope.deleteWallet = function() {
+      alert('delete');
+      var w = $rootScope.wallet;
+      w.disconnect();
+      walletFactory.delete(w.id, function() {
+        controllerUtils.logout();
+      });
+    };
 
     $scope.getVideoURL = function(copayer) {
       if (config.disableVideo) return;

From 1d6e4b897f6826a01cbfe1f05bbcafd80bad3a1f Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Mon, 21 Jul 2014 16:25:47 -0300
Subject: [PATCH 2/4] remove '...' from More tab name

---
 js/controllers/header.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/controllers/header.js b/js/controllers/header.js
index e20b412a2..ffe69c450 100644
--- a/js/controllers/header.js
+++ b/js/controllers/header.js
@@ -15,7 +15,7 @@ angular.module('copayApp.controllers').controller('HeaderController',
       'icon': 'fi-arrow-right',
       'link': '#/send'
     }, {
-      'title': 'More...',
+      'title': 'More',
       'icon': 'fi-download',
       'link': '#/backup'
     }];

From e7847208f740dddffd2676a74c69278f361c3f0c Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Mon, 21 Jul 2014 16:31:46 -0300
Subject: [PATCH 3/4] add confirmation message before deleting

---
 index.html               | 3 ++-
 js/controllers/header.js | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 48aa9ee72..f6d69a31f 100644
--- a/index.html
+++ b/index.html
@@ -141,8 +141,9 @@
               <div ng-show="!$root.wallet.publicKeyRing.isComplete()">
               <a ng-click="dowloadBackup()">Save seed backup</a>
               |
-              <a ng-click="deleteWallet()">Delete wallet</a>
               </div>
+              <a ng-really-click="deleteWallet()"
+                ng-really-message="Are you sure to delete this wallet from this computer?">Delete wallet</a>
               <button class="button primary radius right"
                 ng-click="backup()"
                 ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
diff --git a/js/controllers/header.js b/js/controllers/header.js
index ffe69c450..8ecf69e90 100644
--- a/js/controllers/header.js
+++ b/js/controllers/header.js
@@ -99,7 +99,6 @@ angular.module('copayApp.controllers').controller('HeaderController',
     };
     
     $scope.deleteWallet = function() {
-      alert('delete');
       var w = $rootScope.wallet;
       w.disconnect();
       walletFactory.delete(w.id, function() {

From 67fec16462191806ab05051ab32d178c3562635c Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Mon, 21 Jul 2014 16:33:58 -0300
Subject: [PATCH 4/4] fix style

---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index f6d69a31f..1a589c8d8 100644
--- a/index.html
+++ b/index.html
@@ -138,10 +138,10 @@
           </div>
           <div class="large-12 medium-12 small-12 columns">
             <div class="line-dashed">
-              <div ng-show="!$root.wallet.publicKeyRing.isComplete()">
+              <span ng-show="!$root.wallet.publicKeyRing.isComplete()">
               <a ng-click="dowloadBackup()">Save seed backup</a>
               |
-              </div>
+              </span>
               <a ng-really-click="deleteWallet()"
                 ng-really-message="Are you sure to delete this wallet from this computer?">Delete wallet</a>
               <button class="button primary radius right"