Bug fixed

src/components/CreateReview/CreateReview.js

@@ -66,13 +66,7 @@ const CreateReview = (props) => {
     }
   };
   const goToPrevStep = () => {
-    if (currentStep === 2) {
-      setInformations({});
-      setCurrentStep(1);
-    }
-    if (currentStep === 3) {
-      setCurrentStep(2);
-    }
+    setCurrentStep(prevCurrentStep => prevCurrentStep - 1);
   };
   return (
     <CreateReviewContainer currentStep={currentStep}>
@@ -88,6 +82,7 @@ const CreateReview = (props) => {
         <FirstStepCreateReview
           offer={offer}
           interlocutor={props.interlocutor}
+          informations={informations}
           goToNextStep={goToNextStep}
         />
       )}

src/components/CreateReview/FirstStep/FirstStepCreateReview.js

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import PropTypes from "prop-types";
 import {
   FirstStepCreateReviewContainer,
@@ -20,8 +20,6 @@ import { useFormik } from "formik";
 import * as Yup from "yup";
 import useScreenDimensions from "../../../hooks/useScreenDimensions";
 
-// const selectFieldValidation = Yup.string().oneOf(Object.keys(reviewEnum).map(property => reviewEnum[property].mainText));
-
 const FirstStepCreateReview = (props) => {
   const offer = props.offer;
   const interlocutor = props.interlocutor;
@@ -31,6 +29,20 @@ const FirstStepCreateReview = (props) => {
     props.goToNextStep(values);
   };
 
+  useEffect(() => {
+    if (props.informations?.exchangeSucceed) {
+      formik.setFieldValue(
+        "exchangeSucceed",
+        props.informations?.exchangeSucceed
+      );
+      formik.setFieldValue(
+        "correctCommunication",
+        props.informations?.correctCommunication
+      );
+      formik.setFieldValue("comment", props.informations?.comment);
+    }
+  }, [props.informations]);
+
   const formik = useFormik({
     initialValues: {
       exchangeSucceed: reviewEnum.YES.mainText,
@@ -64,18 +76,15 @@ const FirstStepCreateReview = (props) => {
         leftText={t("reviews.isCorrectCommunication").toUpperCase()}
       />
       <SelectField
-        defaultValue={reviewEnum.YES}
+        defaultValue={formik.values.correctCommunication}
         onChange={(event) =>
-          formik.setFieldValue(
-            "correctCommunication",
-            event.target.value.mainText
-          )
+          formik.setFieldValue("correctCommunication", event.target.value)
         }
       >
         {Object.keys(reviewEnum).map((property) => (
           <SelectOption
             key={reviewEnum[property].value}
-            value={reviewEnum[property]}
+            value={reviewEnum[property].mainText}
           >
             {reviewEnum[property].mainText}
           </SelectOption>
@@ -84,21 +93,22 @@ const FirstStepCreateReview = (props) => {
 
       <FieldLabel leftText={t("reviews.hasExchangeSucceed").toUpperCase()} />
       <SelectField
-        defaultValue={reviewEnum.YES}
+        defaultValue={formik.values.exchangeSucceed}
         onChange={(event) =>
-          formik.setFieldValue("exchangeSucceed", event.target.value.mainText)
+          formik.setFieldValue("exchangeSucceed", event.target.value)
         }
       >
         {Object.keys(reviewEnum).map((property) => {
           if (property === "NOT_BAD") return;
           return (
-          <SelectOption
-            key={reviewEnum[property].value}
-            value={reviewEnum[property]}
-          >
-            {reviewEnum[property].mainText}
-          </SelectOption>
-        )})}
+            <SelectOption
+              key={reviewEnum[property].value}
+              value={reviewEnum[property].mainText}
+            >
+              {reviewEnum[property].mainText}
+            </SelectOption>
+          );
+        })}
       </SelectField>
 
       <FieldLabel leftText={t("reviews.comment")} />
@@ -131,6 +141,11 @@ FirstStepCreateReview.propTypes = {
   offer: PropTypes.any,
   interlocutor: PropTypes.any,
   goToNextStep: PropTypes.func,
+  informations: PropTypes.shape({
+    exchangeSucceed: PropTypes.string,
+    correctCommunication: PropTypes.string,
+    comment: PropTypes.string,
+  }),
 };
 
 export default FirstStepCreateReview;

src/components/DirectChat/DirectChatHeader/DirectChatHeader.js

@@ -32,6 +32,15 @@ const DirectChatHeader = (props) => {
     }
     return false;
   }, [exchange, userId])
+
+  useEffect(() => {
+    if (showReviewModal) {
+      document.body.style.overflow = "hidden";
+    } else {
+      document.body.style.overflow = "auto";
+    }
+  }, [showReviewModal])
+
   const makeReview = () => {
     setShowReviewModal(true);
   };

src/components/DirectChat/DirectChatNewMessage/DirectChatNewMessage.js

@@ -9,6 +9,7 @@ import { useTranslation } from "react-i18next";
 import selectedTheme from "../../../themes";
 import { useDispatch } from "react-redux";
 import {
+  fetchChats,
   sendMessage,
   startNewChat,
 } from "../../../store/actions/chat/chatActions";
@@ -24,6 +25,7 @@ const DirectChatNewMessage = (props) => {
     props.refreshChat();
   };
   const handleSend = () => {
+    console.log(location.state?.offerId);
     if (location.state?.offerId) {
       initiateNewChat(typedValue);
     } else {
@@ -39,6 +41,7 @@ const DirectChatNewMessage = (props) => {
   };
   const handleMessageSendSuccess = (newChatId) => {
     history.replace(`${newChatId}`);
+    dispatch(fetchChats());
   };
   const initiateNewChat = (typedValue) => {
     const offerId = location.state.offerId;

src/layouts/ItemDetailsLayout/ItemDetailsLayout.styled.js

@@ -24,10 +24,6 @@ export const RightCard = styled(Grid)`
   margin-top: 34px;
   border-top-right-radius: 4px;
   width: 100%;
-  /* @media (max-width: 800px) {
-    position: relative;
-    bottom: -500px;
-  } */
 `;
 export const Content = styled(Grid)`
 `;