anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

added conditional to show back button when no backup has been saved

Browse source
This commit is contained in:
Jamal Jackson 2016-09-29 14:50:33 -04:00
commit 7f813ba396
5 changed files with 29 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/js/controllers/backup.js
View file

@ -49,15 +49,6 @@ angular.module('copayApp.controllers').controller('backupController',
}, 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) {
ongoingProcess.set('validatingWords', false);
$log.debug('Failed to verify backup: ', err);
@ -93,13 +84,15 @@ angular.module('copayApp.controllers').controller('backupController',
$scope.closeBackupResultModal = function() {
$scope.confirmBackupModal.hide();
$scope.confirmBackupModal.remove();
if ($stateParams.fromOnboarding) {
$state.go('onboarding.disclaimer');
} else {
$ionicHistory.removeBackView();
$state.go('tabs.home');
}
profileService.isDisclaimerAccepted(function(val) {
if (val) {
$ionicHistory.removeBackView();
$state.go('tabs.home');
}
else $state.go('onboarding.disclaimer', {backedUp: false});
});
};
var confirm = function(cb) {
@ -193,16 +186,6 @@ angular.module('copayApp.controllers').controller('backupController',
$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.deleted = isDeletedSeed();
if ($scope.deleted) {
@ -222,4 +205,4 @@ angular.module('copayApp.controllers').controller('backupController',
});
});
});
});

2
src/js/controllers/onboarding/backupRequest.js
View file

@ -18,7 +18,7 @@ angular.module('copayApp.controllers').controller('backupRequestController', fun
var cancelText = gettextCatalog.getString('Go back');
popupService.showConfirm(title, message, okText, cancelText, function(val) {
if (val) {
$state.go('onboarding.disclaimer');
$state.go('onboarding.disclaimer', {backedUp: false});
}
});
}

10
src/js/controllers/onboarding/disclaimer.js
View file

@ -1,11 +1,11 @@
'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.lang = uxLanguage.currentLanguage;
$scope.terms = {};
$scope.accept1 = $scope.accept2 = $scope.accept3 = false;
$scope.backedUp = $stateParams.backedUp;
$timeout(function() {
$scope.$apply();
}, 1);
@ -34,4 +34,10 @@ angular.module('copayApp.controllers').controller('disclaimerController', functi
$scope.termsModal.show();
});
};
$scope.goBack = function(){
$state.go('onboarding.backupRequest');
}
});

2
src/js/routes.js
View file

@ -634,7 +634,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
})
.state('onboarding.disclaimer', {
url: '/disclaimer',
url: '/disclaimer/:backedUp',
views: {
'onboarding': {
templateUrl: 'views/onboarding/disclaimer.html'