From 91ac072083015ae64e8d90002074c63faa15a09b Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Thu, 2 Jun 2016 18:17:31 -0300
Subject: [PATCH] fix backup without seed

---
 public/views/backup.html     | 14 +++++++-------
 src/js/controllers/backup.js | 15 +++++++++------
 src/sass/buttons.scss        |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/public/views/backup.html b/public/views/backup.html
index 56d963203..2dc92b538 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -19,17 +19,17 @@
     </section>
   </nav>
 
-  <div class="content preferences text-center">
-    <div class="box-notification" ng-show="wordsC.error">
-      <span class="text-warning">
-        {{wordsC.error|translate}}
-      </span>
-    </div>
+  <div class="box-notification" ng-show="wordsC.error">
+    <span class="text-warning" translate>
+      {{wordsC.error}}
+    </span>
+  </div>
 
     <!--
     ## STEP 1
     -->
 
+  <div class="content preferences text-center">
     <div ng-show="wordsC.step == 1">
       <div ng-show="wordsC.mnemonicWords || (wordsC.credentialsEncrypted && !wordsC.deleted)" class="row">
         <h5 class="text-center" translate>Write your wallet recovery phrase</h5>
@@ -97,7 +97,7 @@
       <div class="button-box">
         <button
           ng-show="!wordsC.deleted"
-          ng-disabled="wordsC.credentialsEncrypted"
+          ng-disabled="wordsC.credentialsEncrypted || wordsC.error"
           class="round expand m0"
           ng-style="{'background-color':index.backgroundColor}"
           ng-click="wordsC.goToStep(2);"
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index cb81c905a..ec448379f 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -16,14 +16,11 @@ angular.module('copayApp.controllers').controller('backupController',
       });
     };
 
-    if (fc.credentials && !fc.credentials.mnemonicEncrypted && !fc.credentials.mnemonic)
-      self.deleted = true;
-
-    if (fc.isPrivKeyEncrypted() && !self.deleted) {
+    if (fc.isPrivKeyEncrypted() && !isDeletedSeed()) {
       self.credentialsEncrypted = true;
       passwordRequest();
     } else {
-      if (!self.deleted)
+      if (!isDeletedSeed())
         initWords();
     }
 
@@ -34,12 +31,18 @@ angular.module('copayApp.controllers').controller('backupController',
       self.shuffledMnemonicWords = shuffledWords(self.mnemonicWords);
       self.customWords = [];
       self.step = 1;
-      self.deleted = false;
+      self.deleted = isDeletedSeed();
       self.credentialsEncrypted = false;
       self.selectComplete = false;
       self.backupError = false;
     };
 
+    function isDeletedSeed() {
+      if (lodash.isEmpty(fc.credentials.mnemonic) && lodash.isEmpty(fc.credentials.mnemonicEncrypted))
+        return true;
+      return false;
+    };
+
     self.goToStep = function(n) {
       self.step = n;
       if (self.step == 1)
diff --git a/src/sass/buttons.scss b/src/sass/buttons.scss
index 682012192..4da7f0b4a 100644
--- a/src/sass/buttons.scss
+++ b/src/sass/buttons.scss
@@ -327,7 +327,7 @@ button.radius, .button.radius {
   left: 0;
   width: 100%;
   padding: 0.8rem;
-  z-index: 9999;
+  z-index: 1;
 }
 
 .backup .button-box {