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

Refactory

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-06-12 14:21:37 -03:00
commit a25fead7d5
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/walletHome.js
View file

@ -545,11 +545,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var errMessage = var errMessage =
fc.credentials.m > 1 ? gettext('Could not create payment proposal') : gettext('Could not send payment'); fc.credentials.m > 1 ? gettext('Could not create payment proposal') : gettext('Could not send payment');
if (typeof err == 'string') { errMessage = errMessage + '. ' + (err.message ? err.message : gettext('Check you connection and try again'));
errMessage = errMessage + '. ' + (err ? err : gettext('Unknown error'));
} else {
errMessage = errMessage + '. ' + (err.message ? err.message : gettext('Check you connection and try again'));
}
this.error = errMessage; this.error = errMessage;

4
src/js/services/profileService.js
View file

@ -378,13 +378,13 @@ angular.module('copayApp.services')
$log.debug('Wallet is encrypted'); $log.debug('Wallet is encrypted');
$rootScope.$emit('Local/NeedsPassword', false, function(err2, password) { $rootScope.$emit('Local/NeedsPassword', false, function(err2, password) {
if (err2 || !password) { if (err2 || !password) {
return cb(err2 || gettext('Password needed')); return cb({message: (err2 || gettext('Password needed'))});
} }
try { try {
fc.unlock(password); fc.unlock(password);
} catch (e) { } catch (e) {
$log.debug(e); $log.debug(e);
return cb(gettext('Wrong password')); return cb({message: gettext('Wrong password')});
} }
$timeout(function() { $timeout(function() {
if (fc.isPrivKeyEncrypted()) { if (fc.isPrivKeyEncrypted()) {