From 81dcbbc5b458100ec148bf1b369923c12bf3216c Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 22 Jan 2016 17:42:49 -0300 Subject: [PATCH] refactor error cases --- angular-bitcore-wallet-client/index.js | 2 +- src/js/services/bwsError.js | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/angular-bitcore-wallet-client/index.js b/angular-bitcore-wallet-client/index.js index 916898fec..0bda601ad 100644 --- a/angular-bitcore-wallet-client/index.js +++ b/angular-bitcore-wallet-client/index.js @@ -36,7 +36,7 @@ bwcModule.provider("bwcService", function() { }; service.getErrors = function() { - return Client.Errors; + return Client.errors; }; service.getSJCL = function() { diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js index 9a5c61b01..83b3a5ba6 100644 --- a/src/js/services/bwsError.js +++ b/src/js/services/bwsError.js @@ -1,21 +1,25 @@ 'use strict'; angular.module('copayApp.services') - .factory('bwsError', function bwcErrorService($log, gettextCatalog, bwcService) { + .factory('bwsError', function bwcErrorService($log, gettextCatalog) { var root = {}; - var clientError = bwcService; - console.log('Client Error: ', clientError); root.msg = function(err, prefix) { + var name; - console.log(err); - if (err instanceof error.NOT_AUTHORIZED) - console.log('true'); + if (err.name == 'Error') + name = err.message + else + + if (err.name) + name = err.name.replace(/^bwc.Error/g, ''); + else + name = err; var body = ''; prefix = prefix || ''; - if (err) { - switch (err.code) { + if (err && name) { + switch (name) { case 'INVALID_BACKUP': body = gettextCatalog.getString(err.message); break; @@ -126,8 +130,8 @@ angular.module('copayApp.services') break; default: - $log.warn('Unknown error type:', err.code); - body = err.message || err.code; + $log.warn('Unknown error type:', name); + body = err.message || name; break; } } else if (err.message) {