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

better err message

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-05-12 10:48:00 -03:00
commit 8981bcc251
1 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -89,6 +89,17 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
// walletHome // walletHome
var parseError = function(err) {
if (err.message) {
if (err.message.indexOf('CORS')) {
err.message = gettext('Could not connect wallet service. Check your Internet connexion and your wallet service configuration.');
}
if (err.message.indexOf('TIMEDOUT')) {
err.message = gettext('Wallet service timed out. Check your Internet connexion and your wallet service configuration.');
}
}
};
$scope.openCopayersModal = function(copayers, copayerId) { $scope.openCopayersModal = function(copayers, copayerId) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
@ -126,7 +137,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.getShortNetworkName = function() { $scope.getShortNetworkName = function() {
return fc.credentials.networkName.substring(0, 4); return fc.credentials.networkName.substring(0, 4);
}; };
lodash.each(['TxProposalRejectedBy', 'TxProposalAcceptedBy', 'transactionProposalRemoved', 'TxProposalRemoved', 'NewOutgoingTx'], function(eventName) { lodash.each(['TxProposalRejectedBy', 'TxProposalAcceptedBy', 'transactionProposalRemoved', 'TxProposalRemoved', 'NewOutgoingTx'], function(eventName) {
$rootScope.$on(eventName, function() { $rootScope.$on(eventName, function() {
fc.getTx($scope.tx.id, function(err, tx) { fc.getTx($scope.tx.id, function(err, tx) {
@ -170,6 +180,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (fc.isPrivKeyEncrypted()) { if (fc.isPrivKeyEncrypted()) {
profileService.unlockFC(function(err) { profileService.unlockFC(function(err) {
if (err) { if (err) {
parseError(err);
$scope.error = err; $scope.error = err;
return; return;
} }
@ -187,7 +198,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self.setOngoingProcess(); self.setOngoingProcess();
if (err) { if (err) {
$scope.loading = false; $scope.loading = false;
$scope.error = err.message || gettext('Transaction not signed. Please try again.'); parseError(err);
$scope.error = err.message || gettext('Could not sign transaction. Please try again.');
$scope.$digest(); $scope.$digest();
} else { } else {
//if txp has required signatures then broadcast it //if txp has required signatures then broadcast it
@ -199,7 +211,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self.setOngoingProcess(); self.setOngoingProcess();
$scope.loading = false; $scope.loading = false;
if (err) { if (err) {
$scope.error = gettext('Transaction not broadcasted. Please try again.'); parseError(err);
$scope.error = gettext('Could not broadcast transaction. Please try again.');
$scope.$digest(); $scope.$digest();
} else { } else {
$modalInstance.close(txpsb); $modalInstance.close(txpsb);
@ -223,7 +236,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self.setOngoingProcess(); self.setOngoingProcess();
$scope.loading = false; $scope.loading = false;
if (err) { if (err) {
$scope.error = err.message || gettext('Transaction not rejected. Please try again.'); parseError(err);
$scope.error = err.message || gettext('Could not reject transaction. Please try again.');
$scope.$digest(); $scope.$digest();
} else { } else {
$modalInstance.close(txpr); $modalInstance.close(txpr);
@ -244,7 +258,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
// Hacky: request tries to parse an empty response // Hacky: request tries to parse an empty response
if (err && !(err.message && err.message.match(/Unexpected/))) { if (err && !(err.message && err.message.match(/Unexpected/))) {
$scope.error = err.message || gettext('Transaction could not be deleted. Please try again.'); parseError(err);
$scope.error = err.message || gettext('Could not delete transaction. Please try again.');
$scope.$digest(); $scope.$digest();
return; return;
} }
@ -262,7 +277,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self.setOngoingProcess(); self.setOngoingProcess();
$scope.loading = false; $scope.loading = false;
if (err) { if (err) {
$scope.error = err.message || gettext('Transaction not sent. Please try again.'); parseError(err);
$scope.error = err.message || gettext('Could not send transaction. Please try again.');
$scope.$digest(); $scope.$digest();
} else { } else {
$modalInstance.close(txpb); $modalInstance.close(txpb);
@ -492,9 +508,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}); });
}; };
this.setError = function(err) { this.setSendError = function(err) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
$log.warn(err); $log.warn(err);
parseError(err);
var errMessage = 'The transaction' + (fc.credentials.m > 1 ? ' proposal' : '') + var errMessage = 'The transaction' + (fc.credentials.m > 1 ? ' proposal' : '') +
' could not be created: ' + (err.message ? err.message : err); ' could not be created: ' + (err.message ? err.message : err);
@ -538,7 +555,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (fc.isPrivKeyEncrypted()) { if (fc.isPrivKeyEncrypted()) {
profileService.unlockFC(function(err) { profileService.unlockFC(function(err) {
if (err) return self.setError(err); if (err) return self.setSendError(err);
return self.submitForm(); return self.submitForm();
}); });
return; return;
@ -562,13 +579,13 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (err) { if (err) {
self.setOngoingProcess(); self.setOngoingProcess();
profileService.lockFC(); profileService.lockFC();
return self.setError(err); return self.setSendError(err);
} }
self.signAndBroadcast(txp, function(err) { self.signAndBroadcast(txp, function(err) {
if (err) { if (err) {
self.setOngoingProcess(); self.setOngoingProcess();
return self.setError(err); return self.setSendError(err);
} }
self.resetForm(); self.resetForm();