diff --git a/public/views/backup.html b/public/views/backup.html index 92c835615..d176a5e68 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -1,11 +1,13 @@ - - - + + + + + - + Wallet recovery phrase not available. @@ -18,7 +20,7 @@ - + {{word}} @@ -42,7 +44,7 @@ - + {{cword.word}} @@ -63,7 +65,7 @@ - + Enter your password In order to verify your wallet backup, please type your password: diff --git a/public/views/onboarding/backupWarning.html b/public/views/onboarding/backupWarning.html index cc3de6fc5..17f6b2e16 100644 --- a/public/views/onboarding/backupWarning.html +++ b/public/views/onboarding/backupWarning.html @@ -1,5 +1,5 @@ - + diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index aed2ee4df..40484bbd8 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -212,4 +212,14 @@ 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.main', { + walletId: $stateParams.walletId + }); + }; + }); diff --git a/src/js/routes.js b/src/js/routes.js index c8c928e9d..0794cd07c 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -789,6 +789,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr $ionicPlatform.registerBackButtonAction(function(e) { + //from root tabs view var fromWelcome = $ionicHistory.currentStateName().match(/welcome/) ? true : false; var matchHome = $ionicHistory.currentStateName().match(/home/) ? true : false; var matchReceive = $ionicHistory.currentStateName().match(/receive/) ? true : false; @@ -796,9 +797,23 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr var matchSettings = $ionicHistory.currentStateName().match(/settings/) ? true : false; var fromTabs = matchHome | matchReceive | matchSend | matchSettings; + //onboarding with no back views + var matchCollectEmail = $ionicHistory.currentStateName().match(/collectEmail/) ? true : false; + var matchBackupRequest = $ionicHistory.currentStateName().match(/backupRequest/) ? true : false; + var matchDisclaimer = $ionicHistory.currentStateName().match(/disclaimer/) ? true : false; + var matchNotifications = $ionicHistory.currentStateName().match(/notifications/) ? true : false; + + var fromOnboarding = matchCollectEmail | matchBackupRequest | matchDisclaimer | matchNotifications; + + if (fromOnboarding) { + e.preventDefault(); + return; + } + if ($ionicHistory.backView() && !fromTabs) { $ionicHistory.goBack(); - } else if ($rootScope.backButtonPressedOnceToExit || fromWelcome) { + } else + if ($rootScope.backButtonPressedOnceToExit || fromWelcome) { ionic.Platform.exitApp(); } else { $rootScope.backButtonPressedOnceToExit = true;