Fix Token Reg Dapp issues in Firefox (#4489)

* Fix overflow issues in Firefox (#4348)

* Fix wrong Promise inferance

* Add new Componennt for Token Images (#4496)

* Revert "Add new Componennt for Token Images (#4496)"

This reverts commit 6ffbdab891f85e4d988e3e8e96fc2c651bd68e04.
This commit is contained in:
Nicolas Gotchac 2017-02-09 17:41:01 +01:00 committed by Jaco Greeff
parent 2043123db0
commit 867a593988
2 changed files with 12 additions and 12 deletions

View File

@ -105,11 +105,14 @@ export default class InputText extends Component {
const { validationType, contract } = this.props; const { validationType, contract } = this.props;
const validation = validate(value, validationType, contract); const validation = validate(value, validationType, contract);
if (validation instanceof Promise) { const loadingTimeout = setTimeout(() => {
this.setState({ disabled: true, loading: true }); this.setState({ disabled: true, loading: true });
}, 50);
return Promise.resolve(validation)
.then((validation) => {
clearTimeout(loadingTimeout);
return validation
.then(validation => {
this.setValidation({ this.setValidation({
...validation, ...validation,
disabled: false, disabled: false,
@ -120,9 +123,6 @@ export default class InputText extends Component {
}); });
} }
this.setValidation(validation);
}
onKeyDown = (event) => { onKeyDown = (event) => {
if (!this.props.onEnter) { if (!this.props.onEnter) {
return; return;

View File

@ -49,7 +49,7 @@
} }
.token-container { .token-container {
flex: 1; flex: 1 1 auto;
} }
.full-width .token-container { .full-width .token-container {