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

better error when importing a wrong mnemonic

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-06-07 16:16:38 -03:00
commit a130a3e19b
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/js/controllers/import.js
View file

@ -12,6 +12,7 @@ angular.module('copayApp.controllers').controller('importController',
$scope.bwsurl = defaults.bws.url;
$scope.derivationPath = derivationPathHelper.default;
$scope.account = 1;
self.importErr = false;
window.ignoreMobilePause = true;
$scope.$on('$destroy', function() {
@ -20,6 +21,7 @@ angular.module('copayApp.controllers').controller('importController',
}, 100);
});
var updateSeedSourceSelect = function() {
self.seedOptions = [];
@ -52,7 +54,7 @@ angular.module('copayApp.controllers').controller('importController',
try {
str2 = sjcl.decrypt(self.password, str);
} catch (e) {
err = gettext('Could not decrypt file, check your spending password');
err = gettext('Could not decrypt file, check your password');
$log.warn(e);
};
@ -92,6 +94,8 @@ angular.module('copayApp.controllers').controller('importController',
self.loading = false;
if (err) {
self.error = err;
self.importErr = true;
$ionicScrollDelegate.scrollTop();
return $timeout(function() {
$scope.$apply();
@ -112,6 +116,8 @@ angular.module('copayApp.controllers').controller('importController',
self.loading = false;
if (err) {
self.error = err;
self.importErr = true;
$ionicScrollDelegate.scrollTop();
return $timeout(function() {
$scope.$apply();
@ -265,6 +271,7 @@ angular.module('copayApp.controllers').controller('importController',
return;
}
this.error = '';
this.importErr = false;
var account = +$scope.account;