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

add backup warning view to backup flow

Browse source
This commit is contained in:
Gabriel Bazán 2016-09-26 16:11:45 -03:00
commit 33c7e2b297
17 changed files with 123 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,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');
});
};
var confirm = function(cb) {
@ -184,17 +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 if ($stateParams.fromReceive) $state.go('tabs.receive');
else $state.go('tabs.preferences', {
walletId: $stateParams.walletId
});
};
$scope.$on("$ionicView.enter", function(event, data) {
$scope.deleted = isDeletedSeed();
if ($scope.deleted) {

33
src/js/controllers/onboarding/backupWarning.js
View file

@ -5,20 +5,31 @@ angular.module('copayApp.controllers').controller('backupWarningController', fun
$scope.walletId = $stateParams.walletId;
$scope.openPopup = function() {
$ionicModal.fromTemplateUrl('views/includes/screenshotWarningModal.html', {
scope: $scope,
backdropClickToClose: false,
hardwareBackButtonClose: false
}).then(function(modal) {
$scope.warningModal = modal;
$scope.warningModal.show();
});
scope: $scope,
backdropClickToClose: false,
hardwareBackButtonClose: false
}).then(function(modal) {
$scope.warningModal = modal;
$scope.warningModal.show();
});
$scope.close = function() {
$scope.warningModal.hide();
$state.go('onboarding.backup', {
walletId: $stateParams.walletId,
fromOnboarding: true
});
if ($stateParams.from == 'onboarding.backupRequest')
$state.go('onboarding.backup', {
walletId: $stateParams.walletId
});
else
$state.go($stateParams.from + '.backup', {
walletId: $stateParams.walletId
});
};
}
$scope.goBack = function() {
$state.go($stateParams.from, {
walletId: $stateParams.walletId
});
};
});

27
src/js/controllers/tab-receive.js
View file

@ -53,6 +53,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$scope.wallet = wallet;
$log.debug('Wallet changed: ' + wallet.name);
$scope.setAddress();
if ($scope.wallet.showBackupNeededModal) $scope.openBackupNeededModal();
$scope.$apply();
});
});
@ -71,28 +72,32 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
}, 100);
};
$scope.openBackupNeededPopup = function() {
$scope.openBackupNeededModal = function() {
$ionicModal.fromTemplateUrl('views/includes/backupNeededPopup.html', {
scope: $scope,
backdropClickToClose: false,
hardwareBackButtonClose: false
}).then(function(modal) {
$scope.BackupNeededPopup = modal;
$scope.BackupNeededPopup.show();
$scope.BackupNeededModal = modal;
$scope.BackupNeededModal.show();
});
};
$scope.closeBackupNeededModal = function() {
$scope.BackupNeededPopup.hide();
$scope.BackupNeededPopup.remove();
$scope.close = function() {
$scope.BackupNeededModal.hide();
$scope.BackupNeededModal.remove();
profileService.setBackupNeededModalFlag($scope.wallet.credentials.walletId);
};
$scope.doBackup = function() {
$scope.close();
$scope.goToBackupFlow();
};
$scope.goToBackupFlow = function() {
$scope.BackupNeededPopup.hide();
$scope.BackupNeededPopup.remove();
$state.go('tabs.receive.backup', {
fromReceive: true,
$state.go('tabs.receive.backupWarning', {
from: 'tabs.receive',
walletId: $scope.wallet.credentials.walletId
});
};
}
});