mirror of https://github.com/BTCPrivate/copay.git
remove main tabs from import view in onboarding flow
This commit is contained in:
parent
d25a5dfb1b
commit
657c2b830c
|
@ -1,7 +1,8 @@
|
||||||
<ion-view >
|
<ion-view ng-controller="tabsController" ng-init="importInit()">
|
||||||
<ion-tabs class="tabs-striped tabs-color-positive tabs-color-active-positive tabs-top">
|
<ion-tabs class="tabs-striped tabs-color-positive tabs-color-active-positive tabs-top">
|
||||||
|
|
||||||
<ion-tab title="Recovery Phrare" ui-sref="tabs.import.phrase">
|
<div ng-if="!fromOnboarding">
|
||||||
|
<ion-tab title="Recovery Phrase" ui-sref="tabs.import.phrase">
|
||||||
<ion-nav-view name="tab-import-phrase"></ion-nav-view>
|
<ion-nav-view name="tab-import-phrase"></ion-nav-view>
|
||||||
</ion-tab>
|
</ion-tab>
|
||||||
|
|
||||||
|
@ -12,6 +13,21 @@
|
||||||
<ion-tab title="Hardware Wallet" ui-sref="tabs.import.hardware">
|
<ion-tab title="Hardware Wallet" ui-sref="tabs.import.hardware">
|
||||||
<ion-nav-view name="tab-import-hardware"></ion-nav-view>
|
<ion-nav-view name="tab-import-hardware"></ion-nav-view>
|
||||||
</ion-tab>
|
</ion-tab>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div ng-if="fromOnboarding">
|
||||||
|
<ion-tab title="Recovery Phrase" ui-sref="onboarding.import.phrase">
|
||||||
|
<ion-nav-view name="tab-import-phrase"></ion-nav-view>
|
||||||
|
</ion-tab>
|
||||||
|
|
||||||
|
<ion-tab title="File/Text" ui-sref="onboarding.import.file">
|
||||||
|
<ion-nav-view name="tab-import-file"></ion-nav-view>
|
||||||
|
</ion-tab>
|
||||||
|
|
||||||
|
<ion-tab title="Hardware Wallet" ui-sref="onboarding.import.hardware">
|
||||||
|
<ion-nav-view name="tab-import-hardware"></ion-nav-view>
|
||||||
|
</ion-tab>
|
||||||
|
</div>
|
||||||
|
|
||||||
</ion-tabs>
|
</ion-tabs>
|
||||||
</ion-view>
|
</ion-view>
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
<button class="button button-block get-started col col-75" href ui-sref="onboarding.tour" translate>Get started</button>
|
<button class="button button-block get-started col col-75" href ui-sref="onboarding.tour" translate>Get started</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<button class="button button-block restore col col-75" translate href ui-sref="tabs.import({'fromOnboarding':true})">Restore</button>
|
<button class="button button-block restore col col-75" translate href ui-sref="onboarding.import.phrase({'fromOnboarding':true})">Restore</button>
|
||||||
</div>
|
</div>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
</ion-view>
|
</ion-view>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) {
|
angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) {
|
||||||
|
|
||||||
$scope.goImport = function(code) {
|
$scope.goImport = function(code) {
|
||||||
$state.go('tabs.import', {
|
$state.go('onboarding.import.phrase', {
|
||||||
fromOnboarding: true,
|
fromOnboarding: true,
|
||||||
code: code
|
code: code
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('tabsController', function($log, $scope, $ionicModal, incomingData) {
|
angular.module('copayApp.controllers').controller('tabsController', function($log, $scope, $stateParams, $ionicModal, $timeout, incomingData) {
|
||||||
|
|
||||||
$scope.onScan = function(data) {
|
$scope.onScan = function(data) {
|
||||||
console.log('[tabsController.js.6:data:]',data); //TODO
|
|
||||||
if (!incomingData.redir(data)) {
|
if (!incomingData.redir(data)) {
|
||||||
$ionicPopup.alert({
|
$ionicPopup.alert({
|
||||||
title: 'Invalid data',
|
title: 'Invalid data',
|
||||||
|
@ -18,4 +16,12 @@ console.log('[tabsController.js.6:data:]',data); //TODO
|
||||||
scanFn();
|
scanFn();
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$scope.importInit = function() {
|
||||||
|
$scope.fromOnboarding = $stateParams.fromOnboarding;
|
||||||
|
$timeout(function() {
|
||||||
|
$scope.$apply();
|
||||||
|
}, 1);
|
||||||
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -631,6 +631,42 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
.state('onboarding.import', {
|
||||||
|
url: '/import/:fromOnboarding',
|
||||||
|
abstract: true,
|
||||||
|
views: {
|
||||||
|
'onboarding': {
|
||||||
|
templateUrl: 'views/import.html'
|
||||||
|
},
|
||||||
|
},
|
||||||
|
params: {
|
||||||
|
code: null
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.state('onboarding.import.phrase', {
|
||||||
|
url: '/tab-import-phrase',
|
||||||
|
views: {
|
||||||
|
'tab-import-phrase': {
|
||||||
|
templateUrl: 'views/tab-import-phrase.html',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.state('onboarding.import.file', {
|
||||||
|
url: '/tab-import-file',
|
||||||
|
views: {
|
||||||
|
'tab-import-file': {
|
||||||
|
templateUrl: 'views/tab-import-file.html',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.state('onboarding.import.hardware', {
|
||||||
|
url: '/tab-import-hardware',
|
||||||
|
views: {
|
||||||
|
'tab-import-hardware': {
|
||||||
|
templateUrl: 'views/tab-import-hardware.html',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue