fix(dismiss): fix link to detailed Notice being triggered

dis-moi · Jul 8, 2019 · fd0d913 · fd0d913
1 parent a3d1964
commit fd0d913
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/components/organisms/Notice/Notice.tsx b/src/components/organisms/Notice/Notice.tsx
@@ -100,13 +100,10 @@ export default class Notice extends PureComponent<Props, CountDownState> {
     const { intervalID } = this.state;
     if (intervalID) {
       window.clearInterval(intervalID);
+      this.setState({ intervalID: null });
     }
   };
 
-  onUndismiss = () => {
-    this.stopCountdown();
-  };
-
   componentWillUnmount(): void {
     this.stopCountdown();
   }
@@ -130,7 +127,7 @@ export default class Notice extends PureComponent<Props, CountDownState> {
       <Container style={style}>
         {!dismissed && !disliked && <DeleteButton onClick={this.onDismiss} />}
         <Content
-          to={dismissed ? undefined : `notices/details/${id}`}
+          to={dismissed || intervalID ? undefined : `notices/details/${id}`}
           read={read}
         >
           {(dismissed || disliked) && intervalID ? (

diff --git a/src/components/organisms/NoticeDetails/NoticeDetails.tsx b/src/components/organisms/NoticeDetails/NoticeDetails.tsx
@@ -60,6 +60,7 @@ class NoticeDetails extends PureComponent<NoticeDetailsProps, CountDownState> {
   stopCountdown = () => {
     if (this.state.intervalID) {
       window.clearInterval(this.state.intervalID);
+      this.setState({ intervalID: null });
     }
   };
 
@@ -93,7 +94,7 @@ class NoticeDetails extends PureComponent<NoticeDetailsProps, CountDownState> {
     const { notice: { id }, undislike } = this.props;
     undislike(id);
     this.stopCountdown();
-  }
+  };
 
   handleFollowSource = () => {
     const {
@@ -124,7 +125,7 @@ class NoticeDetails extends PureComponent<NoticeDetailsProps, CountDownState> {
         contributor,
         source,
         ratings: { likes, dislikes },
-        state: { liked, disliked }
+        state: { liked, disliked, dismissed }
       }
     } = this.props;