Merge pull request #30 from bitpay/bug/activity/created
fix restore from onboarding.
This commit is contained in:
commit
9acebebaff
4 changed files with 3 additions and 10 deletions
|
|
@ -6,7 +6,6 @@
|
|||
Take control of your money - get started with bitcoin
|
||||
</span>
|
||||
<button class="button button-block button-positive" href ui-sref="onboarding.tour" translate>Get started</button>
|
||||
<button class="button button-block button-light" ng-click="goImport()" translate>Restore</button>
|
||||
</div>
|
||||
<button class="button button-block button-light" href ui-sref="tabs.import({'fromOnboarding':true})" translate>Restore</button>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<ion-view>
|
||||
<ion-view id="tab-home">
|
||||
<ion-nav-bar class="bar-stable">
|
||||
<ion-nav-title>Home</ion-nav-title>
|
||||
</ion-nav-bar>
|
||||
|
|
|
|||
|
|
@ -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