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

14
public/views/import.html
View file

@ -34,9 +34,17 @@
<div ng-show="type == '12' "> <div ng-show="type == '12' ">
<div class="box-notification m20b" ng-show="import.error"> <div class="box-notification m20b" ng-show="import.error">
<span class="text-warning"> <div ng-show="import.importErr" class="text-warning">
{{import.error|translate}} <div >
</span> </div>
<div class="m10 text-bold" translate>Could not access the wallet at the server. Please check:</div>
<div class="p25l" translate> The password of the recovery phrase (if set) </div>
<div class="p25l" translate> The derivation path</div>
<div class="p25l" translate> The wallet service URL </div>
<div class="p25l" translate> NOTE: To import a wallet from a 3rd party software, please go to Add Wallet &gt; Create Wallet, and specify the seed there.</div>
<div class="text-right"> <span translate>Error</span>: {{import.error|translate}}</div>
</div>
</div> </div>
<div class="row large-12 columns"> <div class="row large-12 columns">
<form name="importForm12" ng-submit="import.importMnemonic(importForm12)" novalidate> <form name="importForm12" ng-submit="import.importMnemonic(importForm12)" novalidate>

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

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