Ready for demo

src/components/Cards/CreateOfferCard/SecondPart/SecondPartCreateOffer.js

@@ -26,7 +26,7 @@ const SecondPartCreateOffer = (props) => {
       props?.offer,
       images
     );
-  }, [props?.informations, props?.offer, images]);
+  }, [props?.informations, props?.offer]);
 
   useEffect(() => {
     formik.setFieldValue("images", images);

src/components/Cards/OfferCard/OfferCard.styled.js

@@ -246,7 +246,7 @@ export const MessageIcon = styled(IconButton)`
       height: 16px;
       position: relative;
       top: -3px;
-      left: -2.4px;
+      left: -3.5px;
     }
   }
 `;

src/components/Header/Drawer/Buttons/PrivacyPolicyButton/PrivacyPolicyButton.js

@@ -9,6 +9,7 @@ import {
 } from "./PrivacyPolicyButton.styled";
 import { ABOUT_PAGE } from "../../../../../constants/pages";
 import scrollConstants from "../../../../../constants/scrollConstants";
+import history from "../../../../../store/utils/history";
 
 const PrivacyPolicyButton = (props) => {
   const { t } = useTranslation();

src/components/MarketPlace/Header/Header.js

@@ -1,6 +1,7 @@
 import React, { useMemo } from "react";
 import PropTypes from "prop-types";
 import {
+  ButtonContainer,
   // ButtonContainer,
   CategoryHeaderIcon,
   HeaderAltLocation,
@@ -14,6 +15,7 @@ import {
   HeaderOptions,
   HeaderSelect,
   HeaderSubcategoryString,
+  HeaderText,
   // HeaderText,
   HeaderTitleContainer,
   HeaderTitleText,
@@ -37,8 +39,9 @@ import SkeletonHeader from "./SkeletonHeader/SkeletonHeader";
 import { useSelector } from "react-redux";
 import { selectHeaderString } from "../../../store/selectors/filtersSelectors";
 import useIsMobile from "../../../hooks/useIsMobile";
+import { ArrowButton } from "../../Buttons/ArrowButton/ArrowButton";
 // import { ArrowButton } from "../../Buttons/ArrowButton/ArrowButton";
-// import history from "../../../store/utils/history";
+import history from "../../../store/utils/history";
 
 const DownArrow = (props) => (
   <IconStyled {...props}>
@@ -75,6 +78,9 @@ const Header = (props) => {
     props.offers.filters.locations.clear();
     props.offers.applyFilters();
   };
+  const goBack = () => {
+    history.goBack();
+  };
 
   return (
     <>
@@ -89,27 +95,44 @@ const Header = (props) => {
                   <CategoryHeaderIcon />
                   <HeaderLocation>
                     {/* {headerString} */}
-                    <HeaderCategoryString component="span" onClick={handleClickCategory}>
+                    <HeaderCategoryString
+                      component="span"
+                      onClick={handleClickCategory}
+                    >
                       {headerString.categoryString}
-                      {headerString.subcategoryString && <>&nbsp;</>}
+                      {/* {headerString.subcategoryString && <>&nbsp;</>} */}
                     </HeaderCategoryString>
-                    <HeaderSubcategoryString component="span" onClick={handleClickSubcategory}>
+                    <HeaderSubcategoryString
+                      component="span"
+                      onClick={handleClickSubcategory}
+                    >
                       {headerString.subcategoryString}
-                      {headerString.locationsString && <>&nbsp;</>}
+                      {/* {headerString.locationsString && <>&nbsp;</>} */}
                     </HeaderSubcategoryString>
                     <HeaderLocationsString component="span">
                       <HeaderLocationsMainString component="span">
                         {headerString.locationsString}
                       </HeaderLocationsMainString>
-                      <HeaderAltLocation component="span">{altString}</HeaderAltLocation>
+                      <HeaderAltLocation component="span">
+                        {altString}
+                      </HeaderAltLocation>
                     </HeaderLocationsString>
                   </HeaderLocation>
                 </>
               ) : (
-                <HeaderTitleContainer>
-                  <SwapsHeaderIcon />
-                  <HeaderTitleText>{t("header.myOffers")}</HeaderTitleText>
-                </HeaderTitleContainer>
+                <>
+                  {!isMobile ? (
+                    <HeaderTitleContainer>
+                      <SwapsHeaderIcon />
+                      <HeaderTitleText>{t("header.myOffers")}</HeaderTitleText>
+                    </HeaderTitleContainer>
+                  ) : (
+                    <ButtonContainer onClick={goBack}>
+                      <ArrowButton side={"left"}></ArrowButton>
+                      <HeaderText>{t("messages.goBack")}</HeaderText>
+                    </ButtonContainer>
+                  )}
+                </>
               )}
             </TooltipInnerContainer>
           </Tooltip>

src/components/Paging/Paging.styled.js

@@ -104,7 +104,7 @@ export const PageNumber = styled(Box)`
     min-width: 30px;
     max-width: 30px;
     width: 30px !important;
-    padding-top: 6px;
+    padding-top: 5px;
     font-size: 14px;
     margin: 1px;
   }

src/components/Popovers/MyPosts/MyPosts.js

@@ -1,21 +1,6 @@
 import React, { useEffect, useState } from "react";
 import { EyeIcon, PostsImgSuit } from "./MyPosts.styled";
 import PropTypes from "prop-types";
-
-// const dummyData2 = [
-//   {
-//     alt: "Remy Sharp",
-//     src: "/static/images/avatar/1.jpg",
-//     title: "Gitara",
-//     text: (<React.Fragment><PostsImgSuit/> Player.rs</React.Fragment>)
-//   },
-//   {
-//     alt: "Remy Sharp",
-//     src: "/static/images/avatar/1.jpg",
-//     title: "Gitara",
-//     text: (<React.Fragment><PostsImgSuit/> Player.rs</React.Fragment>)
-//   }
-// ]
 import HeaderPopover from "../HeaderPopover/HeaderPopover";
 import { useTranslation } from "react-i18next";
 import { useDispatch, useSelector } from "react-redux";

src/i18n/resources/rs.js

@@ -244,6 +244,7 @@ export default {
     labelNameRequired: "Ime firme je obavezno!",
     labelPIBRequired: "PIB firme je obavezan!",
     labelLocationRequired: "Lokacija je obavezna!",
+    labelLocationValid: "Unesite ispravnu lokaciju!",
     labelPhoneValid: "Unesite validan broj telefona",
     labelPhoneRequired: "Broj telefona je obavezan!",
   },

src/layouts/ProfileLayout/ProfileLayout.styled.js

@@ -12,11 +12,11 @@ export const ProfileLayoutContainer = styled(Container)`
   /* flex: 1; */
   height: 100%;
   @media (max-width: 1200px) {
-    padding-right: ${(props) => (props.profile ? 0 : "36px")};
+    padding-right: 36px;
   }
   @media (max-width: 600px) {
     padding-left: 18px;
-    padding-right: ${(props) => (props.profile ? 0 : "18px")};
+    padding-right: 18px;
   }
 `;