From 9a806f3bab664901427e9687f9167d8117eeb957 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Mon, 23 Nov 2015 17:53:42 -0300
Subject: [PATCH] fix navigation top control

---
 public/views/backup.html     | 64 +++++++++++++++++++++++-------------
 src/js/controllers/backup.js | 40 +++++++++++++++++-----
 src/js/controllers/index.js  |  7 +++-
 3 files changed, 79 insertions(+), 32 deletions(-)

diff --git a/public/views/backup.html b/public/views/backup.html
index 0bc9cb7ec..86bc97838 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -1,16 +1,27 @@
-<div
-  class="topbar-container"
-  ng-include="'views/includes/topbar.html'"
-  ng-init="titleSection='Backup'; closeToHome = 'true'">
-</div>
+<div class="" ng-controller="backupController as wordsC">
+  <nav class="tab-bar">
+    <section class="left-small" ng-show="!wordsC.step1 && !wordsC.step4">
+      <a ng-click="wordsC.goToStep();">
+        <i class="icon-arrow-left3 icon-back"></i>
+      </a>
+    </section>
 
-<div class="content preferences backup" ng-controller="backupController as wordsC">
-  <h4></h4>
-  <div class="box-notification" ng-show="wordsC.error">
-    <span class="text-warning">
-    {{wordsC.error|translate}}
-    </span>
-  </div>
+    <section class="middle tab-bar-section">
+    </section>
+
+    <section class="right-small">
+      <a class="p10" ng-click="$root.go(index.prevState);">
+        <span class="text-close">X</span>
+      </a>
+    </section>
+  </nav>
+
+  <div class="content preferences backup">
+    <div class="box-notification" ng-show="wordsC.error">
+      <span class="text-warning" translate>
+        {{wordsC.error}}
+      </span>
+    </div>
 
     <!--
     ## STEP 1
@@ -169,24 +180,33 @@
         <p class="text-gray p20" translate>
           You backed up your new wallet. You can now restore this wallet at any time
         </p>
+
+        <div class="columns text-center m20t">
+          <button
+            ng-style="{'background-color':index.backgroundColor}"
+            class="button round expand"
+            ng-click="$root.go('walletHome');"
+            translate>Finish
+          </button>
+        </div>
       </div>
       <div class="row m10t m10b text-center" ng-show="wordsC.backupError">
         <div class="circle-icon">
-          <i class="fi-like size-48"></i>
+          <i class="fi-dislike size-48"></i>
         </div>
         <h5>Backup failed</h5>
         <p class="text-gray p20" translate>
-          Failed to verify backup. Please try again
+          Failed to verify backup. Please check your information
         </p>
-      </div>
 
-      <div class="columns text-center m20t">
-        <button
-          ng-style="{'background-color':index.backgroundColor}"
-          class="button round expand"
-          ng-click="$root.go('walletHome');"
-          translate>Finish
-        </button>
+        <div class="columns text-center m20t">
+          <button
+            ng-style="{'background-color':index.backgroundColor}"
+            class="button round expand"
+            ng-click="$root.go(index.prevState);"
+            translate>Try again
+          </button>
+        </div>
       </div>
     </div>
 
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index be3ccc624..1e9d490d0 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -7,15 +7,22 @@ angular.module('copayApp.controllers').controller('backupController',
     var fc = profileService.focusedClient;
     var customWords = [];
     var mnemonic = null;
-    self.xPrivKey = null;
-    self.step1 = true;
-    self.step2 = false;
-    self.step3 = false;
-    self.step4 = false;
-    self.deleted = false;
-    self.credentialsEncrypted = false;
-    self.selectComplete = false;
-    self.backupError = false;
+
+    function init() {
+      customWords = [];
+      mnemonic = null;
+      self.xPrivKey = null;
+      self.step1 = true;
+      self.step2 = false;
+      self.step3 = false;
+      self.step4 = false;
+      self.deleted = false;
+      self.credentialsEncrypted = false;
+      self.selectComplete = false;
+      self.backupError = false;
+    }
+
+    init();
 
     if (fc.credentials && !fc.credentials.mnemonicEncrypted && !fc.credentials.mnemonic)
       self.deleted = true;
@@ -33,6 +40,21 @@ angular.module('copayApp.controllers').controller('backupController',
       return mnemonic;
     }
 
+    self.goToStep = function() {
+      if (self.step2) {
+        self.goToStep1();
+      } else if (self.step3) {
+        self.goToStep2();
+      }
+    }
+
+    self.goToStep1 = function() {
+      init();
+      $timeout(function() {
+        $scope.$apply();
+      }, 1);
+    }
+
     self.goToStep2 = function() {
       self.step1 = false;
       self.step2 = true;
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index f75651ccb..5ba636900 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -9,6 +9,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   self.onGoingProcess = {};
   self.historyShowLimit = 10;
   self.updatingTxHistory = {};
+  self.prevState = 'walletHome';
 
   function strip(number) {
     return (parseFloat(number.toPrecision(12)));
@@ -729,7 +730,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
             _creator = '';
 
             if (it.actions && it.actions.length > 1) {
-              for (var i = 0; i < it.actions.length; i++) { 
+              for (var i = 0; i < it.actions.length; i++) {
                 _copayers += it.actions[i].copayerName + ':' + it.actions[i].type + ' - ';
               }
               _creator = (it.creatorName && it.creatorName != 'undefined') ? it.creatorName : '';
@@ -1097,6 +1098,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     });
   };
 
+  $rootScope.$on('$stateChangeSuccess', function(ev, to, toParams, from, fromParams) {
+    self.prevState = from.name || 'walletHome';
+  });
+
   $rootScope.$on('Local/ClearHistory', function(event) {
     $log.debug('The wallet transaction history has been deleted');
     self.txHistory = self.completeHistory = [];