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

Fixes loading message after press a button

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-02-13 13:05:56 -03:00
commit 112c1adc11
7 changed files with 47 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

47
js/controllers/import.js
View file

@ -70,33 +70,36 @@ angular.module('copayApp.controllers').controller('ImportController',
$rootScope.starting = true;
$scope.importOpts = {};
$timeout(function() {
var skipFields = [];
$scope.importOpts = {};
if ($scope.skipPublicKeyRing)
skipFields.push('publicKeyRing');
var skipFields = [];
if ($scope.skipTxProposals)
skipFields.push('txProposals');
if ($scope.skipPublicKeyRing)
skipFields.push('publicKeyRing');
if (skipFields)
$scope.importOpts.skipFields = skipFields;
if ($scope.skipTxProposals)
skipFields.push('txProposals');
if (backupFile) {
reader.readAsBinaryString(backupFile);
} else {
updateStatus('Importing wallet - Procesing backup...');
identityService.importWallet(backupText, $scope.password, $scope.importOpts, function(err) {
if (err) {
$rootScope.starting = false;
$scope.error = 'Could not read wallet. Please check your password';
$timeout(function() {
$rootScope.$digest();
}, 1);
}
});
}
if (skipFields)
$scope.importOpts.skipFields = skipFields;
if (backupFile) {
reader.readAsBinaryString(backupFile);
} else {
updateStatus('Importing wallet - Procesing backup...');
identityService.importWallet(backupText, $scope.password, $scope.importOpts, function(err) {
if (err) {
$rootScope.starting = false;
$scope.error = 'Could not read wallet. Please check your password';
$timeout(function() {
$rootScope.$digest();
}, 1);
}
});
}
}, 100);
};