forked from treehouse/mastodon
Fix web UI crash on page load when detailed status has a poll
Port 5dfa433698
to glitch-soc
signup-info-prompt
parent
2156765448
commit
f14eda23e9
|
@ -45,7 +45,7 @@ export default @injectIntl
|
|||
class Poll extends ImmutablePureComponent {
|
||||
|
||||
static propTypes = {
|
||||
poll: ImmutablePropTypes.map.isRequired,
|
||||
poll: ImmutablePropTypes.map,
|
||||
intl: PropTypes.object.isRequired,
|
||||
dispatch: PropTypes.func,
|
||||
disabled: PropTypes.bool,
|
||||
|
@ -122,6 +122,11 @@ class Poll extends ImmutablePureComponent {
|
|||
|
||||
render () {
|
||||
const { poll, intl } = this.props;
|
||||
|
||||
if (!poll) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const timeRemaining = timeRemainingString(intl, new Date(poll.get('expires_at')), intl.now());
|
||||
const showResults = poll.get('voted') || poll.get('expired');
|
||||
const disabled = this.props.disabled || Object.entries(this.state.selected).every(item => !item);
|
||||
|
|
Loading…
Reference in New Issue