Fix null poll

mashirozx · Nov 3, 2020 · dc7b06f · dc7b06f
1 parent 19c8d15
commit dc7b06f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/javascript/mastodon/components/poll.js b/app/javascript/mastodon/components/poll.js
@@ -39,6 +39,9 @@ class Poll extends ImmutablePureComponent {
 
   static getDerivedStateFromProps (props, state) {
     const { poll, intl } = props;
+    if (!poll) {
+      return null;
+    }
     const expires_at = poll.get('expires_at');
     const expired = poll.get('expired') || expires_at !== null && (new Date(expires_at)).getTime() < intl.now();
     return (expired === state.expired) ? null : { expired };
@@ -59,7 +62,7 @@ class Poll extends ImmutablePureComponent {
   _setupTimer () {
     const { poll, intl } = this.props;
     clearTimeout(this._timer);
-    if (!this.state.expired) {
+    if (!this.state.expired && !!poll) {
       const delay = (new Date(poll.get('expires_at'))).getTime() - intl.now();
       this._timer = setTimeout(() => {
         this.setState({ expired: true });