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

Add feedback while importing wallet

Browse source
This commit is contained in:
Yemel Jardi 2014-06-25 15:49:02 -03:00
commit 96cbf8ad7b
5 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.html
View file

@ -276,7 +276,7 @@
<div ng-controller="ImportController"> <div ng-controller="ImportController">
<div data-alert class="alert-box info radius" ng-show="loading"> <div data-alert class="alert-box info radius" ng-show="loading">
<i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i> <i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i>
Importing wallet... {{ importStatus }}
</div> </div>
<div ng-init="choosefile=0; pastetext=0" ng-show="!loading"> <div ng-init="choosefile=0; pastetext=0" ng-show="!loading">
<h3>{{title}}</h3> <h3>{{title}}</h3>

15
js/controllers/import.js
View file

@ -3,10 +3,19 @@
angular.module('copayApp.controllers').controller('ImportController', angular.module('copayApp.controllers').controller('ImportController',
function($scope, $rootScope, walletFactory, controllerUtils, Passphrase) { function($scope, $rootScope, walletFactory, controllerUtils, Passphrase) {
$scope.title = 'Import a backup'; $scope.title = 'Import a backup';
$scope.importStatus = 'Importing wallet - Reading backup...';
var reader = new FileReader(); var reader = new FileReader();
var updateStatus = function(status) {
$scope.importStatus = status;
$scope.$digest();
}
var _importBackup = function(encryptedObj) { var _importBackup = function(encryptedObj) {
Passphrase.getBase64Async($scope.password, function(passphrase) { Passphrase.getBase64Async($scope.password, function(passphrase) {
walletFactory.import(encryptedObj, passphrase, function(err, w) { updateStatus('Importing wallet - Setting things up...');
var w = walletFactory.import(encryptedObj, passphrase, function(err, w) {
if (err) { if (err) {
$scope.loading = false; $scope.loading = false;
$rootScope.$flashMessage = { $rootScope.$flashMessage = {
@ -19,6 +28,10 @@ angular.module('copayApp.controllers').controller('ImportController',
$rootScope.wallet = w; $rootScope.wallet = w;
controllerUtils.startNetwork($rootScope.wallet, $scope); controllerUtils.startNetwork($rootScope.wallet, $scope);
}); });
w.on('updatingIndexes', function(){
updateStatus('Importing wallet - We are almost there...');
});
}); });
}; };

1
js/models/core/Wallet.js
View file

@ -755,6 +755,7 @@ Wallet.prototype.updateIndexes = function(callback) {
if (changeIndex != -1) if (changeIndex != -1)
self.publicKeyRing.indexes.changeIndex = changeIndex + 1; self.publicKeyRing.indexes.changeIndex = changeIndex + 1;
self.emit('updatingIndexes');
start = self.publicKeyRing.indexes.receiveIndex; start = self.publicKeyRing.indexes.receiveIndex;
self.indexDiscovery(start, false, 20, function(err, receiveIndex) { self.indexDiscovery(start, false, 20, function(err, receiveIndex) {
if (err) return callback(err); if (err) return callback(err);

1
js/models/core/WalletFactory.js
View file

@ -84,6 +84,7 @@ WalletFactory.prototype.import = function(base64, password, cb) {
self.log('Indexes updated'); self.log('Indexes updated');
cb(null, w); cb(null, w);
}); });
return w;
} }
WalletFactory.prototype.read = function(walletId) { WalletFactory.prototype.read = function(walletId) {

2
test/test.Wallet.js
View file

@ -743,7 +743,7 @@ describe('Wallet model', function() {
var spyEmit = sinon.spy(w, 'emit'); var spyEmit = sinon.spy(w, 'emit');
w.updateIndexes(function(err) { w.updateIndexes(function(err) {
sinon.assert.callCount(spyStore, 1); sinon.assert.callCount(spyStore, 1);
sinon.assert.callCount(spyEmit, 1); sinon.assert.callCount(spyEmit, 2);
done(); done();
}); });
}); });