diff --git a/public/views/onboarding/welcome.html b/public/views/onboarding/welcome.html index dbcde98e3..861e6ba87 100644 --- a/public/views/onboarding/welcome.html +++ b/public/views/onboarding/welcome.html @@ -1,5 +1,5 @@ - +

bitpay

@@ -7,7 +7,7 @@ Take control of your money - get started with bitcoin - +
diff --git a/public/views/tab-import-file.html b/public/views/tab-import-file.html index 437251135..e0069afa8 100644 --- a/public/views/tab-import-file.html +++ b/public/views/tab-import-file.html @@ -1,6 +1,6 @@ - + - diff --git a/public/views/tab-import-hardware.html b/public/views/tab-import-hardware.html index 9a85f29f7..041f3d499 100644 --- a/public/views/tab-import-hardware.html +++ b/public/views/tab-import-hardware.html @@ -1,6 +1,6 @@ - + - diff --git a/public/views/tab-import-phrase.html b/public/views/tab-import-phrase.html index c0255a2c7..42d4525fd 100644 --- a/public/views/tab-import-phrase.html +++ b/public/views/tab-import-phrase.html @@ -1,6 +1,6 @@ - + - diff --git a/src/js/controllers/backController.js b/src/js/controllers/backController.js new file mode 100644 index 000000000..c54ba0599 --- /dev/null +++ b/src/js/controllers/backController.js @@ -0,0 +1,10 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('backController', function($scope, $state, $stateParams) { + + $scope.importGoBack = function() { + if ($stateParams.fromOnboarding) $state.go('onboarding.welcome'); + else $state.go('add.main'); + }; + +}); diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 6e4b4deab..a70e5eab4 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -15,10 +15,6 @@ angular.module('copayApp.controllers').controller('importController', $scope.account = 1; $scope.importErr = false; - $scope.goBack = function() { - $ionicHistory.goBack(); - }; - var updateSeedSourceSelect = function() { $scope.seedOptions = []; diff --git a/src/js/controllers/onboarding/welcomeController.js b/src/js/controllers/onboarding/welcomeController.js new file mode 100644 index 000000000..cda0a930c --- /dev/null +++ b/src/js/controllers/onboarding/welcomeController.js @@ -0,0 +1,11 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $ionicPopup, profileService) { + + $scope.goImport = function() { + $state.go('add.import.phrase', { + fromOnboarding: true + }); + } + +}); diff --git a/src/js/routes.js b/src/js/routes.js index 36d1f9edc..98b24680e 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -412,7 +412,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('add.import', { - url: '/import', + url: '/import/:fromOnboarding', abstract: true, views: { 'add': {