From 6e9fa520164f2fd4e0c1507a70202d0c6532e1a0 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Sat, 21 Jan 2017 19:37:39 -0300
Subject: [PATCH 1/2] Fix delete wallet view cache and transition. Fix UI
 details

---
 src/js/controllers/preferencesDelete.js | 30 +++++++++++++++++--------
 www/views/preferencesDeleteWallet.html  |  6 ++---
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js
index 7c869e29c..ecf2c0807 100644
--- a/src/js/controllers/preferencesDelete.js
+++ b/src/js/controllers/preferencesDelete.js
@@ -1,12 +1,19 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesDeleteWalletController',
-  function($scope, $stateParams, $ionicHistory, gettextCatalog, lodash, profileService, $state, ongoingProcess, popupService) {
-    var wallet = profileService.getWallet($stateParams.walletId);
-    $scope.wallet = wallet;
-
-    $scope.alias = lodash.isEqual(wallet.name, wallet.credentials.walletName) ? null : wallet.name + ' ';
-    $scope.walletName = wallet.credentials.walletName;
+  function($scope, $ionicHistory, gettextCatalog, lodash, profileService, $state, ongoingProcess, popupService) {
+    
+    $scope.$on("$ionicView.beforeEnter", function(event, data) {
+      if (!data.stateParams || !data.stateParams.walletId) {
+        popupService.showAlert(null, gettextCatalog.getString('Bad param'), function() {
+          $ionicHistory.goBack();
+        });
+        return;
+      }
+      $scope.wallet = profileService.getWallet(data.stateParams.walletId);
+      $scope.alias = lodash.isEqual($scope.wallet.name, $scope.wallet.credentials.walletName) ? null : $scope.wallet.name + ' ';
+      $scope.walletName = $scope.wallet.credentials.walletName;
+    });
 
     $scope.showDeletePopup = function() {
       var title = gettextCatalog.getString('Warning!');
@@ -18,14 +25,19 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
 
     function deleteWallet() {
       ongoingProcess.set('deletingWallet', true);
-      profileService.deleteWalletClient(wallet, function(err) {
+      profileService.deleteWalletClient($scope.wallet, function(err) {
         ongoingProcess.set('deletingWallet', false);
         if (err) {
           popupService.showAlert(gettextCatalog.getString('Error'), err.message || err);
         } else {
+          $ionicHistory.nextViewOptions({
+            disableAnimate: true,
+            historyRoot: true
+          });
           $ionicHistory.clearHistory();
-          $ionicHistory.clearCache();
-          $state.go('tabs.home');
+          $state.go('tabs.settings').then(function() {
+            $state.transitionTo('tabs.home');
+          });
         }
       });
     };
diff --git a/www/views/preferencesDeleteWallet.html b/www/views/preferencesDeleteWallet.html
index 2b18163f2..61144f41e 100644
--- a/www/views/preferencesDeleteWallet.html
+++ b/www/views/preferencesDeleteWallet.html
@@ -5,9 +5,9 @@
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content>
-    <div class="wallet-item" ng-include="'views/includes/walletItem.html'"></div>
+    <div class="list" ng-show="wallet">
+      <div class="wallet-item" ng-include="'views/includes/walletItem.html'"></div>
 
-    <div class="padding">
       <h1 class="text-center assertive" translate>Warning!</h1>
       <div class="padding text-center">
         <p translate>
@@ -17,8 +17,6 @@
           THIS ACTION CANNOT BE REVERSED
         </p>
       </div>
-    </div>
-    <div class="padding">
       <button class="button button-standard button-assertive" ng-click="showDeletePopup()">
         {{'Delete'|translate}} <span ng-show="alias">{{alias}}</span>{{walletName}}
       </button>

From 1693e9e02e2400d62adc9f0953dc1f08868ec5a8 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 23 Jan 2017 10:51:39 -0300
Subject: [PATCH 2/2] Fix wording

---
 src/js/controllers/preferencesDelete.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js
index ecf2c0807..442cb7b0d 100644
--- a/src/js/controllers/preferencesDelete.js
+++ b/src/js/controllers/preferencesDelete.js
@@ -5,12 +5,18 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
     
     $scope.$on("$ionicView.beforeEnter", function(event, data) {
       if (!data.stateParams || !data.stateParams.walletId) {
-        popupService.showAlert(null, gettextCatalog.getString('Bad param'), function() {
+        popupService.showAlert(null, gettextCatalog.getString('No wallet selected'), function() {
           $ionicHistory.goBack();
         });
         return;
       }
       $scope.wallet = profileService.getWallet(data.stateParams.walletId);
+      if (!$scope.wallet) {
+        popupService.showAlert(null, gettextCatalog.getString('No wallet found'), function() {
+          $ionicHistory.goBack();
+        });
+        return;
+      }
       $scope.alias = lodash.isEqual($scope.wallet.name, $scope.wallet.credentials.walletName) ? null : $scope.wallet.name + ' ';
       $scope.walletName = $scope.wallet.credentials.walletName;
     });