mirror of https://github.com/BTCPrivate/copay.git
added conditional to show back button when no backup has been saved
This commit is contained in:
parent
43b265835f
commit
7f813ba396
|
@ -1,5 +1,13 @@
|
||||||
<ion-view id="onboarding-disclaimer" class="onboarding">
|
<ion-view id="onboarding-disclaimer" class="onboarding" ng-controller="disclaimerController" ng-init=init()>
|
||||||
<ion-content ng-controller="disclaimerController" ng-init=init() scroll="false">
|
<ion-nav-bar class="bar-stable" ng-if="backedUp == 'false'">
|
||||||
|
<ion-nav-title></ion-nav-title>
|
||||||
|
<ion-nav-buttons side="primary">
|
||||||
|
<button class="button back-button button-clear" ng-click="goBack()">
|
||||||
|
<i class="icon ion-ios-arrow-thin-left"></i>
|
||||||
|
</button>
|
||||||
|
</ion-nav-buttons>
|
||||||
|
</ion-nav-bar>
|
||||||
|
<ion-content scroll="false" ng-class="{'has-header': backedUp == 'false'}">
|
||||||
<div class="row text-center">
|
<div class="row text-center">
|
||||||
<h3 translate class="col-75 col">Almost done! Let's review</h3>
|
<h3 translate class="col-75 col">Almost done! Let's review</h3>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -49,15 +49,6 @@ angular.module('copayApp.controllers').controller('backupController',
|
||||||
}, 10);
|
}, 10);
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.goBack = function() {
|
|
||||||
if ($scope.step == 1) {
|
|
||||||
if ($stateParams.fromOnboarding) $state.go('onboarding.backupRequest');
|
|
||||||
else $state.go('wallet.preferences');
|
|
||||||
} else {
|
|
||||||
$scope.goToStep($scope.step - 1);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
var backupError = function(err) {
|
var backupError = function(err) {
|
||||||
ongoingProcess.set('validatingWords', false);
|
ongoingProcess.set('validatingWords', false);
|
||||||
$log.debug('Failed to verify backup: ', err);
|
$log.debug('Failed to verify backup: ', err);
|
||||||
|
@ -93,13 +84,15 @@ angular.module('copayApp.controllers').controller('backupController',
|
||||||
|
|
||||||
$scope.closeBackupResultModal = function() {
|
$scope.closeBackupResultModal = function() {
|
||||||
$scope.confirmBackupModal.hide();
|
$scope.confirmBackupModal.hide();
|
||||||
|
$scope.confirmBackupModal.remove();
|
||||||
|
|
||||||
if ($stateParams.fromOnboarding) {
|
profileService.isDisclaimerAccepted(function(val) {
|
||||||
$state.go('onboarding.disclaimer');
|
if (val) {
|
||||||
} else {
|
|
||||||
$ionicHistory.removeBackView();
|
$ionicHistory.removeBackView();
|
||||||
$state.go('tabs.home');
|
$state.go('tabs.home');
|
||||||
}
|
}
|
||||||
|
else $state.go('onboarding.disclaimer', {backedUp: false});
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
var confirm = function(cb) {
|
var confirm = function(cb) {
|
||||||
|
@ -193,16 +186,6 @@ angular.module('copayApp.controllers').controller('backupController',
|
||||||
$scope.selectComplete = false;
|
$scope.selectComplete = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.backupGoBack = function() {
|
|
||||||
if ($stateParams.fromOnboarding) $state.go('onboarding.backupWarning', {
|
|
||||||
walletId: $stateParams.walletId,
|
|
||||||
fromOnboarding: true
|
|
||||||
});
|
|
||||||
else $state.go('tabs.preferences', {
|
|
||||||
walletId: $stateParams.walletId
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.$on("$ionicView.enter", function(event, data) {
|
$scope.$on("$ionicView.enter", function(event, data) {
|
||||||
$scope.deleted = isDeletedSeed();
|
$scope.deleted = isDeletedSeed();
|
||||||
if ($scope.deleted) {
|
if ($scope.deleted) {
|
||||||
|
|
|
@ -18,7 +18,7 @@ angular.module('copayApp.controllers').controller('backupRequestController', fun
|
||||||
var cancelText = gettextCatalog.getString('Go back');
|
var cancelText = gettextCatalog.getString('Go back');
|
||||||
popupService.showConfirm(title, message, okText, cancelText, function(val) {
|
popupService.showConfirm(title, message, okText, cancelText, function(val) {
|
||||||
if (val) {
|
if (val) {
|
||||||
$state.go('onboarding.disclaimer');
|
$state.go('onboarding.disclaimer', {backedUp: false});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, profileService, uxLanguage, externalLinkService) {
|
angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, profileService, uxLanguage, externalLinkService, storageService, $stateParams) {
|
||||||
|
|
||||||
$scope.init = function() {
|
$scope.init = function() {
|
||||||
$scope.lang = uxLanguage.currentLanguage;
|
$scope.lang = uxLanguage.currentLanguage;
|
||||||
$scope.terms = {};
|
$scope.terms = {};
|
||||||
$scope.accept1 = $scope.accept2 = $scope.accept3 = false;
|
$scope.accept1 = $scope.accept2 = $scope.accept3 = false;
|
||||||
|
$scope.backedUp = $stateParams.backedUp;
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$scope.$apply();
|
$scope.$apply();
|
||||||
}, 1);
|
}, 1);
|
||||||
|
@ -34,4 +34,10 @@ angular.module('copayApp.controllers').controller('disclaimerController', functi
|
||||||
$scope.termsModal.show();
|
$scope.termsModal.show();
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$scope.goBack = function(){
|
||||||
|
$state.go('onboarding.backupRequest');
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -634,7 +634,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.state('onboarding.disclaimer', {
|
.state('onboarding.disclaimer', {
|
||||||
url: '/disclaimer',
|
url: '/disclaimer/:backedUp',
|
||||||
views: {
|
views: {
|
||||||
'onboarding': {
|
'onboarding': {
|
||||||
templateUrl: 'views/onboarding/disclaimer.html'
|
templateUrl: 'views/onboarding/disclaimer.html'
|
||||||
|
|
Loading…
Reference in New Issue