From 39dfa8df0ad6f0364be953dc871cdc96abd53af4 Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 22 Jan 2016 16:51:46 -0300 Subject: [PATCH] add error in bwc module provider --- angular-bitcore-wallet-client/index.js | 4 +++ package.json | 2 +- src/js/services/bwsError.js | 49 ++++++++++++++------------ 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/angular-bitcore-wallet-client/index.js b/angular-bitcore-wallet-client/index.js index c45b24438..916898fec 100644 --- a/angular-bitcore-wallet-client/index.js +++ b/angular-bitcore-wallet-client/index.js @@ -35,6 +35,10 @@ bwcModule.provider("bwcService", function() { return Client.Bitcore; }; + service.getErrors = function() { + return Client.Errors; + }; + service.getSJCL = function() { return Client.sjcl; }; diff --git a/package.json b/package.json index 4772c6c31..bc60bfd79 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "url": "https://github.com/bitpay/copay/issues" }, "dependencies": { - "bitcore-wallet-client": "1.3.0", + "bitcore-wallet-client": "1.5.0", "express": "^4.11.2", "fs": "0.0.2", "grunt": "^0.4.5", diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js index 137289830..9a5c61b01 100644 --- a/src/js/services/bwsError.js +++ b/src/js/services/bwsError.js @@ -1,72 +1,77 @@ 'use strict'; angular.module('copayApp.services') - .factory('bwsError', function bwcErrorService($log, gettextCatalog) { + .factory('bwsError', function bwcErrorService($log, gettextCatalog, bwcService) { var root = {}; + var clientError = bwcService; + console.log('Client Error: ', clientError); root.msg = function(err, prefix) { - console.log('ERROR: '); + console.log(err); + if (err instanceof error.NOT_AUTHORIZED) + console.log('true'); + var body = ''; prefix = prefix || ''; - if (err && err.code) { + if (err) { switch (err.code) { case 'INVALID_BACKUP': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'WALLET_DOES_NOT_EXIST': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'MISSING_PRIVATE_KEY': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'ENCRYPTED_PRIVATE_KEY': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'SERVER_COMPROMISED': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'COULD_NOT_BUILD_TRANSACTION': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'INSUFFICIENT_FUNDS': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'CONNECTION_ERROR': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'NOT_FOUND': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'ECONNRESET_ERROR': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'BAD_RESPONSE_CODE': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'WALLET_ALREADY_EXISTS': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'COPAYER_IN_WALLET': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'WALLET_FULL': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'WALLET_NOT_FOUND': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'INSUFFICIENT_FUNDS_FOR_FEE': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'LOCKED_FUNDS': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'COPAYER_VOTED': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'NOT_AUTHORIZED': - body = err.message; + body = gettextCatalog.getString(err.message); break; case 'TX_ALREADY_BROADCASTED': body = gettextCatalog.getString('Transaction already broadcasted');