From c722902eab47b8748a51b6c908300de61c7b5df4 Mon Sep 17 00:00:00 2001 From: Kadir Sekha Date: Fri, 2 Feb 2018 12:27:32 -0400 Subject: [PATCH] disclaimer is always accepted --- src/js/controllers/backup.js | 12 +----------- src/js/models/profile.js | 2 +- src/js/routes.js | 5 +---- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 3b49f0d3e..0eec71f12 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -97,17 +97,7 @@ angular.module('copayApp.controllers').controller('backupController', $scope.closeBackupResultModal = function() { $scope.confirmBackupModal.hide(); $scope.confirmBackupModal.remove(); - - profileService.isDisclaimerAccepted(function(val) { - if (val) { - $ionicHistory.removeBackView(); - $state.go('tabs.home'); - } else $state.go('onboarding.disclaimer', { - bchWalletId: $stateParams.bchWalletId, - btcWalletId: $stateParams.btcWalletId, - backedUp: true - }); - }); + $state.go('tabs.home'); }; $scope.copyRecoveryPhrase = function() { diff --git a/src/js/models/profile.js b/src/js/models/profile.js index a2b70fac4..74b0c33b9 100644 --- a/src/js/models/profile.js +++ b/src/js/models/profile.js @@ -15,7 +15,7 @@ Profile.create = function(opts) { var x = new Profile(); x.createdOn = Date.now(); x.credentials = opts.credentials || []; - x.disclaimerAccepted = false; + x.disclaimerAccepted = true; x.checked = {}; return x; }; diff --git a/src/js/routes.js b/src/js/routes.js index a8ee33f12..8afe69e85 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -1230,12 +1230,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr //onboarding with no back views var matchWelcome = $ionicHistory.currentStateName() == 'onboarding.welcome' ? true : false; var matchCollectEmail = $ionicHistory.currentStateName() == 'onboarding.collectEmail' ? true : false; - var matchBackupRequest = $ionicHistory.currentStateName() == 'onboarding.backupRequest' ? true : false; - var backedUp = $ionicHistory.backView().stateName == 'onboarding.backup' ? true : false; var noBackView = $ionicHistory.backView().stateName == 'starting' ? true : false; - var matchDisclaimer = $ionicHistory.currentStateName() == 'onboarding.disclaimer' && (backedUp || noBackView) ? true : false; - var fromOnboarding = matchCollectEmail | matchBackupRequest | matchWelcome | matchDisclaimer; + var fromOnboarding = matchCollectEmail | matchWelcome ; //views with disable backbutton var matchComplete = $ionicHistory.currentStateName() == 'tabs.rate.complete' ? true : false;