diff --git a/js/src/views/Signer/components/RequestFinishedWeb3/RequestFinishedWeb3.js b/js/src/views/Signer/components/RequestFinishedWeb3/RequestFinishedWeb3.js index 168d306d3..7b30d3e93 100644 --- a/js/src/views/Signer/components/RequestFinishedWeb3/RequestFinishedWeb3.js +++ b/js/src/views/Signer/components/RequestFinishedWeb3/RequestFinishedWeb3.js @@ -46,7 +46,6 @@ export default class RequestFinishedWeb3 extends Component { id={ id } address={ sign.address } hash={ sign.hash } - result={ result } msg={ msg } status={ status } error={ error } diff --git a/js/src/views/Signer/components/SignRequest/SignRequest.css b/js/src/views/Signer/components/SignRequest/SignRequest.css index f1981986d..03ae73009 100644 --- a/js/src/views/Signer/components/SignRequest/SignRequest.css +++ b/js/src/views/Signer/components/SignRequest/SignRequest.css @@ -15,6 +15,7 @@ /* along with Parity. If not, see . */ .container { + position: relative; padding: 25px 0 15px; } @@ -61,7 +62,6 @@ } .actions { - width: 180px; display: inline-block; min-height: 120px; } diff --git a/js/src/views/Signer/components/SignRequest/SignRequest.js b/js/src/views/Signer/components/SignRequest/SignRequest.js index 2c026edf9..25b3dd77d 100644 --- a/js/src/views/Signer/components/SignRequest/SignRequest.js +++ b/js/src/views/Signer/components/SignRequest/SignRequest.js @@ -25,10 +25,13 @@ import styles from './SignRequest.css'; const nullable = (type) => React.PropTypes.oneOfType([ React.PropTypes.oneOf([ null ]), type ]); export default class SignRequest extends Component { + static contextTypes = { + api: PropTypes.object + } // TODO [todr] re-use proptypes? static propTypes = { - id: PropTypes.string.isRequired, + id: PropTypes.object.isRequired, address: PropTypes.string.isRequired, hash: PropTypes.string.isRequired, isFinished: PropTypes.bool.isRequired, @@ -75,7 +78,10 @@ export default class SignRequest extends Component { } renderDetails () { - const { address, balance, chain, hash } = this.props; + const { address, hash } = this.props; + const { balance, chain } = this.state; + + if (!balance || !chain) return (
); return (
@@ -95,7 +101,8 @@ export default class SignRequest extends Component { if (isFinished) { if (status === 'confirmed') { - const { chain, hash } = this.props; + const { hash } = this.props; + const { chain } = this.state; return (