Link task manage button to manage job page

src/components/FamilyAcc/FamilyTable.jsx

@@ -42,15 +42,15 @@ export default function FamilyTable({ className, familyList, loader }) {
                             key={idx}
                           >
                             <td className=" py-4">
-                              <div className="flex space-x-2 items-center">
-                                <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                              <div className="flex space-x-2 items-center w-full">
+                                <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] max-w-[60px]">
                                   <img
                                     src={dataImage1}
                                     alt="data"
                                     className="w-full h-full"
                                   />
                                 </div>
-                                <div className="flex flex-col">
+                                <div className="flex flex-col flex-[0.9]">
                                   <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
                                     {`${firstname} ${lastname} (${age})`}
                                   </h1>

src/components/MyActiveJobs/ActiveJobs.jsx

@@ -60,7 +60,7 @@ function ActiveJobs(props) {
                 <button
                   type="button"
                   className="text-[#374557] border border-sky-blue p-1 rounded-full"
-                  onClick={() => navigate('/my-active-jobs', {replace: true})}
+                  onClick={() => navigate(props.details.pathname, {replace: true})}
                 >
                   <svg
                     xmlns="http://www.w3.org/2000/svg"
@@ -78,8 +78,8 @@ function ActiveJobs(props) {
               </div>
               {/* END of back btn and title */}
 
-              <div className="mt-2 w-full lg:flex lg:justify-between lg:items-center lg:space-x-2">
-                <div className="my-2 lg:my-0">
+              <div className="mt-2 w-full flex flex-col-reverse lg:flex-row lg:justify-between lg:items-start lg:space-x-2">
+                <div className="w-full lg:w-2/3 my-2 lg:my-0">
                   <p className="text-base text-slate-700 dark:text-black">
                     {props.details?.contract && props.details.contract}
                   </p>
@@ -88,23 +88,25 @@ function ActiveJobs(props) {
                     {props.details?.description && props.details.description}
                   </p>
                   <p className="text-base text-sky-blue">Delivery Detail</p>
+                  <div className="">
+                    <p className="text-base text-slate-700 dark:text-black">
+                      <span className="font-semibold">Due: </span>
+                      {props.details?.delivery_date &&
+                        props.details.delivery_date.split(" ")[0]}
+                    </p>
+                    <p className="text-base text-slate-700 dark:text-black">
+                      {props.details?.delivery_date &&
+                        props.details.delivery_date.split(" ")[1]}
+                    </p>
+                    <p className="text-base text-slate-700 dark:text-black">
+                      {props.details?.timeline_days && props.details.timeline_days} day(s)
+                    </p>
+                  </div>
                 </div>
-                <div className="">
+                <div className="w-full lg:w-1/3 lg:text-center">
                   <p className="text-base text-sky-blue">
                     {userDetails.firstname && userDetails.firstname}
                   </p>
-                  <p className="text-base text-slate-700 dark:text-black">
-                    <span className="font-semibold">Due: </span>
-                    {props.details?.delivery_date &&
-                      props.details.delivery_date.split(" ")[0]}
-                  </p>
-                  <p className="text-base text-slate-700 dark:text-black">
-                    {props.details?.delivery_date &&
-                      props.details.delivery_date.split(" ")[1]}
-                  </p>
-                  <p className="text-base text-slate-700 dark:text-black">
-                    {props.details?.timeline_days && props.details.timeline_days} day(s)
-                  </p>
                 </div>
               </div>
             </div>

src/components/MyActiveJobs/MyActiveJobTable.jsx

@@ -1,13 +1,14 @@
 import React, { useState } from "react";
 import dataImage2 from "../../assets/images/data-table-user-2.png";
 
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useLocation } from "react-router-dom";
 
 import { handlePagingFunc } from "../Pagination/HandlePagination";
 import PaginatedList from "../Pagination/PaginatedList";
 
 export default function MyActiveJobTable({ MyJobList, className }) {
-  const navigate = useNavigate()
+  const navigate = useNavigate();
+  let {pathname} = useLocation()
 
   const filterCategories = ["All Categories", "Explore", "Featured"];
   const [selectedCategory, setCategory] = useState(filterCategories[0]);
@@ -51,15 +52,15 @@ export default function MyActiveJobTable({ MyJobList, className }) {
                         className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50"
                       >
                         <td className=" py-4">
-                          <div className="flex space-x-2 items-center">
-                            <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                          <div className="flex space-x-2 items-center w-full">
+                            <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] max-w-[60px]">
                               <img
                                 src={dataImage2}
                                 alt="data"
                                 className="w-full h-full"
                               />
                             </div>
-                            <div className="flex flex-col">
+                            <div className="flex flex-col flex-[0.9]">
                               <h1 className="font-bold text-xl text-dark-gray dark:text-white">
                                 {value.title}
                               </h1>
@@ -100,7 +101,9 @@ export default function MyActiveJobTable({ MyJobList, className }) {
                             <button
                               type="button"
                               onClick={() => {
-                                navigate('/manage-active-job', {state:value});
+                                navigate("/manage-active-job", {
+                                  state: {...value, pathname},
+                                });
                               }}
                               className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                             >

src/components/MyJobs/MyJobTable.jsx

@@ -1,19 +1,16 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react";
-import dataImage1 from "../../assets/images/data-table-user-1.png";
 import dataImage2 from "../../assets/images/data-table-user-2.png";
-import dataImage3 from "../../assets/images/data-table-user-3.png";
-import dataImage4 from "../../assets/images/data-table-user-4.png";
 import SelectBox from "../Helpers/SelectBox";
-import JobListPopout from "../jobPopout/JobListPopout";
 import DeleteJobPopout from "../jobPopout/DeleteJobPopout";
+import JobListPopout from "../jobPopout/JobListPopout";
 
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 
-import PaginatedList from "../Pagination/PaginatedList";
-import { handlePagingFunc } from "../Pagination/HandlePagination";
-import EditJobPopOut from "../jobPopout/EditJobPopout";
-import usersService from "../../services/UsersService";
 import { useSelector } from "react-redux";
+import usersService from "../../services/UsersService";
+import { handlePagingFunc } from "../Pagination/HandlePagination";
+import PaginatedList from "../Pagination/PaginatedList";
+import EditJobPopOut from "../jobPopout/EditJobPopout";
 
 export default function MyJobTable({ MyJobList, reloadJobList, className }) {
   const [myCountry, setCountries] = useState("");
@@ -32,7 +29,6 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
         const {
           data: { signup_country },
         } = await res;
-        console.log(signup_country);
         let checkCountry = signup_country
           ?.filter((item) => item[0] == country)
           ?.map((item, idx) => item[1])
@@ -91,10 +87,9 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
           contentBodyClasses="w-auto min-w-max"
         />
       </div>
-      {MyJobList.loading ? 
-      <LoadingSpinner size='16' color='sky-blue' />
-      :
-      (
+      {MyJobList.loading ? (
+        <LoadingSpinner size="16" color="sky-blue" />
+      ) : (
         <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
           <table className="table-auto min-w-full text-sm text-left text-gray-500 dark:text-gray-400">
             <tbody>
@@ -115,15 +110,15 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
                       >
                         <td className="py-9">
                           <div className="sm:flex sm:space-x-2 sm:justify-between sm:items-center job-items">
-                            <div className="flex space-x-2 items-center job-items">
-                              <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                            <div className="flex space-x-2 items-center job-items w-full">
+                              <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] max-w-[60px]">
                                 <img
                                   src={dataImage2}
                                   alt="data"
                                   className="w-full h-full"
                                 />
                               </div>
-                              <div className="flex flex-col">
+                              <div className="flex flex-col flex-[0.9]">
                                 <h1 className="font-bold text-xl text-dark-gray dark:text-white">
                                   {value.title}
                                 </h1>

src/components/MyPendingJobs/MyPendingJobTable.jsx

@@ -1,112 +1,144 @@
 import React, { useState } from "react";
-import dataImage1 from "../../assets/images/data-table-user-1.png";
 import dataImage2 from "../../assets/images/data-table-user-2.png";
-import dataImage3 from "../../assets/images/data-table-user-3.png";
-import dataImage4 from "../../assets/images/data-table-user-4.png";
-import SelectBox from "../Helpers/SelectBox";
 import PendingJobsPopout from "../jobPopout/PendingJobsPopout";
 
-import PaginatedList from "../Pagination/PaginatedList";
 import { handlePagingFunc } from "../Pagination/HandlePagination";
+import PaginatedList from "../Pagination/PaginatedList";
 
-export default function MyPendingJobTable({MyJobList, className }) {
-    const filterCategories = ["All Categories", "Explore", "Featured"];
-    const [selectedCategory, setCategory] = useState(filterCategories[0]);
+export default function MyPendingJobTable({ MyJobList, className }) {
+  const filterCategories = ["All Categories", "Explore", "Featured"];
+  const [selectedCategory, setCategory] = useState(filterCategories[0]);
+  let [jobPopout, setJobPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
 
-    let [jobPopout,setJobPopout] = useState({show:false, data:{}}) // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
+  const [currentPage, setCurrentPage] = useState(0);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentActiveJobList = MyJobList?.result_list?.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );
 
-    const [currentPage, setCurrentPage] = useState(0);
-    const indexOfFirstItem = Number(currentPage);
-    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
-    const currentActiveJobList = MyJobList?.result_list?.slice(indexOfFirstItem, indexOfLastItem);
-  
-    const handlePagination = (e) => {
-        handlePagingFunc(e,setCurrentPage)
-    }
+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };
 
-    return (
-        <div
-            className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
-                className || ""
-            }`}
-        >
-            {MyJobList && MyJobList?.result_list &&
-            <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
-                <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
-                    <tbody>
-                    {/*<tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
-                    {/*    <td className="py-4">All Product</td>*/}
-                    {/*    <td className="py-4 text-right">.</td>*/}
-                    {/*</tr>*/}
+  return (
+    <div
+      className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
+        className || ""
+      }`}
+    >
+      {MyJobList && MyJobList?.result_list && (
+        <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
+          <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+            <tbody>
+              {/*<tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
+              {/*    <td className="py-4">All Product</td>*/}
+              {/*    <td className="py-4 text-right">.</td>*/}
+              {/*</tr>*/}
 
-                    {
-                        <>
-                            {MyJobList && MyJobList?.result_list &&
-                                MyJobList.result_list.length > 0 &&
-                                currentActiveJobList.map((value, index) => (
-                                    <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                                            <td className=" py-4">
-                                                <div className="flex space-x-2 items-center">
-                                                    <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                                                        <img
-                                                            src={dataImage2}
-                                                            alt="data"
-                                                            className="w-full h-full"
-                                                        />
-                                                    </div>
-                                                    <div className="flex flex-col">
-                                                        <h1 className="font-bold text-xl text-dark-gray dark:text-white">
-                                                            {value.title}
-                                                        </h1>
-                                                        <div>
-                                                            {value.description}
-                                                        </div>
-                                                        <span className="text-sm text-thin-light-gray">
-                                                        Price: <span className="text-purple">{value.price*0.01}</span>
-                                                        </span>
-                                                        <span className="text-sm text-thin-light-gray">
-                                                        Duration:   <span className="text-purple"> {value.timeline_days} day(s)</span>
-                                                        </span>
-                                                        <span className="text-sm text-thin-light-gray">
-                                                        Expire:   <span className="text-purple"> {value.expire}</span>
-                                                        </span>
-                                                        <span className="text-sm text-thin-light-gray">
-                                                        Send to:   <span className="text-purple"> {value.job_to}</span>
-                                                        </span>
+              {
+                <>
+                  {MyJobList &&
+                    MyJobList?.result_list &&
+                    MyJobList.result_list.length > 0 &&
+                    currentActiveJobList.map((value, index) => (
+                      <tr
+                        key={index}
+                        className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50"
+                      >
+                        <td className=" py-4">
+                          <div className="flex space-x-2 items-center w-full">
+                            <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] max-w-[60px]">
+                              <img
+                                src={dataImage2}
+                                alt="data"
+                                className="w-full h-full"
+                              />
+                            </div>
+                            <div className="flex flex-col flex-[0.9]">
+                              <h1 className="font-bold text-xl text-dark-gray dark:text-white">
+                                {value.title}
+                              </h1>
+                              <div>{value.description}</div>
+                              <span className="text-sm text-thin-light-gray">
+                                Price:{" "}
+                                <span className="text-purple">
+                                  {value.price * 0.01}
+                                </span>
+                              </span>
+                              <span className="text-sm text-thin-light-gray">
+                                Duration:{" "}
+                                <span className="text-purple">
+                                  {" "}
+                                  {value.timeline_days} day(s)
+                                </span>
+                              </span>
+                              <span className="text-sm text-thin-light-gray">
+                                Expire:{" "}
+                                <span className="text-purple">
+                                  {" "}
+                                  {value.expire}
+                                </span>
+                              </span>
+                              <span className="text-sm text-thin-light-gray">
+                                Send to:{" "}
+                                <span className="text-purple">
+                                  {" "}
+                                  {value.job_to}
+                                </span>
+                              </span>
+                            </div>
+                          </div>
+                        </td>
 
-                                                    </div>
-                                                </div>
-                                            </td>
-
-
-                                            <td className="text-right py-4 px-2">
-                                                <button
-                                                    type="button"
-                                                    onClick={()=>{setJobPopout({show:true, data:value})}}
-                                                    className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                                                >
-                                                    View
-                                                </button>
-                                            </td>
-                                        </tr>
-                                ))}
-
-
-                        </>
-                    }
-                    </tbody>
-                </table>
-                {/* PAGINATION BUTTON */}
-                <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= MyJobList?.result_list.length ? true : false} data={MyJobList?.result_list} start={indexOfFirstItem} stop={indexOfLastItem} />
-                {/* END OF PAGINATION BUTTON */}
-            </div>
+                        <td className="text-right py-4 px-2">
+                          <button
+                            type="button"
+                            onClick={() => {
+                              setJobPopout({ show: true, data: value });
+                            }}
+                            className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                          >
+                            View
+                          </button>
+                        </td>
+                      </tr>
+                    ))}
+                </>
+              }
+            </tbody>
+          </table>
+          {/* PAGINATION BUTTON */}
+          <PaginatedList
+            onClick={handlePagination}
+            prev={currentPage == 0 ? true : false}
+            next={
+              currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+              MyJobList?.result_list.length
+                ? true
+                : false
             }
-
-            {/* Active Job Popout */}
-            {jobPopout.show &&
-                <PendingJobsPopout details={jobPopout.data} onClose={()=>{setJobPopout({show:false, data:{}})}} situation={jobPopout.show} />
-            }
-            {/* End of Active Job Popout */}
+            data={MyJobList?.result_list}
+            start={indexOfFirstItem}
+            stop={indexOfLastItem}
+          />
+          {/* END OF PAGINATION BUTTON */}
         </div>
-    );
+      )}
+
+      {/* Active Job Popout */}
+      {jobPopout.show && (
+        <PendingJobsPopout
+          details={jobPopout.data}
+          onClose={() => {
+            setJobPopout({ show: false, data: {} });
+          }}
+          situation={jobPopout.show}
+        />
+      )}
+      {/* End of Active Job Popout */}
+    </div>
+  );
 }

src/components/MyTasks/MyJobTable.jsx

@@ -1,48 +1,47 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import dataImage1 from "../../assets/images/data-table-user-1.png";
-import dataImage2 from "../../assets/images/data-table-user-2.png";
-import dataImage3 from "../../assets/images/data-table-user-3.png";
-import dataImage4 from "../../assets/images/data-table-user-4.png";
-import SelectBox from "../Helpers/SelectBox";
 
 import PaginatedList from "../Pagination/PaginatedList";
 import { handlePagingFunc } from "../Pagination/HandlePagination";
 import usersService from "../../services/UsersService";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+
+import {useNavigate, useLocation} from 'react-router-dom'
 
 export default function MyJobTable({ className }) {
-  const filterCategories = ["All Categories", "Explore", "Featured"];
-  const [selectedCategory, setCategory] = useState(filterCategories[0]);
+  let navigate = useNavigate()
+  let {pathname} = useLocation()
+
   const [tasksData, setTasksData] = useState(null);
+  const [loader, setLoader] = useState(true);
 
   let apiCall = useMemo(() => new usersService(), []);
 
   const displayTasks = useCallback(async () => {
     try {
       const res = await apiCall.getMyActiveTaskList();
-      console.log('Ebube step', res)
       let {
-          data: { result_list },
-          internal_return,
-          statusText,
-        } = await res;
+        data: { result_list },
+        internal_return,
+        statusText,
+      } = await res;
       if (internal_return < 0 || statusText !== "OK") return;
       setTasksData(result_list);
+      setLoader(false);
     } catch (error) {
       throw new Error(error);
     }
   }, [apiCall]);
 
   useEffect(() => {
-    displayTasks()
-  }, [])
-
-  let data = ["1", "2", "3", "4", "5", "6"]; // to be replaced later by result from API CALL
+    displayTasks();
+  }, []);
 
   const [currentPage, setCurrentPage] = useState(0);
   const indexOfFirstItem = Number(currentPage);
   const indexOfLastItem =
     Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
-  const currentTask = data.slice(indexOfFirstItem, indexOfLastItem);
+  const currentTask = tasksData?.slice(indexOfFirstItem, indexOfLastItem);
 
   const handlePagination = (e) => {
     handlePagingFunc(e, setCurrentPage);
@@ -54,438 +53,29 @@ export default function MyJobTable({ className }) {
         className || ""
       }`}
     >
-      {tasksData && (
+      {loader ? (
+        <div className="w-full h-[500px] flex items-center justify-center">
+          <LoadingSpinner size="16" color="sky-blue" />
+        </div>
+      ) : (
         <div className="relative w-full overflow-x-auto sm:rounded-lg">
-          {/* <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
-            <tbody>
-              <tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">
-                <td className="py-4">All Product</td>
-                <td className="py-4 text-center">Value</td>
-                <td className="py-4 text-center">USD</td>
-                <td className="py-4 text-center">24H%</td>
-                <td className="py-4 text-center">Bits</td>
-                <td className="py-4 text-center">Time</td>
-                <td className="py-4 text-right">Status</td>
-              </tr>
-
-              {selectedCategory === "All Categories"
-                ? currentTask.map((item, index) => (
-                    <tr
-                      key={index}
-                      className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50"
-                    >
-                      <td className=" py-4">
-                        <div className="flex space-x-2 items-center">
-                          <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                            <img
-                              src={dataImage1}
-                              alt="data"
-                              className="w-full h-full"
-                            />
-                          </div>
-                          <div className="flex flex-col">
-                            <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                              Mullican Computer Joy
-                            </h1>
-                            <span className="text-sm text-thin-light-gray">
-                              Owned by{" "}
-                              <span className="text-purple">Xoeyam</span>
-                            </span>
-                          </div>
-                        </div>
-                      </td>
-                      <td className="text-center py-4 px-2">
-                        <div className="flex space-x-1 items-center justify-center">
-                          <span>
-                            <svg
-                              width="18"
-                              height="18"
-                              viewBox="0 0 18 18"
-                              fill="none"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M9 18C13.9706 18 18 13.9706 18 9C18 4.02944 13.9706 0 9 0C4.02944 0 0 4.02944 0 9C0 13.9706 4.02944 18 9 18Z"
-                                fill="#627EEA"
-                              />
-                              <path
-                                d="M9.28125 2.25V7.23937L13.4983 9.12375L9.28125 2.25Z"
-                                fill="white"
-                                fillOpacity="0.602"
-                              />
-                              <path
-                                d="M9.28012 2.25L5.0625 9.12375L9.28012 7.23937V2.25Z"
-                                fill="white"
-                              />
-                              <path
-                                d="M9.28125 12.3582V15.7483L13.5011 9.91016L9.28125 12.3582Z"
-                                fill="white"
-                                fillOpacity="0.602"
-                              />
-                              <path
-                                d="M9.28012 15.7483V12.3576L5.0625 9.91016L9.28012 15.7483Z"
-                                fill="white"
-                              />
-                              <path
-                                d="M9.28125 11.572L13.4983 9.12348L9.28125 7.24023V11.572Z"
-                                fill="white"
-                                fillOpacity="0.2"
-                              />
-                              <path
-                                d="M5.0625 9.12348L9.28012 11.572V7.24023L5.0625 9.12348Z"
-                                fill="white"
-                                fillOpacity="0.602"
-                              />
-                            </svg>
-                          </span>
-                          <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                            7473 ETH
-                          </span>
-                        </div>
-                      </td>
-                      <td className="text-center py-4 px-2">
-                        <div className="flex space-x-1 items-center justify-center">
-                          <span>
-                            <svg
-                              width="16"
-                              height="16"
-                              viewBox="0 0 16 16"
-                              fill="none"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M7.55225 0C7.8457 0 8.13914 0 8.43205 0C8.44829 0.026534 8.47537 0.0151623 8.49756 0.0162453C9.28966 0.0649812 10.0606 0.220936 10.8013 0.505229C12.7699 1.26172 14.2323 2.58354 15.183 4.46638C15.5999 5.29218 15.8506 6.16997 15.9561 7.08891C15.9691 7.201 15.9621 7.3158 16 7.42465C16 7.80858 16 8.19251 16 8.57698C15.9778 8.5916 15.9854 8.61543 15.9838 8.63546C15.9475 9.10387 15.8744 9.56686 15.7515 10.0206C15.1787 12.1342 13.9524 13.7603 12.0818 14.8942C11.1516 15.4579 10.1397 15.8002 9.06064 15.941C8.89497 15.9626 8.72875 15.98 8.56308 15.9995C8.17217 15.9995 7.78127 15.9995 7.39036 16C7.3752 15.9789 7.35138 15.9865 7.33135 15.9848C6.96752 15.9545 6.60639 15.9009 6.25068 15.8197C4.77639 15.4829 3.48998 14.793 2.4131 13.7311C0.998917 12.3372 0.204656 10.6461 0.0270709 8.66687C0.0205739 8.59431 0.033568 8.51904 0 8.44972C0 8.15081 0 7.85244 0 7.55352C0.0265295 7.53403 0.0151597 7.50479 0.016784 7.47988C0.0730915 6.64162 0.251218 5.83044 0.564158 5.05066C1.10179 3.71043 1.93774 2.59058 3.07634 1.70142C4.33839 0.715876 5.77098 0.159745 7.36762 0.0270755C7.4288 0.0216604 7.49432 0.0341151 7.55225 0ZM7.24635 9.86252C7.24635 10.2383 7.24526 10.6147 7.24743 10.9905C7.24797 11.0457 7.23389 11.0679 7.17596 11.0593C7.09691 11.0479 7.01678 11.0446 6.93774 11.0338C6.26746 10.9461 5.63563 10.7371 5.03952 10.4192C5.00379 10.4002 4.97834 10.3802 4.9621 10.4425C4.81375 11.0176 4.66324 11.5926 4.51164 12.1666C4.50027 12.2094 4.51272 12.2278 4.54954 12.2473C4.66486 12.3096 4.78235 12.3665 4.90309 12.4152C5.5961 12.6968 6.31998 12.8408 7.06497 12.8842C7.14131 12.8885 7.16134 12.9112 7.1608 12.9865C7.15701 13.4159 7.16026 13.8453 7.15809 14.2747C7.15755 14.3397 7.17488 14.3619 7.2431 14.3614C7.69085 14.3581 8.13914 14.3576 8.5869 14.3614C8.66432 14.3619 8.67731 14.3359 8.67731 14.2666C8.67461 13.8026 8.67677 13.3385 8.67461 12.8744C8.67407 12.8089 8.68544 12.7786 8.76015 12.765C9.09962 12.7049 9.4288 12.6058 9.74228 12.4607C10.3498 12.1802 10.8408 11.7703 11.1603 11.1724C11.4288 10.6699 11.51 10.1327 11.4618 9.56957C11.4158 9.03239 11.2366 8.55207 10.8787 8.14431C10.5506 7.77121 10.1402 7.51129 9.69843 7.29522C9.39145 7.14523 9.07363 7.02284 8.75041 6.91129C8.7098 6.89721 8.67407 6.88693 8.67407 6.82736C8.67623 6.14993 8.67569 5.4725 8.67461 4.79507C8.67461 4.75121 8.68489 4.73117 8.73308 4.73767C8.87547 4.75717 9.01895 4.77016 9.16134 4.79236C9.634 4.86493 10.0796 5.02467 10.5116 5.22395C10.5717 5.25157 10.5945 5.24886 10.6123 5.17684C10.7434 4.6467 10.8771 4.1171 11.0162 3.58913C11.0379 3.5079 11.0244 3.47541 10.948 3.44076C10.2799 3.13751 9.57282 3.01025 8.8457 2.97614C8.78018 2.97289 8.76123 2.95556 8.76178 2.88896C8.76503 2.50232 8.76232 2.11568 8.76448 1.72904C8.76503 1.66785 8.75041 1.64727 8.68489 1.64727C8.23173 1.64998 7.77802 1.64998 7.32485 1.64727C7.26151 1.64673 7.24418 1.66406 7.24418 1.72742C7.24689 2.1433 7.24256 2.55972 7.24797 2.9756C7.24905 3.06116 7.2209 3.08661 7.14239 3.10285C6.73579 3.18679 6.34651 3.32271 5.98646 3.53281C5.20628 3.98822 4.72117 4.64724 4.61938 5.5586C4.51597 6.48837 4.83812 7.2427 5.57661 7.81778C6.05739 8.19251 6.60639 8.43781 7.1738 8.64683C7.2274 8.66633 7.24743 8.68907 7.24689 8.7481C7.24472 9.12066 7.24635 9.49159 7.24635 9.86252Z"
-                                fill="#59BE59"
-                              />
-                              <path
-                                d="M7.2452 9.86252C7.2452 9.49158 7.24358 9.12119 7.24683 8.75026C7.24737 8.69123 7.22734 8.66903 7.17374 8.64899C6.60687 8.43997 6.05787 8.19467 5.57655 7.81994C4.8386 7.24486 4.51591 6.49053 4.61933 5.56076C4.72057 4.6494 5.20568 3.99092 5.98641 3.53497C6.34645 3.32486 6.73519 3.18894 7.14233 3.10501C7.22084 3.08876 7.24899 3.06277 7.24791 2.97775C7.2425 2.56187 7.24683 2.14545 7.24412 1.72957C7.24358 1.66621 7.2609 1.64888 7.32479 1.64943C7.77796 1.65213 8.23167 1.65213 8.68483 1.64943C8.7498 1.64888 8.76442 1.66946 8.76442 1.73119C8.76171 2.11783 8.76496 2.50447 8.76171 2.89111C8.76117 2.95717 8.78012 2.97504 8.84563 2.97829C9.57276 3.01295 10.2793 3.13966 10.948 3.44291C11.0243 3.47757 11.0373 3.51006 11.0162 3.59128C10.877 4.11926 10.7433 4.64885 10.6123 5.17899C10.5944 5.25156 10.5717 5.25372 10.5116 5.2261C10.079 5.02683 9.63394 4.86708 9.16128 4.79452C9.01889 4.77286 8.87595 4.75932 8.73302 4.73983C8.68483 4.73333 8.67455 4.75337 8.67455 4.79723C8.67563 5.47466 8.67617 6.15209 8.674 6.82952C8.674 6.88908 8.70974 6.89937 8.75034 6.91345C9.07303 7.02446 9.39138 7.14684 9.69837 7.29738C10.1396 7.51344 10.5506 7.77283 10.8787 8.14647C11.2365 8.55369 11.4157 9.03455 11.4618 9.57173C11.51 10.1349 11.4287 10.6726 11.1602 11.1746C10.8408 11.7724 10.3497 12.1818 9.74222 12.4629C9.42874 12.608 9.09956 12.7071 8.76009 12.7672C8.68483 12.7802 8.674 12.811 8.67455 12.8766C8.67671 13.3406 8.67455 13.8047 8.67725 14.2688C8.67779 14.3381 8.66426 14.3646 8.58684 14.3636C8.13908 14.3598 7.69079 14.3608 7.24304 14.3636C7.17536 14.3641 7.15803 14.3424 7.15803 14.2769C7.1602 13.8475 7.15695 13.4181 7.16074 12.9887C7.16128 12.9128 7.14179 12.8906 7.06491 12.8863C6.31992 12.843 5.59658 12.699 4.90303 12.4174C4.78229 12.3681 4.66426 12.3112 4.54948 12.2495C4.51321 12.23 4.50075 12.2116 4.51158 12.1688C4.66318 11.5943 4.81369 11.0197 4.96204 10.4446C4.97829 10.3824 5.00373 10.4024 5.03947 10.4214C5.63557 10.7387 6.2674 10.9477 6.93768 11.036C7.01672 11.0463 7.09685 11.0501 7.1759 11.0614C7.23383 11.0695 7.24737 11.0479 7.24737 10.9927C7.24412 10.6147 7.2452 10.2383 7.2452 9.86252ZM8.68537 9.36325C8.67942 9.37245 8.67455 9.37678 8.67455 9.38112C8.674 9.83978 8.67401 10.2984 8.67292 10.7571C8.67292 10.8177 8.70216 10.7928 8.72598 10.7755C8.82452 10.7046 8.90736 10.619 8.96691 10.5123C9.17698 10.1333 9.05679 9.63725 8.68537 9.36325ZM7.23871 6.11147C7.23871 5.75354 7.23871 5.40589 7.23871 5.05174C6.92522 5.33982 6.92522 5.77249 7.23871 6.11147Z"
-                                fill="#FEFEFE"
-                              />
-                              <path
-                                d="M8.68433 9.36328C9.05574 9.63729 9.17539 10.1333 8.96586 10.5118C8.90631 10.619 8.82347 10.7046 8.72493 10.775C8.70111 10.7918 8.67188 10.8172 8.67188 10.7566C8.67242 10.2979 8.67296 9.83927 8.6735 9.38061C8.67404 9.37682 8.67891 9.37249 8.68433 9.36328Z"
-                                fill="#59BE59"
-                              />
-                              <path
-                                d="M7.23882 6.11149C6.92533 5.77305 6.92587 5.33984 7.23882 5.05176C7.23882 5.40591 7.23882 5.75355 7.23882 6.11149Z"
-                                fill="#59BE59"
-                              />
-                            </svg>
-                          </span>
-                          <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                            6392.99$
-                          </span>
-                        </div>
-                      </td>
-                      <td className="text-center py-4 px-2">
-                        <span className="text-base text-light-red whitespace-nowrap">
-                          -24.75 (11.5%)
-                        </span>
-                      </td>
-                      <td className="text-right py-4 px-2">
-                        <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                          343
-                        </span>
-                      </td>
-                      <td className="text-right py-4 px-2">
-                        <span className="text-base text-thin-light-gray whitespace-nowrap">
-                          2 Hours 1 min 30s
-                        </span>
-                      </td>
-                      <td className="text-right py-4 px-2">
-                        <button
-                          type="button"
-                          className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full"
-                        >
-                          Active
-                        </button>
-                      </td>
-                    </tr>
-                  ))
-                : selectedCategory === "Explore"
-                ? currentTask.map((item, index) => (
-                    <tr
-                      key={index}
-                      className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50"
-                    >
-                      <td className=" py-4">
-                        <div className="flex space-x-2 items-center">
-                          <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                            <img
-                              src={dataImage2}
-                              alt="data"
-                              className="w-full h-full"
-                            />
-                          </div>
-                          <div className="flex flex-col">
-                            <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                              Mullican Computer Joy
-                            </h1>
-                            <span className="text-sm text-thin-light-gray">
-                              Owned by{" "}
-                              <span className="text-purple">Xoeyam</span>
-                            </span>
-                          </div>
-                        </div>
-                      </td>
-                      <td className="text-center py-4 px-2">
-                        <div className="flex space-x-1 items-center justify-center">
-                          <span>
-                            <svg
-                              width="18"
-                              height="18"
-                              viewBox="0 0 18 18"
-                              fill="none"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M9 18C13.9706 18 18 13.9706 18 9C18 4.02944 13.9706 0 9 0C4.02944 0 0 4.02944 0 9C0 13.9706 4.02944 18 9 18Z"
-                                fill="#627EEA"
-                              />
-                              <path
-                                d="M9.28125 2.25V7.23937L13.4983 9.12375L9.28125 2.25Z"
-                                fill="white"
-                                fillOpacity="0.602"
-                              />
-                              <path
-                                d="M9.28012 2.25L5.0625 9.12375L9.28012 7.23937V2.25Z"
-                                fill="white"
-                              />
-                              <path
-                                d="M9.28125 12.3582V15.7483L13.5011 9.91016L9.28125 12.3582Z"
-                                fill="white"
-                                fillOpacity="0.602"
-                              />
-                              <path
-                                d="M9.28012 15.7483V12.3576L5.0625 9.91016L9.28012 15.7483Z"
-                                fill="white"
-                              />
-                              <path
-                                d="M9.28125 11.572L13.4983 9.12348L9.28125 7.24023V11.572Z"
-                                fill="white"
-                                fillOpacity="0.2"
-                              />
-                              <path
-                                d="M5.0625 9.12348L9.28012 11.572V7.24023L5.0625 9.12348Z"
-                                fill="white"
-                                fillOpacity="0.602"
-                              />
-                            </svg>
-                          </span>
-                          <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                            7473 ETH
-                          </span>
-                        </div>
-                      </td>
-                      <td className="text-center py-4 px-2">
-                        <div className="flex space-x-1 items-center justify-center">
-                          <span>
-                            <svg
-                              width="16"
-                              height="16"
-                              viewBox="0 0 16 16"
-                              fill="none"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M7.55225 0C7.8457 0 8.13914 0 8.43205 0C8.44829 0.026534 8.47537 0.0151623 8.49756 0.0162453C9.28966 0.0649812 10.0606 0.220936 10.8013 0.505229C12.7699 1.26172 14.2323 2.58354 15.183 4.46638C15.5999 5.29218 15.8506 6.16997 15.9561 7.08891C15.9691 7.201 15.9621 7.3158 16 7.42465C16 7.80858 16 8.19251 16 8.57698C15.9778 8.5916 15.9854 8.61543 15.9838 8.63546C15.9475 9.10387 15.8744 9.56686 15.7515 10.0206C15.1787 12.1342 13.9524 13.7603 12.0818 14.8942C11.1516 15.4579 10.1397 15.8002 9.06064 15.941C8.89497 15.9626 8.72875 15.98 8.56308 15.9995C8.17217 15.9995 7.78127 15.9995 7.39036 16C7.3752 15.9789 7.35138 15.9865 7.33135 15.9848C6.96752 15.9545 6.60639 15.9009 6.25068 15.8197C4.77639 15.4829 3.48998 14.793 2.4131 13.7311C0.998917 12.3372 0.204656 10.6461 0.0270709 8.66687C0.0205739 8.59431 0.033568 8.51904 0 8.44972C0 8.15081 0 7.85244 0 7.55352C0.0265295 7.53403 0.0151597 7.50479 0.016784 7.47988C0.0730915 6.64162 0.251218 5.83044 0.564158 5.05066C1.10179 3.71043 1.93774 2.59058 3.07634 1.70142C4.33839 0.715876 5.77098 0.159745 7.36762 0.0270755C7.4288 0.0216604 7.49432 0.0341151 7.55225 0ZM7.24635 9.86252C7.24635 10.2383 7.24526 10.6147 7.24743 10.9905C7.24797 11.0457 7.23389 11.0679 7.17596 11.0593C7.09691 11.0479 7.01678 11.0446 6.93774 11.0338C6.26746 10.9461 5.63563 10.7371 5.03952 10.4192C5.00379 10.4002 4.97834 10.3802 4.9621 10.4425C4.81375 11.0176 4.66324 11.5926 4.51164 12.1666C4.50027 12.2094 4.51272 12.2278 4.54954 12.2473C4.66486 12.3096 4.78235 12.3665 4.90309 12.4152C5.5961 12.6968 6.31998 12.8408 7.06497 12.8842C7.14131 12.8885 7.16134 12.9112 7.1608 12.9865C7.15701 13.4159 7.16026 13.8453 7.15809 14.2747C7.15755 14.3397 7.17488 14.3619 7.2431 14.3614C7.69085 14.3581 8.13914 14.3576 8.5869 14.3614C8.66432 14.3619 8.67731 14.3359 8.67731 14.2666C8.67461 13.8026 8.67677 13.3385 8.67461 12.8744C8.67407 12.8089 8.68544 12.7786 8.76015 12.765C9.09962 12.7049 9.4288 12.6058 9.74228 12.4607C10.3498 12.1802 10.8408 11.7703 11.1603 11.1724C11.4288 10.6699 11.51 10.1327 11.4618 9.56957C11.4158 9.03239 11.2366 8.55207 10.8787 8.14431C10.5506 7.77121 10.1402 7.51129 9.69843 7.29522C9.39145 7.14523 9.07363 7.02284 8.75041 6.91129C8.7098 6.89721 8.67407 6.88693 8.67407 6.82736C8.67623 6.14993 8.67569 5.4725 8.67461 4.79507C8.67461 4.75121 8.68489 4.73117 8.73308 4.73767C8.87547 4.75717 9.01895 4.77016 9.16134 4.79236C9.634 4.86493 10.0796 5.02467 10.5116 5.22395C10.5717 5.25157 10.5945 5.24886 10.6123 5.17684C10.7434 4.6467 10.8771 4.1171 11.0162 3.58913C11.0379 3.5079 11.0244 3.47541 10.948 3.44076C10.2799 3.13751 9.57282 3.01025 8.8457 2.97614C8.78018 2.97289 8.76123 2.95556 8.76178 2.88896C8.76503 2.50232 8.76232 2.11568 8.76448 1.72904C8.76503 1.66785 8.75041 1.64727 8.68489 1.64727C8.23173 1.64998 7.77802 1.64998 7.32485 1.64727C7.26151 1.64673 7.24418 1.66406 7.24418 1.72742C7.24689 2.1433 7.24256 2.55972 7.24797 2.9756C7.24905 3.06116 7.2209 3.08661 7.14239 3.10285C6.73579 3.18679 6.34651 3.32271 5.98646 3.53281C5.20628 3.98822 4.72117 4.64724 4.61938 5.5586C4.51597 6.48837 4.83812 7.2427 5.57661 7.81778C6.05739 8.19251 6.60639 8.43781 7.1738 8.64683C7.2274 8.66633 7.24743 8.68907 7.24689 8.7481C7.24472 9.12066 7.24635 9.49159 7.24635 9.86252Z"
-                                fill="#59BE59"
-                              />
-                              <path
-                                d="M7.2452 9.86252C7.2452 9.49158 7.24358 9.12119 7.24683 8.75026C7.24737 8.69123 7.22734 8.66903 7.17374 8.64899C6.60687 8.43997 6.05787 8.19467 5.57655 7.81994C4.8386 7.24486 4.51591 6.49053 4.61933 5.56076C4.72057 4.6494 5.20568 3.99092 5.98641 3.53497C6.34645 3.32486 6.73519 3.18894 7.14233 3.10501C7.22084 3.08876 7.24899 3.06277 7.24791 2.97775C7.2425 2.56187 7.24683 2.14545 7.24412 1.72957C7.24358 1.66621 7.2609 1.64888 7.32479 1.64943C7.77796 1.65213 8.23167 1.65213 8.68483 1.64943C8.7498 1.64888 8.76442 1.66946 8.76442 1.73119C8.76171 2.11783 8.76496 2.50447 8.76171 2.89111C8.76117 2.95717 8.78012 2.97504 8.84563 2.97829C9.57276 3.01295 10.2793 3.13966 10.948 3.44291C11.0243 3.47757 11.0373 3.51006 11.0162 3.59128C10.877 4.11926 10.7433 4.64885 10.6123 5.17899C10.5944 5.25156 10.5717 5.25372 10.5116 5.2261C10.079 5.02683 9.63394 4.86708 9.16128 4.79452C9.01889 4.77286 8.87595 4.75932 8.73302 4.73983C8.68483 4.73333 8.67455 4.75337 8.67455 4.79723C8.67563 5.47466 8.67617 6.15209 8.674 6.82952C8.674 6.88908 8.70974 6.89937 8.75034 6.91345C9.07303 7.02446 9.39138 7.14684 9.69837 7.29738C10.1396 7.51344 10.5506 7.77283 10.8787 8.14647C11.2365 8.55369 11.4157 9.03455 11.4618 9.57173C11.51 10.1349 11.4287 10.6726 11.1602 11.1746C10.8408 11.7724 10.3497 12.1818 9.74222 12.4629C9.42874 12.608 9.09956 12.7071 8.76009 12.7672C8.68483 12.7802 8.674 12.811 8.67455 12.8766C8.67671 13.3406 8.67455 13.8047 8.67725 14.2688C8.67779 14.3381 8.66426 14.3646 8.58684 14.3636C8.13908 14.3598 7.69079 14.3608 7.24304 14.3636C7.17536 14.3641 7.15803 14.3424 7.15803 14.2769C7.1602 13.8475 7.15695 13.4181 7.16074 12.9887C7.16128 12.9128 7.14179 12.8906 7.06491 12.8863C6.31992 12.843 5.59658 12.699 4.90303 12.4174C4.78229 12.3681 4.66426 12.3112 4.54948 12.2495C4.51321 12.23 4.50075 12.2116 4.51158 12.1688C4.66318 11.5943 4.81369 11.0197 4.96204 10.4446C4.97829 10.3824 5.00373 10.4024 5.03947 10.4214C5.63557 10.7387 6.2674 10.9477 6.93768 11.036C7.01672 11.0463 7.09685 11.0501 7.1759 11.0614C7.23383 11.0695 7.24737 11.0479 7.24737 10.9927C7.24412 10.6147 7.2452 10.2383 7.2452 9.86252ZM8.68537 9.36325C8.67942 9.37245 8.67455 9.37678 8.67455 9.38112C8.674 9.83978 8.67401 10.2984 8.67292 10.7571C8.67292 10.8177 8.70216 10.7928 8.72598 10.7755C8.82452 10.7046 8.90736 10.619 8.96691 10.5123C9.17698 10.1333 9.05679 9.63725 8.68537 9.36325ZM7.23871 6.11147C7.23871 5.75354 7.23871 5.40589 7.23871 5.05174C6.92522 5.33982 6.92522 5.77249 7.23871 6.11147Z"
-                                fill="#FEFEFE"
-                              />
-                              <path
-                                d="M8.68433 9.36328C9.05574 9.63729 9.17539 10.1333 8.96586 10.5118C8.90631 10.619 8.82347 10.7046 8.72493 10.775C8.70111 10.7918 8.67188 10.8172 8.67188 10.7566C8.67242 10.2979 8.67296 9.83927 8.6735 9.38061C8.67404 9.37682 8.67891 9.37249 8.68433 9.36328Z"
-                                fill="#59BE59"
-                              />
-                              <path
-                                d="M7.23882 6.11149C6.92533 5.77305 6.92587 5.33984 7.23882 5.05176C7.23882 5.40591 7.23882 5.75355 7.23882 6.11149Z"
-                                fill="#59BE59"
-                              />
-                            </svg>
-                          </span>
-                          <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                            6392.99$
-                          </span>
-                        </div>
-                      </td>
-                      <td className="text-center py-4 px-2">
-                        <span className="text-base text-light-red whitespace-nowrap">
-                          -24.75 (11.5%)
-                        </span>
-                      </td>
-                      <td className="text-right py-4 px-2">
-                        <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                          343
-                        </span>
-                      </td>
-                      <td className="text-right py-4 px-2">
-                        <span className="text-base text-thin-light-gray whitespace-nowrap">
-                          2 Hours 1 min 30s
-                        </span>
-                      </td>
-                      <td className="text-right py-4 px-2">
-                        <button
-                          type="button"
-                          className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full"
-                        >
-                          Active
-                        </button>
-                      </td>
-                    </tr>
-                  ))
-                : currentTask.map((item, index) => (
-                    <tr
-                      key={index}
-                      className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50"
-                    >
-                      <td className=" py-4">
-                        <div className="flex space-x-2 items-center">
-                          <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                            <img
-                              src={dataImage3}
-                              alt="data"
-                              className="w-full h-full"
-                            />
-                          </div>
-                          <div className="flex flex-col">
-                            <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                              Mullican Computer Joy
-                            </h1>
-                            <span className="text-sm text-thin-light-gray">
-                              Owned by{" "}
-                              <span className="text-purple">Xoeyam</span>
-                            </span>
-                          </div>
-                        </div>
-                      </td>
-                      <td className="text-center py-4 px-2">
-                        <div className="flex space-x-1 items-center justify-center">
-                          <span>
-                            <svg
-                              width="18"
-                              height="18"
-                              viewBox="0 0 18 18"
-                              fill="none"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M9 18C13.9706 18 18 13.9706 18 9C18 4.02944 13.9706 0 9 0C4.02944 0 0 4.02944 0 9C0 13.9706 4.02944 18 9 18Z"
-                                fill="#627EEA"
-                              />
-                              <path
-                                d="M9.28125 2.25V7.23937L13.4983 9.12375L9.28125 2.25Z"
-                                fill="white"
-                                fillOpacity="0.602"
-                              />
-                              <path
-                                d="M9.28012 2.25L5.0625 9.12375L9.28012 7.23937V2.25Z"
-                                fill="white"
-                              />
-                              <path
-                                d="M9.28125 12.3582V15.7483L13.5011 9.91016L9.28125 12.3582Z"
-                                fill="white"
-                                fillOpacity="0.602"
-                              />
-                              <path
-                                d="M9.28012 15.7483V12.3576L5.0625 9.91016L9.28012 15.7483Z"
-                                fill="white"
-                              />
-                              <path
-                                d="M9.28125 11.572L13.4983 9.12348L9.28125 7.24023V11.572Z"
-                                fill="white"
-                                fillOpacity="0.2"
-                              />
-                              <path
-                                d="M5.0625 9.12348L9.28012 11.572V7.24023L5.0625 9.12348Z"
-                                fill="white"
-                                fillOpacity="0.602"
-                              />
-                            </svg>
-                          </span>
-                          <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                            7473 ETH
-                          </span>
-                        </div>
-                      </td>
-                      <td className="text-center py-4 px-2">
-                        <div className="flex space-x-1 items-center justify-center">
-                          <span>
-                            <svg
-                              width="16"
-                              height="16"
-                              viewBox="0 0 16 16"
-                              fill="none"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                d="M7.55225 0C7.8457 0 8.13914 0 8.43205 0C8.44829 0.026534 8.47537 0.0151623 8.49756 0.0162453C9.28966 0.0649812 10.0606 0.220936 10.8013 0.505229C12.7699 1.26172 14.2323 2.58354 15.183 4.46638C15.5999 5.29218 15.8506 6.16997 15.9561 7.08891C15.9691 7.201 15.9621 7.3158 16 7.42465C16 7.80858 16 8.19251 16 8.57698C15.9778 8.5916 15.9854 8.61543 15.9838 8.63546C15.9475 9.10387 15.8744 9.56686 15.7515 10.0206C15.1787 12.1342 13.9524 13.7603 12.0818 14.8942C11.1516 15.4579 10.1397 15.8002 9.06064 15.941C8.89497 15.9626 8.72875 15.98 8.56308 15.9995C8.17217 15.9995 7.78127 15.9995 7.39036 16C7.3752 15.9789 7.35138 15.9865 7.33135 15.9848C6.96752 15.9545 6.60639 15.9009 6.25068 15.8197C4.77639 15.4829 3.48998 14.793 2.4131 13.7311C0.998917 12.3372 0.204656 10.6461 0.0270709 8.66687C0.0205739 8.59431 0.033568 8.51904 0 8.44972C0 8.15081 0 7.85244 0 7.55352C0.0265295 7.53403 0.0151597 7.50479 0.016784 7.47988C0.0730915 6.64162 0.251218 5.83044 0.564158 5.05066C1.10179 3.71043 1.93774 2.59058 3.07634 1.70142C4.33839 0.715876 5.77098 0.159745 7.36762 0.0270755C7.4288 0.0216604 7.49432 0.0341151 7.55225 0ZM7.24635 9.86252C7.24635 10.2383 7.24526 10.6147 7.24743 10.9905C7.24797 11.0457 7.23389 11.0679 7.17596 11.0593C7.09691 11.0479 7.01678 11.0446 6.93774 11.0338C6.26746 10.9461 5.63563 10.7371 5.03952 10.4192C5.00379 10.4002 4.97834 10.3802 4.9621 10.4425C4.81375 11.0176 4.66324 11.5926 4.51164 12.1666C4.50027 12.2094 4.51272 12.2278 4.54954 12.2473C4.66486 12.3096 4.78235 12.3665 4.90309 12.4152C5.5961 12.6968 6.31998 12.8408 7.06497 12.8842C7.14131 12.8885 7.16134 12.9112 7.1608 12.9865C7.15701 13.4159 7.16026 13.8453 7.15809 14.2747C7.15755 14.3397 7.17488 14.3619 7.2431 14.3614C7.69085 14.3581 8.13914 14.3576 8.5869 14.3614C8.66432 14.3619 8.67731 14.3359 8.67731 14.2666C8.67461 13.8026 8.67677 13.3385 8.67461 12.8744C8.67407 12.8089 8.68544 12.7786 8.76015 12.765C9.09962 12.7049 9.4288 12.6058 9.74228 12.4607C10.3498 12.1802 10.8408 11.7703 11.1603 11.1724C11.4288 10.6699 11.51 10.1327 11.4618 9.56957C11.4158 9.03239 11.2366 8.55207 10.8787 8.14431C10.5506 7.77121 10.1402 7.51129 9.69843 7.29522C9.39145 7.14523 9.07363 7.02284 8.75041 6.91129C8.7098 6.89721 8.67407 6.88693 8.67407 6.82736C8.67623 6.14993 8.67569 5.4725 8.67461 4.79507C8.67461 4.75121 8.68489 4.73117 8.73308 4.73767C8.87547 4.75717 9.01895 4.77016 9.16134 4.79236C9.634 4.86493 10.0796 5.02467 10.5116 5.22395C10.5717 5.25157 10.5945 5.24886 10.6123 5.17684C10.7434 4.6467 10.8771 4.1171 11.0162 3.58913C11.0379 3.5079 11.0244 3.47541 10.948 3.44076C10.2799 3.13751 9.57282 3.01025 8.8457 2.97614C8.78018 2.97289 8.76123 2.95556 8.76178 2.88896C8.76503 2.50232 8.76232 2.11568 8.76448 1.72904C8.76503 1.66785 8.75041 1.64727 8.68489 1.64727C8.23173 1.64998 7.77802 1.64998 7.32485 1.64727C7.26151 1.64673 7.24418 1.66406 7.24418 1.72742C7.24689 2.1433 7.24256 2.55972 7.24797 2.9756C7.24905 3.06116 7.2209 3.08661 7.14239 3.10285C6.73579 3.18679 6.34651 3.32271 5.98646 3.53281C5.20628 3.98822 4.72117 4.64724 4.61938 5.5586C4.51597 6.48837 4.83812 7.2427 5.57661 7.81778C6.05739 8.19251 6.60639 8.43781 7.1738 8.64683C7.2274 8.66633 7.24743 8.68907 7.24689 8.7481C7.24472 9.12066 7.24635 9.49159 7.24635 9.86252Z"
-                                fill="#59BE59"
-                              />
-                              <path
-                                d="M7.2452 9.86252C7.2452 9.49158 7.24358 9.12119 7.24683 8.75026C7.24737 8.69123 7.22734 8.66903 7.17374 8.64899C6.60687 8.43997 6.05787 8.19467 5.57655 7.81994C4.8386 7.24486 4.51591 6.49053 4.61933 5.56076C4.72057 4.6494 5.20568 3.99092 5.98641 3.53497C6.34645 3.32486 6.73519 3.18894 7.14233 3.10501C7.22084 3.08876 7.24899 3.06277 7.24791 2.97775C7.2425 2.56187 7.24683 2.14545 7.24412 1.72957C7.24358 1.66621 7.2609 1.64888 7.32479 1.64943C7.77796 1.65213 8.23167 1.65213 8.68483 1.64943C8.7498 1.64888 8.76442 1.66946 8.76442 1.73119C8.76171 2.11783 8.76496 2.50447 8.76171 2.89111C8.76117 2.95717 8.78012 2.97504 8.84563 2.97829C9.57276 3.01295 10.2793 3.13966 10.948 3.44291C11.0243 3.47757 11.0373 3.51006 11.0162 3.59128C10.877 4.11926 10.7433 4.64885 10.6123 5.17899C10.5944 5.25156 10.5717 5.25372 10.5116 5.2261C10.079 5.02683 9.63394 4.86708 9.16128 4.79452C9.01889 4.77286 8.87595 4.75932 8.73302 4.73983C8.68483 4.73333 8.67455 4.75337 8.67455 4.79723C8.67563 5.47466 8.67617 6.15209 8.674 6.82952C8.674 6.88908 8.70974 6.89937 8.75034 6.91345C9.07303 7.02446 9.39138 7.14684 9.69837 7.29738C10.1396 7.51344 10.5506 7.77283 10.8787 8.14647C11.2365 8.55369 11.4157 9.03455 11.4618 9.57173C11.51 10.1349 11.4287 10.6726 11.1602 11.1746C10.8408 11.7724 10.3497 12.1818 9.74222 12.4629C9.42874 12.608 9.09956 12.7071 8.76009 12.7672C8.68483 12.7802 8.674 12.811 8.67455 12.8766C8.67671 13.3406 8.67455 13.8047 8.67725 14.2688C8.67779 14.3381 8.66426 14.3646 8.58684 14.3636C8.13908 14.3598 7.69079 14.3608 7.24304 14.3636C7.17536 14.3641 7.15803 14.3424 7.15803 14.2769C7.1602 13.8475 7.15695 13.4181 7.16074 12.9887C7.16128 12.9128 7.14179 12.8906 7.06491 12.8863C6.31992 12.843 5.59658 12.699 4.90303 12.4174C4.78229 12.3681 4.66426 12.3112 4.54948 12.2495C4.51321 12.23 4.50075 12.2116 4.51158 12.1688C4.66318 11.5943 4.81369 11.0197 4.96204 10.4446C4.97829 10.3824 5.00373 10.4024 5.03947 10.4214C5.63557 10.7387 6.2674 10.9477 6.93768 11.036C7.01672 11.0463 7.09685 11.0501 7.1759 11.0614C7.23383 11.0695 7.24737 11.0479 7.24737 10.9927C7.24412 10.6147 7.2452 10.2383 7.2452 9.86252ZM8.68537 9.36325C8.67942 9.37245 8.67455 9.37678 8.67455 9.38112C8.674 9.83978 8.67401 10.2984 8.67292 10.7571C8.67292 10.8177 8.70216 10.7928 8.72598 10.7755C8.82452 10.7046 8.90736 10.619 8.96691 10.5123C9.17698 10.1333 9.05679 9.63725 8.68537 9.36325ZM7.23871 6.11147C7.23871 5.75354 7.23871 5.40589 7.23871 5.05174C6.92522 5.33982 6.92522 5.77249 7.23871 6.11147Z"
-                                fill="#FEFEFE"
-                              />
-                              <path
-                                d="M8.68433 9.36328C9.05574 9.63729 9.17539 10.1333 8.96586 10.5118C8.90631 10.619 8.82347 10.7046 8.72493 10.775C8.70111 10.7918 8.67188 10.8172 8.67188 10.7566C8.67242 10.2979 8.67296 9.83927 8.6735 9.38061C8.67404 9.37682 8.67891 9.37249 8.68433 9.36328Z"
-                                fill="#59BE59"
-                              />
-                              <path
-                                d="M7.23882 6.11149C6.92533 5.77305 6.92587 5.33984 7.23882 5.05176C7.23882 5.40591 7.23882 5.75355 7.23882 6.11149Z"
-                                fill="#59BE59"
-                              />
-                            </svg>
-                          </span>
-                          <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                            6392.99$
-                          </span>
-                        </div>
-                      </td>
-                      <td className="text-center py-4 px-2">
-                        <span className="text-base text-light-red whitespace-nowrap">
-                          -24.75 (11.5%)
-                        </span>
-                      </td>
-                      <td className="text-right py-4 px-2">
-                        <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                          343
-                        </span>
-                      </td>
-                      <td className="text-right py-4 px-2">
-                        <span className="text-base text-thin-light-gray whitespace-nowrap">
-                          2 Hours 1 min 30s
-                        </span>
-                      </td>
-                      <td className="text-right py-4 px-2">
-                        <button
-                          type="button"
-                          className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full"
-                        >
-                          Active
-                        </button>
-                      </td>
-                    </tr>
-                  ))}
-            </tbody>
-          </table> */}
-
-          <div className="overflow-y-scroll h-auto w-full">
+          <div className="overflow-y-auto h-auto w-full">
             {tasksData?.length > 0 ? (
-              tasksData?.map((task, idx) => (
+              currentTask?.map((task, idx) => (
                 <div
                   className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] w-full flex justify-between items-center hover:bg-gray-50"
                   key={idx}
                 >
                   <div className=" py-4">
                     <div className="flex space-x-2 items-center">
-                      <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                      <div className="w-full max-w-[60px] flex-[0.1] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
                         <img
                           src={dataImage1}
                           alt="data"
                           className="w-full h-full"
                         />
                       </div>
-                      <div className="flex flex-col">
+                      <div className="flex flex-col flex-[0.9]">
                         <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
                           {task?.title}
                         </h1>
@@ -494,19 +84,29 @@ export default function MyJobTable({ className }) {
                         </span>
                         <span className="text-sm text-thin-light-gray">
                           Price:
-                          <span className="text-purple ml-1">{task?.price}</span>
+                          <span className="text-purple ml-1">
+                            {Number(task?.price) * 0.01}
+                          </span>
                         </span>
                         <span className="text-sm text-thin-light-gray">
                           Duration:
-                          <span className="text-purple ml-1">{Number(task?.timeline_days) === 1 ? `${task?.timeline_days} day` : `${task?.timeline_days} day(s)`}</span>
+                          <span className="text-purple ml-1">
+                            {Number(task?.timeline_days) === 1
+                              ? `${task?.timeline_days} day`
+                              : `${task?.timeline_days} day(s)`}
+                          </span>
                         </span>
                         <span className="text-sm text-thin-light-gray">
                           Due Date:
-                          <span className="text-purple ml-1">{task?.delivery_date}</span>
+                          <span className="text-purple ml-1">
+                            {task?.delivery_date}
+                          </span>
                         </span>
                         <span className="text-sm text-thin-light-gray">
                           Confirmation:
-                          <span className="text-purple ml-1">{task?.contract}</span>
+                          <span className="text-purple ml-1">
+                            {task?.contract}
+                          </span>
                         </span>
                       </div>
                     </div>
@@ -515,6 +115,11 @@ export default function MyJobTable({ className }) {
                   <div className="text-right py-4 px-2">
                     <button
                       type="button"
+                      onClick={() => {
+                        navigate("/manage-active-job", {
+                          state: {...task, pathname},
+                        });
+                      }}
                       className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                     >
                       Manage
@@ -537,11 +142,11 @@ export default function MyJobTable({ className }) {
             prev={currentPage == 0 ? true : false}
             next={
               currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
-              data.length
+              tasksData?.length
                 ? true
                 : false
             }
-            data={data}
+            data={tasksData}
             start={indexOfFirstItem}
             stop={indexOfLastItem}
           />

src/components/Partials/Header.jsx

@@ -505,9 +505,9 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                 </div>
                 <div className="heading border-b dark:border-[#5356fb29]  border-light-purple px-7 py-2">
                   <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
-                  Surname
+                  Fullname
                   </h3>
-                  <p className="text-sm text-gray-400 dark:text-white hover:text-sky-blue cursor-pointer">broklinslam_75@gamil.com</p>
+                  <p className="text-base text-gray-400 dark:text-white hover:text-sky-blue cursor-pointer">{`${firstname} ${lastname}`}</p>
                 </div>
                 <div className="content">
                   <ul className="px-7">

src/components/jobPopout/DeleteJobPopout.jsx

@@ -100,7 +100,7 @@ function DeleteJobPopout({details, onClose, situation}) {
                   {details.title}
                 </p>
                 <p className="text-lg tracking-wide text-dark-gray dark:text-white">
-                  Price: {details.price}
+                  Price: {details.price * 0.01}
                 </p>
                 <p className="text-lg tracking-wide text-dark-gray dark:text-white">
                   Duration: {details.timeline_days} day(s)

src/components/jobPopout/EditJobPopout.jsx

@@ -68,6 +68,7 @@ const EditJobPopOut = ({ details, onClose, situation, country }) => {
         job_uid: details.job_uid,
         ...values,
       };
+      delete reqData?.country
       try {
         let res = await jobApi.jobManagerUpdateJob(reqData);
         let { data } = await res;
@@ -162,7 +163,7 @@ const EditJobPopOut = ({ details, onClose, situation, country }) => {
                           type="number"
                           name="price"
                           // placeholder="Please Enter Amount"
-                          value={props.values.price}
+                          value={props.values.price * 0.01}
                           inputHandler={props.handleChange}
                           blurHandler={props.handleBlur}
                         />
@@ -268,7 +269,7 @@ const EditJobPopOut = ({ details, onClose, situation, country }) => {
                     {/* inputs ends here */}
                   </div>
                 </div>
-                {/* ERROR DISPLAY AND SUBMIT BUTTON */}
+                {/* ERROR DISPLAY AND SUBMIT BUTTON */} 
                 <div className="content-footer w-full">
                   {/* error or success display */}
                   {requestStatus.message != "" &&

src/components/jobPopout/PendingJobsPopout.jsx

@@ -7,10 +7,10 @@ function PendingJobsPopout({details, onClose, situation}) {
   return (
     <ModalCom action={onClose} situation={situation}>
     <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
-        <div className="logout-modal-header w-full flex items-center justify-end lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
-          {/* <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
-            Confirm
-          </h1> */}
+        <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
+          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+            Manage Pending Item
+          </h1>
           <button
             type="button"
             className="text-[#374557] dark:text-red-500"

src/services/UsersService.js

@@ -466,7 +466,6 @@ class usersService {
             uid: localStorage.getItem("uid"),
             member_id: localStorage.getItem("member_id"),
             sessionid: localStorage.getItem("session_token"),
-            job_id: localStorage.getItem("job_id"),
             action: 13010,
             ...reqData
         };

src/views/ManageActiveJobs.jsx

@@ -32,7 +32,8 @@ function ManageActiveJobs() {
 
   useEffect(()=>{
     if(!state){
-      navigate('/my-active-jobs', {replace: true})
+      navigate('/', {replace: true})
+      return
     }
     setDetails(state)
     getActiveJobMesList()