From 7f813ba396cc08a929a5f09fc27d5b0d9878473a Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 29 Sep 2016 14:50:33 -0400 Subject: [PATCH 1/3] 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 @@ - - + + + + + + + +

Almost done! Let's review

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' From 845bf1063f222d031060aeaf13c282e8693eb5d9 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 29 Sep 2016 15:21:43 -0400 Subject: [PATCH 2/3] added wallet id to disclaimer route params --- src/js/controllers/backup.js | 2 +- src/js/controllers/onboarding/backupRequest.js | 2 +- src/js/controllers/onboarding/disclaimer.js | 2 +- src/js/routes.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 0a6ffd5d1..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', {backedUp: false}); + else $state.go('onboarding.disclaimer', {walletId: $stateParams.walletId, backedUp: true}); }); }; diff --git a/src/js/controllers/onboarding/backupRequest.js b/src/js/controllers/onboarding/backupRequest.js index 41d868045..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', {backedUp: false}); + $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 08515d690..6298cac08 100644 --- a/src/js/controllers/onboarding/disclaimer.js +++ b/src/js/controllers/onboarding/disclaimer.js @@ -36,7 +36,7 @@ angular.module('copayApp.controllers').controller('disclaimerController', functi }; $scope.goBack = function(){ - $state.go('onboarding.backupRequest'); + $state.go('onboarding.backupRequest', {walletId: $stateParams.walletId}); } diff --git a/src/js/routes.js b/src/js/routes.js index 23f9c8264..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/:backedUp', + url: '/disclaimer/:walletId/:backedUp', views: { 'onboarding': { templateUrl: 'views/onboarding/disclaimer.html' From c06a811bd3be2dc014cc53e7fd07f61bc9383c80 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 29 Sep 2016 15:41:33 -0400 Subject: [PATCH 3/3] fix bottom being cut off issue when back button present with check for if header is present --- public/views/onboarding/disclaimer.html | 4 ++-- src/sass/views/onboarding/onboard-disclaimer.scss | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/public/views/onboarding/disclaimer.html b/public/views/onboarding/disclaimer.html index 72b72c259..47fb3e0c4 100644 --- a/public/views/onboarding/disclaimer.html +++ b/public/views/onboarding/disclaimer.html @@ -11,7 +11,7 @@

Almost done! Let's review

-
+

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

@@ -20,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/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();