Merge branch 'offer-notice' of WrenchBoard/Users-Wrench into master

src/components/Home/FullAccountDash.jsx

@@ -8,9 +8,11 @@ import { useSelector } from "react-redux";
 // import TopSellerTopBuyerSliderSection from "./TopSellerTopBuyerSliderSection";
 //import UpdateTable from "./UpdateTable";
 import HomeActivities from "./HomeActivities";
+import MyOffersTable from "../MyTasks/MyOffersTable";
 
 export default function FullAccountDash(props) {
   console.log("PROPS IN HOME->", props);
+
   const { userDetails } = useSelector((state) => state?.userDetails);
 
   return (
@@ -22,7 +24,16 @@ export default function FullAccountDash(props) {
           bannerList={props.bannerList}
           nextDueTask={props.nextDueTask}
         />
-        <HomeActivities className="mb-10" />
+        {props.offersList?.data?.result_list?.length ?
+          <MyOffersTable
+            MyActiveOffersList={props.offersList?.data}
+            className="mb-10"
+          />
+        : !props.offersList?.loading ?
+          <HomeActivities className="mb-10" />
+        :
+        null
+        }
         {/*<UpdateTable className="mb-10"/>*/}
         {/*<SellHistoryMarketVisitorAnalytic className="mb-10"/>*/}
         {/*<TopSellerTopBuyerSliderSection className="mb-10" />*/}

src/components/Home/index.jsx

@@ -12,7 +12,7 @@ export default function Home(props) {
   const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
 
   let [nextDueTask, setNextDueTask] = useState({});
-  const [MyOffersList, setMyOffersList] = useState([]);
+  const [MyOffersList, setMyOffersList] = useState({loading: true, data: []});
 
   const { userDetails } = useSelector((state) => state?.userDetails);
 
@@ -47,8 +47,9 @@ export default function Home(props) {
   const getMyOffersList = async () => {
     try {
       const res = await userApi.getOffersList();
-      setMyOffersList(res.data?.result_list);
+      setMyOffersList({loading:false, data:res.data});
     } catch (error) {
+      setMyOffersList({loading:false, data:[]});
       console.log("Error getting offers", error);
     }
   };
@@ -72,13 +73,14 @@ export default function Home(props) {
           <FamilyDash
             account={userDetails}
             commonHeadData={props.bannerList}
-            familyOffers={MyOffersList}
+            familyOffers={MyOffersList?.data?.result_list}
             MyActiveJobList={MyActiveJobList}
           />
         ) : userDetails && userDetails?.account_type == "FULL" ? (
           <FullAccountDash
             nextDueTask={nextDueTask}
             bannerList={props.bannerList}
+            offersList={MyOffersList}
           />
         ) : (
           <div>