From f957ba55dd998910c908abfb2e7f5f401746127b Mon Sep 17 00:00:00 2001
From: emizzle <ericmastro@status.im>
Date: Mon, 25 Feb 2019 12:02:43 +1100
Subject: [PATCH] fix(@embark/cockpit): Fix decode transaction error

Reproduce:
1. Go to cockpit > transactions
2. Click a transaction
3. There will be a flicker of an error, then the decoded tx displays OK. Inspecting the network requests, there is a 500 error with a response of
```
AssertionError [ERR_ASSERTION]: invalid remainder
```
This error is also printed in the console.

The issue is that the transaction is not a raw transaction, so instead of trying to decode the non-raw transaction, the transaction can be decoded by web3.
---
 packages/embark-ui/src/actions/index.js               |  3 ---
 .../embark-ui/src/components/ContractsDeployment.js   |  4 ++--
 packages/embark-ui/src/services/web3.js               | 11 +++++------
 .../src/lib/modules/blockchain_connector/index.js     |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/packages/embark-ui/src/actions/index.js b/packages/embark-ui/src/actions/index.js
index ba77cb1df..1b52a4501 100644
--- a/packages/embark-ui/src/actions/index.js
+++ b/packages/embark-ui/src/actions/index.js
@@ -1,6 +1,3 @@
-import {EMBARK_PROCESS_NAME} from '../constants';
-import {ansiToHtml} from '../utils/utils';
-
 export const REQUEST = 'REQUEST';
 export const SUCCESS = 'SUCCESS';
 export const FAILURE = 'FAILURE';
diff --git a/packages/embark-ui/src/components/ContractsDeployment.js b/packages/embark-ui/src/components/ContractsDeployment.js
index 1a33ec3aa..6bd3aefda 100644
--- a/packages/embark-ui/src/components/ContractsDeployment.js
+++ b/packages/embark-ui/src/components/ContractsDeployment.js
@@ -54,8 +54,8 @@ const LayoutContract = ({contract, children, cardTitle}) => (
 
 LayoutContract.propTypes = {
   contract: PropTypes.object,
-  children: PropTypes.array,
-  cardTitle: PropTypes.object
+  children: PropTypes.any,
+  cardTitle: PropTypes.any
 };
 
 const DeploymentResult = ({deployment}) => {
diff --git a/packages/embark-ui/src/services/web3.js b/packages/embark-ui/src/services/web3.js
index af6b102cf..f3393b4b5 100644
--- a/packages/embark-ui/src/services/web3.js
+++ b/packages/embark-ui/src/services/web3.js
@@ -21,13 +21,12 @@ export function estimateGas({web3, contract, args}) {
 
 export function deploy({web3, contract, args}) {
   return new Promise((resolve, reject) => {
-    const cleanup = () => { promiEvent.removeAllListeners(); };
-    const promiEvent = new web3.eth.Contract(contract.abiDefinition)
+    new web3.eth.Contract(contract.abiDefinition)
       .deploy({data: `0x${contract.code}`, arguments: args})
       .send({from: web3.eth.defaultAccount})
       .on('error', reject)
-      .on('receipt', resolve)
-      .then(cleanup)
-      .catch(cleanup);
-  });
+      .once('receipt', resolve)
+      .catch(reject)
+      .then(() => {});
+    });
 }
diff --git a/packages/embark/src/lib/modules/blockchain_connector/index.js b/packages/embark/src/lib/modules/blockchain_connector/index.js
index 554600cf5..4253352c8 100644
--- a/packages/embark/src/lib/modules/blockchain_connector/index.js
+++ b/packages/embark/src/lib/modules/blockchain_connector/index.js
@@ -419,7 +419,7 @@ class BlockchainConnector {
       'get',
       '/embark-api/blockchain/transactions/:hash',
       (req, res) => {
-        self.getTransactionByRawTransactionHash(req.params.hash, (err, transaction) => {
+        self.getTransactionByHash(req.params.hash, (err, transaction) => {
           if (err) {
             self.logger.error(err);
           }