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

If the copayer upload a backup it does not wait for others

Browse source
This commit is contained in:
Matias Pando 2014-09-10 17:36:17 -03:00
commit ecea1a654d
3 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/controllers/import.js
View file

@ -2,12 +2,11 @@
angular.module('copayApp.controllers').controller('ImportController',
function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification) {
controllerUtils.redirIfLogged();
$scope.title = 'Import a backup';
$scope.importStatus = 'Importing wallet - Reading backup...';
$scope.hideAdv=true;
$scope.hideAdv = true;
var reader = new FileReader();
@ -59,7 +58,7 @@ angular.module('copayApp.controllers').controller('ImportController',
$rootScope.wallet = w;
controllerUtils.startNetwork($rootScope.wallet, $scope);
});
});
};
@ -105,6 +104,6 @@ angular.module('copayApp.controllers').controller('ImportController',
if (backupFile) {
reader.readAsBinaryString(backupFile);
}
}
};
});