solve conflict

cofacts · Nov 22, 2017 · 8abf6c2 · 8abf6c2
2 parents 0726612 + 6aef87c
commit 8abf6c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pages/article.js b/pages/article.js
@@ -19,6 +19,7 @@ import {
   connectReply,
   updateReplyConnectionStatus,
   voteReply,
+  reset,
 } from '../redux/articleDetail';
 
 import { detailStyle, tabMenuStyle } from './article.styles';
@@ -125,6 +126,11 @@ class ArticlePage extends React.Component {
     };
   };
 
+  componentWillUnmount() {
+    const { dispatch } = this.props;
+    dispatch(reset());
+  }
+
   renderTabMenu = () => {
     const { data } = this.props;
     const { tab } = this.state;

diff --git a/redux/articleDetail.js b/redux/articleDetail.js
@@ -115,7 +115,7 @@ export const loadAuth = id => dispatch => {
     });
 };
 
-export const reset = () => createAction(RESET);
+export const reset = createAction(RESET);
 
 const reloadReply = articleId => dispatch =>
   gql`