grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

UI2 fixes for Signer popup (#5711)

Browse Source 
* Fix new origin shape

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

* Update build
This commit is contained in:
Jaco Greeff 2017-05-30 13:41:30 +02:00 committed by GitHub
parent d888190637
commit fd3c8bced7
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/shell/Signer/components/RequestOrigin/requestOrigin.js
View File

@ -29,7 +29,10 @@ export default class RequestOrigin extends Component {
static propTypes = { static propTypes = {
origin: PropTypes.shape({ origin: PropTypes.shape({
type: PropTypes.oneOf(['unknown', 'dapp', 'rpc', 'ipc', 'signer']), type: PropTypes.oneOf(['unknown', 'dapp', 'rpc', 'ipc', 'signer']),
details: PropTypes.string.isRequired details: PropTypes.shape({
dapp: PropTypes.string,
session: PropTypes.string
}).isRequired
}).isRequired }).isRequired
}; };
@ -126,7 +129,7 @@ export default class RequestOrigin extends Component {
} }
if (origin.type === 'signer') { if (origin.type === 'signer') {
return this.renderSigner(origin.details); return this.renderSigner(origin.details.session || origin.details);
} }
} }

5
js/src/ui/Form/Input/input.js
View File

@ -139,11 +139,12 @@ export default class Input extends Component {
step={ step } step={ step }
style={ style } style={ style }
tabIndex={ tabIndex } tabIndex={ tabIndex }
type={ type }
value={ parseI18NString(this.context, value || defaultValue) } value={ parseI18NString(this.context, value || defaultValue) }
> >
{ this.renderCopyButton() } { this.renderCopyButton() }
<input /> <input
type={ type }
/>
{ children } { children }
</SemanticInput> </SemanticInput>
</LabelWrapper> </LabelWrapper>