Merge pull request #218 from jamal-jackson/feature/onboarding_last_steps

Add Back Button to Disclaimer view

public/views/onboarding/disclaimer.html

@@ -1,9 +1,17 @@
-<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>
-    <div class="row text-center">
+    <div class="row text-center tag">
       <p translate class="col col-75">
         Bitcoin is different - it cannot be safely held with a bank or web service
       </p>
@@ -12,7 +20,7 @@
       <ion-checkbox ng-model="accept1"><span translate>I understand my funds are held securely on this device, not by a company.</span></ion-checkbox>
       <ion-checkbox ng-model="accept2"><span translate>I understand if this app moved to another device or deleted, my bitcoin can only be recovered with the backup phrase</span></ion-checkbox>
     </ion-list>
-    <div id="agree-to-terms" ng-if="accept1 && accept2">
+    <div id="agree-to-terms" ng-if="accept1 && accept2" ng-class="{'header-present': backedUp == 'false'}">
       <div id="agree-to-terms-content" class="center-block">
         <ion-checkbox ng-model="terms.accept3"></ion-checkbox>
         <p translate>I have read, understood, and agree with the <a ng-click="openTermsModal()" translate>Terms of use</a>.</p>

src/js/controllers/backup.js

@@ -91,7 +91,7 @@ angular.module('copayApp.controllers').controller('backupController',
           $ionicHistory.removeBackView();
           $state.go('tabs.home');
         }
-        else $state.go('onboarding.disclaimer');
+        else $state.go('onboarding.disclaimer', {walletId: $stateParams.walletId, backedUp: true});
       });
     };
 
@@ -205,4 +205,4 @@ angular.module('copayApp.controllers').controller('backupController',
       });
     });
 
-  });
+  });

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', {walletId: $scope.walletId, backedUp: false});
           }
         });
       }

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', {walletId: $stateParams.walletId});
+  }
+
+
 });

src/js/routes.js

@@ -685,7 +685,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('onboarding.disclaimer', {
-        url: '/disclaimer',
+        url: '/disclaimer/:walletId/:backedUp',
         views: {
           'onboarding': {
             templateUrl: 'views/onboarding/disclaimer.html'

src/sass/views/onboarding/onboard-disclaimer.scss

@@ -3,6 +3,9 @@
   height: 100%;
   ion-content{
     height: 100%;
+    &.has-header{
+      top:40px !important;
+    }
     .scroll{
       height: 100%;
     }
@@ -10,9 +13,17 @@
       margin-top:1.5rem;
     }
   }
+  .tag{
+    padding-bottom: 0;
+  }
   .list{
     max-width: 600px;
     @include center-block();
+    .item{
+      &:first-child{
+        padding-top: 0;
+      }
+    }
   }
   .item {
     background: transparent;
@@ -59,6 +70,9 @@
     position: absolute;
     bottom: 0;
     width: 100%;
+    &.header-present{
+      bottom:16px;
+    }
     &-content{
       max-width: 600px;
       @include center-block();