From 610c116d7a2e988b01d707eeb99903f0517992b0 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 16 Jun 2016 19:28:37 -0300
Subject: [PATCH] Fix UI delete wallets

---
 public/views/walletHome.html              | 14 +++++---------
 src/js/controllers/index.js               | 12 +++++-------
 src/js/controllers/modals/confirmation.js |  2 +-
 src/js/controllers/preferencesDelete.js   |  2 +-
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index d3e0b924c..be1a58509 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -1,19 +1,15 @@
 
 <div class="topbar-container"
   ng-include="'views/includes/topbar.html'"
-  ng-init="showPreferences = true">
+  ng-init="showPreferences = true" ng-show="!index.noFocusedWallet">
 </div>
 
 <div ng-controller="walletHomeController as home">
-  <div class="row columns m20tp" ng-show="index.noFocusedWallet">
-    <div class="text-center text-warning m20b">
-      <i class="fi-alert"></i> <span translate>You do not have a wallet</span>
+  <div class="row columns m30tp" ng-show="index.noFocusedWallet">
+    <div class="text-center size-12 text-warning m20b">
+      <i class="fi-alert"></i> <span translate>You do not have any wallet</span>
     </div>
     <button class="button black round expand" href ui-sref="add" translate>Create</button>
-
-    <div class="text-center text-gray p20v" href ui-sref="preferencesGlobal">
-      <button class=" outline round dark-gray tiny" translate>Settings</button>
-    </div>
   </div>
 
  <div class="onGoingProcess" ng-show="index.updating">
@@ -28,7 +24,7 @@
        <span translate>Updating Wallet...</span>
      </div>
   </div>
- 
+
 
   <div class="oh" ng-show="!index.noFocusedWallet">
 
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 87b4dc3de..3bc01109e 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -563,7 +563,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.backgroundColor = config.colorFor[self.walletId] || '#4A90E2';
     var fc = profileService.focusedClient;
     fc.backgroundColor = self.backgroundColor;
-    if (isCordova && StatusBar.isVisible) {
+    if (isCordova) {
+      StatusBar.show();
       StatusBar.backgroundColorByHexString(fc.backgroundColor);
     }
   };
@@ -1655,13 +1656,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       self.noFocusedWallet = true;
       self.isComplete = null;
       self.walletName = null;
+      if (isCordova && StatusBar.isVisible) {
+        StatusBar.hide();
+      }
       uxLanguage.update();
-
-      profileService.isDisclaimerAccepted(function(v) {
-        if (v) {
-          go.path('import');
-        }
-      });
     });
   });
 
diff --git a/src/js/controllers/modals/confirmation.js b/src/js/controllers/modals/confirmation.js
index c6f60aaf7..534e33740 100644
--- a/src/js/controllers/modals/confirmation.js
+++ b/src/js/controllers/modals/confirmation.js
@@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('confirmationController', func
   $scope.ok = function() {
     $scope.loading = true;
     $scope.okAction();
-    $scope.cancel();
+    $scope.confirmationModal.hide();
   };
 
   $scope.cancel = function() {
diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js
index 5dc6cf9d4..1e411a728 100644
--- a/src/js/controllers/preferencesDelete.js
+++ b/src/js/controllers/preferencesDelete.js
@@ -38,10 +38,10 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
         if (err) {
           $scope.error = err.message || err;
         } else {
+          go.walletHome();
           notification.success(gettextCatalog.getString('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {
             walletName: walletName
           }));
-          applicationService.restart();
         }
       });
     };