From 8686339b0c742a7b79752cbf3647c644791569fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Mon, 28 Nov 2016 11:55:29 +0100
Subject: [PATCH] Fixing UI to support both send and signTransaction

---
 js/src/api/format/output.js                                | 3 ++-
 js/src/redux/providers/signerMiddleware.js                 | 4 ++--
 .../Signer/components/RequestFinished/requestFinished.js   | 7 ++++---
 .../Signer/components/RequestPending/requestPending.js     | 7 ++++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/js/src/api/format/output.js b/js/src/api/format/output.js
index 262a275a0..1094cdb83 100644
--- a/js/src/api/format/output.js
+++ b/js/src/api/format/output.js
@@ -144,7 +144,8 @@ export function outSignerRequest (request) {
           break;
 
         case 'payload':
-          request[key].transaction = outTransaction(request[key].transaction);
+          request[key].signTransaction = outTransaction(request[key].signTransaction);
+          request[key].sendTransaction = outTransaction(request[key].sendTransaction);
           break;
       }
     });
diff --git a/js/src/redux/providers/signerMiddleware.js b/js/src/redux/providers/signerMiddleware.js
index 4cc877ced..2af1bfe65 100644
--- a/js/src/redux/providers/signerMiddleware.js
+++ b/js/src/redux/providers/signerMiddleware.js
@@ -72,8 +72,8 @@ export default class SignerMiddleware {
     };
 
     // Sign request in-browser
-    if (wallet && payload.transaction) {
-      const { transaction } = payload;
+    if (wallet && (payload.sendTransaction || payload.signTransaction)) {
+      const transaction = payload.sendTransaction || payload.signTransaction;
 
       (transaction.nonce.isZero()
         ? this._api.parity.nextNonce(transaction.from)
diff --git a/js/src/views/Signer/components/RequestFinished/requestFinished.js b/js/src/views/Signer/components/RequestFinished/requestFinished.js
index bce9e4038..edc5c4a47 100644
--- a/js/src/views/Signer/components/RequestFinished/requestFinished.js
+++ b/js/src/views/Signer/components/RequestFinished/requestFinished.js
@@ -25,7 +25,8 @@ export default class RequestFinished extends Component {
     result: PropTypes.any.isRequired,
     date: PropTypes.instanceOf(Date).isRequired,
     payload: PropTypes.oneOfType([
-      PropTypes.shape({ transaction: PropTypes.object.isRequired }),
+      PropTypes.shape({ signTransaction: PropTypes.object.isRequired }),
+      PropTypes.shape({ sendTransaction: PropTypes.object.isRequired }),
       PropTypes.shape({ sign: PropTypes.object.isRequired })
     ]).isRequired,
     msg: PropTypes.string,
@@ -58,8 +59,8 @@ export default class RequestFinished extends Component {
       );
     }
 
-    if (payload.transaction) {
-      const { transaction } = payload;
+    if (payload.sendTransaction || payload.signTransaction) {
+      const transaction = payload.sendTransaction || payload.signTransaction;
 
       return (
         <TransactionFinished
diff --git a/js/src/views/Signer/components/RequestPending/requestPending.js b/js/src/views/Signer/components/RequestPending/requestPending.js
index d8e2e0565..f7afe9133 100644
--- a/js/src/views/Signer/components/RequestPending/requestPending.js
+++ b/js/src/views/Signer/components/RequestPending/requestPending.js
@@ -27,7 +27,8 @@ export default class RequestPending extends Component {
     isSending: PropTypes.bool.isRequired,
     date: PropTypes.instanceOf(Date).isRequired,
     payload: PropTypes.oneOfType([
-      PropTypes.shape({ transaction: PropTypes.object.isRequired }),
+      PropTypes.shape({ signTransaction: PropTypes.object.isRequired }),
+      PropTypes.shape({ sendTransaction: PropTypes.object.isRequired }),
       PropTypes.shape({ sign: PropTypes.object.isRequired })
     ]).isRequired,
     className: PropTypes.string,
@@ -64,8 +65,8 @@ export default class RequestPending extends Component {
       );
     }
 
-    if (payload.transaction) {
-      const { transaction } = payload;
+    if (payload.sendTransaction || payload.signTransaction) {
+      const transaction = payload.sendTransaction || payload.signTransaction;
 
       return (
         <TransactionPending