reverted package-lock.json

src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx

@@ -315,7 +315,7 @@ const AssignTaskPopout = ({
                         checked={taskType == "select"}
                         onChange={switchTaskType}
                       />
-                      <span className="text-lg tracking-wide font-semibold">Previous Task</span>
+                      <span className="text-lg tracking-wide font-semibold">Select Task</span>
                     </div>
                     <div className="flex items-center gap-2 text-sky-blue text-base">
                       <input

src/components/Partials/Header.jsx

@@ -238,7 +238,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
             {/* balance */}
 
             {/* My Page Button */}
-            {/* {userDetails.account_type === "FULL" ? <PageButton /> : null} */}
+            {userDetails.account_type === "FULL" ? <PageButton /> : null}
 
             {/*<div className="lg:hidden block"></div>*/}
             <WalletHeader

src/components/Partials/RightSideBar.jsx

@@ -40,7 +40,7 @@ export default function RightSideBar({ myJobList }) {
   return (
     <>
       <div className="right-sidebar-wrapper overflow-y-scroll overflow-style-none 2xl:fixed h-full 2xl:pb-96">
-        <div className="top-platform bg-white dark:bg-dark-white rounded-2xl p-8 2xl:w-[268px] w-full 2xl:mb-6 2xl:border-none border ">
+        <div className="top-platform bg-white dark:bg-dark-white rounded-2xl p-8 2xl:w-[268px] w-full 2xl:mb-10 2xl:border-none border ">
           {/* heading */}
           <div className="heading flex justify-between items-center mb-3.5">
             <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
@@ -49,10 +49,10 @@ export default function RightSideBar({ myJobList }) {
             <div></div>
           </div>
 
-          <div className="platform-list flex flex-col gap-y-2.5">
+          <div className="platform-list">
             {userDetails && userDetails?.account_type !== "FAMILY" && (
               <>
-                <div className="item flex space-x-3 items-center">
+                <div className="item flex space-x-3 items-center mb-4">
                   {/* image */}
                   <div className="w-8 h-8 rounded-full">
                     <svg
@@ -82,7 +82,7 @@ export default function RightSideBar({ myJobList }) {
                   {/* action */}
                 </div>
 
-                <div className="item flex space-x-3 items-center">
+                <div className="item flex space-x-3 items-center mb-4">
                   {/* image */}
                   <div className="w-8 h-8 rounded-full flex items-center justify-center">
                     <Icons name="pending-job" />
@@ -95,7 +95,7 @@ export default function RightSideBar({ myJobList }) {
                   </div>
                   {/* action */}
                 </div>
-                <div className="item flex space-x-3 items-center">
+                <div className="item flex space-x-3 items-center mb-4">
                   {/* image */}
                   <div className="w-8 h-8 rounded-full">
                     <svg
@@ -129,29 +129,10 @@ export default function RightSideBar({ myJobList }) {
                     </p>
                   </div>
                 </div>
-                <div className="item flex space-x-3 items-center">
-                  {/* image */}
-                  <div className="w-8 h-8 rounded-full bg-sky-500/50 p-1 flex justify-center items-center">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 68 50" id="Page">
-                      <path
-                        fillRule="evenodd"
-                        d="M0 13V2a2 2 0 0 1 2-2h64a2 2 0 0 1 2 2v11H0Zm0 4v31a2 2 0 0 0 2 2h20V17H0Zm26 33h40a2 2 0 0 0 2-2V17H26v33Z"
-                        fill="#ffffff"
-                        className="color000000 svgShape"
-                      ></path>
-                    </svg>
-                  </div>
-                  {/* name */}
-                  <div>
-                    <p className="text-thin-light-gray text-base font-medium">
-                      <NavLink to="/yourpage">My Page</NavLink>
-                    </p>
-                  </div>
-                </div>
               </>
             )}
 
-            <div className="item flex space-x-3 items-center">
+            <div className="item flex space-x-3 items-center mb-4">
               {/* image */}
               <div className="w-8 h-8 rounded-full">
                 <svg
@@ -191,7 +172,7 @@ export default function RightSideBar({ myJobList }) {
             {/* dark mode */}
             <div
               onClick={darkMode.handleThemeSwitch}
-              className="item flex space-x-5 items-center cursor-pointer"
+              className="item flex space-x-5 items-center mb-4 cursor-pointer"
             >
               <span className="dark:text-dark-gray text-white">
                 {darkMode.theme === "light" ? (
@@ -289,8 +270,8 @@ export default function RightSideBar({ myJobList }) {
                 <div></div>
               </div>
 
-              <div className="platform-list flex flex-col gap-y-2.5">
-                <div className="px-8 item flex space-x-3 items-center">
+              <div className="platform-list">
+                <div className="px-8 item flex space-x-3 items-center mb-4">
                   {/* image */}
                   <div className="w-8 h-8 p-[4px] rounded-full">
                     <img
@@ -308,7 +289,7 @@ export default function RightSideBar({ myJobList }) {
                   {/* action */}
                 </div>
 
-                <div className="px-8 item flex space-x-3 items-center">
+                <div className="px-8 item flex space-x-3 items-center mb-4">
                   {/* image */}
                   <div className="w-8 h-8 p-[4px] rounded-full">
                     <img
@@ -326,7 +307,7 @@ export default function RightSideBar({ myJobList }) {
                   {/* action */}
                 </div>
 
-                <div className="px-8 item flex space-x-3 items-center">
+                <div className="px-8 item flex space-x-3 items-center mb-4">
                   {/* image */}
                   <div className="w-8 h-8 p-[4px] rounded-full">
                     <img
@@ -343,7 +324,7 @@ export default function RightSideBar({ myJobList }) {
                   </div>
                 </div>
 
-                <div className="px-8 item flex space-x-3 items-center">
+                <div className="px-8 item flex space-x-3 items-center mb-4">
                   {/* image */}
                   <div className="w-8 h-8 p-[4px] rounded-full">
                     <img
@@ -363,7 +344,7 @@ export default function RightSideBar({ myJobList }) {
                 {/* Line */}
                 <div className="my-4 mx-auto w-10/12 h-[2px] bg-slate-500 dark:bg-white rounded-full"></div>
 
-                <div className="px-8 item flex space-x-3 items-center">
+                <div className="px-8 item flex space-x-3 items-center mb-4">
                   {/* image */}
                   <div className="w-8 h-8 p-[4px] rounded-full">
                     <img

src/components/jobPopout/PendingJobsPopout.jsx

@@ -9,7 +9,6 @@ import Detail from "./popoutcomponent/Detail";
 
 import { useDispatch } from "react-redux";
 import { tableReload } from "../../store/TableReloads";
-import { formattedDate } from "../../lib";
 
 const showSuccessToast = (message) => {
   toast.success(message, {
@@ -166,7 +165,7 @@ function PendingJobsPopout({ details, onClose, situation }) {
             </svg>
           </button>
         </div>
-        <div className="md:flex bg-white dark:bg-dark-white rounded-lg">
+        <div className="md:flex bg-white dark:bg-dark-white rounded-lg shadow-lg">
           <div className="p-4 w-full md:w-3/4 md:border-r-2">
             <p className="text-base font-semibold text-slate-900 dark:text-white tracking-wide">
               {details.title}
@@ -185,12 +184,12 @@ function PendingJobsPopout({ details, onClose, situation }) {
             </div>
 
             {/* INPUT SECTION */}
-            {/* <div className="my-2 md:flex">
+            <div className="my-2 md:flex">
               <Detail
                 label="Date Added"
                 value={details.offer_added || "default"}
               />
-            </div> */}
+            </div>
 
             <div className="my-2 md:flex">
               <Detail label="Description" value={details.description} />
@@ -199,14 +198,12 @@ function PendingJobsPopout({ details, onClose, situation }) {
             <div className="my-2 md:flex">
               <Detail
                 label="Offer Expire"
-                // value={
-                //   details.expire &&
-                //   `${details.expire.split(" ")[0]} ${
-                //     details.expire.split(" ")[1].split(".")[0]
-                //   }`
-                // }
-                // value={new Date(details.expire).toLocaleDateString()}
-                // value={formattedDate(details.expire)}
+                value={
+                  details.expire &&
+                  `${details.expire.split(" ")[0]} ${
+                    details.expire.split(" ")[1].split(".")[0]
+                  }`
+                }
               />
             </div>
 
@@ -317,7 +314,7 @@ function PendingJobsPopout({ details, onClose, situation }) {
         </div>
 
         {/* close button */}
-        <div className="modal-footer-wrapper flex justify-center">
+        <div className="p-6 flex justify-center">
           <button
             onClick={onClose}
             type="button"