From 7f813ba396cc08a929a5f09fc27d5b0d9878473a Mon Sep 17 00:00:00 2001
From: Jamal Jackson <jamal@bitpay.com>
Date: Thu, 29 Sep 2016 14:50:33 -0400
Subject: [PATCH] added conditional to show back button when no backup has been
 saved

---
 public/views/onboarding/disclaimer.html       | 12 +++++--
 src/js/controllers/backup.js                  | 35 +++++--------------
 .../controllers/onboarding/backupRequest.js   |  2 +-
 src/js/controllers/onboarding/disclaimer.js   | 10 ++++--
 src/js/routes.js                              |  2 +-
 5 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/public/views/onboarding/disclaimer.html b/public/views/onboarding/disclaimer.html
index f31a0b082..a7a9d8c47 100644
--- a/public/views/onboarding/disclaimer.html
+++ b/public/views/onboarding/disclaimer.html
@@ -1,5 +1,13 @@
-<ion-view id="onboarding-disclaimer" class="onboarding">
-  <ion-content ng-controller="disclaimerController" ng-init=init() scroll="false">
+<ion-view id="onboarding-disclaimer" class="onboarding" ng-controller="disclaimerController" ng-init=init()>
+  <ion-nav-bar class="bar-stable" ng-if="backedUp == 'false'">
+    <ion-nav-title></ion-nav-title>
+    <ion-nav-buttons side="primary">
+      <button class="button back-button button-clear" ng-click="goBack()">
+        <i class="icon ion-ios-arrow-thin-left"></i>
+      </button>
+    </ion-nav-buttons>
+  </ion-nav-bar>
+  <ion-content scroll="false" ng-class="{'has-header': backedUp == 'false'}">
     <div class="row text-center">
       <h3 translate class="col-75 col">Almost done! Let's review</h3>
     </div>
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index ea28fdaad..0a6ffd5d1 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -49,15 +49,6 @@ angular.module('copayApp.controllers').controller('backupController',
       }, 10);
     };
 
-    $scope.goBack = function() {
-      if ($scope.step == 1) {
-        if ($stateParams.fromOnboarding) $state.go('onboarding.backupRequest');
-        else $state.go('wallet.preferences');
-      } else {
-        $scope.goToStep($scope.step - 1);
-      }
-    };
-
     var backupError = function(err) {
       ongoingProcess.set('validatingWords', false);
       $log.debug('Failed to verify backup: ', err);
@@ -93,13 +84,15 @@ angular.module('copayApp.controllers').controller('backupController',
 
     $scope.closeBackupResultModal = function() {
       $scope.confirmBackupModal.hide();
+      $scope.confirmBackupModal.remove();
 
-      if ($stateParams.fromOnboarding) {
-        $state.go('onboarding.disclaimer');
-      } else {
-        $ionicHistory.removeBackView();
-        $state.go('tabs.home');
-      }
+      profileService.isDisclaimerAccepted(function(val) {
+        if (val) {
+          $ionicHistory.removeBackView();
+          $state.go('tabs.home');
+        }
+        else $state.go('onboarding.disclaimer', {backedUp: false});
+      });
     };
 
     var confirm = function(cb) {
@@ -193,16 +186,6 @@ 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', {
-        walletId: $stateParams.walletId
-      });
-    };
-
     $scope.$on("$ionicView.enter", function(event, data) {
       $scope.deleted = isDeletedSeed();
       if ($scope.deleted) {
@@ -222,4 +205,4 @@ angular.module('copayApp.controllers').controller('backupController',
       });
     });
 
-  });
+  });
\ No newline at end of file
diff --git a/src/js/controllers/onboarding/backupRequest.js b/src/js/controllers/onboarding/backupRequest.js
index 1ff5e6271..a492b1abd 100644
--- a/src/js/controllers/onboarding/backupRequest.js
+++ b/src/js/controllers/onboarding/backupRequest.js
@@ -18,7 +18,7 @@ angular.module('copayApp.controllers').controller('backupRequestController', fun
         var cancelText = gettextCatalog.getString('Go back');
         popupService.showConfirm(title, message, okText, cancelText, function(val) {
           if (val) {
-            $state.go('onboarding.disclaimer');
+            $state.go('onboarding.disclaimer', {backedUp: false});
           }
         });
       }
diff --git a/src/js/controllers/onboarding/disclaimer.js b/src/js/controllers/onboarding/disclaimer.js
index 3a66c39d8..08515d690 100644
--- a/src/js/controllers/onboarding/disclaimer.js
+++ b/src/js/controllers/onboarding/disclaimer.js
@@ -1,11 +1,11 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, profileService, uxLanguage, externalLinkService) {
-
+angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, profileService, uxLanguage, externalLinkService, storageService, $stateParams) {
   $scope.init = function() {
     $scope.lang = uxLanguage.currentLanguage;
     $scope.terms = {};
     $scope.accept1 = $scope.accept2 = $scope.accept3 = false;
+    $scope.backedUp = $stateParams.backedUp;
     $timeout(function() {
       $scope.$apply();
     }, 1);
@@ -34,4 +34,10 @@ angular.module('copayApp.controllers').controller('disclaimerController', functi
       $scope.termsModal.show();
     });
   };
+
+  $scope.goBack = function(){
+    $state.go('onboarding.backupRequest');
+  }
+
+
 });
diff --git a/src/js/routes.js b/src/js/routes.js
index dea85a6e8..b57e24298 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -634,7 +634,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('onboarding.disclaimer', {
-        url: '/disclaimer',
+        url: '/disclaimer/:backedUp',
         views: {
           'onboarding': {
             templateUrl: 'views/onboarding/disclaimer.html'