From 48a3127ba86f185aacd2de4462362417aa0979ca Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sat, 12 Dec 2020 10:19:41 +0100
Subject: [PATCH] Display error.message || error (when string is thrown)
 (#4197)

* Display error.message || error (when string is thrown)

* Update packages/react-signer/src/TxSigned.tsx
---
 packages/react-components/src/Status/index.tsx | 2 +-
 packages/react-signer/src/TxSigned.tsx         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/react-components/src/Status/index.tsx b/packages/react-components/src/Status/index.tsx
index 6c2de7bb57..5b1981dd23 100644
--- a/packages/react-components/src/Status/index.tsx
+++ b/packages/react-components/src/Status/index.tsx
@@ -138,7 +138,7 @@ function renderItem ({ error, extrinsic, id, removeItem, rpc, status }: QueueTx)
               {section}.{method}
             </div>
             <div className='status'>
-              {error ? error.message : status}
+              {error ? (error.message || error) : status}
             </div>
           </div>
         </div>
diff --git a/packages/react-signer/src/TxSigned.tsx b/packages/react-signer/src/TxSigned.tsx
index ecbacc0e6c..e89b1db223 100644
--- a/packages/react-signer/src/TxSigned.tsx
+++ b/packages/react-signer/src/TxSigned.tsx
@@ -81,7 +81,7 @@ async function signAndSend (queueSetTxStatus: QueueTxMessageSetStatus, currentIt
     console.error('signAndSend: error:', error);
     queueSetTxStatus(currentItem.id, 'error', {}, error);
 
-    currentItem.txFailedCb && currentItem.txFailedCb(null);
+    currentItem.txFailedCb && currentItem.txFailedCb(error);
   }
 }
 
@@ -93,6 +93,7 @@ async function signAsync (queueSetTxStatus: QueueTxMessageSetStatus, { id, txFai
 
     return tx.toJSON();
   } catch (error) {
+    console.error('signAsync: error:', error);
     queueSetTxStatus(id, 'error', undefined, error);
 
     txFailedCb(error);