fix Signer UI (#2750)

* fix Signer UI

* resolve conflicts
This commit is contained in:
Jannis Redmann 2016-10-22 19:25:30 +02:00 committed by Jaco Greeff
parent cf9ad991db
commit bf827a758f
3 changed files with 11 additions and 5 deletions

View File

@ -46,7 +46,6 @@ export default class RequestFinishedWeb3 extends Component {
id={ id } id={ id }
address={ sign.address } address={ sign.address }
hash={ sign.hash } hash={ sign.hash }
result={ result }
msg={ msg } msg={ msg }
status={ status } status={ status }
error={ error } error={ error }

View File

@ -15,6 +15,7 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>. /* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/ */
.container { .container {
position: relative;
padding: 25px 0 15px; padding: 25px 0 15px;
} }
@ -61,7 +62,6 @@
} }
.actions { .actions {
width: 180px;
display: inline-block; display: inline-block;
min-height: 120px; min-height: 120px;
} }

View File

@ -25,10 +25,13 @@ import styles from './SignRequest.css';
const nullable = (type) => React.PropTypes.oneOfType([ React.PropTypes.oneOf([ null ]), type ]); const nullable = (type) => React.PropTypes.oneOfType([ React.PropTypes.oneOf([ null ]), type ]);
export default class SignRequest extends Component { export default class SignRequest extends Component {
static contextTypes = {
api: PropTypes.object
}
// TODO [todr] re-use proptypes? // TODO [todr] re-use proptypes?
static propTypes = { static propTypes = {
id: PropTypes.string.isRequired, id: PropTypes.object.isRequired,
address: PropTypes.string.isRequired, address: PropTypes.string.isRequired,
hash: PropTypes.string.isRequired, hash: PropTypes.string.isRequired,
isFinished: PropTypes.bool.isRequired, isFinished: PropTypes.bool.isRequired,
@ -75,7 +78,10 @@ export default class SignRequest extends Component {
} }
renderDetails () { renderDetails () {
const { address, balance, chain, hash } = this.props; const { address, hash } = this.props;
const { balance, chain } = this.state;
if (!balance || !chain) return (<div />);
return ( return (
<div className={ styles.signDetails }> <div className={ styles.signDetails }>
@ -95,7 +101,8 @@ export default class SignRequest extends Component {
if (isFinished) { if (isFinished) {
if (status === 'confirmed') { if (status === 'confirmed') {
const { chain, hash } = this.props; const { hash } = this.props;
const { chain } = this.state;
return ( return (
<div className={ styles.actions }> <div className={ styles.actions }>