Add user notice of errors originating from a transaction

CHANGELOG.md

@@ -2,6 +2,7 @@
 - Add a current instance cache for transaction hashes to prevent multiple send attempts 
 - Add notice when malformed response is received from mobile
 - Add a current instance timer to stop checking for transaction hash after 60 minutes
+- Add user notice of errors originating from a transaction
 
 
 ### Release 2.1.23-beta.3

src/connectProvider/index.js

@@ -433,7 +433,11 @@ export default class Integration extends EventEmitter {
         );
       }
     });
-
+    eventHub.on(EventNames.ERROR_NOTIFY, err => {
+      if(err && err.message){
+        this.popUpHandler.showNotice(err.message);
+      }
+    })
     eventHub.on(EventNames.SHOW_MSG_CONFIRM_MODAL, (msg, resolve) => {
       if (!state.wallet) {
         this.popUpHandler.showNoticePersistentEnter(

src/connectProvider/web3Provider/web3-provider/events.js

@@ -3,5 +3,6 @@ export default {
   SHOW_TX_CONFIRM_MODAL: 'showTxConfirmModal',
   SHOW_MSG_CONFIRM_MODAL: 'showMessageConfirmModal',
   SHOW_TX_SIGN_MODAL: 'showTxSignModal',
-  WALLET_NOT_CONNECTED: 'walletNotConnected'
+  WALLET_NOT_CONNECTED: 'walletNotConnected',
+  ERROR_NOTIFY: 'errorNotify'
 };

src/connectProvider/web3Provider/web3-provider/methods/eth_sendTransaction.js

@@ -1,3 +1,4 @@
+/* eslint-disable */
 import EthCalls from '../web3Calls';
 import EventNames from '../events';
 import { toPayload, toError } from '../jsonrpc';
@@ -58,6 +59,7 @@ export default async (
         : tx.gasPrice;
     tx.chainId = !tx.chainId ? store.state.network.type.chainID : tx.chainId;
   } catch (e) {
+    eventHub.emit(EventNames.ERROR_NOTIFY, e)
     debugErrors(e);
     res(e);
     return;
@@ -106,6 +108,7 @@ export default async (
                       }
                     })
                     .catch(err => {
+                      eventHub.emit(EventNames.ERROR_NOTIFY, err)
                       _promiObj.emit('error', err);
                     });
                 }, 1000);
@@ -114,6 +117,7 @@ export default async (
             res(null, toPayload(payload.id, hash));
           })
           .on('error', err => {
+            eventHub.emit(EventNames.ERROR_NOTIFY, err)
             debugErrors('Error: eth_sendTransaction', err);
             res(err);
           });

src/connectProvider/web3Provider/web3-provider/methods/eth_signTransaction.js

@@ -61,6 +61,7 @@ export default async (
         });
       })
       .catch(e => {
+        eventHub.emit(EventNames.ERROR_NOTIFY, e)
         debugErrors('Error: eth_signTransaction', e);
         res(e);
       });

src/connectWindow/messageCreator.js

@@ -34,6 +34,11 @@ export function getMessage(text, extra) {
     }
   }
 
+  const regEx = new RegExp(/^Returned error:/)
+  if(regEx.test(text)){
+    return text;
+  }
+
   if (!text) {
     return messages.defaultMessage;
   }

test/clients/receiverV1.js

@@ -108,12 +108,10 @@ export default class MewConnectReceiver extends EventEmitter {
   }
 
   async setKeys(publicKey, privateKey, connId) {
-    console.log(privateKey); // todo remove dev item
     this.publicKey = publicKey
     this.privateKey = privateKey
     this.connId = connId
     this.signed = CryptoUtils.signMessage(this.privateKey, this.privateKey)
-    console.log(this.signed); // todo remove dev item
   }
 
   isJSON(arg) {