Remove redirect from NewConversation.js, remove clearing data on unmonut, add clearing data to SelectType.js

Clearing data on unmount of NewConveration was causing clearing data on changing route. It was unwanted action, decided to add clear action whenever user hit SelectType route

Author: thecactoos

src/pages/NewConversation/NewConversation.js

@@ -1,6 +1,5 @@
-import React, { useEffect } from "react";
+import React from "react";
 import { Redirect, Switch, Route } from "react-router-dom";
-import { useDispatch, useSelector } from "react-redux";
 import { useMediaQuery } from "react-responsive";
 
 // Components
@@ -11,39 +10,18 @@ import DirectMessage from "./DirectMessageForm/DirectMessageFrom";
 
 // Routes
 import {
-  CONVERSATION_WITHOUT_ID,
   NEW_CONVERSATION_GROUP_RECEIVERS,
   NEW_CONVERSATION_GROUP_INFO,
   NEW_CONVERSATION_DM_RECEIVER,
   NEW_CONVERSATION_DM_CONVERSATION,
   NEW_CONVERSATION,
 } from "../../consts/routes";
 
-// Actions
-import { clearNewConversation } from "../../actions/newconversation-actions";
-
 function NewConversation() {
-  const dispatch = useDispatch();
-  const conversation = useSelector(
-    (state) => state.newconversation.conversation
-  );
-
   const isSmallScreen = useMediaQuery({
     query: "(max-width: 1023px)",
   });
 
-  useEffect(() => {
-    return () => {
-      if (conversation) {
-        dispatch(clearNewConversation());
-      }
-    };
-  }, [dispatch, conversation]);
-
-  if (conversation) {
-    return <Redirect to={`${CONVERSATION_WITHOUT_ID}${conversation._id}`} />;
-  }
-
   return (
     <>
       {isSmallScreen ? (

src/pages/NewConversation/SelectType/SelectType.js

@@ -1,5 +1,6 @@
-import React from "react";
+import React, { useEffect } from "react";
 import { Link, useLocation } from "react-router-dom";
+import { useDispatch } from "react-redux";
 
 // Components
 import BackLink from "../../../components/BackLink/BackLink";
@@ -9,15 +10,24 @@ import {
   NEW_CONVERSATION_GROUP_RECEIVERS,
   NEW_CONVERSATION_DM_RECEIVER,
 } from "../../../consts/routes";
+
 // Assets
 import { ReactComponent as NewGroupSVG } from "../../../assets/group.svg";
 import { ReactComponent as NewDMSVG } from "../../../assets/plane.svg";
 
+// Actions
+import { clearNewConversation } from "../../../actions/newconversation-actions";
+
 // Styles
 import classes from "./SelectType.module.scss";
 
 function NewConversationSelectType() {
   const location = useLocation();
+  const dispatch = useDispatch();
+  useEffect(() => {
+    // Clear previeous values of new-conversation
+    dispatch(clearNewConversation());
+  }, [dispatch]);
   return (
     <section className={classes.SelectType}>
       <BackLink className={classes.Btn} />