Merge branch 'feature/get_started_tour' of https://github.com/jamal-jackson/bitpay-wallet into feature/onboarding_wallet_created
This commit is contained in:
commit
7a7b78d03b
46 changed files with 526 additions and 527 deletions
|
|
@ -2,12 +2,6 @@
|
|||
|
||||
angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) {
|
||||
|
||||
$scope.goImport = function() {
|
||||
$state.go('tabs.import.phrase', {
|
||||
fromOnboarding: true
|
||||
});
|
||||
};
|
||||
|
||||
$scope.createProfile = function() {
|
||||
$log.debug('Creating profile');
|
||||
profileService.createProfile(function(err) {
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
|||
})
|
||||
.state('tabs.import', {
|
||||
url: '/import/:fromOnboarding',
|
||||
abstract: true,
|
||||
// abstract: true,
|
||||
views: {
|
||||
'tab-home': {
|
||||
templateUrl: 'views/import.html'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue