diff --git a/public/views/onboarding/disclaimer.html b/public/views/onboarding/disclaimer.html index d00df84e9..47fb3e0c4 100644 --- a/public/views/onboarding/disclaimer.html +++ b/public/views/onboarding/disclaimer.html @@ -1,9 +1,17 @@ - - + + + + + + + +

Almost done! Let's review

-
+

Bitcoin is different - it cannot be safely held with a bank or web service

@@ -12,7 +20,7 @@ I understand my funds are held securely on this device, not by a company. I understand if this app moved to another device or deleted, my bitcoin can only be recovered with the backup phrase -
+

I have read, understood, and agree with the Terms of use.

diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 01eeae6ec..b8d21bc90 100644 --- a/src/js/controllers/backup.js +++ b/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', }); }); - }); + }); \ No newline at end of file diff --git a/src/js/controllers/onboarding/backupRequest.js b/src/js/controllers/onboarding/backupRequest.js index abf63c661..e2290e62c 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', {walletId: $scope.walletId, backedUp: false}); } }); } diff --git a/src/js/controllers/onboarding/disclaimer.js b/src/js/controllers/onboarding/disclaimer.js index 3a66c39d8..6298cac08 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', {walletId: $stateParams.walletId}); + } + + }); diff --git a/src/js/routes.js b/src/js/routes.js index b8301f47f..87393f20c 100644 --- a/src/js/routes.js +++ b/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' diff --git a/src/sass/views/onboarding/onboard-disclaimer.scss b/src/sass/views/onboarding/onboard-disclaimer.scss index 3bf455da5..f8142a8d2 100644 --- a/src/sass/views/onboarding/onboard-disclaimer.scss +++ b/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();