diff --git a/src/js/controllers/onboarding/backupRequest.js b/src/js/controllers/onboarding/backupRequest.js deleted file mode 100644 index c9185142e..000000000 --- a/src/js/controllers/onboarding/backupRequest.js +++ /dev/null @@ -1,41 +0,0 @@ -'use strict'; - -angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $stateParams, $ionicConfig, popupService, gettextCatalog) { - - $scope.bchWalletId = $stateParams.bchWalletId; - $scope.btcWalletId = $stateParams.btcWalletId; - - $scope.$on("$ionicView.enter", function() { - $ionicConfig.views.swipeBackEnabled(false); - }); - - $scope.$on("$ionicView.beforeLeave", function() { - $ionicConfig.views.swipeBackEnabled(true); - }); - - $scope.openPopup = function() { - - var title = gettextCatalog.getString('Watch out!'); - var message = gettextCatalog.getString('If this device is replaced or this app is deleted, neither you nor Bitcoin.com can recover your funds without a backup.'); - var okText = gettextCatalog.getString('I understand'); - var cancelText = gettextCatalog.getString('Go back'); - popupService.showConfirm(title, message, okText, cancelText, function(val) { - if (val) { - var title = gettextCatalog.getString('Are you sure you want to skip it?'); - var message = gettextCatalog.getString('You can create a backup later from your wallet settings.'); - var okText = gettextCatalog.getString('Yes, skip'); - var cancelText = gettextCatalog.getString('Go back'); - popupService.showConfirm(title, message, okText, cancelText, function(val) { - if (val) { - $state.go('onboarding.disclaimer', { - bchWalletId: $scope.bchWalletId, - btcWalletId: $scope.btcWalletId, - backedUp: false - }); - } - }); - } - }); - } - -}); diff --git a/src/js/controllers/onboarding/backupWarning.js b/src/js/controllers/onboarding/backupWarning.js deleted file mode 100644 index 0eb24c2ca..000000000 --- a/src/js/controllers/onboarding/backupWarning.js +++ /dev/null @@ -1,55 +0,0 @@ -'use strict'; - -angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, $ionicModal) { - - if ($stateParams.from == 'onboarding') { - $scope.bchWalletId = $stateParams.bchWalletId; - $scope.btcWalletId = $stateParams.btcWalletId; - $scope.fromState = $stateParams.from + '.backupRequest' ; - } else { - $scope.walletId = $stateParams.walletId; - $scope.fromState = $stateParams.from; - } - - $scope.toState = $stateParams.from + '.backup'; - - $scope.openPopup = function() { - $ionicModal.fromTemplateUrl('views/includes/screenshotWarningModal.html', { - scope: $scope, - backdropClickToClose: true, - hardwareBackButtonClose: true - }).then(function(modal) { - $scope.warningModal = modal; - $scope.warningModal.show(); - }); - - $scope.close = function() { - $scope.warningModal.remove(); - $timeout(function() { - if ($stateParams.from == 'onboarding') { - $state.go($scope.toState, { - bchWalletId: $scope.bchWalletId, - btcWalletId: $scope.btcWalletId - }); - } else { - $state.go($scope.toState, { - walletId: $scope.walletId - }); - } - }, 200); - }; - } - - $scope.goBack = function() { - if ($stateParams.from == 'onboarding') { - $state.go($scope.fromState, { - bchWalletId: $scope.bchWalletId, - btcWalletId: $scope.btcWalletId - }); - } else { - $state.go($scope.fromState, { - walletId: $scope.walletId - }); - } - }; -}); diff --git a/src/js/controllers/onboarding/collectEmail.js b/src/js/controllers/onboarding/collectEmail.js index a7c6dc0d4..a03dfea4f 100644 --- a/src/js/controllers/onboarding/collectEmail.js +++ b/src/js/controllers/onboarding/collectEmail.js @@ -73,10 +73,7 @@ angular.module('copayApp.controllers').controller('collectEmailController', func }; $scope.goNextView = function() { - $state.go('onboarding.backupRequest', { - bchWalletId: bchWalletId, - btcWalletId: btcWalletId - }); + $state.go('tabs.home'); }; $scope.confirm = function(emailForm) { diff --git a/src/js/controllers/onboarding/disclaimer.js b/src/js/controllers/onboarding/disclaimer.js deleted file mode 100644 index d46b973bd..000000000 --- a/src/js/controllers/onboarding/disclaimer.js +++ /dev/null @@ -1,55 +0,0 @@ -'use strict'; - -angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, $ionicConfig, profileService, uxLanguage, externalLinkService, storageService, $stateParams, startupService, $rootScope, firebaseEventsService) { - - $scope.$on("$ionicView.afterEnter", function() { - startupService.ready(); - }); - - $scope.$on("$ionicView.beforeEnter", function() { - $scope.lang = uxLanguage.currentLanguage; - $scope.terms = {}; - $scope.accepted = {}; - $scope.accepted.first = $scope.accepted.second = $scope.accepted.third = false; - $scope.backedUp = $stateParams.backedUp == 'false' ? false : true; - $scope.resume = $stateParams.resume || false; - $scope.shrinkView = false; - }); - - $scope.$on("$ionicView.enter", function() { - if ($scope.backedUp || $scope.resume) $ionicConfig.views.swipeBackEnabled(false); - }); - - $scope.$on("$ionicView.beforeLeave", function() { - $ionicConfig.views.swipeBackEnabled(true); - }); - - $scope.confirm = function() { - profileService.setDisclaimerAccepted(function(err) { - if (err) $log.error(err); - else { - firebaseEventsService.logEvent('completed_onboarding'); - $state.go('tabs.home', { - fromOnboarding: true - }); - } - }); - }; - - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); - }; - - $scope.openTerms = function() { - $scope.shrinkView = !$scope.shrinkView; - } - - $scope.goBack = function() { - $state.go('onboarding.backupRequest', { - bchWalletId: $stateParams.bchWalletId, - btcWalletId: $stateParams.btcWalletId - }); - } - - -}); diff --git a/src/js/controllers/onboarding/terms.js b/src/js/controllers/onboarding/terms.js deleted file mode 100644 index 3a7c2adf5..000000000 --- a/src/js/controllers/onboarding/terms.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -angular.module('copayApp.controllers').controller('termsController', function($scope, $log, $state, appConfigService, uxLanguage, profileService, externalLinkService, gettextCatalog) { - $scope.lang = uxLanguage.currentLanguage; - - $scope.confirm = function() { - profileService.setDisclaimerAccepted(function(err) { - if (err) $log.error(err); - else { - $state.go('tabs.home', { - fromOnboarding: true - }); - } - }); - }; - - $scope.openExternalLink = function() { - var url = appConfigService.disclaimerUrl; - var optIn = true; - var title = gettextCatalog.getString('View Terms of Service'); - var message = gettextCatalog.getString('The official English Terms of Service are available on the BitPay website.'); - var okText = gettextCatalog.getString('Open Website'); - var cancelText = gettextCatalog.getString('Go Back'); - externalLinkService.open(url, optIn, title, message, okText, cancelText); - }; - -}); diff --git a/src/js/routes.js b/src/js/routes.js index 17069ba8d..a8ee33f12 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -782,51 +782,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) - .state('onboarding.backupRequest', { - url: '/backupRequest/:bchWalletId/:btcWalletId', - views: { - 'onboarding': { - templateUrl: 'views/onboarding/backupRequest.html', - controller: 'backupRequestController' - } - } - }) - .state('onboarding.backupWarning', { - url: '/backupWarning/:from/:walletId/:bchWalletId/:btcWalletId', - views: { - 'onboarding': { - templateUrl: 'views/backupWarning.html', - controller: 'backupWarningController' - } - } - }) - .state('onboarding.backup', { - url: '/backup/:walletId/:bchWalletId/:btcWalletId', - views: { - 'onboarding': { - templateUrl: 'views/backup.html', - controller: 'backupController' - } - } - }) - .state('onboarding.disclaimer', { - url: '/disclaimer/:bchWalletId/:btcWalletId/:backedUp/:resume', - views: { - 'onboarding': { - templateUrl: 'views/onboarding/disclaimer.html', - controller: 'disclaimerController' - } - } - }) - .state('onboarding.terms', { - url: '/terms', - views: { - 'onboarding': { - templateUrl: 'views/onboarding/terms.html', - controller: 'termsController' - } - } - }) .state('onboarding.import', { url: '/import', views: { diff --git a/www/views/onboarding/backupRequest.html b/www/views/onboarding/backupRequest.html deleted file mode 100644 index 8f3103979..000000000 --- a/www/views/onboarding/backupRequest.html +++ /dev/null @@ -1,15 +0,0 @@ - - -
- -
No backup, no bitcoin.
-
Since only you control your money, you’ll need to save your backup phrase in case this app is deleted.
-
-
- -
Your wallet is never saved to cloud storage or standard device backups.
- - -
-
-
diff --git a/www/views/onboarding/disclaimer.html b/www/views/onboarding/disclaimer.html deleted file mode 100644 index 484513c0b..000000000 --- a/www/views/onboarding/disclaimer.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - -
-
Quick review!
-
Almost done! Let's review.
-
Bitcoin is different – it cannot be safely held with a bank or web service.
- - - I understand that my funds are held securely on this device, not by a company. - - - I understand that if this app is moved to another device or deleted, my bitcoin can only be recovered with the backup phrase. - - -
-
-
-
- - {{'Terms of Use' | translate}} - - - - -
-
-
-
-
-
- -

I have read, understood, and agree to the Terms of Use.

- -
-
-
diff --git a/www/views/onboarding/tour.html b/www/views/onboarding/tour.html index 8c79e6137..87642f4df 100644 --- a/www/views/onboarding/tour.html +++ b/www/views/onboarding/tour.html @@ -13,34 +13,6 @@ - - -
Bitcoin is secure,
digital money.
-
You can spend bitcoin at millions of websites and stores worldwide.
-
-
-
Just scan the code to pay.
- -
-
-
- - -
Bitcoin is a currency.
-
You can trade it for other currencies like US Dollars, Euros, or Pounds.
-
-
1 BTC = {{localCurrencySymbol}}{{localCurrencyPerBtc}}
-
-
-
The exchange rate changes with the market.
- -
-
-
You control your bitcoin.