Merge branch 'height-fix' of WrenchBoard/Users-Wrench into master

src/components/Home/index.jsx

@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from "react";
+import {Navigate} from 'react-router-dom'
 import datas from "../../data/product_data.json";
 import Layout from "../Partials/Layout";
 import usersService from "../../services/UsersService";
@@ -43,9 +44,10 @@ export default function Home(props) {
               }
           </>
         ) : (
-          <div>
+          // <div>
-            You are not logged in or your account type is not supported.
+          //   You are not logged in or your account type is not supported.
-          </div>
+          // </div>
+          <Navigate to='/login' />
         )}
         </>
       </div>

src/components/MarketPlace/PopUp/MarketPopUp.jsx

@@ -133,11 +133,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
   // let addedIntDate = marketInt?.added?.split(" ")[0];
   // let expireIntDate = marketInt?.expire?.split(" ")[0];
 
-  let cleanedText = details?.job_description
+  let cleanedText = details?.job_description?.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&amp;/g, "&");
-    ?.replace(/&lt;/g, "<")
-    .replace(/&gt;/g, ">")
-    .replace(/&quot;/g, '"')
-    .replace(/&amp;/g, "&");
 
   return (
     <ModalCom action={onClose} situation={situation}>
@@ -197,8 +193,8 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
                     <div
                       className={`w-full p-2 md:w-3/4 text-slate-900 dark:text-white market-pop rounded-2xl ${
                         name == "Description"
-                          ? "min-h-[150px] max-h-[150px] h-full overflow-y-auto break-words bg-slate-50"
+                          ? "min-h-[100px] max-h-[100px] h-full overflow-y-auto break-words bg-slate-50"
-                          : name == "Delivery Detail" ? " overflow-y-auto h-full min-h-[150px] max-h-[150px] bg-slate-50"
+                          : name == "Delivery Detail" ? " overflow-y-auto h-full min-h-[200px] max-h-[200px] bg-slate-50"
                           : "h-full flex items-center"
                       }`}
                     >

src/components/Partials/Header.jsx

@@ -480,7 +480,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                           {/* end Language list items*/}
                         </li>
                         <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
-                          <Link to="#" className="notifications">
+                          <Link to="/settings" className="notifications">
                             <div className="name">
                               <p className="text-sm py-2 px-4 text-dark-gray dark:text-white hover:text-sky-blue transition font-medium">
                                 Account Settings

src/middleware/AuthRoute.jsx

@@ -90,7 +90,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
         apiCall
           .loadProfile()
           .then((res) => {
-            if (res?.data?.internal_return < 0) {
+            if (!res?.data?.internal_return || res?.data?.internal_return < 0) {
               setIsLogin({ loading: false, status: false });
               return;
             }