From a2c5127b3073bf895bf9f2985ac658576725ac1d Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Fri, 22 Jan 2016 13:08:43 -0300
Subject: [PATCH] WIP refactor errors

---
 src/js/services/bwsError.js | 104 +++++++++++++++++++++---------------
 1 file changed, 60 insertions(+), 44 deletions(-)

diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js
index 0675c517d..137289830 100644
--- a/src/js/services/bwsError.js
+++ b/src/js/services/bwsError.js
@@ -4,52 +4,69 @@ angular.module('copayApp.services')
     var root = {};
 
     root.msg = function(err, prefix) {
+      console.log('ERROR: ');
+      console.log(err);
       var body = '';
       prefix = prefix || '';
 
       if (err && err.code) {
         switch (err.code) {
-          case 'CONNECTION_ERROR':
-            body = gettextCatalog.getString('Network connection error');
+          case 'INVALID_BACKUP':
+            body = err.message;
             break;
-          case 'NOT_FOUND':
-            body = gettextCatalog.getString('Wallet service not found');
+          case 'WALLET_DOES_NOT_EXIST':
+            body = err.message;
             break;
-          case 'BAD_SIGNATURES':
-            body = gettextCatalog.getString('Signatures rejected by server');
+          case 'MISSING_PRIVATE_KEY':
+            body = err.message;
             break;
-          case 'COPAYER_DATA_MISMATCH':
-            body = gettextCatalog.getString('Copayer data mismatch');
+          case 'ENCRYPTED_PRIVATE_KEY':
+            body = err.message;
             break;
-          case 'COPAYER_IN_WALLET':
-            body = gettextCatalog.getString('Copayer already in this wallet');
+          case 'SERVER_COMPROMISED':
+            body = err.message;
             break;
-          case 'COPAYER_REGISTERED':
-            body = gettextCatalog.getString('Key already associated with an existing wallet');
-            break;
-          case 'COPAYER_VOTED':
-            body = gettextCatalog.getString('Copayer already voted on this spend proposal');
-            break;
-          case 'DUST_AMOUNT':
-            body = gettextCatalog.getString('Amount below dust threshold');
-            break;
-          case 'INCORRECT_ADDRESS_NETWORK':
-            body = gettextCatalog.getString('Incorrect address network');
+          case 'COULD_NOT_BUILD_TRANSACTION':
+            body = err.message;
             break;
           case 'INSUFFICIENT_FUNDS':
-            body = gettextCatalog.getString('Insufficient funds');
+            body = err.message;
+            break;
+          case 'CONNECTION_ERROR':
+            body = err.message;
+            break;
+          case 'NOT_FOUND':
+            body = err.message;
+            break;
+          case 'ECONNRESET_ERROR':
+            body = err.message;
+            break;
+          case 'BAD_RESPONSE_CODE':
+            body = err.message;
+            break;
+          case 'WALLET_ALREADY_EXISTS':
+            body = err.message;
+            break;
+          case 'COPAYER_IN_WALLET':
+            body = err.message;
+            break;
+          case 'WALLET_FULL':
+            body = err.message;
+            break;
+          case 'WALLET_NOT_FOUND':
+            body = err.message;
             break;
           case 'INSUFFICIENT_FUNDS_FOR_FEE':
-            body = gettextCatalog.getString('Insufficient funds for fee');
-            break;
-          case 'INVALID_ADDRESS':
-            body = gettextCatalog.getString('Invalid address');
+            body = err.message;
             break;
           case 'LOCKED_FUNDS':
-            body = gettextCatalog.getString('Funds are locked by pending spend proposals');
+            body = err.message;
+            break;
+          case 'COPAYER_VOTED':
+            body = err.message;
             break;
           case 'NOT_AUTHORIZED':
-            body = gettextCatalog.getString('Not authorized');
+            body = err.message;
             break;
           case 'TX_ALREADY_BROADCASTED':
             body = gettextCatalog.getString('Transaction already broadcasted');
@@ -72,26 +89,23 @@ angular.module('copayApp.services')
           case 'UPGRADE_NEEDED':
             body = gettextCatalog.getString('Please upgrade Copay to perform this action');
             break;
-          case 'WALLET_ALREADY_EXISTS':
-            body = gettextCatalog.getString('Wallet already exists');
+          case 'BAD_SIGNATURES':
+            body = gettextCatalog.getString('Signatures rejected by server');
             break;
-          case 'WALLET_FULL':
-            body = gettextCatalog.getString('Wallet is full');
+          case 'COPAYER_DATA_MISMATCH':
+            body = gettextCatalog.getString('Copayer data mismatch');
             break;
-          case 'WALLET_NOT_COMPLETE':
-            body = gettextCatalog.getString('Wallet is not complete');
+          case 'DUST_AMOUNT':
+            body = gettextCatalog.getString('Amount below dust threshold');
             break;
-          case 'WALLET_NOT_FOUND':
-            body = gettextCatalog.getString('Wallet not found');
+          case 'INCORRECT_ADDRESS_NETWORK':
+            body = gettextCatalog.getString('Incorrect address network');
             break;
-          case 'SERVER_COMPROMISED':
-            body = gettextCatalog.getString('Server response could not be verified');
+          case 'COPAYER_REGISTERED':
+            body = gettextCatalog.getString('Key already associated with an existing wallet');
             break;
-          case 'WALLET_DOES_NOT_EXIST':
-            body = gettextCatalog.getString('Wallet not registered at the wallet service. Recreate it from "Create Wallet" using "Advanced Options" to set your seed');
-            break;
-          case 'INVALID_BACKUP':
-            body = gettextCatalog.getString('Wallet seed is invalid');
+          case 'INVALID_ADDRESS':
+            body = gettextCatalog.getString('Invalid address');
             break;
           case 'MAIN_ADDRESS_GAP_REACHED':
             body = gettextCatalog.getString('Empty addresses limit reached. New addresses cannot be generated.');
@@ -99,7 +113,9 @@ angular.module('copayApp.services')
           case 'WALLET_LOCKED':
             body = gettextCatalog.getString('Wallet is locked');
             break;
-
+          case 'WALLET_NOT_COMPLETE':
+            body = gettextCatalog.getString('Wallet is not complete');
+            break;
           case 'ERROR':
             body = (err.message || err.error);
             break;