From fd3c8bced7c3ac43d7408704a8b9960ec378031d Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Tue, 30 May 2017 13:41:30 +0200
Subject: [PATCH] UI2 fixes for Signer popup (#5711)

* Fix new origin shape

* Pass input types through (<input /> tag)

* Update build
---
 .../shell/Signer/components/RequestOrigin/requestOrigin.js | 7 +++++--
 js/src/ui/Form/Input/input.js                              | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/js/src/shell/Signer/components/RequestOrigin/requestOrigin.js b/js/src/shell/Signer/components/RequestOrigin/requestOrigin.js
index 5cc6b8fa4..eff02dc6b 100644
--- a/js/src/shell/Signer/components/RequestOrigin/requestOrigin.js
+++ b/js/src/shell/Signer/components/RequestOrigin/requestOrigin.js
@@ -29,7 +29,10 @@ export default class RequestOrigin extends Component {
   static propTypes = {
     origin: PropTypes.shape({
       type: PropTypes.oneOf(['unknown', 'dapp', 'rpc', 'ipc', 'signer']),
-      details: PropTypes.string.isRequired
+      details: PropTypes.shape({
+        dapp: PropTypes.string,
+        session: PropTypes.string
+      }).isRequired
     }).isRequired
   };
 
@@ -126,7 +129,7 @@ export default class RequestOrigin extends Component {
     }
 
     if (origin.type === 'signer') {
-      return this.renderSigner(origin.details);
+      return this.renderSigner(origin.details.session || origin.details);
     }
   }
 
diff --git a/js/src/ui/Form/Input/input.js b/js/src/ui/Form/Input/input.js
index 9a3729a52..9c1776f44 100644
--- a/js/src/ui/Form/Input/input.js
+++ b/js/src/ui/Form/Input/input.js
@@ -139,11 +139,12 @@ export default class Input extends Component {
           step={ step }
           style={ style }
           tabIndex={ tabIndex }
-          type={ type }
           value={ parseI18NString(this.context, value || defaultValue) }
         >
           { this.renderCopyButton() }
-          <input />
+          <input
+            type={ type }
+          />
           { children }
         </SemanticInput>
       </LabelWrapper>