diff --git a/public/views/import.html b/public/views/import.html index da78df49a..4a75fc928 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -34,9 +34,17 @@
- - {{import.error|translate}} - +
+
+
+ +
Could not access the wallet at the server. Please check:
+
The password of the recovery phrase (if set)
+
The derivation path
+
The wallet service URL
+
NOTE: To import a wallet from a 3rd party software, please go to Add Wallet > Create Wallet, and specify the seed there.
+
Error: {{import.error|translate}}
+
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 35d18b5a4..0309346ae 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -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;