From c3e471a525be441763159923c31a37c2eda1203f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 14 Sep 2016 14:12:34 -0300
Subject: [PATCH] fix back routes on backup view when resume

---
 public/views/backup.html                   | 16 +++++++++-------
 public/views/onboarding/backupWarning.html |  2 +-
 src/js/controllers/backup.js               | 10 ++++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/public/views/backup.html b/public/views/backup.html
index 92c835615..d176a5e68 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -1,11 +1,13 @@
 <ion-view id="wallet-backup-phrase" title="{{viewTitle}}" ng-controller="backupController" ng-init="init()">
   <ion-nav-bar class="bar-royal">
-    <ion-nav-back-button>
-      <i class="icon ion-ios-arrow-thin-left"></i>
-    </ion-nav-back-button>
+    <ion-nav-buttons side="primary">
+      <button class="button button-back no-border" ng-click="backupGoBack()">
+        <i class="icon ion-ios-arrow-thin-left"></i>
+      </button>
+    </ion-nav-buttons>
   </ion-nav-bar>
   <ion-content>
-    <div ng-show="deleted">
+    <div class="ng-hide" ng-show="deleted">
       <div class="row text-center">
         <h3 translate class="col col-75 center-block">Wallet recovery phrase not available.</h3>
       </div>
@@ -18,7 +20,7 @@
         <!--
     ## STEP 1
   -->
-  <div ng-show="step == 1 && (mnemonicWords || (!credentialsEncrypted && !deleted))">
+  <div class="ng-hide" ng-show="step == 1 && (mnemonicWords || (!credentialsEncrypted && !deleted))">
     <div class="backup-phrase" ng-class="{'enable_text_select': wallet.network == 'testnet'}">
       <span ng-repeat="word in mnemonicWords track by $index"><span style="white-space:nowrap">{{word}}</span><span ng-show="useIdeograms">&#x3000;</span> </span>
     </div>
@@ -42,7 +44,7 @@
         <!--
       ## STEP 2
     -->
-    <div ng-show="step == 2">
+    <div class="ng-hide" ng-show="step == 2">
       <div class="backup-phrase">
         <span ng-repeat="cword in customWords track by $index" ng-show="customWords[$index]">
         <button class="button select-word" ng-click="removeButton($index, cword)">{{cword.word}}</button>
@@ -63,7 +65,7 @@
         <!--
       ## STEP 3
     -->
-    <div ng-show="step == 3">
+    <div class="ng-hide" ng-show="step == 3">
       <h5 translate>Enter your password</h5>
       <label class="item item-input item-stacked-label">
         <span class="input-label" transalate>In order to verify your wallet backup, please type your password:</span>
diff --git a/public/views/onboarding/backupWarning.html b/public/views/onboarding/backupWarning.html
index cc3de6fc5..17f6b2e16 100644
--- a/public/views/onboarding/backupWarning.html
+++ b/public/views/onboarding/backupWarning.html
@@ -1,5 +1,5 @@
 <ion-view id="onboarding-backup-warning" class="onboarding" ng-controller="backupWarningController">
-  <ion-nav-bar>
+  <ion-nav-bar  class="bar-royal">
     <ion-nav-buttons side="primary">
       <button class="button button-back no-border" href ui-sref="onboarding.backupRequest({walletId: walletId})">
         <i class="icon ion-ios-arrow-thin-left"></i>
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index aed2ee4df..40484bbd8 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -212,4 +212,14 @@ angular.module('copayApp.controllers').controller('backupController',
         $scope.selectComplete = false;
     };
 
+    $scope.backupGoBack = function() {
+      if ($stateParams.fromOnboarding) $state.go('onboarding.backupWarning', {
+        walletId: $stateParams.walletId,
+        fromOnboarding: true
+      });
+      else $state.go('tabs.preferences.main', {
+        walletId: $stateParams.walletId
+      });
+    };
+
   });