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

disclaimer is always accepted

Browse source
This commit is contained in:
Kadir Sekha 2018-02-02 12:27:32 -04:00
commit c722902eab
3 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,17 +97,7 @@ angular.module('copayApp.controllers').controller('backupController',
$scope.closeBackupResultModal = function() { $scope.closeBackupResultModal = function() {
$scope.confirmBackupModal.hide(); $scope.confirmBackupModal.hide();
$scope.confirmBackupModal.remove(); $scope.confirmBackupModal.remove();
$state.go('tabs.home');
profileService.isDisclaimerAccepted(function(val) {
if (val) {
$ionicHistory.removeBackView();
$state.go('tabs.home');
} else $state.go('onboarding.disclaimer', {
bchWalletId: $stateParams.bchWalletId,
btcWalletId: $stateParams.btcWalletId,
backedUp: true
});
});
}; };
$scope.copyRecoveryPhrase = function() { $scope.copyRecoveryPhrase = function() {

2
src/js/models/profile.js
View file

@ -15,7 +15,7 @@ Profile.create = function(opts) {
var x = new Profile(); var x = new Profile();
x.createdOn = Date.now(); x.createdOn = Date.now();
x.credentials = opts.credentials || []; x.credentials = opts.credentials || [];
x.disclaimerAccepted = false; x.disclaimerAccepted = true;
x.checked = {}; x.checked = {};
return x; return x;
}; };

5
src/js/routes.js
View file

@ -1230,12 +1230,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
//onboarding with no back views //onboarding with no back views
var matchWelcome = $ionicHistory.currentStateName() == 'onboarding.welcome' ? true : false; var matchWelcome = $ionicHistory.currentStateName() == 'onboarding.welcome' ? true : false;
var matchCollectEmail = $ionicHistory.currentStateName() == 'onboarding.collectEmail' ? true : false; var matchCollectEmail = $ionicHistory.currentStateName() == 'onboarding.collectEmail' ? true : false;
var matchBackupRequest = $ionicHistory.currentStateName() == 'onboarding.backupRequest' ? true : false;
var backedUp = $ionicHistory.backView().stateName == 'onboarding.backup' ? true : false;
var noBackView = $ionicHistory.backView().stateName == 'starting' ? true : false; var noBackView = $ionicHistory.backView().stateName == 'starting' ? true : false;
var matchDisclaimer = $ionicHistory.currentStateName() == 'onboarding.disclaimer' && (backedUp || noBackView) ? true : false;
var fromOnboarding = matchCollectEmail | matchBackupRequest | matchWelcome | matchDisclaimer; var fromOnboarding = matchCollectEmail | matchWelcome ;
//views with disable backbutton //views with disable backbutton
var matchComplete = $ionicHistory.currentStateName() == 'tabs.rate.complete' ? true : false; var matchComplete = $ionicHistory.currentStateName() == 'tabs.rate.complete' ? true : false;