From 6a8da2e6fe29b73d6363b2027845ca22031d8a39 Mon Sep 17 00:00:00 2001
From: apotdevin <potdevin.anthony@gmail.com>
Date: Tue, 1 Jun 2021 22:20:29 +0200
Subject: [PATCH] chore: improve error message

---
 server/helpers/helpers.ts          | 16 ++++++----------
 server/schema/chain/resolvers.ts   | 15 +++++----------
 src/views/chain/utxos/UtxoCard.tsx |  5 ++++-
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/server/helpers/helpers.ts b/server/helpers/helpers.ts
index 55ae590c..014bd298 100644
--- a/server/helpers/helpers.ts
+++ b/server/helpers/helpers.ts
@@ -16,15 +16,11 @@ export const getIp = (req: any) => {
 };
 
 export const getErrorMsg = (error: any[] | string): string => {
-  if (typeof error === 'string') {
-    return error;
-  }
-  if (error.length >= 2) {
-    return error[1];
-  }
-  // if (error.length > 2) {
-  //   return error[2].err?.message || 'Error';
-  // }
+  console.log(error);
+  if (!error) return 'Unknown Error';
+  if (typeof error === 'string') return error;
+  if (error[2]?.err?.details) return error[2]?.err?.details;
+  if (error[1]) return error[1];
 
-  return 'Error';
+  return 'Unkown Error';
 };
diff --git a/server/schema/chain/resolvers.ts b/server/schema/chain/resolvers.ts
index c9c64479..d044cb0d 100644
--- a/server/schema/chain/resolvers.ts
+++ b/server/schema/chain/resolvers.ts
@@ -8,9 +8,7 @@ import {
   getPendingChannels,
 } from 'ln-service';
 import { ContextType } from 'server/types/apiTypes';
-import { logger } from 'server/helpers/logger';
 import { requestLimiter } from 'server/helpers/rateLimiter';
-import { getErrorMsg } from 'server/helpers/helpers';
 import { sortBy } from 'underscore';
 import { to } from 'server/helpers/async';
 import {
@@ -114,18 +112,15 @@ export const chainResolvers = {
 
       const format = params.nested ? 'np2wpkh' : 'p2wpkh';
 
-      try {
-        const address = await createChainAddress({
+      const address = await to<{ address: string }>(
+        createChainAddress({
           lnd,
           is_unused: true,
           format,
-        });
+        })
+      );
 
-        return address.address;
-      } catch (error) {
-        logger.error('Error creating address: %o', error);
-        throw new Error(getErrorMsg(error));
-      }
+      return address.address;
     },
     sendToAddress: async (_: undefined, params: any, context: ContextType) => {
       await requestLimiter(context.ip, 'sendToAddress');
diff --git a/src/views/chain/utxos/UtxoCard.tsx b/src/views/chain/utxos/UtxoCard.tsx
index 4ea5e762..98be7772 100644
--- a/src/views/chain/utxos/UtxoCard.tsx
+++ b/src/views/chain/utxos/UtxoCard.tsx
@@ -55,7 +55,10 @@ export const UtxoCard = ({
         {renderLine('Confirmations: ', confirmation_count)}
         {renderLine('Output Script: ', output_script)}
         {renderLine('Transaction Id: ', getTransactionLink(transaction_id))}
-        {renderLine('Transaction Vout: ', transaction_vout)}
+        {renderLine(
+          'Transaction Vout: ',
+          transaction_vout >= 0 ? `${transaction_vout}` : '-'
+        )}
       </>
     );
   };