From f7a0cb3c6e7e81e7a3d317f29693d6bc6173ae1a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 12 Jun 2015 13:15:14 -0300 Subject: [PATCH 1/2] Fixes message error when password incorrect --- src/js/controllers/walletHome.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 1454bf3ad..b170a6a0b 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -545,7 +545,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var errMessage = fc.credentials.m > 1 ? gettext('Could not create payment proposal') : gettext('Could not send payment'); - errMessage = errMessage + '. ' + (err.message ? err.message : gettext('Check you connection and try again')); + if (typeof err == 'string') { + errMessage = errMessage + '. ' + (err ? err : gettext('Unknown error')); + } else { + errMessage = errMessage + '. ' + (err.message ? err.message : gettext('Check you connection and try again')); + } this.error = errMessage; From a25fead7d56171ab8d7906e2cdd01d6ffd0dfab2 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 12 Jun 2015 14:21:37 -0300 Subject: [PATCH 2/2] Refactory --- src/js/controllers/walletHome.js | 6 +----- src/js/services/profileService.js | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index b170a6a0b..1454bf3ad 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -545,11 +545,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var errMessage = fc.credentials.m > 1 ? gettext('Could not create payment proposal') : gettext('Could not send payment'); - if (typeof err == 'string') { - errMessage = errMessage + '. ' + (err ? err : gettext('Unknown error')); - } else { - errMessage = errMessage + '. ' + (err.message ? err.message : gettext('Check you connection and try again')); - } + errMessage = errMessage + '. ' + (err.message ? err.message : gettext('Check you connection and try again')); this.error = errMessage; diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 64c84b685..d237bf47a 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -378,13 +378,13 @@ angular.module('copayApp.services') $log.debug('Wallet is encrypted'); $rootScope.$emit('Local/NeedsPassword', false, function(err2, password) { if (err2 || !password) { - return cb(err2 || gettext('Password needed')); + return cb({message: (err2 || gettext('Password needed'))}); } try { fc.unlock(password); } catch (e) { $log.debug(e); - return cb(gettext('Wrong password')); + return cb({message: gettext('Wrong password')}); } $timeout(function() { if (fc.isPrivKeyEncrypted()) {