reduced reference number

.env

@@ -14,6 +14,10 @@ REACT_APP_APPSITE="https://myfitapp.mermsemr.com"
 
 REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
 REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_ENDPOINT_KEY="WRENCH-BOARD-2024"
+
+#SOCKETS ENDS
+REACT_APP_PRIMARY_SOCKET="https://socket-dev.wrenchboard.com"
 
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
@@ -108,4 +112,16 @@ REACT_APP_APPLE_APP='https://itunes.apple.com/us/app/wrenchboard/id1435718367?ls
 REACT_APP_SHOW_NEW_FAMILY_DASH=1
 
 # Displays the account dashboard
-REACT_APP_SHOW_ACCOUNT_DASH=1
+REACT_APP_SHOW_ACCOUNT_DASH=1
+
+# Displays the slider banners
+REACT_APP_SHOW_SLIDER_BANNERS=0
+
+# FOR MEDIA LINK
+REACT_APP_MEDIA_LINK='https://dev-media.wrenchboard.com'
+
+# FOR FAMILY GAME LINK
+REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
+
+# REACT APP CUSTOMTIMER
+REACT_APP_CUSTOMTIMER=90

.env.development

@@ -14,6 +14,10 @@ REACT_APP_APPSITE="https://myfitapp.mermsemr.com"
 
 REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
 REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_ENDPOINT_KEY="WRENCH-BOARD-2024"
+
+#SOCKETS ENDS
+REACT_APP_PRIMARY_SOCKET="https://socket-dev.wrenchboard.com"
 
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
@@ -76,4 +80,16 @@ REACT_APP_APPLE_APP='https://itunes.apple.com/us/app/wrenchboard/id1435718367?ls
 REACT_APP_SHOW_NEW_FAMILY_DASH=1
 
 # Displays the account dashboard
-REACT_APP_SHOW_ACCOUNT_DASH=1
+REACT_APP_SHOW_ACCOUNT_DASH=1
+
+# Displays the slider banners
+REACT_APP_SHOW_SLIDER_BANNERS=0
+
+# FOR MEDIA LINK
+REACT_APP_MEDIA_LINK='https://dev-media.wrenchboard.com'
+
+# FOR FAMILY GAME LINK
+REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
+
+# REACT APP CUSTOMTIMER
+REACT_APP_CUSTOMTIMER=90

.env.production

@@ -14,6 +14,10 @@ REACT_APP_APPSITE="https://myfitapp.mermsemr.com"
 
 REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
 REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_ENDPOINT_KEY="WRENCH-BOARD-2024"
+
+#SOCKETS ENDS
+REACT_APP_PRIMARY_SOCKET="https://socket.wrenchboard.com"
 
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
@@ -82,4 +86,16 @@ REACT_APP_APPLE_APP='https://itunes.apple.com/us/app/wrenchboard/id1435718367?ls
 REACT_APP_SHOW_NEW_FAMILY_DASH=1
 
 # Displays the account dashboard
-REACT_APP_SHOW_ACCOUNT_DASH=1
+REACT_APP_SHOW_ACCOUNT_DASH=1
+
+# Displays the slider banners
+REACT_APP_SHOW_SLIDER_BANNERS=0
+
+# FOR MEDIA LINK
+REACT_APP_MEDIA_LINK='https://media.wrenchboard.com'
+
+# FOR FAMILY GAME LINK
+REACT_APP_FAM_GAME_LINK='https://games.wrenchboard.com'
+
+# REACT APP CUSTOMTIMER
+REACT_APP_CUSTOMTIMER=90

.vscode/settings.json

@@ -21,5 +21,14 @@
   "emmet.triggerExpansionOnTab": true,
   "emmet.includeLanguages": {
     "javascript": "javascriptreact"
-  }
+  },
+  "cSpell.words": [
+    "completesignuplink",
+    "MOBILEUSER",
+    "MYFILES",
+    "mynotifications",
+    "PASSWORDRESET",
+    "TRANSFERSTART",
+    "WRENCHBOARD"
+  ]
 }

docker-compose.yml

@@ -21,9 +21,10 @@ services:
       - backend.wrenchboard.api.live:10.10.33.15
       - backend.wrenchboard.api.test:10.10.33.15
       - apigate.lotus.g1.wrenchboard.com:10.10.33.15
+      - apigate.nebula.g1.wrenchboard.com:10.10.33.15
       - apigate.orion.g1.wrenchboard.com:10.10.33.15
-      # #- backend.wrenchboard.api.live:172.31.4.27
-      # #- backend.wrenchboard.api.test:10.20.30.27
+      - socket-dev.wrenchboard.com:10.10.33.15
+      - socket.wrenchboard.com:10.10.33.15
       - apigateway.wrenchboard.app.dev.fluxtra.net:10.20.30.19
       - apigateway.wrenchboard.app.lotus.fluxtra.net:172.31.4.19
     environment:

package.json

@@ -30,6 +30,7 @@
     "react-to-print": "^2.14.12",
     "react-toastify": "^9.0.1",
     "redux": "^4.2.0",
+    "socket.io-client": "^4.4.1",
     "slick-carousel": "^1.8.1",
     "web-vitals": "^1.0.1",
     "yup": "^1.1.1"

src/App.jsx

@@ -2,19 +2,22 @@ import { Navigate, useLocation } from "react-router-dom";
 import Routers from "./Routers";
 import Toaster from "./components/Helpers/Toaster";
 import Default from "./components/Partials/Default";
+import SocketIOContextProvider from "./components/Contexts/SocketIOContext";
 
 function App() {
   const { pathname } = useLocation();
   return (
     <Default>
-      <>
-        {pathname.startsWith("/@") ? (
-          <Navigate to="/app" replace={true} />
-        ) : (
-          <Routers />
-        )}
-        <Toaster />
-      </>
+      <SocketIOContextProvider>
+        <>
+          {pathname.startsWith("/@") ? (
+            <Navigate to="/app" replace={true} />
+          ) : (
+            <Routers />
+          )}
+          <Toaster />
+        </>
+      </SocketIOContextProvider>
     </Default>
   );
 }

src/Routers.jsx

@@ -58,6 +58,15 @@ import VerifyYouPages from "./views/VerifyYouPages";
 import VerifyYouPagesTwo from "./views/VerifyYouPagesTwo";
 import YourPages from "./views/YourPage_";
 import ParentWaitingPage from "./views/ParentWaitingPage";
+import FamilyPendingOfferPage from "./views/FamilyPendingOfferPage";
+import FamBlogPage from "./views/FamBlogPage"
+import FamAIQuestionPage from "./views/FamAIQuestionPage"
+import FamMyFilesPage from "./views/FamMyFilesPage"
+import FamWorkInProgressPage from "./views/FamWorkInProgressPage";
+import MyPastDueTasksPage from "./views/MyPastDueTasksPage";
+import FamilyWalletPage from "./views/FamilyWalletPage";
+import FamilyActivitiesPage from "./views/FamilyActivitiesPage";
+import FamGamesPage from "./views/FamGamesPage";
 
 export default function Routers() {
   return (
@@ -118,24 +127,32 @@ export default function Routers() {
           <Route exact path="/notification" element={<Notification />} />
           <Route exact path="/market-place" element={<MarketPlacePage />} />
           <Route exact path="/shop-details" element={<ShopDetailsPage />} />
-          <Route exact path="/my-wallet" element={<MyWalletPage />} />
-          <Route exact path="/my-collection" element={<MyCollection />} />*/}
+        <Route exact path="/my-collection" element={<MyCollection />} />*/}
           <Route exact path="/reminders" element={<RemindersPage />} />
           <Route exact path="/tracking" element={<TrackingPage />} />
           <Route exact path="/calendar" element={<CalendarPage />} />
           <Route exact path="/resources" element={<ResourcePage />} />
           <Route exact path="/my-wallet/*" element={<MyWalletPage />} />
+          <Route exact path="/family-wallet" element={<FamilyWalletPage />} />
           <Route exact path="/my-coupon" element={<MyCouponPage />} />
           <Route exact path="/notification" element={<Notification />} />
           <Route exact path="/market-place" element={<MarketPlacePage />} />
           <Route exact path="/market" element={<MarketPlacePage />} />
           <Route exact path="/familymarket" element={<FamilyMarketPage />} />
-          <Route exact path="/parentwaiting" element={<ParentWaitingPage />} />
+          <Route exact path="/suggested" element={<ParentWaitingPage />} />
+          <Route exact path="/pending" element={<FamilyPendingOfferPage />} />
+          <Route exact path="/fam-blog" element={<FamBlogPage />} />
+          <Route exact path="/ai-question" element={<FamAIQuestionPage />} />
+          <Route exact path="/myfiles" element={<FamMyFilesPage />} />
+          <Route exact path="/ai-lab" element={<FamAIQuestionPage />} />
+          <Route exact path="/fam-games" element={<FamGamesPage />} />
+          <Route exact path="/work-in-progress" element={<FamWorkInProgressPage />} />
           <Route
             exact
             path="/familysettings"
             element={<FamilySettingsPage />}
           />
+          <Route exact path="/pastdue" element={<MyPastDueTasksPage />} />
           <Route exact path="/notification" element={<Notification />} />
           <Route exact path="/mytask" element={<MyTaskPage />} />
           <Route exact path="/myjobs" element={<MyJobsPage />} />
@@ -154,6 +171,7 @@ export default function Routers() {
             element={<MyReviewDueJobsPage />}
           />
           <Route exact path="/acc-family" element={<FamilyAccPage />} />
+          <Route exact path="/acc-family/activities" element={<FamilyActivitiesPage />} />
           <Route exact path="/manage-family" element={<FamilyManagePage />} />
           <Route exact path="/start-job" element={<StartJob />} />
           <Route exact path="/yourpage" element={<YourPages />} />

src/components/AddJob/AddJob.jsx

@@ -73,8 +73,7 @@ function AddJob({ popUpHandler, categories }) {
   };
 
   return (
-    <div className="add-job p-5 w-full bg-white dark:bg-dark-white dark:text-white rounded-md flex flex-col justify-between">
-      <Formik
+    <Formik
         initialValues={IV}
         validationSchema={validationSchema}
         onSubmit={handleAddJob}
@@ -82,281 +81,282 @@ function AddJob({ popUpHandler, categories }) {
         {(props) => {
           return (
             <Form>
-              <div className="flex flex-col-reverse sm:flex-row">
-                <div className="fields w-full">
-                  {/* inputs starts here */}
-                  <div className="xl:flex xl:space-x-7 mb-[5px]">
-                    <div className="field w-full mb-6 xl:mb-0">
-                      <label
-                        htmlFor="country"
-                        className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex item-center gap-1"
-                      >
-                        Currency
-                        {props.errors.country && props.touched.country && (
-                          <span className="text-[12px] text-red-500">
-                            {props.errors.country}
-                          </span>
-                        )}
-                      </label>
-                      <select
-                        id="country"
-                        name="country"
-                        value={props.values.country}
-                        className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none border`}
-                        onChange={props.handleChange}
-                        onBlur={props.handleBlur}
-                      >
-                        {walletDetails?.loading ? (
-                          <option className="text-slate-500 text-lg" value="">
-                            Loading...
-                          </option>
-                        ) : walletDetails.data.length ? (
-                          <>
+              <div className="add-job p-5 w-full bg-white dark:bg-dark-white dark:text-white rounded-md flex flex-col justify-between">
+                <div className="flex flex-col-reverse sm:flex-row">
+                  <div className="fields w-full">
+                    {/* inputs starts here */}
+                    <div className="xl:flex xl:space-x-7 mb-[5px]">
+                      <div className="field w-full mb-6 xl:mb-0">
+                        <label
+                          htmlFor="country"
+                          className="job-label job-label-flex"
+                        >
+                          <span>Currency</span>
+                          {props.errors.country && props.touched.country && (
+                            <span className="text-[12px] text-red-500">
+                              {props.errors.country}
+                            </span>
+                          )}
+                        </label>
+                        <select
+                          id="country"
+                          name="country"
+                          value={props.values.country}
+                          className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none border`}
+                          onChange={props.handleChange}
+                          onBlur={props.handleBlur}
+                        >
+                          {walletDetails?.loading ? (
                             <option className="text-slate-500 text-lg" value="">
-                              Select a currency
+                              Loading...
                             </option>
-                            {walletDetails.data?.map((item, index) => (
-                              <option
-                                key={index}
-                                className="text-slate-500 text-lg"
-                                value={item?.country}
-                              >
-                                {item?.description}
+                          ) : walletDetails.data.length ? (
+                            <>
+                              <option className="text-slate-500 text-lg" value="">
+                                Select a currency
                               </option>
-                            ))}
-                          </>
-                        ) : (
-                          <option className="text-slate-500 text-lg" value="">
-                            No Options Found! Try Again
-                          </option>
-                        )}
-                      </select>
+                              {walletDetails.data?.map((item, index) => (
+                                <option
+                                  key={index}
+                                  className="text-slate-500 text-lg"
+                                  value={item?.country}
+                                >
+                                  {item?.description}
+                                </option>
+                              ))}
+                            </>
+                          ) : (
+                            <option className="text-slate-500 text-lg" value="">
+                              No Options Found! Try Again
+                            </option>
+                          )}
+                        </select>
+                      </div>
+
+                      {/* Price */}
+                      <div className="field w-full">
+                        <InputCom
+                          fieldClass="px-6 text-right flex"
+                          label="Price"
+                          labelClass=""
+                          type="number"
+                          name="price"
+                          placeholder="0"
+                          value={props.values.price}
+                          inputHandler={props.handleChange}
+                          blurHandler={props.handleBlur}
+                          error={
+                            props.errors.price &&
+                            props.touched.price &&
+                            props.errors.price
+                          }
+                        />
+                      </div>
                     </div>
 
-                    {/* Price */}
-                    <div className="field w-full">
+                    {/* Title  */}
+                    <div className="field w-full mb-[5px]">
                       <InputCom
-                        fieldClass="px-6 text-right"
-                        label="Price"
-                        labelClass="tracking-wide"
-                        type="number"
-                        name="price"
-                        placeholder="0"
-                        value={props.values.price}
+                        fieldClass="px-6"
+                        label="Title"
+                        labelClass=""
+                        type="text"
+                        name="title"
+                        value={props.values.title}
                         inputHandler={props.handleChange}
                         blurHandler={props.handleBlur}
                         error={
-                          props.errors.price &&
-                          props.touched.price &&
-                          props.errors.price
+                          props.errors.title &&
+                          props.touched.title &&
+                          props.errors.title
                         }
                       />
                     </div>
-                  </div>
 
-                  {/* Title  */}
-                  <div className="field w-full mb-[5px]">
-                    <InputCom
-                      fieldClass="px-6"
-                      label="Title"
-                      labelClass="tracking-wide"
-                      type="text"
-                      name="title"
-                      value={props.values.title}
-                      inputHandler={props.handleChange}
-                      blurHandler={props.handleBlur}
-                      error={
-                        props.errors.title &&
-                        props.touched.title &&
-                        props.errors.title
-                      }
-                    />
-                  </div>
-
-                  {/* Description  */}
-                  <div className="field w-full mb-[5px]">
-                    <InputCom
-                      fieldClass="px-6"
-                      label="Description"
-                      labelClass="tracking-wide"
-                      type="text"
-                      name="description"
-                      value={props.values.description}
-                      inputHandler={props.handleChange}
-                      blurHandler={props.handleBlur}
-                      error={
-                        props.errors.description &&
-                        props.touched.description &&
-                        props.errors.description
-                      }
-                    />
-                  </div>
-
-                  {/* Details */}
-                  <div className="field flex flex-col sm:flex-row w-full mb-[5px] gap-2">
-                    <div className="sm:w-[60%] w-full">
-                      <label
-                        htmlFor="Job Delivery Details"
-                        className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex items-center gap-1"
-                      >
-                        Job Delivery Details
-                        {props.errors.job_detail &&
-                          props.touched.job_detail && (
-                            <span className="text-[12px] text-red-500">
-                              {props.errors.job_detail}
-                            </span>
-                          )}
-                      </label>
-                      <textarea
-                        id="Job Delivery Details"
-                        rows="5"
-                        className={`input-field px-3 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px] border`}
-                        style={{ resize: "none" }}
-                        name="job_detail"
-                        value={props.values.job_detail}
-                        onChange={props.handleChange}
-                        onBlur={props.handleBlur}
+                    {/* Description  */}
+                    <div className="field w-full mb-[5px]">
+                      <InputCom
+                        fieldClass="px-6"
+                        label="Description"
+                        labelClass=""
+                        type="text"
+                        name="description"
+                        value={props.values.description}
+                        inputHandler={props.handleChange}
+                        blurHandler={props.handleBlur}
+                        error={
+                          props.errors.description &&
+                          props.touched.description &&
+                          props.errors.description
+                        }
                       />
                     </div>
 
-                    <div className="sm:w-[35%] w-full">
-                      <div
-                        htmlFor="Job Categories"
-                        className='className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"'
-                        id="checked-group"
-                      >
-                        Categories
-                      </div>
-                      <div
-                        className="sm:flex-col flex flex-wrap px-3 mt-3"
-                        role="group"
-                        aria-labelledby="checked-group"
-                      >
-                        {categories ? (
-                          <>
-                            {Object?.entries(categories).map(([key, value]) => (
-                              <label
-                                key={key}
-                                className="flex gap-1 w-full items-center"
-                              >
-                                <Field
-                                  type="checkbox"
-                                  name="category"
-                                  value={key}
-                                />
-                                <span className="text-[13.975px]">{value}</span>
-                              </label>
-                            ))}
-                          </>
-                        ) : (
-                          <label className="flex gap-1 w-full items-center">
-                            <Field type="checkbox" name="category" />
-                            <span className="text-[13.975px]">null</span>
-                          </label>
-                        )}
-                        <span className="h-5 text-sm italic text-[#cf3917]">
-                          {props.errors.category &&
-                            props.touched.category &&
-                            "please select a category"}
-                        </span>
-                      </div>
-                    </div>
-                  </div>
-
-                  <div className="field w-full mb-[5px]">
-                    <div className={`flex items-center justify-between mb-2.5`}>
-                      <label
-                        className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"
-                        htmlFor="timeline_days"
-                      >
-                        Timeline
-                        <span className="text-green-700 text-sm tracking-wide">
-                          - Expected duration of this task
-                        </span>
-                      </label>
-                    </div>
-
-                    <Field
-                      component="select"
-                      name="timeline_days"
-                      className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none border ${
-                        props.errors.timeline_days &&
-                        props.touched.timeline_days
-                          ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
-                          : "border border-[#f5f8fa] dark:border-[#5e6278]"
-                      }`}
-                      value={props.values.timeline_days}
-                    >
-                      <option value="">Select Duration</option>
-                      {publicArray.map(({ name, duration }, idx) => (
-                        <option
-                          key={idx}
-                          className="text-slate-500 text-lg"
-                          value={duration}
+                    {/* Details */}
+                    <div className="field flex flex-col sm:flex-row w-full mb-[5px] gap-2">
+                      <div className="sm:w-[60%] w-full">
+                        <label
+                          htmlFor="Job Delivery Details"
+                          className="job-label job-label-flex"
                         >
-                          {name}
-                        </option>
-                      ))}
-                    </Field>
-                  </div>
-                  {/* inputs ends here */}
-                </div>
-              </div>
+                          Job Delivery Details
+                          {props.errors.job_detail &&
+                            props.touched.job_detail && (
+                              <span className="text-[12px] text-red-500">
+                                {props.errors.job_detail}
+                              </span>
+                            )}
+                        </label>
+                        <textarea
+                          id="Job Delivery Details"
+                          rows="5"
+                          className={`input-field px-3 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px] border`}
+                          style={{ resize: "none" }}
+                          name="job_detail"
+                          value={props.values.job_detail}
+                          onChange={props.handleChange}
+                          onBlur={props.handleBlur}
+                        />
+                      </div>
 
-              {/* ERROR DISPLAY AND SUBMIT BUTTON */}
-              <div className="content-footer w-full">
-                {/* error or success display */}
-                {requestStatus.message != "" &&
-                  (!requestStatus.status ? (
-                    <div
-                      className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
-                    >
-                      {requestStatus.message}
+                      <div className="sm:w-[35%] w-full">
+                        <label
+                          htmlFor="Job Categories"
+                          className='job-label'
+                          id="checked-group"
+                        >
+                          Categories
+                        </label>
+                        <div
+                          className="sm:flex-col flex flex-wrap px-3 mt-3"
+                          role="group"
+                          aria-labelledby="checked-group"
+                        >
+                          {categories ? (
+                            <>
+                              {Object?.entries(categories).map(([key, value]) => (
+                                <label
+                                  key={key}
+                                  className="flex gap-1 w-full items-center"
+                                >
+                                  <Field
+                                    type="checkbox"
+                                    name="category"
+                                    value={key}
+                                  />
+                                  <span className="text-[13.975px]">{value}</span>
+                                </label>
+                              ))}
+                            </>
+                          ) : (
+                            <label className="flex gap-1 w-full items-center">
+                              <Field type="checkbox" name="category" />
+                              <span className="text-[13.975px]">null</span>
+                            </label>
+                          )}
+                          <span className="h-5 text-sm italic text-[#cf3917]">
+                            {props.errors.category &&
+                              props.touched.category &&
+                              "please select a category"}
+                          </span>
+                        </div>
+                      </div>
                     </div>
-                  ) : (
-                    requestStatus.status && (
+
+                    <div className="field w-full mb-[5px]">
+                      <div className={`flex items-center justify-between mb-2.5`}>
+                        <label
+                          className="job-label"
+                          htmlFor="timeline_days"
+                        >
+                          Timeline
+                          <span className="text-green-700 text-sm tracking-wide">
+                            - Expected duration of this task
+                          </span>
+                        </label>
+                      </div>
+
+                      <Field
+                        component="select"
+                        name="timeline_days"
+                        className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none border ${
+                          props.errors.timeline_days &&
+                          props.touched.timeline_days
+                            ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
+                            : "border border-[#f5f8fa] dark:border-[#5e6278]"
+                        }`}
+                        value={props.values.timeline_days}
+                      >
+                        <option value="">Select Duration</option>
+                        {publicArray.map(({ name, duration }, idx) => (
+                          <option
+                            key={idx}
+                            className="text-slate-500 text-lg"
+                            value={duration}
+                          >
+                            {name}
+                          </option>
+                        ))}
+                      </Field>
+                    </div>
+                    {/* inputs ends here */}
+                  </div>
+                </div>
+
+                {/* ERROR DISPLAY AND SUBMIT BUTTON */}
+                <div className="content-footer w-full">
+                  {/* error or success display */}
+                  {requestStatus.message != "" &&
+                    (!requestStatus.status ? (
                       <div
-                        className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                        className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
                       >
                         {requestStatus.message}
                       </div>
-                    )
-                  ))}
-                {/* End of error or success display */}
-
-                <div className="w-full h-[70px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
-                  <div className="flex items-center space-x-4 mr-9">
-                    <button
-                      type="button"
-                      className="text-18 text-light-red tracking-wide "
-                    >
-                      <span
-                        className="border-b dark:border-[#5356fb29]  border-light-red"
-                        onClick={popUpHandler}
-                      >
-                        {" "}
-                        Cancel
-                      </span>
-                    </button>
-
-                    {requestStatus?.loading ? (
-                      <LoadingSpinner size="8" color="sky-blue" />
                     ) : (
-                      <button
-                        type="submit"
-                        className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                      >
-                        Add Job
-                      </button>
-                    )}
-                  </div>
+                      requestStatus.status && (
+                        <div
+                          className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                        >
+                          {requestStatus.message}
+                        </div>
+                      )
+                    ))}
+                  {/* End of error or success display */}
+
+                </div>
+              </div>
+              <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
+                <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center">
+                  <button
+                    type="button"
+                    className="custom-btn border border-light-red text-light-red"
+                  >
+                    <span
+                      className="px-2"
+                      onClick={popUpHandler}
+                    >
+                      {" "}
+                      Cancel
+                    </span>
+                  </button>
+
+                  {requestStatus?.loading ? (
+                    <LoadingSpinner size="8" color="sky-blue" />
+                  ) : (
+                    <button
+                      type="submit"
+                      className="custom-btn btn-gradient text-white"
+                    >
+                      Add Job
+                    </button>
+                  )}
                 </div>
               </div>
             </Form>
           );
         }}
       </Formik>
-    </div>
   );
 }
 

src/components/AuthPages/AuthLayout2.jsx

@@ -25,7 +25,7 @@ export default function LoginLayout({ slogan, children }) {
         >
         </div> */}
         <div className="p-5 sm:p-7 flex place-content-center lg:col-start-2">
-          <div className="py-5 w-full sm:w-11/12 max-w-2xl shadow-md bg-slate-50 rounded-[0.475rem]">
+          <div className="py-5 w-full sm:w-11/12 max-w-[550px] shadow-md bg-slate-50 rounded-[0.475rem]">
             <div className="w-full flex justify-center items-center">
               {children && children}
             </div>

src/components/AuthPages/Login/index2.jsx

@@ -145,8 +145,9 @@ export default function Login() {
         localStorage.setItem("member_id", `${res.data.member_id}`);
         localStorage.setItem("uid", `${res.data.uid}`);
         localStorage.setItem("session_token", `${res.data.session}`);
-        if (name === "family") {
+        if (res.data?.account_type == "FAMILY") {
           sessionStorage.setItem("family_uid", res.data?.family_uid);
+          sessionStorage.setItem("parent_uid", res.data?.parent_uid);
         }
         // localStorage.setItem("session", `${res.data.session}`);
         dispatch(updateUserDetails({ ...res.data }));

src/components/Blogs/index.jsx

@@ -4,9 +4,15 @@ import usersService from "../../services/UsersService";
 import Layout from "../Partials/Layout";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import CommonHead from "../UserHeader/CommonHead";
+import { useSelector } from "react-redux";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
 
 export default function BlogItem(props) {
 
+    const {
+        userDetails: { account_type },
+      } = useSelector((state) => state?.userDetails); // CHECKS IF USER Details account type
+
     const apiCall = new usersService()
     const navigate = useNavigate()
 
@@ -33,11 +39,26 @@ export default function BlogItem(props) {
     },[blog_id])
     return (
         <Layout>
-            <CommonHead
-                commonHeadData={props.commonHeadData}
-            />
+            {account_type == 'FULL' &&
+                <CommonHead
+                    commonHeadData={props.commonHeadData}
+                />
+            }
+            { account_type == 'FAMILY' &&
+            <div className="mb-5">
+                <CustomBreadcrumb 
+                title = {blogdata?.data?.blogdata?.length > 0 ? blogdata?.data?.blogdata[0]?.post_title : 'Blog'}
+                breadcrumb={
+                    [
+                    { link: "/", title: "Home" },
+                    { link: "/fam-blog", title: "Blogs", active: true},
+                    ]
+                }
+                />
+            </div>
+            }
             <div className="notification-page w-full mb-10">
-                <div className="mb-5">
+                {/* <div className="mb-5">
                     <h1 className="text-26 font-bold text-dark-gray dark:text-white">
                         <span
                             className={`${selectTab === "today" ? "block" : "hidden"}`}
@@ -45,7 +66,7 @@ export default function BlogItem(props) {
                         {blogdata.data?.blogdata?.[0]?.post_title}
                         </span>
                     </h1>
-                </div>
+                </div> */}
                 <div className="notification-wrapper w-full bg-white p-8 rounded-2xl">
                     {blogdata?.loading ? 
                         <LoadingSpinner size='8' color='sky-blue' height='h-[100px]' />
@@ -53,8 +74,8 @@ export default function BlogItem(props) {
                         blogdata?.data?.blogdata && blogdata.data?.blogdata.length ?
                         <div className="w-full">
                             {/* heading */}
-                            <div className="sm:flex justify-between items-center mb-6">
-                                {/* <div className="mb-5">
+                            {/* <div className="sm:flex justify-between items-center mb-6">
+                                <div className="mb-5">
                                     <h1 className="text-26 font-bold text-dark-gray dark:text-white">
                                         <span
                                             className={`${selectTab === "today" ? "block" : "hidden"}`}
@@ -62,10 +83,10 @@ export default function BlogItem(props) {
                                         {blogdata.data?.blogdata?.[0]?.post_title}
                                         </span>
                                     </h1>
-                                </div> */}
-                                {/* <div className="slider-btns flex space-x-4">
-                                </div> */}
-                            </div>
+                                </div>
+                                <div className="slider-btns flex space-x-4">
+                                </div>
+                            </div> */}
                             <div dangerouslySetInnerHTML={{__html: blogdata.data?.blogdata?.[0]?.post_content}}>
                             </div>
                     </div>

src/components/Breadcrumb/CustomBreadcrumb.jsx

@@ -1,22 +1,25 @@
-import React from 'react'
-import { Link } from 'react-router-dom'
+import React from "react";
+import { Link } from "react-router-dom";
 
-export default function CustomBreadcrumb({title, breadcrumb}) {
+export default function CustomBreadcrumb({ title, breadcrumb }) {
   return (
     <div className="">
-        <h3 className="text-26 font-bold text-dark-gray dark:text-white">{title}</h3>
-        <nav aria-label="breadcrumb" className='text-base text-dark-gray dark:text-white flex items-center'>
-            {breadcrumb.map((value, index) => (
-                <p key={index}>
-                    <Link className={`${value.active ? 'opacity-60' : ''}`} to={value.link}>{value.title}</Link>
-                    {index != breadcrumb.length - 1 ?
-                    <span className='px-1'>/</span>
-                    :
-                    null
-                    }
-                </p>
-            ))}
-        </nav>
+      <h3 className="text-26 font-bold text-dark-gray dark:text-white">
+        {title}
+      </h3>
+      <nav
+        aria-label="breadcrumb"
+        className="text-base text-dark-gray dark:text-white flex items-center"
+      >
+        {breadcrumb.map((value, index) => (
+          <React.Fragment key={index}>
+            <Link className={value.active ? "opacity-60" : ""} to={value.link}>
+              {value.title}
+            </Link>
+            {index !== breadcrumb.length - 1 && <span className="px-1">\</span>}
+          </React.Fragment>
+        ))}
+      </nav>
     </div>
-  )
+  );
 }

src/components/Cards/AvailableJobsCard.jsx

@@ -117,7 +117,7 @@ export default function AvailableJobsCard({
           </div>
         </div>
       ) : (
-        <div className="card-style-two w-full p-8 my-2 flex items-center gap-4 bg-white dark:bg-dark-white rounded-2xl section-shadow">
+        <div className="card-style-two w-full px-4 py-[0.4rem] my-2 flex items-center gap-4 bg-white dark:bg-dark-white rounded-2xl section-shadow">
           <div className="flex gap-5 items-center w-full">
             <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] min-w-[60px] max-w-[60px]">
               <img src={image} alt="data" className="w-full h-full" />

src/components/Cards/OfferCard.jsx

@@ -1,7 +1,10 @@
+import { Suspense, lazy } from "react";
 import localImgLoad from "../../lib/localImgLoad";
 import CountDown from "../Helpers/CountDown";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 
+const VideoElement = lazy(() => import("../VideoCom/VideoElement")); // LAZY IMPORTING VIDEO COMPONENT
+
 export default function OfferCard({
   datas,
   hidden = false,
@@ -19,9 +22,13 @@ export default function OfferCard({
   return (
     <div className="card-style-one flex flex-col justify-between w-full h-[387px] bg-white dark:bg-dark-white   p-3 pb rounded-2xl">
       <div className="content">
-        {/* thumbnail */}
         <div className="w-full h-40">
-          {/* thumbnail image */}
+          {/* thumbnail image/video */}
+          {datas.job_type == "MEDIA" ?
+          <Suspense fallback={<p>Loading...</p>}>
+            <VideoElement videoId={datas?.media_uid} />
+          </Suspense>
+          :
           <div
             className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
             style={{
@@ -30,6 +37,7 @@ export default function OfferCard({
           >
             {hidden && <div className="flex justify-center"></div>}
           </div>
+          }
         </div>
         {/* details */}
         <div className="details">
@@ -38,15 +46,15 @@ export default function OfferCard({
           </h1>
 
           <div className="w-full p-2 rounded-lg border border-[#E3E4FE] dark:border-[#a7a9b533] ">
-            <div className="grid grid-cols-2 gap-2">
-              <div className="flex flex-col justify-between items-center border-r-2">
+            <div className="grid grid-cols-1 gap-2">
+              {/* <div className="flex flex-col justify-between items-center border-r-2">
                 <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
                   Task Code
                 </p>
                 <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
                   {datas.contract}
                 </p>
-              </div>
+              </div> */}
               <div className="flex flex-col justify-between items-center">
                 <p className="text-sm text-red-500 tracking-wide">Expires</p>
                 <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">

src/components/Contexts/SocketIOContext.js

@@ -0,0 +1,116 @@
+import React, { createContext, useContext, useEffect, useState } from "react";
+import { tableReload } from "../../store/TableReloads";
+import { useDispatch, useSelector } from "react-redux";
+
+import io from "socket.io-client";
+
+let SocketIOContext = createContext({})
+
+export default function SocketIOContextProvider({children}) {
+    const {userDetails} = useSelector((state) => state?.userDetails); // CHECKS IF USER UID, to determine if user is active
+
+    const dispatch = useDispatch()
+
+    const socket = io.connect(process.env.REACT_APP_PRIMARY_SOCKET); 
+
+    // //Room State
+    // const [room, setRoom] = useState("");
+
+    // // Messages States
+    // const [message, setMessage] = useState("");
+    const [socketMsgReceived, setSocketMsgReceived] = useState("");
+
+    const joinRoom = (room) => {
+        if (room !== "") {
+        socket.emit("join_room", room);
+        }
+    };
+
+    const sendMessage = (message, room) => {
+        if(message && room){
+            socket.emit("send_message", { message, room });
+        }
+    };
+
+    const marketUpdate = (message, room) => {
+        if(message && room){
+            socket.emit("marketjob_added", { message, room });
+        }
+    };
+
+    const parentAssignJobToKid = (message, room) => {
+        if(message && room){
+            socket.emit("family", { message:{...message}, room });
+        }
+    };
+
+    const sendJobInterestToOwner = (message, room) => {
+        if(message && room){
+            socket.emit("marketjob", { message:{...message}, room });
+        }
+    };
+
+    useEffect(() => {
+        socket.on("receive_message", (data) => {
+            // setSocketMsgReceived(data.message);
+            dispatch(tableReload({type:'CHATMESSAGELIST'})) // dispatches to update chat message sending from owner to worker and vice versa
+        });
+
+        socket.on("received_refreshmarket_jobs", (data) => {
+            // setSocketMsgReceived(data.message);
+            dispatch(tableReload({type:'MARKETTABLELIST'})) // dispatches to update market list on full account
+        });
+
+        socket.on("family_actions", (data) => {
+            // setSocketMsgReceived(data.message);
+            let user_uid = userDetails.account_type == 'FULL' ? userDetails.uid : sessionStorage.getItem('family_uid') // gets user UID
+            let {message} = data
+            if(message.action == "REFRESH_OFFER" && message.family_uid == user_uid && message.audience == "MEMBER"){  // for refreshing child account when parent assigns a job
+                dispatch(tableReload({type:'FAMILYOFFERLIST'})) // dispatches to update family pending/offer list on family side
+            }
+            if(message.action == "REFRESH_TASK" && message.audience == "PARENT"){  // for refreshing parent account when child accepts or rejects a job
+                dispatch(tableReload({type:'PARENTFAMILYTASKLIST'})) // dispatches to update parent family task list on parent side
+            }
+            if(message.action == "REFRESH_WALLET" && message.family_uid == user_uid && message.audience == "MEMBER"){  // for refreshing child wallet account when parent sends money to kid
+                dispatch(tableReload({type:'WALLETTABLE'})) // dispatches to update wallet balance on family side
+            }
+            // console.log('DATA', data)
+        });
+
+        socket.on("marketjob_actions", (data) => { // Triggers refresh on owner side, when somebody sends/shows interest in a job 
+            let user_uid = userDetails.account_type == 'FULL' ? userDetails.uid : sessionStorage.getItem('family_uid') // gets user UID
+            let {message} = data
+            if(message.action == "REFRESH_OFFERS" && message.audience == "MERCHANT" && message.market_uid == user_uid){  // for refreshing job owner offer interest list when any worker sends interest
+                dispatch(tableReload({type:'OFFERINTERESTLISTRELOAD'}))
+            }
+            console.log('data', data)
+        });
+
+    }, [socket]);
+
+    let values = {
+        socket,
+        sendMessage,
+        joinRoom,
+        setSocketMsgReceived,
+        marketUpdate,
+        parentAssignJobToKid,
+        sendJobInterestToOwner,
+        socketMsgReceived,
+        // room,
+        // setRoom,
+        // message,
+        // setMessage,
+    }
+
+  return (
+    <SocketIOContext.Provider value={values}>
+        {children}
+    </SocketIOContext.Provider>
+  )
+}
+
+
+export const SocketValues = () => {
+    return useContext(SocketIOContext)
+}

src/components/Dashboards/AccountDashboard.jsx

@@ -29,14 +29,15 @@ const AccountDashboard = ({ className, bannerList }) => {
             props;
 
           return (
-            <TopBanner
-              btn={short_button_text}
-              image={image}
-              title={short_title}
-              desc={short_description}
-              link_path={link_path}
-              key={idx}
-            />
+            <div key={idx}>
+              <TopBanner
+                btn={short_button_text}
+                image={image}
+                title={short_title}
+                desc={short_description}
+                link_path={link_path}
+              />
+            </div>
           );
         })}
       </div>
@@ -48,14 +49,15 @@ const AccountDashboard = ({ className, bannerList }) => {
             props;
 
           return (
-            <LowerBanner
-              btn={short_button_text}
-              image={image}
-              title={short_title}
-              desc={short_description}
-              link_path={link_path}
-              key={idx}
-            />
+            <div key={idx}>
+              <LowerBanner
+                btn={short_button_text}
+                image={image}
+                title={short_title}
+                desc={short_description}
+                link_path={link_path}
+              />
+            </div>
           );
         })}
       </div>
@@ -67,11 +69,12 @@ export default AccountDashboard;
 
 const TopBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
   return (
-    <div className="flex flex-col shadow-md rounded-xl dark:border-[#5356fb29]">
-      <Link to={link_path} key={key} className="h-[12rem] rounded-t-xl">
+    <div className="flex flex-col shadow-md rounded-xl dark:border-[#5356fb29]" key={key}>
+      <Link to={link_path} className="h-[12rem] rounded-t-xl">
         <img
           src={image}
           alt="banner-img"
+          loading="lazy"
           className="w-full h-full rounded-t-xl object-cover"
         />
       </Link>
@@ -120,6 +123,7 @@ const LowerBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
           <img
             src={image}
             alt="banner-img"
+            loading="lazy"
             className="w-full h-full rounded-xl"
           />
         </Link>

src/components/Dashboards/FamilyParentDashboard.jsx

@@ -1,9 +1,8 @@
 import React from "react";
-import CountDown from "../Helpers/CountDown";
 // import HomeSliders from "./HomeSliders";
 import { useSelector } from "react-redux";
 
-export default function JobOwnerDashboard({
+export default function FamilyParentDashboard({
   className,
   bannerList,
   nextDueTask,
@@ -16,7 +15,7 @@ export default function JobOwnerDashboard({
 
   return (
     <div
-      className={`w-full md:h-[47px] xxs:h-[74px] flex p-1 flex-wrap justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${
+      className={`w-full md:h-[47px] xxs:h-[74px] flex px-[1.05rem] py-[0.35rem] flex-wrap justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${
         className || ""
       }`}
       style={{
@@ -28,50 +27,19 @@ export default function JobOwnerDashboard({
       <div className="h-full flex flex-wrap w-full justify-between mb-5 lg:mb-0">
         {/* heading */}
         <div className="flex gap-8">
-          <h1 className="text-base ng font-medium text-white tracking-wide">
+          <h1 className="text-base font-medium text-white tracking-wide">
             Welcome
           </h1>
           {/* user */}
-          <div>
-            <p className="text-base tracking-wide font-bold antise text-white">
+          <div className="flex flex-col gap-1">
+            <p className="text-base tracking-wide font-bold antise text-white leading-[1]">
               {`${firstname} ${lastname}`}
             </p>
-            <p className="text-sm tracking-wide text-white">@{userEmail}</p>
+            <p className="text-sm tracking-wide text-white leading-[1]">
+              @{userEmail}
+            </p>
           </div>
         </div>
-
-        {/* countdown */}
-        {nextDueTask?.next_due &&
-          Object.keys(nextDueTask.next_due)?.length != 0 && (
-            <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border back-dark1 border-white-opacity">
-              <div className="flex flex-col justify-between">
-                <p className="text-base text-white tracking-wide">
-                  Current Task
-                </p>
-                <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-                  {nextDueTask.next_due.item_code.substr(0, 4) + "..."}
-                </p>
-                <p className="text-base text-white tracking-wide">
-                  {nextDueTask.next_due.price * 0.01} Naira
-                </p>
-              </div>
-              <div className="w-[1px] h-full bg-white-opacity"></div>
-              <div className="flex flex-col justify-between">
-                <p className="text-base text-white tracking-wide">
-                  Next due in
-                </p>
-                <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-                  {/* <CountDown lastDate="2023-04-26 4:00:00" /> */}
-                  <CountDown lastDate={nextDueTask.next_due.due_date} />
-                </p>
-                <div className="text-base text-white tracking-wide flex gap-[23px]">
-                  <span>Hrs</span>
-                  <span>Min</span>
-                  <span>Sec</span>
-                </div>
-              </div>
-            </div>
-          )}
         <span className="text-base font-thin tracking-wide text-white flex items-end">
           Last Login : {loginDate}
         </span>

src/components/Dashboards/HomeDashboard.jsx

@@ -1,13 +1,8 @@
 import React from "react";
-import CountDown from "../Helpers/CountDown";
 // import HomeSliders from "./HomeSliders";
 import { useSelector } from "react-redux";
 
-export default function JobOwnerDashboard({
-  className,
-  bannerList,
-  nextDueTask,
-}) {
+export default function HomeDashboard({ className, bannerList, nextDueTask }) {
   const { userDetails } = useSelector((state) => state?.userDetails);
 
   let loginDate = userDetails?.last_login.split(" ")[0];
@@ -16,7 +11,7 @@ export default function JobOwnerDashboard({
 
   return (
     <div
-      className={`w-full md:h-[47px] xxs:h-[74px] flex p-1 flex-wrap justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${
+      className={`w-full md:h-[47px] xxs:h-[74px] flex px-[1.05rem] py-[0.35rem] flex-wrap justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${
         className || ""
       }`}
       style={{
@@ -28,50 +23,20 @@ export default function JobOwnerDashboard({
       <div className="h-full flex flex-wrap w-full justify-between mb-5 lg:mb-0">
         {/* heading */}
         <div className="flex gap-8">
-          <h1 className="text-base ng font-medium text-white tracking-wide">
+          <h1 className="text-base font-medium text-white tracking-wide">
             Welcome
           </h1>
           {/* user */}
-          <div>
-            <p className="text-base tracking-wide font-bold antise text-white">
+          <div className="flex flex-col gap-1">
+            <p className="text-base tracking-wide font-bold antise text-white leading-[1]">
               {`${firstname} ${lastname}`}
             </p>
-            <p className="text-sm tracking-wide text-white">@{userEmail}</p>
+            <p className="text-sm tracking-wide text-white leading-[1]">
+              @{userEmail}
+            </p>
           </div>
         </div>
 
-        {/* countdown */}
-        {nextDueTask?.next_due &&
-          Object.keys(nextDueTask.next_due)?.length != 0 && (
-            <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border back-dark1 border-white-opacity">
-              <div className="flex flex-col justify-between">
-                <p className="text-base text-white tracking-wide">
-                  Current Task
-                </p>
-                <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-                  {nextDueTask.next_due.item_code.substr(0, 4) + "..."}
-                </p>
-                <p className="text-base text-white tracking-wide">
-                  {nextDueTask.next_due.price * 0.01} Naira
-                </p>
-              </div>
-              <div className="w-[1px] h-full bg-white-opacity"></div>
-              <div className="flex flex-col justify-between">
-                <p className="text-base text-white tracking-wide">
-                  Next due in
-                </p>
-                <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-                  {/* <CountDown lastDate="2023-04-26 4:00:00" /> */}
-                  <CountDown lastDate={nextDueTask.next_due.due_date} />
-                </p>
-                <div className="text-base text-white tracking-wide flex gap-[23px]">
-                  <span>Hrs</span>
-                  <span>Min</span>
-                  <span>Sec</span>
-                </div>
-              </div>
-            </div>
-          )}
         <span className="text-base font-thin tracking-wide text-white flex items-end">
           Last Login : {loginDate}
         </span>

src/components/Dashboards/JobOwnerDashboard.jsx

@@ -1,5 +1,4 @@
 import React from "react";
-import CountDown from "../Helpers/CountDown";
 // import HomeSliders from "./HomeSliders";
 import { useSelector } from "react-redux";
 
@@ -16,7 +15,7 @@ export default function JobOwnerDashboard({
 
   return (
     <div
-      className={`w-full md:h-[47px] xxs:h-[74px] flex p-1 flex-wrap justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${
+      className={`w-full md:h-[47px] xxs:h-[74px] flex px-[1.05rem] py-[0.35rem] flex-wrap justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${
         className || ""
       }`}
       style={{
@@ -32,46 +31,16 @@ export default function JobOwnerDashboard({
             Welcome
           </h1>
           {/* user */}
-          <div>
-            <p className="text-base tracking-wide font-bold antise text-white">
+          <div className="flex flex-col gap-1">
+            <p className="text-base tracking-wide font-bold antise text-white leading-[1]">
               {`${firstname} ${lastname}`}
             </p>
-            <p className="text-sm tracking-wide text-white">@{userEmail}</p>
+            <p className="text-sm tracking-wide text-white leading-[1]">
+              @{userEmail}
+            </p>
           </div>
         </div>
 
-        {/* countdown */}
-        {nextDueTask?.next_due &&
-          Object.keys(nextDueTask.next_due)?.length != 0 && (
-            <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border back-dark1 border-white-opacity">
-              <div className="flex flex-col justify-between">
-                <p className="text-base text-white tracking-wide">
-                  Current Task
-                </p>
-                <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-                  {nextDueTask.next_due.item_code.substr(0, 4) + "..."}
-                </p>
-                <p className="text-base text-white tracking-wide">
-                  {nextDueTask.next_due.price * 0.01} Naira
-                </p>
-              </div>
-              <div className="w-[1px] h-full bg-white-opacity"></div>
-              <div className="flex flex-col justify-between">
-                <p className="text-base text-white tracking-wide">
-                  Next due in
-                </p>
-                <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-                  {/* <CountDown lastDate="2023-04-26 4:00:00" /> */}
-                  <CountDown lastDate={nextDueTask.next_due.due_date} />
-                </p>
-                <div className="text-base text-white tracking-wide flex gap-[23px]">
-                  <span>Hrs</span>
-                  <span>Min</span>
-                  <span>Sec</span>
-                </div>
-              </div>
-            </div>
-          )}
         <span className="text-base font-thin tracking-wide text-white flex items-end">
           Last Login : {loginDate}
         </span>

src/components/Dashboards/OldDashboard.jsx

@@ -1,14 +1,16 @@
-import React, { useState } from "react";
+import React from "react";
 import { Link } from "react-router-dom";
-import { toast } from "react-toastify";
-import heroBg from "../../assets/images/bg-sky-blue.jpg"; //hero-bg.svg";
 import heroUser from "../../assets/images/hero-user.png";
 import CountDown from "../Helpers/CountDown";
 // import HomeSliders from "./HomeSliders";
 import { useSelector } from "react-redux";
 import HomeSliders from "../Home/HomeSliders";
 
-export default function WorkerDashboard({ className, bannerList, nextDueTask }) {
+export default function WorkerDashboard({
+  className,
+  bannerList,
+  nextDueTask,
+}) {
   const settings = {
     autoplay: true,
     dots: true,
@@ -57,32 +59,37 @@ export default function WorkerDashboard({ className, bannerList, nextDueTask })
           </div>
         </div>
         {/* countdown */}
-        {nextDueTask?.next_due && Object.keys(nextDueTask.next_due)?.length != 0 && (
-          <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border back-dark1 border-white-opacity">
-            <div className="flex flex-col justify-between">
-              <p className="text-base text-white tracking-wide">Current Task</p>
-              <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-                {(nextDueTask.next_due.item_code).substr(0,4)+'...'}
-              </p>
-              <p className="text-base text-white tracking-wide">
-                {nextDueTask.next_due.price * 0.01} Naira
-              </p>
-            </div>
-            <div className="w-[1px] h-full bg-white-opacity"></div>
-            <div className="flex flex-col justify-between">
-              <p className="text-base text-white tracking-wide">Next due in</p>
-              <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-                {/* <CountDown lastDate="2023-04-26 4:00:00" /> */}
-                <CountDown lastDate={nextDueTask.next_due.due_date} />
-              </p>
-              <div className="text-base text-white tracking-wide flex gap-[23px]">
-                <span>Hrs</span>
-                <span>Min</span>
-                <span>Sec</span>
+        {nextDueTask?.next_due &&
+          Object.keys(nextDueTask.next_due)?.length != 0 && (
+            <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border back-dark1 border-white-opacity">
+              <div className="flex flex-col justify-between">
+                <p className="text-base text-white tracking-wide">
+                  Current Task
+                </p>
+                <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
+                  {nextDueTask.next_due.item_code.substr(0, 4) + "..."}
+                </p>
+                <p className="text-base text-white tracking-wide">
+                  {nextDueTask.next_due.price * 0.01} Naira
+                </p>
+              </div>
+              <div className="w-[1px] h-full bg-white-opacity"></div>
+              <div className="flex flex-col justify-between">
+                <p className="text-base text-white tracking-wide">
+                  Next due in
+                </p>
+                <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
+                  {/* <CountDown lastDate="2023-04-26 4:00:00" /> */}
+                  <CountDown lastDate={nextDueTask.next_due.due_date} />
+                </p>
+                <div className="text-base text-white tracking-wide flex gap-[23px]">
+                  <span>Hrs</span>
+                  <span>Min</span>
+                  <span>Sec</span>
+                </div>
               </div>
             </div>
-          </div>
-        )}
+          )}
         {/* action */}
         <div className="flex lg:space-x-3 space-x-1 items-center">
           <Link to="/mytask" className="text-white text-base">

src/components/Dashboards/WorkerDashboard.jsx

@@ -1,9 +1,8 @@
 import React from "react";
-import CountDown from "../Helpers/CountDown";
 // import HomeSliders from "./HomeSliders";
 import { useSelector } from "react-redux";
 
-export default function JobOwnerDashboard({
+export default function WorkerDashboard({
   className,
   bannerList,
   nextDueTask,
@@ -16,7 +15,7 @@ export default function JobOwnerDashboard({
 
   return (
     <div
-      className={`w-full md:h-[47px] xxs:h-[74px] flex p-1 flex-wrap justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${
+      className={`w-full md:h-[47px] xxs:h-[74px] flex px-[1.05rem] py-[0.35rem] flex-wrap justify-between items-center gap-2 rounded-2xl overflow-hidden bg-sky-blue ${
         className || ""
       }`}
       style={{
@@ -28,50 +27,19 @@ export default function JobOwnerDashboard({
       <div className="h-full flex flex-wrap w-full justify-between mb-5 lg:mb-0">
         {/* heading */}
         <div className="flex gap-8">
-          <h1 className="text-base ng font-medium text-white tracking-wide">
+          <h1 className="text-base font-medium text-white tracking-wide">
             Welcome
           </h1>
           {/* user */}
-          <div>
-            <p className="text-base tracking-wide font-bold antise text-white">
+          <div className="flex flex-col gap-1">
+            <p className="text-base tracking-wide font-bold antise text-white leading-[1]">
               {`${firstname} ${lastname}`}
             </p>
-            <p className="text-sm tracking-wide text-white">@{userEmail}</p>
+            <p className="text-sm tracking-wide text-white leading-[1]">
+              @{userEmail}
+            </p>
           </div>
         </div>
-
-        {/* countdown */}
-        {nextDueTask?.next_due &&
-          Object.keys(nextDueTask.next_due)?.length != 0 && (
-            <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border back-dark1 border-white-opacity">
-              <div className="flex flex-col justify-between">
-                <p className="text-base text-white tracking-wide">
-                  Current Task
-                </p>
-                <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-                  {nextDueTask.next_due.item_code.substr(0, 4) + "..."}
-                </p>
-                <p className="text-base text-white tracking-wide">
-                  {nextDueTask.next_due.price * 0.01} Naira
-                </p>
-              </div>
-              <div className="w-[1px] h-full bg-white-opacity"></div>
-              <div className="flex flex-col justify-between">
-                <p className="text-base text-white tracking-wide">
-                  Next due in
-                </p>
-                <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-                  {/* <CountDown lastDate="2023-04-26 4:00:00" /> */}
-                  <CountDown lastDate={nextDueTask.next_due.due_date} />
-                </p>
-                <div className="text-base text-white tracking-wide flex gap-[23px]">
-                  <span>Hrs</span>
-                  <span>Min</span>
-                  <span>Sec</span>
-                </div>
-              </div>
-            </div>
-          )}
         <span className="text-base font-thin tracking-wide text-white flex items-end">
           Last Login : {loginDate}
         </span>

src/components/FamilyAcc/FamilyActivities.jsx

@@ -0,0 +1,90 @@
+import React, { Suspense } from "react";
+import { Link } from "react-router-dom";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
+import Layout from "../Partials/Layout";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import FamilyTableNew from "./FamilyTableNew";
+
+export default function FamilyActivities() {
+  return (
+    <Layout>
+      {/*<CommonHead />*/}
+      <div className="notification-page w-full mb-10">
+        <div className="notification-wrapper w-full">
+          {/* heading */}
+          <div className="sm:flex justify-between items-center mb-6">
+            <div className="mb-5 sm:mb-0">
+              <CustomBreadcrumb
+                title={"Tasks & Chores"}
+                breadcrumb={[
+                  { link: "/", title: "Home" },
+                  {
+                    link: "/acc-family",
+                    title: "Family Account",
+                  },
+                  {
+                    link: "/acc-family/activities",
+                    title: "Tasks & Chores",
+                    active: true,
+                  },
+                ]}
+              />
+            </div>
+            <Link
+              className="item-content relative text-[18px] transition-all duration-300 ease-in-out bg-[#76a5df] text-white font-medium dark:text-white h-12 px-2 flex items-center gap-2 rounded-md shadow-sm justify-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)]"
+              to="/acc-family"
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                fill="none"
+                viewBox="0 0 24 24"
+                strokeWidth={1.5}
+                stroke="currentColor"
+                className="w-4 h-4"
+              >
+                <path
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  d="M10.5 19.5 3 12m0 0 7.5-7.5M3 12h18"
+                />
+              </svg>
+
+              <span>Family</span>
+            </Link>
+          </div>
+          <Suspense 
+            fallback={
+            <div className="bg-white">
+              <LoadingSpinner color="sky-blue" size="16" height='h-[30rem]' />
+            </div>
+            }
+          >
+            <FamilyTableNew />
+          </Suspense>
+        </div>
+      </div>
+    </Layout>
+  );
+}
+
+const CloseIcon = () => (
+  <svg
+    width="36"
+    height="36"
+    viewBox="0 0 36 36"
+    fill="none"
+    className="fill-current"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+      fill=""
+      fillOpacity="0.6"
+    />
+    <path
+      d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+      fill="#"
+      fillOpacity="0.6"
+    />
+  </svg>
+);

src/components/FamilyAcc/FamilyManage.jsx

@@ -1,8 +1,9 @@
 import React, { useEffect, useState } from "react";
-import { useLocation, useNavigate } from "react-router-dom";
+import { Link, useLocation, useNavigate } from "react-router-dom";
 import Layout from "../Partials/Layout";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import FamilyManageTabs from "./FamilyManageTabs";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
 
 export default function FamilyManage() {
   const [selectTab, setValue] = useState("today");
@@ -34,7 +35,7 @@ export default function FamilyManage() {
         <div className="notification-page w-full mb-10">
           <div className="notification-wrapper w-full">
             {/* heading */}
-            <div className="sm:flex justify-between items-center mb-6">
+            {/* <div className="sm:flex justify-between items-center mb-6">
               <div className="mb-5 sm:mb-0">
                 <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
                   <span
@@ -50,6 +51,40 @@ export default function FamilyManage() {
                   className="relative"
                 ></div>
               </div>
+            </div> */}
+            <div className="w-full mb-5 flex justify-between items-center">
+              <div className="">
+                  <CustomBreadcrumb 
+                  title = {'Manage Family'}
+                  breadcrumb={
+                      [
+                      { link: "/", title: "Home" },
+                      { link: "/manage-family", title: "Manage Family", active: true},
+                      ]
+                  }
+                  />
+              </div>
+              <Link
+                className="item-content relative text-[18px] transition-all duration-300 ease-in-out bg-[#76a5df] text-white font-medium dark:text-white h-12 px-2 flex items-center gap-2 rounded-md shadow-sm justify-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)]"
+                to="/acc-family"
+              >
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                  strokeWidth={1.5}
+                  stroke="currentColor"
+                  className="w-4 h-4"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    d="M10.5 19.5 3 12m0 0 7.5-7.5M3 12h18"
+                  />
+                </svg>
+
+              <span>Family</span>
+            </Link>
             </div>
             <FamilyManageTabs accountDetails={accountDetails} />
           </div>

src/components/FamilyAcc/FamilyManageTabs.jsx

@@ -14,6 +14,7 @@ import LoadingSpinner from "../Spinners/LoadingSpinner";
 import AssignTaskPopout from "./FamilyPopout/AssignTaskPopout";
 import FamilyWallet from "./Tabs/FamilyWallet";
 import { apiConst } from "../../lib/apiConst";
+import { useSelector } from "react-redux";
 
 // Lazy Imports for components
 const FamilyWaitlist = lazy(() => import("./Tabs/FamilyWaitlist"));
@@ -29,43 +30,32 @@ export default function FamilyManageTabs({
   listReload,
   loader,
 }) {
+
+  const { jobListTable, pendingListTable, parentFamilyTaskList } = useSelector((state) => state.tableReload); // TABLE RELOAD TRIGGERS
+
   // Initial state for family details
   const initialDetailState = {
     loading: false,
-    data: null,
+    data: [],
   };
-// console.log('accountDetails',accountDetails)
-  // State for family details, tasks, waitlist, and pending
-  const [details, setDetails] = useState({
-    familyDetails: { ...initialDetailState },
-    familyTasks: { ...initialDetailState },
-    familyWaitList: { ...initialDetailState },
-    familyPending: { ...initialDetailState },
-  });
 
-  // Function to reset family details, tasks, waitlist, and pending
-  const resetDetails = () => {
-    setDetails({
-      familyDetails: { ...initialDetailState },
-      familyTasks: { ...initialDetailState },
-      familyWaitList: { ...initialDetailState },
-      familyPending: { ...initialDetailState },
-    });
-  };
+  // State for family details, tasks, waitlist, and pending
+  let [familyDetails, setFamilyDetails] = useState({loading: false, data: {}})
+  let [familyTasks, setFamilyTasks] = useState({...initialDetailState})
+  let [familyWaitList, setFamilyWaitList] = useState({...initialDetailState})
+  let [familyPending, setFamilyPending] = useState({...initialDetailState})
+
 
   const [updatePage, setUpdatePage] = useState(false) // State to determine when to update the page
 
-  // State for family task data
-  const [familyTask, setFamilyTask] = useState({ loading: false, data: [] });
+  // State for list of created jobs by FULL USER
+  const [jobList, setJobList] = useState({ loading: false, data: [] });
 
-  // State for active task
+  // State for active/selected job
   const [activeTask, setActiveTask] = useState({ id: 0, data: {} });
 
-  // State for error messages
-  const [errMsg, setErrMsg] = useState("");
-
   // State for family task popout
-  const [familyTaskPopout, setFamilyTaskPopout] = useState(false);
+  const [assignTaskPopout, setAssignTaskPopout] = useState(false);
 
   let [uploadStatus, setUploadStatus] = useState({loading: false, status: false, message:''}) // HOLDS STATE FOR UPLOAD PROFILE PICTURE STATUS
 
@@ -79,8 +69,8 @@ export default function FamilyManageTabs({
   const apiCall = useMemo(() => new usersService(), []);
 
   // Function to handle toggling the family task popout
-  const familyPopUpHandler = () => {
-    setFamilyTaskPopout((prev) => !prev);
+  const familyAssignPopUpHandler = () => {
+    setAssignTaskPopout((prev) => !prev);
   };
 
   // Function to trigger a click on the hidden profile image input
@@ -177,43 +167,40 @@ export default function FamilyManageTabs({
     Tasks: (
       <FamilyTasks
         className={className}
-        loader={details.familyTasks.loading}
-        familyData={details.familyTasks.data}
+        familyData={familyTasks}
         accountDetails={accountDetails}
       />
     ),
     Waiting: (
       <FamilyWaitlist
-        familyData={details.familyWaitList.data}
+        familyData={familyWaitList}
         accountDetails={accountDetails}
-        loader={details.familyWaitList.loading}
+        setUpdatePage={setUpdatePage}
       />
     ),
     Pending: (
       <FamilyPending
-        familyData={details.familyPending.data}
+        familyData={familyPending}
         accountDetails={accountDetails}
-        loader={details.familyPending.loading}
+        setUpdatePage={setUpdatePage}
       />
     ),
     Account: (
       <FamilyAccount
-        familyData={details.familyDetails.data}
+        familyData={familyDetails}
         myRef={accountRef}
-        loader={details.familyDetails.loading}
         handlePrint={useHandlePrint}
       />
     ),
-    Profile: <FamilyProfile familyData={details.familyDetails.data} />,
-    wallet: <FamilyWallet familyData={details.familyDetails.data} />,
+    Profile: <FamilyProfile familyData={familyDetails.data} />,
+    wallet: <FamilyWallet familyData={familyDetails.data} />,
   };
 
   // Default tab component
   const defaultTabComponent = (
     <FamilyTasks
       className={className}
-      loader={details.familyTasks.loading}
-      familyData={details.familyTasks.data}
+      familyData={familyTasks}
       accountDetails={accountDetails}
     />
   );
@@ -221,67 +208,90 @@ export default function FamilyManageTabs({
   // Selected tab component based on the current 'tab'
   const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
 
-  // Effect to manage family details and related data
+  // Effect to manage family details
   useEffect(() => {
     const manageFamily = async () => {
+      setFamilyDetails({loading:true, data: {}})
       try {
-        resetDetails();
-
-        setDetails({
-          familyDetails: { loading: true },
-          familyTasks: { loading: true },
-          familyWaitList: { loading: true },
-          familyPending: { loading: true },
-        });
-
         const { family_uid } = accountDetails;
         const reqData = { family_uid };
 
-        const [familyRes, tasksRes, familyWaitRes, familyPending] =
-          await Promise.all([
-            apiCall.ManageFamily(reqData),
-            apiCall.ManageTasks(reqData),
-            apiCall.ManageFamilyWaitlist(),
-            apiCall.ManageFamilyPending(),
-          ]);
-
-        const familyData = familyRes.data;
-        const tasksData = tasksRes.data;
-        const familyWaitData = familyWaitRes.data;
-        const familyPendingData = familyPending.data;
-
-        // Function to check for errors in data
-        const checkDataError = (data) => data?.internal_return < 0;
-
-        if (
-          checkDataError(familyData) ||
-          checkDataError(tasksData) ||
-          checkDataError(familyWaitData) ||
-          checkDataError(familyPendingData)
-        ) {
-          return;
+        const response = await apiCall.ManageFamily(reqData)
+        if(response.status != 200 || !response?.data){
+          return setFamilyDetails({loading:false, data: {}})
         }
-
-        setDetails({
-          familyDetails: { loading: false, data: familyData },
-          familyTasks: { loading: false, data: tasksData },
-          familyWaitList: { loading: false, data: familyWaitData },
-          familyPending: { loading: false, data: familyPendingData },
-        });
+        setFamilyDetails({loading:false, data: response?.data})
       } catch (error) {
-        resetDetails();
-        setErrMsg("An error occurred");
         throw new Error(error);
+        setFamilyDetails({loading:false, data: {}})
       }
     };
-
     // Invoke the manageFamily function when the component mounts
     manageFamily();
+  }, []);
+
+    // Effect to manage active family task details
+    useEffect(() => {
+      const manageTasks = async () => {
+        setFamilyTasks({loading:true, data: []})
+        try {
+          const { family_uid } = accountDetails;
+          const reqData = { family_uid };
+  
+          const response = await apiCall.ManageTasks(reqData)
+          if(response.status != 200 || !response?.data){
+            return setFamilyTasks({loading:false, data: []})
+          }
+          setFamilyTasks({loading:false, data: response?.data})
+        } catch (error) {
+          throw new Error(error);
+          setFamilyTasks({loading:false, data: []})
+        }
+      };
+      // Invoke the manageFamily function when the component mounts
+      manageTasks();
+    }, [updatePage, parentFamilyTaskList]);
+
+  // Effect to manage family wait task details
+  useEffect(() => {
+    const manageFamilyWaitlist = async () => {
+      setFamilyWaitList({loading:true, data: []})
+      try {
+        const response = await apiCall.ManageFamilyWaitlist()
+        if(response.status != 200 || !response?.data){
+          return setFamilyWaitList({loading:false, data: []})
+        }
+        setFamilyWaitList({loading:false, data: response?.data})
+      } catch (error) {
+        throw new Error(error);
+        setFamilyWaitList({loading:false, data: []})
+      }
+    };
+    // Invoke the manageFamily function when the component mounts
+    manageFamilyWaitlist();
   }, [updatePage]);
 
-  // Effect to manage family tasks
+    // Effect to manage family pending task details
+    useEffect(() => {
+      const manageFamilyPending = async () => {
+        setFamilyPending({loading:true, data: []})
+        try {
+          const response = await apiCall.ManageFamilyPending()
+          if(response.status != 200 || !response?.data){
+            return setFamilyPending({loading:false, data: []})
+          }
+          setFamilyPending({loading:false, data: response?.data})
+        } catch (error) {
+          throw new Error(error);
+          setFamilyPending({loading:false, data: []})
+        }
+      };
+      // Invoke the manageFamily function when the component mounts
+      manageFamilyPending();
+    }, [updatePage, pendingListTable]);
+
+  // Effect to get all parent job list
   useEffect(() => {
-    let checkFamilyTask = true;
     const reqData = {
       limit: 30,
       offset: 0,
@@ -289,12 +299,11 @@ export default function FamilyManageTabs({
       action: apiConst.WRENCHBOARD_PICTURE_FAMMEMBER,
     };
 
-    if (checkFamilyTask) {
-      setFamilyTask({ loading: true });
+      setJobList({ loading: true });
       apiCall
         .getMyJobList(reqData)
         .then((res) => {
-          setFamilyTask({ loading: false, data: res?.data?.result_list });
+          setJobList({ loading: false, data: res?.data?.result_list });
           if (res?.data?.result_list?.length) {
             setActiveTask((prev) => ({
               ...prev,
@@ -303,15 +312,9 @@ export default function FamilyManageTabs({
           }
         })
         .catch((err) => {
-          setFamilyTask({ loading: false, data: [] });
+          setJobList({ loading: false, data: [] });
           console.log("Error", err);
         });
-    }
-
-    // Cleanup function to prevent memory leaks
-    return () => {
-      checkFamilyTask = false;
-    };
   }, []);
 
   return (
@@ -394,7 +397,7 @@ export default function FamilyManageTabs({
                   </ul>
                   <button
                     type="button"
-                    onClick={familyPopUpHandler}
+                    onClick={familyAssignPopUpHandler}
                     className="p-1 my-1 w-[100px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
                   >
                     Add task
@@ -416,15 +419,14 @@ export default function FamilyManageTabs({
         </Suspense>
       </div>
 
-      {familyTaskPopout && (
+      {assignTaskPopout && (
         <AssignTaskPopout
-          action={familyPopUpHandler}
-          situation={familyTaskPopout}
-          familyTask={familyTask}
-          setFamilyTask={setFamilyTask}
+          action={familyAssignPopUpHandler}
+          situation={assignTaskPopout}
+          jobList={jobList}
           setActiveTask={setActiveTask}
           activeTask={activeTask}
-          familyDetailsData={details.familyDetails.data}
+          familyDetailsData={familyDetails.data}
           setUpdatePage={setUpdatePage}
         />
       )}

src/components/FamilyAcc/FamilyMarket.jsx

@@ -4,6 +4,7 @@ import SearchCom from "../Helpers/SearchCom";
 import FamilyMarketCard from "../Cards/FamilyMarketCard";
 import usersService from "../../services/UsersService";
 import SuggestTask from "../FamilyPopup/SuggestTask";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
 
 export default function FamilyMarket() {
   const [popUp, setPopUp] = useState(false);
@@ -53,12 +54,23 @@ export default function FamilyMarket() {
       <div className="notification-page w-full mb-10">
         <div className="notification-wrapper w-full">
           {/* heading */}
-          <div className="sm:flex justify-between items-center mb-6">
+          {/* <div className="sm:flex justify-between items-center mb-6">
             <div className="mb-5 sm:mb-0">
               <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
                 <span>Suggest Task to the Parents</span>
               </h1>
             </div>
+          </div> */}
+          <div className="mb-5">
+            <CustomBreadcrumb 
+            title = {'Suggest Task to the Parents'}
+            breadcrumb={
+                [
+                { link: "/", title: "Home" },
+                { link: "/familymarket", title: "Family Market", active: true},
+                ]
+            }
+            />
           </div>
           {/* Body */}
           <div className="filter-section w-full items-center sm:flex justify-between mb-6">

src/components/FamilyAcc/FamilyPendingOffer.jsx

@@ -0,0 +1,61 @@
+import React, { useEffect, useState } from 'react'
+import Layout from '../Partials/Layout'
+import MyOffersFamilyTable from '../MyTasks/MyOffersFamilyTable'
+import LoadingSpinner from '../Spinners/LoadingSpinner';
+import usersService from '../../services/UsersService';
+import CustomBreadcrumb from '../Breadcrumb/CustomBreadcrumb';
+import { useSelector } from 'react-redux';
+
+export default function FamilyPendingOffer() {
+    const userApi = new usersService();
+
+    const {familyOfferList} = useSelector((state) => state.tableReload)
+
+    const [myOffersList, setMyOffersList] = useState({loading: true, data: []});
+
+    const getMyOffersList = async () => {
+        try {
+            const res = await userApi.getOffersList();
+            setMyOffersList({loading:false, data:res.data});
+        } catch (error) {
+            setMyOffersList({loading:false, data:[]});
+        }
+    };
+
+    useEffect(()=>{
+        getMyOffersList()
+    },[familyOfferList])
+    return (
+        <Layout>
+            {myOffersList.loading ?
+            <div className='w-full flex justify-center items-center rounded-2xl bg-white'>
+                <LoadingSpinner size='10' color='sky-blue' height='h-[20rem]'  />
+            </div>
+            :
+            myOffersList?.data?.result_list && myOffersList?.data?.result_list.length > 0 ?
+            <MyOffersFamilyTable
+                familyOffers={myOffersList?.data?.result_list}
+                image_server={myOffersList?.data?.session_image_server}
+                className="mb-10" 
+            />
+            :
+            <>
+                <div className="mb-6">
+                    <CustomBreadcrumb 
+                    title = {'Ready to Start'}
+                    breadcrumb={
+                        [
+                        { link: "/", title: "Home" },
+                        { link: "/pending", title: "Pending", active: true},
+                        ]
+                    }
+                    />
+                </div>
+                <div className='w-full h-[30rem] bg-white dark:bg-dark-white flex justify-center items-center rounded-2xl'>
+                    <p className='text-black dark:text-white'>No Record Found!</p>
+                </div>
+            </>
+            }
+        </Layout>
+    )
+}

src/components/FamilyAcc/FamilyPopout/AssignMediaTask.jsx

@@ -0,0 +1,359 @@
+import React, { useEffect, useState, lazy, Suspense } from 'react'
+import LoadingSpinner from '../../Spinners/LoadingSpinner'
+import { NewTasks } from './forms'
+import { PriceFormatter } from '../../Helpers/PriceFormatter'
+import { useSelector } from 'react-redux';
+import { InputCom } from '../../AddJob/settings';
+import * as Yup from "yup";
+import { Form, Formik } from "formik";
+
+
+// To get the validation schema
+const validationSchema = Yup.object().shape({
+    currency: Yup.string()
+      .min(1, "Minimum 3 characters")
+      .max(25, "Maximum 25 characters")
+      .required("required"),
+    amount: Yup.number()
+      .typeError("Invalid number")
+      .min(1, "Must be greater than 0")
+      .test("no-e", "Invalid number", (value) => {
+        if (value && /\d+e/.test(value)) {
+          return false;
+        }
+        return true;
+      })
+      .required("required"),
+      job_description: Yup.string()
+      .min(3, "Minimum 3 characters")
+      .max(499, "Maximum 499 characters")
+      .required("required"),
+      timeline_days: Yup.number()
+      .typeError("you must specify a number")
+      .min(1, "Must be greater than 0")
+      .required("required"),
+  });
+
+
+
+const VideoElement = lazy(() => import("../../VideoCom/VideoElement")); // LAZY IMPORTING VIDEO COMPONENT
+
+export default function AssignMediaTask({
+    commonMedia,
+    requestStatus,
+    setRequestStatus,
+    assignMediaTask,
+    activeMedia,
+    handleActiveMedia,
+    closeModal,
+    family_uid
+}) {
+
+    const {userDetails} = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active
+
+    const { walletDetails } = useSelector((state) => state?.walletDetails); // WALLET STORE
+
+  // For form initial values
+    const initialValues = {
+        // initial values for formik
+        currency: walletDetails.data.length == 1 ? walletDetails.data[0].country : '',
+        amount: "",
+        job_description: "",
+        timeline_days: "",
+        media_uid: activeMedia?.uid,
+        family_uid: family_uid,
+        media_type: "COMMON"
+    };
+
+
+
+
+//   let imageSrc = (localStorage.getItem("session_token")
+//   ? `${userDetails?.session_image_server}${localStorage.getItem("session_token")}/job/${activeMedia.uid}` : ""); // FOR GETTING JOB IMAGE
+
+  return (
+    <>
+         {commonMedia?.loading ? (
+              <div className="h-[30rem] w-full flex justify-center items-center">
+                <LoadingSpinner color="sky-blue" size="16" />
+              </div>
+            ) : (
+                <Formik
+                initialValues={initialValues}
+                validationSchema={validationSchema}
+                onSubmit={(values, helpers)=>{assignMediaTask(values, helpers)}}
+              >
+                {(props) => {
+                  return (
+                        <Form>
+                            <>
+                                <div
+                                className={`job-action-modal-body w-full min-h-[450px] max-h-[450px] overflow-y-auto md:grid md:grid-cols-2`}
+                                >
+                                <div className="p-4 pt-0">
+                                    <div className="p-4 w-full min-h-[410px] max-h-[410px] overflow-y-auto bg-slate-100 rounded-md dark:bg-[#11131f] dark:text-white">
+                                        {commonMedia?.data?.length ? (
+                                        commonMedia?.data?.map((item, index) => (
+                                            <div
+                                            key={item.uid}
+                                            className="mb-2 flex justify-start items-center gap-2 text-sky-blue text-base cursor-pointer"
+                                            onClick={() => handleActiveMedia(item)}
+                                            >
+                                            <input
+                                                type="radio"
+                                                name="media-list"
+                                                checked={activeMedia?.uid == item?.uid}
+                                                onChange={() =>
+                                                handleActiveMedia(item)
+                                                }
+                                                className="w-[15px] h-[15px] cursor-pointer"
+                                            />
+                                            <p className="w-full text-dark-gray dark:text-white tracking-wide">
+                                                {item?.title}
+                                            </p>
+                                            </div>
+                                        ))
+                                        ) : (
+                                        <p className="p-8 text-lg text-dark-gray dark:text-white tracking-wide text-center cursor-default">
+                                            No Media found!
+                                        </p>
+                                        )}
+                                    </div>
+                                </div>
+
+                                {/*Right Hand Side for details && Task Type === select */}
+                                    <>
+                                    {commonMedia?.data?.length > 0 ? (
+                                        <div className="p-4 py-0 h-full">
+                                        <div className="w-full">
+                                            <div className="mb-3 w-full">
+                                            <label className="job-label">
+                                                Description
+                                            </label>
+                                            <p className="p-1 text-sm text-slate-900 dark:text-white">
+                                                {activeMedia?.description}
+                                            </p>
+                                            </div>
+
+                                            <div className="my-3 w-full flex items-center justify-center">
+                                                <div className="w-full max-w-xs h-28 rounded-2xl flex items-center justify-center">
+                                                    <Suspense fallback={<p>Loading...</p>}>
+                                                        <VideoElement videoId={activeMedia?.uid} />
+                                                    </Suspense>
+                                                </div>
+                                            </div>
+                                            <div className="grid grid-cols-3 gap-3">
+                                                {/* Price */}
+                                                <div className="field w-full flex flex-col justify-between">
+                                                    <label htmlFor="price" className="job-label flex gap-1">
+                                                        Reward
+                                                        <span className='text-red-500 text-base'>{props.errors.amount && props.touched.amount && '*'}</span>
+                                                    </label>
+                                                    <InputCom
+                                                    fieldClass="px-6 text-right"
+                                                    // label="Price"
+                                                    // labelClass="tracking-wide"
+                                                    inputBg="bg-slate-100"
+                                                    type="number"
+                                                    name="amount"
+                                                    placeholder="0"
+                                                    value={props.values.amount}
+                                                    inputHandler={props.handleChange}
+                                                    // error={props.errors.price && props.touched.price && props.errors.price}
+                                                    />
+                                                </div>
+
+                                                {/* Currency */}
+                                                <div className="field w-full flex flex-col justify-between">
+                                                    <label
+                                                    htmlFor="currency"
+                                                    className="job-label flex gap-1 invisible"
+                                                    >
+                                                    Currency
+                                                    {props.errors.currency && props.touched.currency && <span className="text-base text-red-500">*</span>}
+                                                    </label>
+                                                    <select
+                                                    id="currency"
+                                                    name="currency"
+                                                    value={props.values.currency}
+                                                    className={`input-field w-full h-[42px] flex items-center px-2 mt-2 rounded-full placeholder:text-base text-dark-gray dark:text-white bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none ${props.errors.currency && props.touched.currency && 'border border-red-500'}`}
+                                                    onChange={props.handleChange}
+                                                    disabled={walletDetails.data.length == 1}
+                                                    >
+                                                    {walletDetails?.loading ? (
+                                                        <option className="text-slate-500 text-[13.975px]" value="">
+                                                        Loading...
+                                                        </option>
+                                                    ) : walletDetails.data.length ? (
+                                                        <>
+                                                            {walletDetails.data.length == 1 ?
+                                                            <>
+                                                            {walletDetails.data?.map((item, index) => (
+                                                                <option
+                                                                key={index}
+                                                                className="text-slate-500 text-lg"
+                                                                value={item?.country}
+                                                                >
+                                                                {item?.code}
+                                                                </option>
+                                                            ))}
+                                                            </>
+                                                            :
+                                                            <>
+                                                                <option className="text-slate-500 text-[13.975px]" value="">
+                                                                    Select
+                                                                </option>
+                                                                {walletDetails.data?.map((item, index) => (
+                                                                    <option
+                                                                    key={index}
+                                                                    className="text-slate-500 text-lg"
+                                                                    value={item?.country}
+                                                                    >
+                                                                    {item?.code}
+                                                                    </option>
+                                                                ))}
+                                                            </>
+                                                            }
+                                                        </>
+                                                    ) : (
+                                                        <option className="text-slate-500 text-lg" value="">
+                                                        No Options Found!
+                                                        </option>
+                                                    )}
+                                                    </select>
+                                                </div>
+                                            
+                                                {/* Duration */}
+                                                <div className="field w-full flex flex-col justify-between">
+                                                    <label
+                                                    htmlFor="timeline_days"
+                                                    className="job-label flex gap-1"
+                                                    >
+                                                    Timeline
+                                                    {props.errors.timeline_days && props.touched.timeline_days && <span className="text-base text-red-500">*</span>}
+                                                    </label>
+                                                    <select
+                                                    id="timeline_days"
+                                                    name="timeline_days"
+                                                    value={props.values.timeline_days}
+                                                    className={`input-field w-full h-[42px] flex items-center px-2 mt-2 rounded-full placeholder:text-base text-dark-gray dark:text-white bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
+                                                    onChange={props.handleChange}
+                                                    >
+                                                    {publicArray.length && (
+                                                        <>
+                                                        <option className="text-slate-500 text-[13.975px]" value="">
+                                                            Select
+                                                        </option>
+                                                        {publicArray.map(({ name, duration }, idx) => (
+                                                            <option
+                                                            key={idx}
+                                                            className="text-slate-500 text-[13.975px]"
+                                                            value={duration}
+                                                            >
+                                                            {name}
+                                                            </option>
+                                                        ))}
+                                                        </>
+                                                    )}
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            
+                                            {/* Delivery Detail */}
+                                            <div className="my-3">
+                                            <label className="w-full job-label flex gap-1">
+                                                Delivery Detail
+                                                {props.errors.job_description && props.touched.job_description && <span className="text-base text-red-500">*</span>}
+                                            </label>
+                                            <textarea
+                                                className={`p-1 w-full text-sm text-slate-900 dark:text-white bg-transparent outline-none border border-slate-300 rounded-md`}
+                                                rows="5"
+                                                style={{ resize: "none" }}
+                                                value={props.values.job_description}
+                                                onChange={props.handleChange}
+                                                name='job_description'
+                                            />
+                                            </div>
+                                        </div>
+                                        </div>
+                                    ) : (
+                                        <></>
+                                    )}
+                                    </>
+                                </div>
+
+                                {/* BTN */}
+                                <div className="modal-footer-wrapper">
+                                {/* error or success display */}
+                                <div className="w-auto h-auto flex items-center">
+                                    {requestStatus.message != "" &&
+                                    (!requestStatus.status ? (
+                                        <div
+                                        className={`relative p-2 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px] self-start`}
+                                        >
+                                        {requestStatus.message}
+                                        </div>
+                                    ) : (
+                                        requestStatus.status && (
+                                        <div
+                                            className={`relative p-2 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                        >
+                                            {requestStatus.message}
+                                        </div>
+                                        )
+                                    ))}
+                                </div>
+
+                                {/* End of error or success display */}
+                                <div className="w-auto h-auto flex items-center gap-20">
+                                    <button
+                                    disabled={requestStatus.loading}
+                                    onClick={()=>closeModal()}
+                                    type="button"
+                                    className="custom-btn border-gradient"
+                                    >
+                                    <span className="text-gradient">Close</span>
+                                    </button>
+                                    <div className="">
+                                    {requestStatus.loading ? (
+                                        <LoadingSpinner color="sky-blue" size="8" />
+                                    ) : (
+                                        <button
+                                        type="submit"
+                                        disabled={requestStatus.loading}
+                                        // onClick={assignFamilyTask}
+                                        className="custom-btn btn-gradient text-white"
+                                        >
+                                        Assign
+                                        </button>
+                                    ) 
+                                    }
+                                    </div>
+                                </div>
+                                </div>
+                            </>
+                        </Form>
+                        )
+                    }
+                }
+            </Formik>
+            )  
+        }     
+    </>
+  )
+}
+
+
+
+const publicArray = [
+    { duration: 1, name: "1 day" },
+    { duration: 2, name: "2 days" },
+    { duration: 3, name: "3 days" },
+    { duration: 4, name: "4 days" },
+    { duration: 5, name: "5 days" },
+    { duration: 6, name: "6 days" },
+    { duration: 7, name: "1 week" },
+    { duration: 14, name: "2 weeks" },
+    { duration: 21, name: "3 weeks" },
+    { duration: 28, name: "4 weeks" },
+  ];

src/components/FamilyAcc/FamilyPopout/AssignPrevNewTask.jsx

@@ -0,0 +1,263 @@
+import React from 'react'
+import LoadingSpinner from '../../Spinners/LoadingSpinner'
+import { NewTasks } from './forms'
+import { PriceFormatter } from '../../Helpers/PriceFormatter'
+import { useSelector } from 'react-redux';
+
+export default function AssignPrevNewTask({
+    jobList,
+    requestStatus,
+    assignFamilyTask,
+    taskType,
+    switchTaskType,
+    formState,
+    setFormState,
+    activeTask,
+    handleActiveTask,
+    closeModal
+}) {
+
+  const {userDetails} = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active
+
+
+  let imageSrc = (localStorage.getItem("session_token")
+  ? `${userDetails?.session_image_server}${localStorage.getItem("session_token")}/job/${activeTask.data.job_uid}` : ""); // FOR GETTING JOB IMAGE
+
+  return (
+    <>
+         {jobList?.loading ? (
+              <div className="h-[30rem] w-full flex justify-center items-center">
+                <LoadingSpinner color="sky-blue" size="16" />
+              </div>
+            ) : (
+              <>
+                <div
+                  className={`job-action-modal-body w-full min-h-[450px] max-h-[450px] overflow-y-auto md:grid ${
+                    taskType !== "new" ? "md:grid-cols-2" : "md:grid-cols-1"
+                  }`}
+                >
+                  <div className="px-4">
+                    <div className="mb-2 w-full flex items-center gap-4">
+                      <div className="flex items-center gap-2 text-sky-blue text-base">
+                        <input
+                          type="radio"
+                          name="task-type"
+                          value="select"
+                          className="w-[20px] h-[20px] cursor-pointer"
+                          checked={taskType == "select"}
+                          onChange={switchTaskType}
+                        />
+                        <span className="text-lg tracking-wide font-semibold">Previous Task</span>
+                      </div>
+                      <div className="flex items-center gap-2 text-sky-blue text-base">
+                        <input
+                          type="radio"
+                          name="task-type"
+                          value="new"
+                          className="w-[20px] h-[20px] cursor-pointer"
+                          checked={taskType == "new"}
+                          onChange={switchTaskType}
+                        />
+                        <span className="text-lg tracking-wide font-semibold">New Task</span>
+                      </div>
+                    </div>
+                    {/* Task Type === select */}
+                    {taskType == "select" && (
+                      <div className="p-4 w-full h-[400px] overflow-y-auto bg-slate-100 rounded-md dark:bg-[#11131f] dark:text-white">
+                        {jobList?.data?.length ? (
+                          jobList?.data?.map((item, index) => (
+                            <div
+                              key={item.job_uid}
+                              className="mb-2 flex justify-start items-center gap-2 text-sky-blue text-base cursor-pointer"
+                              onClick={() => handleActiveTask(item.job_uid, item)}
+                            >
+                              <input
+                                type="radio"
+                                name="task-list"
+                                checked={
+                                  activeTask.id == item.job_uid ||
+                                  (activeTask.id == index && true)
+                                }
+                                onChange={() =>
+                                  handleActiveTask(item.job_uid, item)
+                                }
+                                className="w-[15px] h-[15px] cursor-pointer"
+                              />
+                              <p className="w-full text-dark-gray dark:text-white tracking-wide">
+                                {item?.title}
+                              </p>
+                            </div>
+                          ))
+                        ) : (
+                          <p className="p-8 text-lg text-dark-gray dark:text-white tracking-wide text-center cursor-default">
+                            No Task found!
+                          </p>
+                        )}
+                      </div>
+                    )}
+                    {taskType == "new" && (
+                      <div className="px-4 w-full">
+                        <NewTasks
+                          formState={formState}
+                          setFormState={setFormState}
+                        />
+                      </div>
+                    )}
+                  </div>
+
+                  {/*Right Hand Side for details && Task Type === select */}
+                  {taskType == "select" && (
+                    <>
+                      {jobList?.data?.length > 0 ? (
+                        <div className="px-4">
+                          <div className="w-full">
+                            <p className="text-lg font-bold text-dark-gray dark:text-white tracking-wide border-b-2 max-h-[50px] overflow-y-auto">
+                              {activeTask?.data?.title}
+                            </p>
+                            {/* <div className="my-3">
+                              <Detail
+                                label="Description"
+                                value={activeTask?.data?.description}
+                              />
+                            </div> */}
+                            <div className="my-3 w-full">
+                              <label className="job-label">
+                                Description
+                              </label>
+                              <p className="p-1 text-sm text-slate-900 dark:text-white max-h-[100px] overflow-y-auto">
+                                {activeTask?.data?.description}
+                              </p>
+                            </div>
+                            <div className="grid grid-cols-2">
+                              <div className="w-full">
+                                <div className="my-3 w-full flex items-center gap-1">
+                                  <label className="job-label">
+                                    Reward
+                                  </label>
+                                  <p className="p-1 text-sm text-slate-900 dark:text-white">
+                                    {PriceFormatter(
+                                      activeTask?.data?.price * 0.01,
+                                      activeTask?.data?.currency,
+                                      activeTask?.data?.curreny_code
+                                    )}
+                                  </p>
+                                </div>
+
+                                <div className="my-3 w-full flex items-center gap-1">
+                                  <label className="job-label">
+                                    Timeline
+                                  </label>
+                                  <p className="p-1 text-sm text-slate-900 dark:text-white">{`${activeTask?.data?.timeline_days} day(s)`}</p>
+                                </div>
+                              </div>
+                              <div className="w-full flex items-center justify-center">
+                                <div className="w-28 h-28 rounded-2xl flex items-center justify-center">
+                                    <img 
+                                      className="w-full h-auto"
+                                      loading="lazy"
+                                      src={imageSrc} 
+                                      alt='job image' 
+                                    />
+                                </div>
+                              </div>
+                            </div>
+                            
+                            {/* Dummy, no value found for created! thus commented*/}
+                            {/* <div className="my-3 sm:flex items-center">
+                              <Detail
+                                label="Created"
+                                value={`Dummy, no value found for created!`}
+                              />
+                            </div> */}
+
+                            <div className="my-3">
+                              <label className="w-full job-label">
+                                Delivery Detail
+                              </label>
+                              <textarea
+                                className={`p-1 w-full text-sm text-slate-900 dark:text-white bg-transparent outline-none border border-slate-300 rounded-md`}
+                                rows="5"
+                                style={{ resize: "none" }}
+                                value={activeTask?.data?.job_detail}
+                                readOnly
+                                // onChange={handleInputChange}
+                              />
+                            </div>
+                          </div>
+                        </div>
+                      ) : (
+                        <></>
+                      )}
+                    </>
+                  )}
+                </div>
+
+                {/* BTN */}
+                <div className="modal-footer-wrapper">
+                  {/* error or success display */}
+                  <div className="w-auto h-auto flex items-center">
+                    {requestStatus.message != "" &&
+                      (!requestStatus.status ? (
+                        <div
+                          className={`relative p-2 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px] self-start`}
+                        >
+                          {requestStatus.message}
+                        </div>
+                      ) : (
+                        requestStatus.status && (
+                          <div
+                            className={`relative p-2 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                          >
+                            {requestStatus.message}
+                          </div>
+                        )
+                      ))}
+                  </div>
+
+                  {/* End of error or success display */}
+                  <div className="w-auto h-auto flex items-center gap-20">
+                    <button
+                      disabled={requestStatus.loading}
+                      onClick={()=>closeModal()}
+                      type="button"
+                      className="custom-btn border-gradient"
+                    >
+                      <span className="text-gradient">Close</span>
+                    </button>
+                    <div className="">
+                      {requestStatus.loading ? (
+                        <LoadingSpinner color="sky-blue" size="8" />
+                      ) : (
+                        <button
+                          type="button"
+                          disabled={requestStatus.loading}
+                          onClick={assignFamilyTask}
+                          className="custom-btn btn-gradient text-white"
+                        >
+                          Assign
+                        </button>
+                      ) 
+                      // : (
+                      //   <button
+                      //     type="button"
+                      //     disabled={requestStatus.loading}
+                      //     onClick={assignFamilyTask}
+                      //     className="px-1 w-40 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer"
+                      //   >
+                      //     {details
+                      //       ? `Assign task to ${details?.firstname}`
+                      //       : familyDetailsData
+                      //       ? `Assign task to ${familyDetailsData.firstname}`
+                      //       : "Assign"}
+                      //   </button>
+                      // )
+                      }
+                    </div>
+                  </div>
+                </div>
+              </>
+            )  
+        }     
+    </>
+  )
+}

src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx

@@ -1,424 +1,419 @@
-import React, { useState } from "react";
+import React, { Suspense, useEffect, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { useLocation } from "react-router-dom";
 import usersService from "../../../services/UsersService";
+import { tableReload } from "../../../store/TableReloads";
 import ModalCom from "../../Helpers/ModalCom";
 import { PriceFormatter } from "../../Helpers/PriceFormatter";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
 import Detail from "../../jobPopout/popoutcomponent/Detail";
 import { NewTasks } from "./forms";
-import { tableReload } from "../../../store/TableReloads";
-import { useDispatch } from "react-redux";
+import { SocketValues } from "../../Contexts/SocketIOContext";
+import { errorMsg } from "../../../lib/errorMsg";
 
-const AssignTaskPopout = React.memo(
-  ({
-    action,
-    details,
-    situation,
-    familyDetailsData,
-    familyTask,
-    activeTask,
-    setActiveTask,
-    setUpdatePage
-  }) => {
-    const apiCall = new usersService();
+import AssignPrevNewTask from "./AssignPrevNewTask";
+import AssignMediaTask from "./AssignMediaTask";
 
-    const dispatch = useDispatch()
+const AssignTaskPopout = ({
+  action,
+  details,
+  situation,
+  familyDetailsData,
+  jobList,
+  activeTask,
+  setActiveTask,
+  setUpdatePage,  
+}) => {
+  const {parentAssignJobToKid} = SocketValues()
 
-    let [requestStatus, setRequestStatus] = useState({
-      loading: false,
-      status: false,
-      message: "",
-    }); // HOLDS RESPONSE FOR SENDING API REQUEST
+  const { walletDetails } = useSelector((state) => state?.walletDetails); // WALLET STORE
 
-    let [taskType, setTaskType] = useState(details ? "new" : "select"); // SWITCHES BTW SELECT TASK AND NEW TASK
 
-    const switchTaskType = ({ target: { value } }) => {
-      // FUNCTION TO CHANGE SELECTED ACTIVE TASK
-      setTaskType(value);
-    };
+  const apiCall = new usersService();
 
-    const handleActiveTask = (id = 0, data = {}) => {
-      // FUNCTION TO CHANGE SELECTED ACTIVE TASK
-      setActiveTask({ id, data });
-    };
+  let { pathname, state } = useLocation();
 
-    // New Task
-    const [formState, setFormState] = useState({
-      // Initialize form state with desired fields
-      banner: details?.banner || "default.jpg",
-      country: details?.country || "",
-      price: details?.price || "",
-      title: details?.title || "",
-      description: details?.description || "",
-      job_detail: details?.job_detail || "",
-      timeline_days: details?.timeline_days || "",
-      category: details?.category || "",
-    });
+  const {userDetails} = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active
 
-    const assignFamilyTask = () => {
-      setRequestStatus({ loading: true, status: false, message: "" });
-      let reqData = {};
-      if (taskType == "select") {
-        // RUNS HERE IF TASK TYPE IS SELECT
-        if (!Object.keys(activeTask.data).length) {
+  const [selectedFamilyUid, setSelectedFamilyUid] = useState('');
+
+  const handleFamChange = (event) => {
+    setSelectedFamilyUid(event.target.value);
+  };
+
+
+  const dispatch = useDispatch();
+
+  const getFamilySession = JSON.parse(sessionStorage.getItem("family_list"));
+
+  const familyList = getFamilySession?.map((member) => (
+    <option key={member?.family_uid} value={member?.family_uid}>
+      {member?.firstname} {member?.lastname}
+    </option>
+  ));
+
+  let [requestStatus, setRequestStatus] = useState({
+    loading: false,
+    status: false,
+    message: "",
+  }); // HOLDS RESPONSE FOR SENDING API REQUEST
+
+  let [commonMedia, setCommonMedia] = useState({loading: true, data: [], image: ''})  // HOLDS COMMON MEDIA DATA
+  let [activeMedia, setActiveMedia] = useState({})  // HOLDS ACTIVE COMMON MEDIA DATA
+  const handleActiveMedia = (data = {}) => {
+    // FUNCTION TO CHANGE SELECTED ACTIVE MEDIA
+    setActiveMedia({...data});
+  };
+
+
+  let [assignType, setAssignType] = useState("task"); // SWITCHES BTW TASK AND MEDIA ASSIGNMENT
+
+  const switchAssignType = ({ target: { name } }) => {
+    // FUNCTION TO CHANGE ASSIGN TASK TYPE
+    setAssignType(name);
+  };
+
+  let [taskType, setTaskType] = useState(details ? "new" : "select"); // SWITCHES BTW SELECT TASK AND NEW TASK
+
+  const switchTaskType = ({ target: { value } }) => {
+    // FUNCTION TO CHANGE SELECTED ACTIVE TASK
+    setTaskType(value);
+  };
+
+  const handleActiveTask = (id = 0, data = {}) => {
+    // FUNCTION TO CHANGE SELECTED ACTIVE TASK
+    setActiveTask({ id, data });
+  };
+
+  // New Task
+  const [formState, setFormState] = useState({
+    // Initialize form state with desired fields
+    banner: details?.banner || "default.jpg",
+    country: details?.country ? details?.country : walletDetails.data.length == 1 ? walletDetails.data[0].country : '',
+    price: details?.price || "",
+    title: details?.title || "",
+    description: details?.description || "",
+    job_detail: details?.job_detail || "",
+    timeline_days: details?.timeline_days || "",
+    category: details?.category || "",
+  });
+
+  const assignFamilyTask = () => {
+    setRequestStatus({ loading: true, status: false, message: "" });
+
+    if(!selectedFamilyUid){ // If no family found, throw error
+      setRequestStatus({ loading: false, status: false, message: "Please Select a Kid" });
+      return setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 3000);
+    }
+
+    let reqData = {};
+    if (taskType == "select" && assignType == 'task') {
+      // RUNS HERE IF TASK TYPE IS SELECT
+      if (!Object.keys(activeTask.data).length) {
+        setRequestStatus({
+          loading: false,
+          status: false,
+          message: "No Task is selected",
+        });
+        return setTimeout(() => {
+          setRequestStatus({ loading: false, status: false, message: "" });
+        }, 3000);
+      }
+      reqData = {
+        // API PAYLOADS
+        job_id: activeTask.data?.job_id,
+        job_uid: activeTask.data?.job_uid,
+        family_uid: selectedFamilyUid
+          ? selectedFamilyUid
+          : familyDetailsData?.uid || details?.family_uid,
+        job_description: activeTask.data?.description,
+        assign_mode: 110011,
+      };
+    }
+
+    if (taskType === "new" && assignType == 'task') {
+      const {
+        banner,
+        category,
+        country,
+        description,
+        job_detail,
+        price,
+        timeline_days,
+        title,
+      } = formState;
+
+      const requiredFields = {
+        banner,
+        // category,
+        currency: country,
+        description,
+        "job detail": job_detail,
+        price,
+        timeline: timeline_days,
+        title,
+      };
+
+      for (let field in requiredFields) {
+        if (requiredFields[field] == "") {
+          // let currencyErrMsg = field == "country" && "currency"
           setRequestStatus({
             loading: false,
             status: false,
-            message: "No Task is seleted",
+            message: `${
+              field[0].toUpperCase() + field.slice(1).toLowerCase()
+            } is empty`,
           });
           return setTimeout(() => {
             setRequestStatus({ loading: false, status: false, message: "" });
           }, 3000);
         }
-        reqData = {
-          // API PAYLOADS
-          job_id: activeTask.data?.job_id,
-          job_uid: activeTask.data?.job_uid,
-          family_uid: familyDetailsData?.uid || details?.family_uid,
-          job_description: activeTask.data?.description,
-          assign_mode: 110011,
-        };
       }
 
-      if (taskType === "new") {
-        const {
-          banner,
-          category,
-          country,
-          description,
-          job_detail,
-          price,
-          timeline_days,
-          title,
-        } = formState;
+      reqData = {
+        banner,
+        category,
+        country,
+        description,
+        job_detail,
+        price: price * 100,
+        timeline_days,
+        title,
+        assign_mode: 110055,
+        family_uid: selectedFamilyUid
+        ? selectedFamilyUid
+        : familyDetailsData?.uid || details?.family_uid,
+      };
+    }
 
-        const requiredFields = {
-          banner,
-          // category,
-          currency:country,
-          description,
-          'job detail':job_detail,
-          price,
-          timeline:timeline_days,
-          title,
-        };
+    apiCall
+      .assignFamilyTask(reqData)
+      .then((res) => {
+        if (res.status != 200 || res.data.internal_return < 0) {
 
-        for (let field in requiredFields) {
-          if (requiredFields[field] == "") {
-            // let currencyErrMsg = field == "country" && "currency"
-            setRequestStatus({
-              loading: false,
-              status: false,
-              message: `${field[0].toUpperCase()+field.slice(1).toLowerCase()} is empty`,
-            });
-            return setTimeout(() => {
-              setRequestStatus({ loading: false, status: false, message: "" });
-            }, 3000);
-          }
+          let error = errorMsg[res?.data?.error_msg] || ''
+
+          setRequestStatus({
+            loading: false,
+            status: false,
+            message: error? error : "failed to assign task",
+          });
+
+          return setTimeout(() => {
+            setRequestStatus({ loading: false, status: false, message: "" });
+          }, 5000);
         }
+        if (res.status === 200) {
 
-        reqData = {
-          banner,
-          category,
-          country,
-          description,
-          job_detail,
-          price: price * 100,
-          timeline_days,
-          title,
-          assign_mode: 110055,
-          family_uid: details?.family_uid || familyDetailsData?.uid,
-        };
-      }
-
-      apiCall
-        .assignFamilyTask(reqData)
-        .then((res) => {
-          if (res.status != 200 || res.data.internal_return < 0) {
-            setRequestStatus({
-              loading: false,
-              status: false,
-              message: "failed to assign task",
-            });
-            return setTimeout(() => {
-              setRequestStatus({ loading: false, status: false, message: "" });
-            }, 5000);
-          }
           setRequestStatus({
             loading: false,
             status: true,
-            message: "action successful",
+            message: "Task Assigned successfully",
           });
-          setUpdatePage(prev => !prev) // Updates family task page by calling the useeffect hook
+
+          setUpdatePage(prev => !prev); // Updates family task page by calling the useeffect hook
+
           dispatch(tableReload({ type: "WALLETTABLE" })); // RELOADS USER WALLET
+
+          //SENDS MESSAGE TO SOCKET TO UPDATE CHILD ACCOUNT
+          // message, room
+          let socketMsg = {
+            "audience": "MEMBER",
+            "action": "REFRESH_OFFER",
+            "family_uid": reqData.family_uid,
+          }
+          let socketRoom = `FAMILY-${userDetails.uid}`
+          parentAssignJobToKid(socketMsg, socketRoom) //SENDS MESSAGE TO SOCKET TO UPDATE CHILD ACCOUNT
+
           setTimeout(() => {
             setRequestStatus({ loading: false, status: false, message: "" });
             action(); // FUNCTION THAT CLOSES THE MODAL BOX
           }, 5000);
-        })
-        .catch((err) => {
-          setRequestStatus({
-            loading: false,
-            status: false,
-            message: "An Error occured, try again",
-          });
-          setTimeout(() => {
-            setRequestStatus({ loading: false, status: false, message: "" });
-          }, 5000);
+        }
+      })
+      .catch((err) => {
+        setRequestStatus({
+          loading: false,
+          status: false,
+          message: "An Error occured, try again",
         });
-    };
 
-    return (
-      <>
-        <ModalCom
-          action={action}
-          situation={situation}
-        >
-          <div className="w-11/12 lg:w-[700px] bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
-            <div className="w-full flex items-center justify-between lg:px-10 lg:py-8 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">
-                Assign task to{" "}
-                {familyDetailsData?.firstname || details?.firstName}
-              </h1>
-              <button
-                type="button"
-                className="text-[#374557] dark:text-red-500"
-                onClick={action}
+        setTimeout(() => {
+          setRequestStatus({ loading: false, status: false, message: "" });
+        }, 5000);
+      });
+  };
+
+  const closeModal = () => {  // FOR CLOSING ASSIGN TASK MODAL
+    action()
+  }
+
+  const assignMediaTask = (values, helpers) => {  // FUNCTION TO HANDLE ASSIGNING MEDIA TASK
+    setRequestStatus({ loading: true, status: false, message: "" });
+
+    if(!selectedFamilyUid){ // If no family found, throw error
+      setRequestStatus({ loading: false, status: false, message: "Please Select a Kid" });
+      return setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 3000);
+    }
+
+    let reqData = {...values, assign_mode:'110012', family_uid:selectedFamilyUid, media_uid:activeMedia.uid, amount:values.amount * 100}
+
+    apiCall.parentAssignMediaTask(reqData).then(res => {  // API CALL TO ASSIGN MEDIA TASK
+      if(res.status != 200 || res.data.internal_return < 0){
+        let error = errorMsg[res?.data?.error_msg] || ''
+
+        setRequestStatus({
+          loading: false,
+          status: false,
+          message: error? error : "failed to assign task",
+        });
+        return setTimeout(()=>{
+          setRequestStatus({ loading: false, status: false, message: "" });
+        }, 3000)
+      }
+      setRequestStatus({ loading: false, status: true, message: "Task Assigned Successfully" });
+      return setTimeout(()=>{
+        setRequestStatus({ loading: false, status: false, message: "" });
+        closeModal() // FOR CLOSING ASSIGN MODAL
+      }, 3000)
+    }).catch(err => {
+      setRequestStatus({ loading: false, status: false, message: "Failed, something went wrong. Try Again" });
+      return setTimeout(()=>{
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 3000)
+    })
+  }
+
+  useEffect(()=>{ // effect to update family UID when components mounts
+    if(familyDetailsData?.uid){
+      setSelectedFamilyUid(familyDetailsData?.uid)
+    }else if(details?.family_uid){
+      setSelectedFamilyUid(details?.family_uid)
+    }else{
+      setSelectedFamilyUid('')
+    }
+  },[])
+
+  useEffect(()=>{
+    apiCall.getParentCommonMedia().then((res)=>{
+        // console.log('RESPONSE', res)
+        setCommonMedia({loading: false, data: res?.data?.result, image: ''})
+        setActiveMedia(res?.data?.result[0])
+    }).catch(err => {
+        setCommonMedia({loading: false, data: [], image: ''})
+    })
+  },[])
+
+  return (
+    <>
+      <ModalCom action={action} situation={situation}>
+        <div className="w-11/12 lg:w-[700px] bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+          <div className="modal-header-con">
+            <h1 className="modal-title">
+              {details ? (
+                ` Assign ${details?.firstname}'s Task`
+              ) : familyDetailsData ? (
+                ` Assign ${familyDetailsData.firstname}'s Task`
+              ) : (
+                <div className="flex items-center gap-2">
+                  <span className="text-black">Assign task to{" "}</span>
+                  <div className="w-[270px] h-[40px] flex items-center">
+                    <select
+                      name=""
+                      id=""
+                      className="text-lg text-black/80 px-2 tracking-wide font-semibold transition-all cursor-pointer bg-white focus:outline-none border border-gray-200 rounded-full w-full h-full"
+                      onChange={handleFamChange}
+                      value={selectedFamilyUid}
+                    >
+                      <option value="" className="">
+                        Select a kid
+                      </option>
+                      {familyList}
+                    </select>
+                  </div>
+                </div>
+              )}
+            </h1>
+            <button
+              type="button"
+              className="modal-close-btn"
+              onClick={action}
+            >
+              <svg
+                width="36"
+                height="36"
+                viewBox="0 0 36 36"
+                fill="none"
+                className="fill-current"
+                xmlns="http://www.w3.org/2000/svg"
               >
-                <svg
-                  width="36"
-                  height="36"
-                  viewBox="0 0 36 36"
-                  fill="none"
-                  className="fill-current"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
-                    fill=""
-                    fillOpacity="0.6"
-                  />
-                  <path
-                    d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
-                    fill="#"
-                    fillOpacity="0.6"
-                  />
-                </svg>
+                <path
+                  d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                  fill=""
+                  fillOpacity="0.6"
+                />
+                <path
+                  d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                  fill="#"
+                  fillOpacity="0.6"
+                />
+              </svg>
+            </button>
+          </div>
+          <div className="modal-body">
+            <div className="px-4 py-2 w-full flex items-center gap-4">
+              <button
+                name='task'
+                className={`py-1 px-2 font-medium bg-transparent border border-purple text-purple transition-all rounded-md duration-300 ${assignType=='task' && 'bg-yellow-500'}`}
+                onClick={switchAssignType}
+                disabled={requestStatus.loading}
+              >
+              Task
+              </button>
+              <button
+                name='media'
+                className={`py-1 px-2 font-medium bg-transparent border border-purple text-purple transition-all rounded-md duration-300 ${assignType=='media' && 'bg-yellow-500'}`}
+                onClick={switchAssignType}
+                disabled={requestStatus.loading}
+              >
+              Media
               </button>
             </div>
-            {familyTask?.loading ? (
-              <div className="h-[100px] w-full flex justify-center items-center">
-                <LoadingSpinner color="sky-blue" size="16" />
-              </div>
-            ) : (
-              <>
-                <div
-                  className={`job-action-modal-body w-full md:grid ${
-                    taskType !== "new" ? "md:grid-cols-2" : "md:grid-cols-1"
-                  }`}
-                >
-                  <div className="p-4">
-                    <div className="mb-2 w-full flex items-center gap-4">
-                      <div className="flex items-center gap-2 text-sky-blue text-base">
-                        <input
-                          type="radio"
-                          name="task-type"
-                          value="select"
-                          className="w-[20px] h-[20px] cursor-pointer"
-                          checked={taskType == "select"}
-                          onChange={switchTaskType}
-                        />
-                        <span>Select Task</span>
-                      </div>
-                      <div className="flex items-center gap-2 text-sky-blue text-base">
-                        <input
-                          type="radio"
-                          name="task-type"
-                          value="new"
-                          className="w-[20px] h-[20px] cursor-pointer"
-                          checked={taskType == "new"}
-                          onChange={switchTaskType}
-                        />
-                        <span>New Task</span>
-                      </div>
-                    </div>
-                    {/* Task Type === select */}
-                    {taskType == "select" && (
-                      <div className="p-4 w-full h-[400px] overflow-y-auto bg-slate-100 rounded-md dark:bg-[#11131f] dark:text-white">
-                        {familyTask?.data?.length ? (
-                          familyTask?.data?.map((item, index) => (
-                            <div
-                              key={item.job_uid}
-                              className="mb-2 flex justify-start items-center gap-2 text-sky-blue text-base cursor-pointer"
-                              onClick={() =>
-                                handleActiveTask(item.job_uid, item)
-                              }
-                            >
-                              <input
-                                type="radio"
-                                name="task-list"
-                                checked={
-                                  activeTask.id == item.job_uid ||
-                                  (activeTask.id == index && true)
-                                }
-                                onChange={() =>
-                                  handleActiveTask(item.job_uid, item)
-                                }
-                                className="w-[15px] h-[15px] cursor-pointer"
-                              />
-                              <p className="w-full text-dark-gray dark:text-white tracking-wide">
-                                {item?.title}
-                              </p>
-                            </div>
-                          ))
-                        ) : (
-                          <p className="p-8 text-lg text-dark-gray dark:text-white tracking-wide text-center cursor-default">
-                            No Task found!
-                          </p>
-                        )}
-                      </div>
-                    )}
-                    {taskType == "new" && (
-                      <div className="p-4 w-full h-[400px]">
-                        <NewTasks
-                          formState={formState}
-                          setFormState={setFormState}
-                        />
-                      </div>
-                    )}
-                  </div>
-
-                  {/*Right Hand Side for details && Task Type === select */}
-                  {taskType == "select" && (
-                    <>
-                      {familyTask?.data?.length > 0 ? (
-                        <div className="p-4">
-                          <div className="w-full">
-                            <p className="text-lg font-bold text-dark-gray dark:text-white tracking-wide border-b-2">
-                              {activeTask?.data?.title}
-                            </p>
-                            <div className="my-3">
-                              <Detail
-                                label="Description"
-                                value={activeTask?.data?.description}
-                              />
-                            </div>
-                            <div className="flex items-center">
-                              <div className="my-3 w-full flex items-center gap-1">
-                                <label className="text-slate-900 dark:text-white tracking-wide font-semibold">
-                                  Price
-                                </label>
-                                <p className="p-1 text-sm text-slate-900 dark:text-white">
-                                  {PriceFormatter(
-                                    activeTask?.data?.price * 0.01,
-                                    activeTask?.data?.currency,
-                                    activeTask?.data?.curreny_code
-                                  )}
-                                </p>
-                              </div>
-
-                              <div className="my-3 w-full flex items-center gap-1">
-                                <label className="text-slate-900 dark:text-white tracking-wide font-semibold">
-                                  Timeline
-                                </label>
-                                <p className="p-1 text-sm text-slate-900 dark:text-white">{`${activeTask?.data?.timeline_days} day(s)`}</p>
-                              </div>
-                            </div>
-
-                            <div className="my-3 sm:flex items-center">
-                              <Detail
-                                label="Created"
-                                value={`Dummy, no value found for created!`}
-                              />
-                            </div>
-
-                            <div className="my-3">
-                              <label className="w-full text-slate-900 dark:text-white tracking-wide font-semibold">
-                                Delivery Detail
-                              </label>
-                              <textarea
-                                className={`p-1 w-full text-sm text-slate-900 dark:text-white bg-transparent outline-none border border-slate-300 rounded-md`}
-                                rows="5"
-                                style={{ resize: "none" }}
-                                value={activeTask?.data?.job_detail}
-                                readOnly
-                                // onChange={handleInputChange}
-                              />
-                            </div>
-                          </div>
-                        </div>
-                      ) : (
-                        <></>
-                      )}
-                    </>
-                  )}
-                </div>
-
-                {/* BTN */}
-                <div className="py-2 px-4 border-t-2 flex justify-between items-center">
-                  {/* error or success display */}
-                  <div className="w-auto h-auto flex items-center">
-                    {requestStatus.message != "" &&
-                      (!requestStatus.status ? (
-                        <div
-                          className={`relative p-2 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px] self-start`}
-                        >
-                          {requestStatus.message}
-                        </div>
-                      ) : (
-                        requestStatus.status && (
-                          <div
-                            className={`relative p-2 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
-                          >
-                            {requestStatus.message}
-                          </div>
-                        )
-                      ))}
-                  </div>
-
-                  {/* End of error or success display */}
-                  <div className="w-auto h-auto flex items-center gap-3">
-                    <button
-                      disabled={requestStatus.loading}
-                      onClick={action}
-                      type="button"
-                      className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white cursor-pointer"
-                    >
-                      <span className="text-gradient">Close</span>
-                    </button>
-                    <div className="">
-                      {requestStatus.loading ? (
-                        <LoadingSpinner color="sky-blue" size="8" />
-                      ) : taskType == "select" ? (
-                        <button
-                          type="button"
-                          disabled={requestStatus.loading}
-                          onClick={assignFamilyTask}
-                          className="px-1 w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer"
-                        >
-                          Assign
-                        </button>
-                      ) : (
-                        <button
-                          type="button"
-                          disabled={requestStatus.loading}
-                          onClick={assignFamilyTask}
-                          className="px-1 w-40 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer"
-                        >
-                          {`Assign to ${
-                            familyDetailsData?.firstname || details?.firstName
-                          }`}
-                        </button>
-                      )}
-                    </div>
-                  </div>
-                </div>
-              </>
-            )}
+            <div className="">
+              {assignType == 'task' ?
+                <AssignPrevNewTask 
+                  jobList={jobList}
+                  requestStatus={requestStatus}
+                  assignFamilyTask={assignFamilyTask}
+                  taskType={taskType}
+                  switchTaskType={switchTaskType}
+                  formState={formState}
+                  setFormState={setFormState}
+                  activeTask={activeTask}
+                  handleActiveTask={handleActiveTask}
+                  closeModal={closeModal}
+                />
+                :
+                <AssignMediaTask 
+                  commonMedia={commonMedia}
+                  requestStatus={requestStatus}
+                  assignMediaTask={assignMediaTask}
+                  activeMedia={activeMedia}
+                  handleActiveMedia={handleActiveMedia}
+                  closeModal={closeModal}
+                  family_uid = {selectedFamilyUid}
+                />
+              }
+            </div>
           </div>
-        </ModalCom>
-      </>
-    );
-  }
-);
+        </div>
+      </ModalCom>
+    </>
+  );
+};
 
 export default AssignTaskPopout;

src/components/FamilyAcc/FamilyPopout/forms/NewTasks.jsx

@@ -1,13 +1,17 @@
 import React, { useEffect, useState } from "react";
 import usersService from "../../../../services/UsersService";
 import InputCom from "../../../Helpers/Inputs/InputCom";
+import { useSelector } from "react-redux";
 
 export default function NewTasks({ formState, setFormState }) {
-  let [currency, setCurrency] = useState({
-    loading: true,
-    status: false,
-    data: null,
-  });
+
+  const { walletDetails } = useSelector((state) => state?.walletDetails); // WALLET STORE
+
+  // let [currency, setCurrency] = useState({
+  //   loading: true,
+  //   status: false,
+  //   data: null,
+  // });
 
   const selectImage = require(`../../../../assets/images/taskbanners/${
     formState.banner || "default.jpg"
@@ -15,25 +19,25 @@ export default function NewTasks({ formState, setFormState }) {
   const ApiCall = new usersService();
 
   // FUNCTION TO GET Currency
-  const getUserCurrency = () => {
-    setCurrency((prev) => ({ ...prev, loading: true }));
-    ApiCall.getUserWallets()
-      .then((res) => {
-        if (res.data.internal_return < 0) {
-          setCurrency({ loading: false, status: true, data: [] });
-          return;
-        }
+  // const getUserCurrency = () => {
+  //   setCurrency((prev) => ({ ...prev, loading: true }));
+  //   ApiCall.getUserWallets()
+  //     .then((res) => {
+  //       if (res.data.internal_return < 0) {
+  //         setCurrency({ loading: false, status: true, data: [] });
+  //         return;
+  //       }
 
-        setCurrency({
-          loading: false,
-          status: true,
-          data: res.data.result_list,
-        });
-      })
-      .catch((err) => {
-        setCurrency({ loading: false, status: false, data: [] });
-      });
-  };
+  //       setCurrency({
+  //         loading: false,
+  //         status: true,
+  //         data: res.data.result_list,
+  //       });
+  //     })
+  //     .catch((err) => {
+  //       setCurrency({ loading: false, status: false, data: [] });
+  //     });
+  // };
 
   const handleInputChange = (event) => {
     const { name, value } = event.target;
@@ -43,81 +47,166 @@ export default function NewTasks({ formState, setFormState }) {
     }));
   };
 
-  useEffect(() => {
-    getUserCurrency();
-  }, []);
+  // useEffect(() => {
+  //   getUserCurrency();
+  // }, []);
 
   return (
     <form className="w-full flex justify-between items-start">
-      <div className="flex flex-col gap-3 max-w-[77%]">
-        {/* inputs starts here */}
-        <div className="grid md:grid-cols-3 grid-cols-1 gap-6 mb-[5px]">
-          {/* Currency */}
-          <div className="field w-full mb-6 xl:mb-0">
-            <label
-              htmlFor="country"
-              className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex item-center gap-1"
-            >
-              Currency
-              {/* {props.errors.country && props.touched.country && <span className="text-[12px] text-red-500">{props.errors.country}</span>} */}
-            </label>
-            <select
-              id="country"
-              name="country"
-              value={formState.country}
-              className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
-              onChange={handleInputChange}
-              // onBlur={props.handleBlur}
-            >
-              {currency?.loading ? (
-                <option className="text-slate-500 text-[13.975px]" value="">
-                  Loading...
-                </option>
-              ) : currency.data.length ? (
-                <>
-                  <option className="text-slate-500 text-[13.975px]" value="">
-                    Currency
-                  </option>
-                  {currency.data?.map((item, index) => (
-                    <option
-                      key={index}
-                      className="text-slate-500 text-lg"
-                      value={item?.country}
-                    >
-                      {item?.description}
-                    </option>
-                  ))}
-                </>
-              ) : (
-                <option className="text-slate-500 text-lg" value="">
-                  No Options Found! Try Again
-                </option>
-              )}
-            </select>
-          </div>
-
-          {/* Price */}
+      <div className="w-full block sm:grid grid-cols-3 gap-2">
+        
+        <div className="w-full flex flex-col gap-2 col-span-2">
+          {/* Title  */}
           <div className="field w-full">
+            <label htmlFor="title" className="job-label">Title</label>
             <InputCom
-              fieldClass="px-6 text-right"
-              label="Price"
-              labelClass="tracking-wide"
+              fieldClass="px-6"
+              // label="Title"
+              // labelClass="tracking-wide"
               inputBg="bg-slate-100"
-              type="number"
-              name="price"
-              placeholder="0"
-              value={formState.price}
+              type="text"
+              name="title"
+              value={formState.title}
               inputHandler={handleInputChange}
-              // blurHandler={props.handleBlur}
-              // error={props.errors.price && props.touched.price && props.errors.price}
+              //   blurHandler={props.handleBlur}
+              //   error={props.errors.title && props.touched.title && props.errors.title}
             />
           </div>
 
+          {/* Description  */}
+          <div className="field flex flex-col sm:flex-row w-full gap-2">
+            <div className="w-full">
+              <label
+                htmlFor="description"
+                className='job-label'
+              >
+                Description
+              </label>
+              <textarea
+                id="description"
+                rows="5"
+                className={`input-field px-3 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[80px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px]`}
+                style={{ resize: "none" }}
+                name="description"
+                value={formState.description}
+                onChange={handleInputChange}
+                // onBlur={props.handleBlur}
+              />
+            </div>
+          </div>
+
+          {/* Details */}
+          <div className="field flex flex-col sm:flex-row w-full gap-2">
+            <div className="w-full">
+              <label
+                htmlFor="Job Delivery Details"
+                className='job-label'
+              >
+                Delivery Detail
+                {/* {props.errors.job_detail && props.touched.job_detail && <span className="text-[12px] text-red-500">{props.errors.job_detail}</span>} */}
+              </label>
+              <textarea
+                id="Job Delivery Details"
+                rows="5"
+                className={`input-field px-3 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px]`}
+                style={{ resize: "none" }}
+                name="job_detail"
+                value={formState.job_detail}
+                onChange={handleInputChange}
+                // onBlur={props.handleBlur}
+              />
+            </div>
+          </div>
+        </div>
+
+        {/* inputs starts here */}
+        <div className="w-full flex flex-col gap-2">
+          <div className="grid grid-cols-2 gap-3">
+            {/* Price */}
+            <div className="field w-full">
+              <label htmlFor="price" className="job-label">Reward</label>
+              <InputCom
+                fieldClass="px-6 text-right"
+                // label="Price"
+                // labelClass="tracking-wide"
+                inputBg="bg-slate-100"
+                type="number"
+                name="price"
+                placeholder="0"
+                value={formState.price}
+                inputHandler={handleInputChange}
+                // blurHandler={props.handleBlur}
+                // error={props.errors.price && props.touched.price && props.errors.price}
+              />
+            </div>
+
+            {/* Currency */}
+            <div className="field w-full">
+              <label
+                htmlFor="country"
+                className="job-label invisible"
+              >
+                Currency
+                {/* {props.errors.country && props.touched.country && <span className="text-[12px] text-red-500">{props.errors.country}</span>} */}
+              </label>
+              <select
+                id="country"
+                name="country"
+                value={formState.country}
+                className={`input-field w-full h-[42px] flex items-center px-2 mt-2 rounded-full placeholder:text-base text-dark-gray dark:text-white bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
+                onChange={handleInputChange}
+                disabled={walletDetails.data.length == 1}
+                // onBlur={props.handleBlur}
+              >
+                {walletDetails?.loading ? (
+                  <option className="text-slate-500 text-[13.975px]" value="">
+                    Loading...
+                  </option>
+                ) : walletDetails.data.length ? (
+                  <>
+                      {walletDetails.data.length == 1 ?
+                      <>
+                      {walletDetails.data?.map((item, index) => (
+                          <option
+                          key={index}
+                          className="text-slate-500 text-lg"
+                          value={item?.country}
+                          >
+                          {item?.code}
+                          </option>
+                      ))}
+                      </>
+                      :
+                      <>
+                          <option className="text-slate-500 text-[13.975px]" value="">
+                              Select
+                          </option>
+                          {walletDetails.data?.map((item, index) => (
+                              <option
+                              key={index}
+                              className="text-slate-500 text-lg"
+                              value={item?.country}
+                              >
+                              {item?.code}
+                              </option>
+                          ))}
+                      </>
+                      }
+                  </>
+                ) : (
+                  <option className="text-slate-500 text-lg" value="">
+                    No Options Found! Try Again
+                  </option>
+                )}
+              </select>
+            </div>
+          </div>
+
           {/* Duration */}
-          <div className="field w-full mb-6 xl:mb-0">
+          <div className="field w-full">
             <label
               htmlFor="timeline_days"
-              className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex item-center gap-1"
+              className="job-label"
             >
               Timeline
               {/* {props.errors.country && props.touched.country && <span className="text-[12px] text-red-500">{props.errors.country}</span>} */}
@@ -126,17 +215,18 @@ export default function NewTasks({ formState, setFormState }) {
               id="timeline_days"
               name="timeline_days"
               value={formState.timeline_days}
-              className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
+              className={`input-field w-full h-[42px] flex items-center px-2 mt-2 rounded-full placeholder:text-base text-dark-gray dark:text-white bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
               onChange={handleInputChange}
               // onBlur={props.handleBlur}
             >
               {publicArray.length && (
                 <>
                   <option className="text-slate-500 text-[13.975px]" value="">
-                    Duration
+                    Select
                   </option>
                   {publicArray.map(({ name, duration }, idx) => (
                     <option
+                      key={idx}
                       className="text-slate-500 text-[13.975px]"
                       value={duration}
                     >
@@ -147,72 +237,19 @@ export default function NewTasks({ formState, setFormState }) {
               )}
             </select>
           </div>
-        </div>
 
-        {/* Title  */}
-        <div className="field w-full mb-[5px]">
-          <InputCom
-            fieldClass="px-6"
-            label="Title"
-            labelClass="tracking-wide"
-            inputBg="bg-slate-100"
-            type="text"
-            name="title"
-            value={formState.title}
-            inputHandler={handleInputChange}
-            //   blurHandler={props.handleBlur}
-            //   error={props.errors.title && props.touched.title && props.errors.title}
-          />
-        </div>
-
-        {/* Description  */}
-        <div className="field w-full mb-[5px]">
-          <InputCom
-            fieldClass="px-6"
-            label="Description"
-            labelClass="tracking-wide"
-            inputBg="bg-slate-100"
-            type="text"
-            name="description"
-            value={formState.description}
-            inputHandler={handleInputChange}
-            //   blurHandler={props.handleBlur}
-            //   error={props.errors.description && props.touched.description && props.errors.description}
-          />
-        </div>
-
-        {/* Details */}
-        <div className="field flex flex-col sm:flex-row w-full mb-[5px] gap-2">
+          {/* Banner Image */}
           <div className="w-full">
-            <label
-              htmlFor="Job Delivery Details"
-              className='className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex items-center gap-1'
-            >
-              Job Delivery Details
-              {/* {props.errors.job_detail && props.touched.job_detail && <span className="text-[12px] text-red-500">{props.errors.job_detail}</span>} */}
-            </label>
-            <textarea
-              id="Job Delivery Details"
-              rows="5"
-              className={`input-field px-3 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px]`}
-              style={{ resize: "none" }}
-              name="job_detail"
-              value={formState.job_detail}
-              onChange={handleInputChange}
-              // onBlur={props.handleBlur}
-            />
+            <div className="h-32 w-full">
+              <img
+                src={selectImage}
+                alt="task_banner_img"
+                className="w-full h-full object-contain"
+              />
+            </div>
           </div>
         </div>
-      </div>
-      {/* Banner Image */}
-      <div className="max-w-[20%] w-full">
-        <div className="h-32 w-full">
-          <img
-            src={selectImage}
-            alt="task_banner_img"
-            className="w-full h-full object-contain"
-          />
-        </div>
+
       </div>
     </form>
   );

src/components/FamilyAcc/FamilySettings/index.jsx

@@ -1,11 +1,12 @@
 import React, { useEffect, useState } from "react";
 import { Link, useLocation } from "react-router-dom";
+import CustomBreadcrumb from "../../Breadcrumb/CustomBreadcrumb";
 import Icons from "../../Helpers/Icons";
 import Layout from "../../Partials/Layout";
 import { AddFamily, FamilyBanner, Relatives } from "./Tabs";
 
 const FamilySettings = () => {
-  let {state} = useLocation()
+  let { state } = useLocation();
   const tabs = [
     {
       id: 1,
@@ -58,15 +59,42 @@ const FamilySettings = () => {
           {/* heading */}
           <div className="sm:flex justify-between items-center mb-6">
             <div className="mb-5 sm:mb-0">
-              <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
-                <span className={``}>Family Settings</span>
-              </h1>
+              <CustomBreadcrumb
+                title={"Family Settings"}
+                breadcrumb={[
+                  { link: "/", title: "Home" },
+                  {
+                    link: "/acc-family",
+                    title: "Family Account",
+                  },
+                  {
+                    link: "/familysettings",
+                    title: "Family Settings",
+                    active: true,
+                  },
+                ]}
+              />
             </div>
-            <Link to="/acc-family" className="flex gap-2 items-center text-dark-gray dark:text-white">
-              <svg className="w-5 h-5 rtl:rotate-180" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth="1.5" stroke="currentColor">
-                  <path strokeLinecap="round" strokeLinejoin="round" d="M6.75 15.75L3 12m0 0l3.75-3.75M3 12h18" />
+            <Link
+              className="item-content relative text-[18px] transition-all duration-300 ease-in-out bg-[#76a5df] text-white font-medium dark:text-white h-12 px-2 flex items-center gap-2 rounded-md shadow-sm justify-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)]"
+              to="/acc-family"
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                fill="none"
+                viewBox="0 0 24 24"
+                strokeWidth={1.5}
+                stroke="currentColor"
+                className="w-4 h-4"
+              >
+                <path
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  d="M10.5 19.5 3 12m0 0 7.5-7.5M3 12h18"
+                />
               </svg>
-              Family
+
+              <span>Family</span>
             </Link>
           </div>
 

src/components/FamilyAcc/FamilyTable.jsx

@@ -19,7 +19,7 @@ export default function FamilyTable({
   familyList,
   loader,
   popUpHandler,
-  imageServer
+  imageServer,
 }) {
   const navigate = useNavigate();
   const [currentPage, setCurrentPage] = useState(0);
@@ -55,14 +55,19 @@ export default function FamilyTable({
     banner,
     enable_traking,
     profile_picture,
-    imageServer
+    imageServer,
+    username,
   }) => {
     // Check for valid dates
     const addedDate = added ? added.split(" ")[0] : "N/A";
     const loginDate = last_login ? formatDateString(last_login) : "N/A";
     const key = `family-${family_uid}`; // Assign a unique key
-    const image = localStorage.getItem('session_token') ? `${imageServer}${localStorage.getItem('session_token')}/family/${family_uid}` : ''
-    
+    const image = localStorage.getItem("session_token")
+      ? `${imageServer}${localStorage.getItem(
+          "session_token"
+        )}/family/${family_uid}`
+      : "";
+
     const trackingStatus =
       enable_traking === "0"
         ? "Stopped"
@@ -80,14 +85,19 @@ export default function FamilyTable({
             <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
               <img
                 // src={profile_picture}
-                src={image || profile_picture || localImgLoad(`images/icons/${banner}`)}
+                src={
+                  image ||
+                  profile_picture ||
+                  localImgLoad(`images/icons/${banner}`)
+                }
                 alt={`Avatar of ${firstname} ${lastname}`}
                 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 whitespace-nowrap">
-                {`${firstname} ${lastname} (${age < 10 ? `0${age}` : age})`}
+              <h1 className="font-bold text-lg text-dark-gray dark:text-white whitespace-nowrap">
+                {`${firstname} ${lastname}`}{" "}
+                <span className="ml-1 text-sm">{`[${username}]`}</span>
               </h1>
               <span className="text-sm text-thin-light-gray">
                 Added: <span className="text-purple ml-1">{addedDate}</span>
@@ -136,7 +146,7 @@ export default function FamilyTable({
                 task_count,
                 family_uid,
                 banner,
-                image
+                image,
               })
             }
             type="button"
@@ -186,7 +196,13 @@ export default function FamilyTable({
                 </thead>
                 <tbody className="h-full">
                   {currentFamilyList?.map((familyMember, index) => {
-                    return <FamilyRow key={index} {...familyMember} imageServer={imageServer} />;
+                    return (
+                      <FamilyRow
+                        key={index}
+                        {...familyMember}
+                        imageServer={imageServer}
+                      />
+                    );
                   })}
                 </tbody>
               </table>

src/components/FamilyAcc/FamilyTableNew.jsx

@@ -0,0 +1,251 @@
+import React, { Suspense, lazy, useEffect, useMemo, useState } from "react";
+import { useLocation } from "react-router-dom";
+import { apiConst } from "../../lib/apiConst";
+import usersService from "../../services/UsersService";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import AssignTaskPopout from "./FamilyPopout/AssignTaskPopout";
+import { useSelector } from "react-redux";
+
+// Lazy Imports for components
+const FamilyWaitlist = lazy(() => import("./Tabs/FamilyNewWaitlist"));
+const FamilyTasks = lazy(() => import("./Tabs/FamilyNewTasks"));
+const FamilyPending = lazy(() => import("./Tabs/FamilyNewPending"));
+
+export default function FamilyTableNew() {
+
+  const { jobListTable, pendingListTable, parentFamilyTaskList } = useSelector((state) => state.tableReload); // TABLE RELOAD TRIGGERS
+
+
+  let { pathname } = useLocation();
+
+  // Initial state for family details
+  const initialDetailState = {
+    loading: false,
+    data: [],
+  };
+
+  // State for family details, tasks, waitlist, and pending
+  let [familyTasks, setFamilyTasks] = useState({...initialDetailState})
+
+  let [familyPending, setFamilyPending] = useState({...initialDetailState})
+
+  let [familyWaitList, setFamilyWaitList] = useState({...initialDetailState})
+
+  const [updatePage, setUpdatePage] = useState(false); // State to determine when to update the page
+
+  // State for list of created jobs by FULL USER
+  const [jobList, setJobList] = useState({ loading: false, data: [] });
+
+  // State for active/selected job
+  const [activeTask, setActiveTask] = useState({ id: 0, data: {} });
+
+  // State for family task popout
+  const [assignTaskPopout, setAssignTaskPopout] = useState(false);
+
+
+  // Create an instance of the usersService class
+  const apiCall = useMemo(() => new usersService(), []);
+
+  // Function to handle toggling the family task popout
+  const familyAssignPopUpHandler = () => {
+    setAssignTaskPopout((prev) => !prev);
+  };
+
+  // Array of tab names
+  const tabs = [
+    { id: 1, name: "Tasks" },
+    { id: 2, name: "Waiting" },
+    { id: 3, name: "Pending" },
+  ];
+
+  // State for the currently selected tab
+  const [tab, setTab] = useState(tabs[0].name);
+
+  // Function to handle tab changes
+  const tabHandler = (value) => {
+    setTab(value);
+  };
+
+  // Object that maps tab names to their corresponding components
+  const tabComponents = {
+    Tasks: (
+      <FamilyTasks
+        familyData={familyTasks}
+        action={familyAssignPopUpHandler}
+      />
+    ),
+    Waiting: (
+      <FamilyWaitlist
+        familyData={familyWaitList}
+        setUpdatePage={setUpdatePage}
+      />
+    ),
+    Pending: (
+      <FamilyPending
+        familyData={familyPending}
+      />
+    ),
+  };
+
+  const defaultTabComponent = tabComponents.Tasks;
+
+  // Selected tab component based on the current 'tab'
+  const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
+
+
+  // Effect to manage active family task details
+  useEffect(() => {
+    const manageTasks = async () => {
+      setFamilyTasks({loading:true, data: []})
+      try {
+        const response = await apiCall.getMyActiveJobList()
+        if(response.status != 200 || !response?.data){
+          return setFamilyTasks({loading:false, data: []})
+        }
+        setFamilyTasks({loading:false, data: response?.data})
+      } catch (error) {
+        throw new Error(error);
+        setFamilyTasks({loading:false, data: []})
+      }
+    };
+    // Invoke the manageFamily function when the component mounts
+    manageTasks();
+  }, [updatePage, parentFamilyTaskList]);
+
+  // Effect to manage family wait task details
+  useEffect(() => {
+    const manageFamilyWaitlist = async () => {
+      setFamilyWaitList({loading:true, data: []})
+      try {
+        const response = await apiCall.ManageFamilyWaitlist()
+        if(response.status != 200 || !response?.data){
+          return setFamilyWaitList({loading:false, data: []})
+        }
+        setFamilyWaitList({loading:false, data: response?.data})
+      } catch (error) {
+        throw new Error(error);
+        setFamilyWaitList({loading:false, data: []})
+      }
+    };
+    // Invoke the manageFamily function when the component mounts
+    manageFamilyWaitlist();
+  }, [updatePage]);
+
+  // Effect to manage family pending task details
+  useEffect(() => {
+    const manageFamilyPending = async () => {
+      setFamilyPending({loading:true, data: []})
+      try {
+        const response = await apiCall.ManageFamilyPending()
+        if(response.status != 200 || !response?.data){
+          return setFamilyPending({loading:false, data: []})
+        }
+        setFamilyPending({loading:false, data: response?.data})
+      } catch (error) {
+        throw new Error(error);
+        setFamilyPending({loading:false, data: []})
+      }
+    };
+    // Invoke the manageFamily function when the component mounts
+    manageFamilyPending();
+  }, [updatePage, pendingListTable]);
+
+  // Effect to get all parent job list
+  useEffect(() => {
+    const reqData = {
+      limit: 30,
+      offset: 0,
+      job_type: "FAMILY",
+      action: apiConst.WRENCHBOARD_PICTURE_FAMMEMBER,
+    };
+
+      setJobList({ loading: true });
+      apiCall
+        .getMyJobList(reqData)
+        .then((res) => {
+          setJobList({ loading: false, data: res?.data?.result_list });
+          if (res?.data?.result_list?.length) {
+            setActiveTask((prev) => ({
+              ...prev,
+              data: res?.data?.result_list[0],
+            }));
+          }
+        })
+        .catch((err) => {
+          setJobList({ loading: false, data: [] });
+          console.log("Error", err);
+        });
+  }, []);
+
+  // console.log(updatePage);
+
+  return (
+    <div
+      className={`w-full bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow h-full`}
+    >
+      <div className="relative w-full sm:rounded-lg overflow-x-auto">
+        <Suspense
+          fallback={
+            <div className="h-full min-h-[609px] w-full overflow-hidden flex justify-center items-center">
+              <LoadingSpinner size="16" color="sky-blue" />
+            </div>
+          }
+        >
+          <div className="w-full h-full text-sm text-left text-gray-500 dark:text-gray-400 relative grid grid-cols-3 min-h-[575px]">
+            <div className="col-span-3 h-full w-full">
+              <div className="flex flex-col w-full">
+                <div className="w-full pr-8 flex items-center gap-1 border-b border-b-[#FAFAF]">
+                  <ul className="flex gap-2 items-center w-full">
+                    {tabs.map(({ name, id }) => (
+                      <li
+                        onClick={() => tabHandler(name)}
+                        className={`p-4 flex hover:text-purple transition-all ease-in-out items-center cursor-pointer overflow-hidden text-xl relative top-[2px] ${
+                          tab === name
+                            ? "text-purple border-r"
+                            : "text-thin-light-gray"
+                        }`}
+                        key={id}
+                      >
+                        <h1>{name}</h1>
+                      </li>
+                    ))}
+                  </ul>
+                  <button
+                    type="button"
+                    onClick={familyAssignPopUpHandler}
+                    className="p-1 my-1 w-[100px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                  >
+                    Add task
+                  </button>
+                </div>
+
+                <div className="flex-[0.9] h-full">
+                  <div className="h-full relative overflow-y-auto">
+                    <Suspense
+                      fallback={<LoadingSpinner size="16" color="sky-blue" />}
+                    >
+                      {selectedTabComponent}
+                    </Suspense>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </Suspense>
+      </div>
+
+      {assignTaskPopout && (
+        <AssignTaskPopout
+          action={familyAssignPopUpHandler}
+          situation={assignTaskPopout}
+          jobList={jobList}
+          setActiveTask={setActiveTask}
+          activeTask={activeTask}
+          familyDetailsData={''}
+          setUpdatePage={setUpdatePage}
+        />
+      )}
+
+    </div>
+  );
+}

src/components/FamilyAcc/Tabs/FamilyAccount.jsx

@@ -3,7 +3,7 @@ import QRCode from "react-qr-code";
 import { useSelector } from "react-redux";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
 
-const FamilyAccount = forwardRef(({ familyData, myRef, handlePrint, loader }, ref) => {
+const FamilyAccount = forwardRef(({ familyData, myRef, handlePrint}, ref) => {
   const { userDetails } = useSelector((state) => state.userDetails);
   return (
     <div
@@ -16,13 +16,13 @@ const FamilyAccount = forwardRef(({ familyData, myRef, handlePrint, loader }, re
             <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
               Username:{" "}
               <span className="ml-2 normal-case">
-                {familyData?.username ? familyData?.username : "please wait..."}
+                {familyData?.data?.username ? familyData?.data?.username : "please wait..."}
               </span>
             </h2>
             <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
               Pin:{" "}
               <span className="ml-2 normal-case">
-                {familyData?.pin ? familyData?.pin : "please wait..."}
+                {familyData?.data?.pin ? familyData?.data?.pin : "please wait..."}
               </span>
             </h2>
           </div>
@@ -35,7 +35,7 @@ const FamilyAccount = forwardRef(({ familyData, myRef, handlePrint, loader }, re
             <p className="text-xl tracking-wide mb-[15px] text-center font-bold text-dark-gray dark:text-white">
               Scan the code from mobile app
             </p>
-            {loader ?
+            {familyData.loading ?
             <div className="w-full">
               <LoadingSpinner size='8' color='sky-blue' />
             </div>
@@ -44,7 +44,7 @@ const FamilyAccount = forwardRef(({ familyData, myRef, handlePrint, loader }, re
               size={256}
               style={{ height: "auto", maxWidth: "100%", width: "100%" }}
               // value={`https://www.google.com`}
-              value={`${userDetails?.uid}@${familyData?.username}@${familyData?.uid}`}
+              value={`${userDetails?.uid}@${familyData?.data?.username}@${familyData?.data?.uid}`}
               viewBox={`0 0 256 256`}
             />
             }

src/components/FamilyAcc/Tabs/FamilyNewPending.jsx

@@ -0,0 +1,161 @@
+import { useMemo, useState } from "react";
+import { PriceFormatter } from "../../Helpers/PriceFormatter";
+import { PaginatedList, handlePagingFunc } from "../../Pagination";
+import PendingJobsPopout from "../../jobPopout/PendingJobsPopout";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+
+export default function FamilyPending({ familyData }) {
+  let [jobPopout, setJobPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
+
+  let filteredFamilyData = useMemo(
+    () => familyData?.data?.result_list?.filter((data) => data.family_uid !== ""),
+    [familyData?.data?.result_list]
+  );
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const itemsPerPage = Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentPendingTasks = filteredFamilyData?.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );
+
+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };
+
+
+  return (
+    <div
+      className={`update-table w-full p-3 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow lg:min-h-[538px]`}
+    >
+      {familyData.loading ? 
+      (<div className="w-full h-full flex justify-center items-center">
+        <LoadingSpinner size={16} color="sky-blue" height='h-[30rem]' />
+      </div>
+      ):
+      <>
+      {familyData?.data?.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>
+              {
+                <>
+                  {currentPendingTasks.length > 0 ? (
+                    currentPendingTasks.map((value, index) => {
+                      let deliveryDate = value?.expire?.split(" ")[0];
+                      let thePrice = PriceFormatter(
+                        value?.price * 0.01,
+                        value?.currency_code,
+                        value?.currency
+                      );
+                      let image = `${familyData?.data?.session_image_server}${localStorage.getItem(
+                        "session_token"
+                      )}/job/${value.job_uid}`;
+                      return (
+                        <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-[60px] h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
+                                <img
+                                  src={image}
+                                  alt="data"
+                                  className="w-full h-full rounded-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 flex items-start gap-1">
+                                  Price:{" "}
+                                  <span className="text-purple">
+                                    {thePrice}
+                                  </span>
+                                </span>
+                                <div className="flex items-center gap-4">
+                                  <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">
+                                      {" "}
+                                      {deliveryDate}
+                                    </span>
+                                  </span>
+                                  <span className="text-sm text-thin-light-gray">
+                                    Sent to:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {value.job_to}
+                                    </span>
+                                  </span>
+                                </div>
+                              </div>
+                            </div>
+                          </td>
+
+                          <td className="text-right py-4 px-2 flex justify-end items-center">
+                            <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>
+                      );
+                    })
+                  ) : (
+                    <tr>
+                      <td className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap text-center py-4 px-2">
+                        No Pending Task!
+                      </td>
+                    </tr>
+                  )}
+                </>
+              }
+            </tbody>
+          </table>
+          {/* PAGINATION BUTTON */}
+          <PaginatedList
+            onClick={handlePagination}
+            prev={currentPage == 0}
+            next={currentPage + itemsPerPage >= filteredFamilyData.length}
+            data={filteredFamilyData}
+            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/FamilyAcc/Tabs/FamilyNewTasks.jsx

@@ -0,0 +1,169 @@
+import React, { useMemo, useState } from "react";
+import { useLocation, useNavigate } from "react-router-dom";
+import Icons from "../../Helpers/Icons";
+import { PriceFormatter } from "../../Helpers/PriceFormatter";
+import { handlePagingFunc } from "../../Pagination/HandlePagination";
+import PaginatedList from "../../Pagination/PaginatedList";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+
+export default function FamilyNewTasks({
+  familyData,
+  className,
+  action,
+}) {
+  let navigate = useNavigate();
+  let { pathname } = useLocation();
+
+  // ...
+  let filteredFamilyData = useMemo(
+    () => familyData?.data?.result_list?.filter((data) => data.family_uid !== ""),
+    [familyData?.data?.result_list]
+  );
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentTasks = filteredFamilyData?.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );
+
+  const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);
+
+  return (
+    <div
+      className={`update-table w-full bg-white dark:bg-dark-white h-full lg:min-h-[538px] overflow-hidden rounded-2xl section-shadow p-3 ${
+        familyData?.data?.result_list?.length <= 0 && "flex items-center justify-center"
+      }`}
+    >
+      {familyData.loading ? (
+        <div className="w-full h-full flex justify-center items-center">
+          <LoadingSpinner size={16} color="sky-blue" height='h-[30rem]' />
+        </div>
+      ) : (
+        <>
+          {familyData?.data?.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>
+                  {
+                    <>
+                      {familyData?.data?.result_list?.length <= 0 ? (
+                        <tr>
+                          <td
+                            colSpan="2"
+                            className="text-center py-4 font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap flex items-center justify-center gap-1"
+                          >
+                            You currently have no active tasks{" "}
+                            <span
+                              className="text-blue-400 cursor-pointer hover:underline transition duration-150"
+                              onClick={action}
+                            >
+                              add new
+                            </span>
+                          </td>
+                        </tr>
+                      ) : (
+                        currentTasks.map((value, index) => {
+                          // find due date
+                          const dueDate = value?.delivery_date.split(" ")[0];
+                          // the price
+                          let thePrice = PriceFormatter(
+                            value?.price * 0.01,
+                            value?.currency_code,
+                            value?.currency
+                          );
+                          let image = `${familyData?.data?.result_list}${localStorage.getItem(
+                            "session_token"
+                          )}/job/${value.job_uid}`;
+                          return (
+                            <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-[60px] h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
+                                    <img
+                                      src={image}
+                                      alt="data"
+                                      className="w-full h-full rounded-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 className="flex flex-col sm:flex-row items-start gap-1 md:gap-4 md:items-center">
+                                      <span className="text-sm text-thin-light-gray flex flex-start gap-1">
+                                        Price:{" "}
+                                        <span className="text-purple">
+                                          {thePrice}
+                                        </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">
+                                        Due Date:{" "}
+                                        <span className="text-purple">
+                                          {" "}
+                                          {dueDate}
+                                        </span>
+                                      </span>
+                                    </div>
+                                  </div>
+                                </div>
+                              </td>
+
+                              <td className="text-right py-4 px-2">
+                                <button
+                                  type="button"
+                                  onClick={() => {
+                                    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"
+                                >
+                                  <Icons name="right-arrow" />
+                                </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) >=
+                  filteredFamilyData?.length
+                    ? true
+                    : false
+                }
+                data={filteredFamilyData}
+                start={indexOfFirstItem}
+                stop={indexOfLastItem}
+              />
+              {/* END OF PAGINATION BUTTON */}
+            </div>
+          )}
+        </>
+      )}
+    </div>
+  );
+}

src/components/FamilyAcc/Tabs/FamilyNewWaitlist.jsx

@@ -0,0 +1,152 @@
+import { useState } from "react";
+import SuggestTask from "../../FamilyPopup/SuggestTask";
+import { PaginatedList, handlePagingFunc } from "../../Pagination";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import AssignTaskPopout from "../FamilyPopout/AssignTaskPopout";
+import Icons from "../../Helpers/Icons";
+
+const FamilyNewWaitlist = ({
+  familyData,
+  className,
+  setUpdatePage
+}) => {
+  const [popUp, setPopUp] = useState({ show: false, data: {} });
+  const [continueTaskPopup, setContinueTaskPopup] = useState({
+    show: false,
+    data: {},
+  });
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const itemsPerPage = Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const indexOfFirstItem = currentPage;
+  const indexOfLastItem = currentPage + itemsPerPage;
+  const currentTask = familyData?.data?.result_list?.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );
+
+  const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);
+
+  const openPopUp = (value) => {
+    setPopUp({ show: true, data: { ...value } });
+  };
+
+  const closePopUp = () => {
+    setPopUp({ show: false, data: {} });
+  };
+
+  const openContinueTaskPopup = (value) => {
+    setContinueTaskPopup({ show: true, data: { ...value } });
+  };
+
+  const closeContinueTaskPopup = () => {
+    setContinueTaskPopup({ show: false, data: {} });
+  };
+
+  console.log("Check this >>",continueTaskPopup)
+
+  return (
+    <div
+      className={`update-table w-full bg-white dark:bg-dark-white h-full lg:min-h-[538px] p-3 overflow-hidden rounded-2xl section-shadow ${
+        className || ""
+      }`}
+    >
+      {familyData.loading ? (
+        <div className="w-full h-full flex justify-center items-center">
+          <LoadingSpinner size={16} color="sky-blue" height='h-[30rem]' />
+        </div>
+      ) : (
+        <>
+          {familyData?.data?.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>
+                  {currentTask.map((value) => {
+                    const addedDate = value?.added.split(" ")[0];
+                    const selectedImage = require(`../../../assets/images/family/${
+                      value?.banner || "default.jpg"
+                    }`);
+                    // console.log("VALUE", value);
+                    // let image = `${familyData?.data?.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}`
+                    return (
+                      <tr
+                        className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50"
+                        key={value.uid}
+                      >
+                        <td className="py-4">
+                          <div className="w-full flex justify-between items-center">
+                            <div className="account-name flex space-x-4 items-center">
+                              <div className="icon w-14 h-14 flex justify-center items-center">
+                                <img
+                                  src={selectedImage}
+                                  alt="task_img"
+                                  className="w-full object-cover"
+                                />
+                              </div>
+                              <div className="">
+                                <p className="text-xl font-bold text-dark-gray dark:text-white mb-2 capitalize line-clamp-1">
+                                  {value.title}
+                                </p>
+                                <p className="text-sm text-thin-light-gray font-medium">
+                                  {value.description}
+                                </p>
+                              </div>
+                            </div>
+                            <div className="px-2 flex flex-col items-center justify-center">
+                              <p className="text-sm font-bold text-dark-gray dark:text-white">
+                                {addedDate}
+                              </p>
+                              <p className="text-xs py-1.5 w-[70px] cursor-default tracking-wide rounded-full bg-gold text-white flex justify-center items-center">
+                                {value.firstname}
+                              </p>
+                            </div>
+                          </div>
+                        </td>
+                        <td className="text-right py-4 px-2 flex justify-end">
+                          <button
+                            onClick={() => openPopUp(value)}
+                            className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                          >
+                            {/* View */}
+                            <Icons name="right-arrow" />
+                          </button>
+                        </td>
+                      </tr>
+                    );
+                  })}
+                </tbody>
+              </table>
+              <PaginatedList
+                onClick={handlePagination}
+                prev={currentPage === 0}
+                next={currentPage + itemsPerPage >= familyData?.data?.result_list?.length}
+                data={familyData?.data?.result_list}
+                start={indexOfFirstItem}
+                stop={indexOfLastItem}
+              />
+            </div>
+          )}
+        </>
+      )}
+      {popUp.show && (
+        <SuggestTask
+          details={popUp.data}
+          onClose={closePopUp}
+          continuePopupData={openContinueTaskPopup}
+          situation={popUp.show}
+        />
+      )}
+
+      {continueTaskPopup.show && (
+        <AssignTaskPopout
+          details={continueTaskPopup.data}
+          action={closeContinueTaskPopup}
+          situation={continueTaskPopup.show}
+          setUpdatePage={setUpdatePage}
+        />
+      )}
+    </div>
+  );
+};
+
+export default FamilyNewWaitlist;

src/components/FamilyAcc/Tabs/FamilyPending.jsx

@@ -3,21 +3,23 @@ import localImgLoad from "../../../lib/localImgLoad";
 import { PriceFormatter } from "../../Helpers/PriceFormatter";
 import { PaginatedList, handlePagingFunc } from "../../Pagination";
 import PendingJobsPopout from "../../jobPopout/PendingJobsPopout";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
 
 export default function FamilyPending({
   familyData,
   className,
   accountDetails,
   loader,
+  setUpdatePage,
 }) {
   let [jobPopout, setJobPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
 
   let filteredFamilyData = useMemo(
     () =>
-      familyData?.result_list?.filter(
+      familyData?.data?.result_list?.filter(
         (data) => data?.family_uid === accountDetails?.family_uid
       ),
-    [accountDetails?.family_uid, familyData?.result_list]
+    [accountDetails?.family_uid, familyData?.data?.result_list]
   );
 
   const [currentPage, setCurrentPage] = useState(0);
@@ -40,6 +42,12 @@ export default function FamilyPending({
         className || ""
       }`}
     >
+      {familyData.loading ? 
+      (<div className="w-full h-full flex justify-center items-center">
+        <LoadingSpinner size={16} color="sky-blue" height='h-[30rem]' />
+      </div>
+      ):
+      <>
       {filteredFamilyData && (
         <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">
@@ -54,7 +62,7 @@ export default function FamilyPending({
                         value?.currency_code,
                         value?.currency
                       );
-                      let image = `${familyData.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}`
+                      let image = `${familyData.data.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}`
                       return (
                         <tr
                           key={index}
@@ -144,6 +152,8 @@ export default function FamilyPending({
           {/* END OF PAGINATION BUTTON */}
         </div>
       )}
+      </>
+      }
 
       {/* Active Job Popout */}
       {jobPopout.show && (
@@ -151,6 +161,7 @@ export default function FamilyPending({
           details={jobPopout.data}
           onClose={() => {
             setJobPopout({ show: false, data: {} });
+            setUpdatePage(prev => !prev);
           }}
           situation={jobPopout.show}
         />

src/components/FamilyAcc/Tabs/FamilyTasks.jsx

@@ -10,7 +10,6 @@ import LoadingSpinner from "../../Spinners/LoadingSpinner";
 export default function FamilyTasks({
   familyData,
   className,
-  loader,
   accountDetails,
 }) {
   let navigate = useNavigate();
@@ -19,17 +18,17 @@ export default function FamilyTasks({
   // ...
   const filteredFamilyData = useMemo(
     () =>
-      familyData?.result_list?.filter(
+      familyData?.data?.result_list?.filter(
         (data) => data?.family_uid === accountDetails?.family_uid
       ),
-    [familyData, accountDetails]
+    [familyData?.data, accountDetails]
   );
 
   const [currentPage, setCurrentPage] = useState(0);
   const indexOfFirstItem = Number(currentPage);
   const indexOfLastItem =
     Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
-  const currentTask = familyData?.result_list.slice(
+  const currentTask = familyData?.data?.result_list?.slice(
     indexOfFirstItem,
     indexOfLastItem
   );
@@ -43,21 +42,21 @@ export default function FamilyTasks({
         className || ""
       }`}
     >
-      {loader ? (
-        <div className="w-full h-full flex justify-center items-center lg:min-h-[470px]">
-          <LoadingSpinner size={16} color="sky-blue" />
+      {familyData.loading ? (
+        <div className="w-full h-full flex justify-center items-center">
+          <LoadingSpinner size={16} color="sky-blue" height='h-[30rem]' />
         </div>
       ) : (
         <>
-          {familyData && familyData?.result_list && (
+          {familyData?.data && familyData?.data?.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>
                   {
                     <>
-                      {familyData &&
-                      familyData?.result_list &&
-                      familyData.result_list.length > 0 ? (
+                      {familyData?.data &&
+                      familyData?.data?.result_list &&
+                      familyData?.data.result_list.length > 0 ? (
                         currentTask.map((value, index) => {
                           // find due date
                           const dueDate = value?.delivery_date.split(" ")[0];
@@ -67,7 +66,7 @@ export default function FamilyTasks({
                             value?.currency_code,
                             value?.currency
                           );
-                          let image = `${familyData.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}`
+                          let image = `${familyData?.data?.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}`
                           return (
                             <tr
                               key={index}
@@ -149,11 +148,11 @@ export default function FamilyTasks({
                 prev={currentPage == 0 ? true : false}
                 next={
                   currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
-                  familyData?.result_list.length
+                  familyData?.data?.result_list.length
                     ? true
                     : false
                 }
-                data={familyData?.result_list}
+                data={familyData?.data?.result_list}
                 start={indexOfFirstItem}
                 stop={indexOfLastItem}
               />

src/components/FamilyAcc/Tabs/FamilyWaitlist.jsx

@@ -5,7 +5,7 @@ import LoadingSpinner from "../../Spinners/LoadingSpinner";
 import AssignTaskPopout from "../FamilyPopout/AssignTaskPopout";
 
 const FamilyWaitlist = memo(
-  ({ familyData, className, accountDetails, loader }) => {
+  ({ familyData, className, accountDetails, setUpdatePage }) => {
     const [popUp, setPopUp] = useState({ show: false, data: {} });
     const [continueTaskPopup, setContinueTaskPopup] = useState({
       show: false,
@@ -13,10 +13,10 @@ const FamilyWaitlist = memo(
     });
     const filteredFamilyData = useMemo(
       () =>
-        familyData?.result_list?.filter(
+        familyData?.data?.result_list?.filter(
           (data) => data?.family_uid === accountDetails?.family_uid
         ),
-      [familyData, accountDetails]
+      [familyData.data, accountDetails]
     );
 
     const [currentPage, setCurrentPage] = useState(0);
@@ -52,9 +52,9 @@ const FamilyWaitlist = memo(
           className || ""
         }`}
       >
-        {loader ? (
-          <div className="w-full h-full flex justify-center items-center lg:min-h-[470px]">
-            <LoadingSpinner size={16} color="sky-blue" />
+        {familyData.loading ? (
+          <div className="w-full h-full flex justify-center items-center">
+            <LoadingSpinner size={16} color="sky-blue" height='h-[30rem]' />
           </div>
         ) : (
           <>
@@ -67,8 +67,7 @@ const FamilyWaitlist = memo(
                       const selectedImage = require(`../../../assets/images/family/${
                         value?.banner || "default.jpg"
                       }`);
-                      console.log('VALUE', value)
-                      // let image = `${familyData.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}`
+                      // let image = `${familyData.data.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}`
                       return (
                         <tr
                           className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50"
@@ -144,6 +143,7 @@ const FamilyWaitlist = memo(
             details={continueTaskPopup.data}
             action={closeContinueTaskPopup}
             situation={continueTaskPopup.show}
+            setUpdatePage={setUpdatePage}
           />
         )}
       </div>

src/components/FamilyAcc/Tabs/FamilyWallet.jsx

@@ -15,7 +15,7 @@ function FamilyWallet({familyData}) {
 
   useEffect(()=>{
     setFamilyWallet({loading:true, data: []})
-    apiUrl.getFamilyWallet({family_uid:familyData?.uid}).then(res => {
+    apiUrl.getKidWallets({family_uid:familyData?.uid}).then(res => {
       setFamilyWallet({loading:false, data: res?.data?.result_list || []})
     }).catch(error => {
       setFamilyWallet({loading:false, data: []})

src/components/FamilyAcc/Tabs/wallet/FamilyAddFundPopout.jsx

@@ -9,8 +9,9 @@ import usersService from "../../../../services/UsersService";
 import LoadingSpinner from "../../../Spinners/LoadingSpinner";
 import { PriceFormatter } from "../../../Helpers/PriceFormatter";
 import { tableReload } from "../../../../store/TableReloads";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { apiConst } from "../../../../lib/apiConst";
+import { SocketValues } from "../../../Contexts/SocketIOContext";
 
 const validationSchema = Yup.object().shape({
   // amount: Yup.string()
@@ -30,6 +31,11 @@ const validationSchema = Yup.object().shape({
 });
 
 function FamilyAddFundPopout({ action, situation, wallet, familyData }) {
+
+  const {userDetails} = useSelector((state) => state?.userDetails); // Gets User Detail
+
+  const { parentAssignJobToKid } = SocketValues() // socket emit event from FULL account
+
   const dispatch = useDispatch();
 
   const apiUrl = new usersService();
@@ -54,6 +60,7 @@ function FamilyAddFundPopout({ action, situation, wallet, familyData }) {
   };
   // FUNCTION TO PERFORM FAMILY TRANSFER
   const handleAddFund = (values) => {
+
     setRequestStatus({ loading: true, status: false, message: "" });
 
     let senderBal = startTransfer?.data?.origing_current_balance || ""; // SENDER'S ACCOUNT BALANCE
@@ -132,6 +139,17 @@ function FamilyAddFundPopout({ action, situation, wallet, familyData }) {
           status: true,
           message: "Transfer Successful",
         });
+
+        //SENDS MESSAGE TO SOCKET TO UPDATE CHILD ACCOUNT
+        // message, room
+        let socketMsg = {
+          "audience": "MEMBER",
+          "action": "REFRESH_WALLET",
+          "family_uid": reqData.family_uid,
+        }
+        let socketRoom = `FAMILY-${userDetails.uid}`
+        parentAssignJobToKid(socketMsg, socketRoom) //SENDS MESSAGE TO SOCKET TO UPDATE CHILD ACCOUNT
+
         setTimeout(() => {
           setRequestStatus({ loading: false, status: false, message: "" });
           dispatch(tableReload({ type: "WALLETTABLE" })); // UPDATES PARENT WALLET ACCOUNT
@@ -170,13 +188,13 @@ function FamilyAddFundPopout({ action, situation, wallet, familyData }) {
   return (
     <ModalCom action={action} situation={situation}>
       <div className="relative logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
-        <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
-          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
             Add Fund
           </h1>
           <button
             type="button"
-            className="text-[#374557] dark:text-red-500"
+            className="modal-close-btn"
             onClick={action}
           >
             <svg
@@ -271,7 +289,7 @@ function FamilyAddFundPopout({ action, situation, wallet, familyData }) {
                       <div className="field w-full mb-[0.5rem]">
                         <div className="w-full">
                           <label
-                            htmlFor="Job Delivery Details"
+                            htmlFor="job-label"
                             className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex items-center gap-1"
                           >
                             Comment

src/components/FamilyAcc/index.jsx

@@ -7,11 +7,13 @@ import React, {
 } from "react";
 import { Link } from "react-router-dom";
 import usersService from "../../services/UsersService";
+import Icons from "../Helpers/Icons";
 import InputCom from "../Helpers/Inputs/InputCom";
 import ModalCom from "../Helpers/ModalCom";
 import Layout from "../Partials/Layout";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import FamilyTable from "./FamilyTable";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
 
 export default function FamilyAcc() {
   // State to store the selected year and month
@@ -107,6 +109,7 @@ export default function FamilyAcc() {
       if (data?.internal_return >= 0 && data?.status === "OK") {
         const { result_list, session_image_server } = data;
         setFamilyList({ result_list, session_image_server });
+        sessionStorage.setItem("family_list", JSON.stringify(result_list))
         setLoader(false);
       } else {
         return;
@@ -136,7 +139,18 @@ export default function FamilyAcc() {
           <div className="sm:flex justify-between items-center mb-6">
             <div className="mb-5 sm:mb-0">
               <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
-                <span className={``}>Family Accounts</span>
+                {/* <span className={``}>Family Accounts</span> */}
+                <div className="mb-5">
+                    <CustomBreadcrumb 
+                    title = {'Family Account'}
+                    breadcrumb={
+                      [
+                        { link: "/", title: "Home" },
+                        { link: "/acc-family", title: "Family Account", active: true},
+                      ]
+                    }
+                    />
+                </div>
                 {familyList?.result_list?.length <
                   process.env.REACT_APP_MAX_FAMILY_MEMBERS &&
                   !loader && (
@@ -150,31 +164,44 @@ export default function FamilyAcc() {
                   )}
               </h1>
             </div>
-            <Link
-              to={`/familysettings`}
-              state={{ imageServer: familyList?.session_image_server }}
-              className="slider-btns flex space-x-4 w-12 h-12 rounded-md shadow-sm justify-center items-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)]"
-            >
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                fill="none"
-                viewBox="0 0 24 24"
-                strokeWidth={1.5}
-                stroke="currentColor"
-                className="w-6 h-6 dark:stroke-white"
+
+            <div className="flex gap-4 items-center">
+              <Link state={familyList} to="/acc-family/activities" className={`nav-item flex items-center rounded-md shadow-sm justify-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)] bg-[#76a5df] text-white px-2 gap-2`}>
+                <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out bg-light-purple dark:bg-dark-light-purple rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+                  <Icons name="pending-job" />
+                </span>
+                <span
+                  className={`item-content relative text-[18px] transition-all duration-300 ease-in-out font-medium dark:text-white h-12 flex items-center`}
+                >
+                  Activities
+                </span>
+              </Link>
+              <Link
+                to={`/familysettings`}
+                state={{ imageServer: familyList?.session_image_server }}
+                className="slider-btns flex space-x-4 w-12 h-12 rounded-md shadow-sm justify-center items-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)] bg-[#76a5df] text-white"
               >
-                <path
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z"
-                />
-                <path
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"
-                />
-              </svg>
-            </Link>
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                  strokeWidth={1.5}
+                  stroke="currentColor"
+                  className="w-6 h-6 dark:stroke-white"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z"
+                  />
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"
+                  />
+                </svg>
+              </Link>
+            </div>
           </div>
           <Suspense fallback={<LoadingSpinner color="sky-blue" size="16" />}>
             <FamilyTable
@@ -221,13 +248,13 @@ const FamilyForm = ({
 }) => {
   return (
     <div className="logout-modal-wrapper w-11/12 lg:w-[460px] bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
-      <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple dark:border-[#5356fb29] ">
-        <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+      <div className="modal-header-con">
+        <h1 className="modal-title">
           Add Members
         </h1>
         <button
           type="button"
-          className="text-[#374557] dark:text-red-500"
+          className="modal-close-btn"
           onClick={popUpHandler}
         >
           <CloseIcon />
@@ -240,8 +267,8 @@ const FamilyForm = ({
           name="first_name"
           type="text"
           parentClass="flex items-center gap-1 w-full"
-          labelClass="flex-[0.2] mb-0"
-          inputClass="flex-[0.8] input-curve lg border border-[#dce4e9]"
+          labelClass="flex-[0.4] mb-0"
+          inputClass="flex-[0.6] input-curve lg border border-[#dce4e9]"
           fieldClass="px-2"
           value={first_name}
           inputHandler={inputHandler}
@@ -252,8 +279,8 @@ const FamilyForm = ({
           name="last_name"
           type="text"
           parentClass="flex items-center gap-1 w-full"
-          labelClass="flex-[0.2] mb-0"
-          inputClass="flex-[0.8] input-curve lg border border-[#dce4e9]"
+          labelClass="flex-[0.4] mb-0"
+          inputClass="flex-[0.6] input-curve lg border border-[#dce4e9]"
           fieldClass="px-2"
           value={last_name}
           inputHandler={inputHandler}
@@ -262,7 +289,7 @@ const FamilyForm = ({
           {/* Age dropdown */}
           <div className="">
             <label
-              className="input-label text-[#181c32] dark:text-white text-[15px] font-semibold"
+              className="job-label"
               htmlFor="age-selection"
             >
               Birthday: (Year/Month)

src/components/FamilyPopup/SuggestTask.jsx

@@ -1,10 +1,9 @@
+import { Form, Formik } from "formik";
 import { useState } from "react";
 import { useLocation } from "react-router-dom";
-import ModalCom from "../Helpers/ModalCom";
-import { Form, Formik } from "formik";
-import InputCom from "../Helpers/Inputs/InputCom";
 import usersService from "../../services/UsersService";
-import Icons from "../Helpers/Icons";
+import InputCom from "../Helpers/Inputs/InputCom";
+import ModalCom from "../Helpers/ModalCom";
 
 const DEFAULT_IMAGE = require("../../assets/images/family/default.jpg");
 const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
@@ -51,26 +50,50 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
   };
 
   const handleParentSuggestion = (values) => {
-    if (suggestedNextStep == "Send Task") {
-      let firstName = state?.firstname;
-      let family_uid = state?.family_uid;
-      continuePopupData({ ...details, firstName, family_uid });
+    if (suggestedNextStep === "Send Task") {
+      let firstname = state?.firstname || details?.firstname;
+      let family_uid = state?.family_uid || details?.family_uid;
+      continuePopupData({
+        ...details,
+        firstname,
+        family_uid,
+      });
     }
     onClose();
   };
 
+  const isActivitiesPage = pathname === "/acc-family/activities";
+  const isManageFamilyPage = pathname === "/manage-family";
+
+  const getButtonText = () => {
+    if (isActivitiesPage) {
+      return suggestedNextStep === "Send Task" ? "Continue" : "Complete";
+    } else {
+      if (!isManageFamilyPage) {
+        if (submitTask.loading) return "Submitting Task";
+        if (submitTask.state === "success") return "Task Submitted";
+        if (submitTask.state === "bad") return "An Error Occurred";
+        return "Send to Parents";
+      } else {
+        return suggestedNextStep === "Send Task" ? "Continue" : "Complete";
+      }
+    }
+  };
+
   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-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
-          <h1 className="text-base md:text-lg font-bold text-dark-gray dark:text-white tracking-wide">
-            {pathname === "/manage-family"
+      <div className="logout-modal-wrapper lw-[90%] md:w-[48rem] min-h-[500px] bg-white dark:bg-dark-white lg:rounded-2xl">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
+            {isManageFamilyPage
               ? `${state?.firstname}'s Suggested Task`
+              : isActivitiesPage
+              ? `${details?.firstname}'s Suggested Task`
               : "Suggest to Parent"}
           </h1>
           <button
             type="button"
-            className="text-[#374557] dark:text-red-500"
+            className="modal-close-btn"
             onClick={onClose}
           >
             <svg
@@ -97,19 +120,21 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
         <Formik
           initialValues={initialValues}
           onSubmit={
-            pathname !== "/manage-family"
-              ? handleSuggestedTask
-              : handleParentSuggestion
+            isActivitiesPage
+              ? handleParentSuggestion
+              : isManageFamilyPage
+              ? handleParentSuggestion
+              : handleSuggestedTask
           }
         >
           {(props) => {
             return (
-              <Form>
-                <div className="p-5 w-full bg-white rounded-md flex justify-between">
+              <Form className="h-[33.875rem] flex flex-col">
+                <div className="px-5 w-full bg-white rounded-md flex justify-between items-center h-full">
                   {/* Image Section */}
-                  <div className="p-4 w-full md:w-2/4 md:border-r-2">
+                  <div className="p-4 w-full md:w-2/4 md:border-r-2 h-full flex items-center">
                     <div
-                      className="w-full h-[236px] p-6 bg-gray-400 rounded-xl overflow-hidden"
+                      className="w-full h-[14.75rem] p-6 bg-gray-400 rounded-xl overflow-hidden"
                       style={{
                         background: `url(${selectedImage}) center / contain no-repeat`,
                       }}
@@ -117,17 +142,22 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                   </div>
 
                   {/* ACTION SECTION */}
-                  <div className="p-4 w-full md:w-2/4 h-full">
+                  <div className="p-4 w-full md:w-2/4 h-full flex flex-col justify-between">
                     {/* Title */}
-                    <div className="field w-full mb-[15px]">
+                    <div className="field w-full mb-[.9375rem]">
                       <InputCom
                         fieldClass={
-                          pathname === "/manage-family" ? "px-2" : "px-6"
+                          pathname === "/manage-family" ||
+                          pathname === "/acc-family/activities"
+                            ? "px-2"
+                            : "px-6"
                         }
                         label="Title"
+                        labalClass="text-[1.125rem]"
                         labelClass="tracking-wide"
                         inputBg={
-                          pathname === "/manage-family"
+                          pathname === "/manage-family" ||
+                          pathname === "/acc-family/activities"
                             ? "bg-white"
                             : "bg-slate-100"
                         }
@@ -147,15 +177,15 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                     </div>
 
                     {/* Description */}
-                    <div className="field w-full mb-[5px]">
+                    <div className="w-full mb-[.3125rem]">
                       <label
                         htmlFor="description"
-                        className='className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex items-center gap-1'
+                        className='job-label'
                       >
                         Description
                         {props.errors.description &&
                           props.touched.description && (
-                            <span className="text-[12px] text-red-500">
+                            <span className="text-[.75rem] text-red-500">
                               {props.errors.description}
                             </span>
                           )}
@@ -164,9 +194,10 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                         id="description"
                         rows="5"
                         className={`input-field pt-2 placeholder:text-base text-dark-gray dark:text-white w-full ${
-                          pathname === "/manage-family"
-                            ? "px-2 h-[110px]"
-                            : "bg-slate-100 px-3 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px] h-[130px]"
+                          pathname === "/manage-family" ||
+                          pathname === "/acc-family/activities"
+                            ? "px-2 h-[6.875rem]"
+                            : "bg-slate-100 px-3 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[.625rem] h-[8.125rem]"
                         }`}
                         style={{ resize: "none" }}
                         name="description"
@@ -177,8 +208,9 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                     </div>
 
                     {/* Radio buttons for family */}
-                    {pathname === "/manage-family" ? (
-                      <div className="h-[20px] w-full border-t dark:border-[#5356fb29] border-light-purple relative">
+                    {pathname === "/manage-family" ||
+                    pathname === "/acc-family/activities" ? (
+                      <div className="h-[3.75rem] w-full border-t dark:border-[#5356fb29] border-light-purple relative">
                         <div id="my-radio-group" className="sr-only">
                           Parent suggested next step
                         </div>
@@ -196,7 +228,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                               role="group"
                               key={idx}
                               htmlFor={`parent-suggested-${idx}`}
-                              className={`transition duration-150 ease-in-out parent-suggest group cursor-pointer`}
+                              className={`transition duration-150 ease-in-out parent-suggest group cursor-pointer flex items-center`}
                               onClick={() => setSuggestedNextStep(title)}
                             >
                               <input
@@ -205,19 +237,19 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                                 value={title}
                                 checked={suggestedNextStep === title}
                                 onChange={switchNextStep}
-                                className={`transition duration-150 ease-in-out parent-suggest pointer-events-none`}
+                                className={`transition duration-150 ease-in-out parent-suggest pointer-events-none w-[1.125rem] h-[1.125rem]`}
                               />
                               <span
                                 onClick={() => setSuggestedNextStep(title)}
                                 id={`parent-suggested-${idx}`}
                                 name="parent-suggested"
                                 className={`ml-1 ${
-                                  title == "Not Now"
+                                  title === "Not Now"
                                     ? "text-red-500"
-                                    : title == "Duplicate"
+                                    : title === "Duplicate"
                                     ? "text-purple"
                                     : "text-black"
-                                } font-semibold`}
+                                } font-semibold text-[1.125rem]`}
                               >
                                 {title}
                               </span>
@@ -229,7 +261,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                   </div>
                 </div>
 
-                <div className="w-full h-[70px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
+                <div className="w-full h-[4.375rem] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
                   <div className="flex items-center space-x-4 mr-9">
                     <button
                       type="button"
@@ -243,19 +275,9 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                       disabled={props.isSubmitting}
                       className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full transition duration-150 ease-in-out flex items-center"
                     >
-                      {pathname !== "/manage-family" ? (
+                      {/* {pathname === "/acc-family/activities" ? (
                         <>
-                          {submitTask.loading
-                            ? "Submitting Task"
-                            : submitTask.state == "success"
-                            ? "Task Submitted"
-                            : submitTask.state == "bad"
-                            ? "An Error Occurred"
-                            : "Send to Parents"}
-                        </>
-                      ) : (
-                        <>
-                          {suggestedNextStep == "Send Task" ? (
+                          {suggestedNextStep === "Send Task" ? (
                             <>
                               Continue <Icons name="chevron-right" />
                             </>
@@ -263,7 +285,32 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                             "Complete"
                           )}
                         </>
-                      )}
+                      ) : (
+                        <>
+                          {pathname !== "/manage-family" ? (
+                            <>
+                              {submitTask.loading
+                                ? "Submitting Task"
+                                : submitTask.state === "success"
+                                ? "Task Submitted"
+                                : submitTask.state === "bad"
+                                ? "An Error Occurred"
+                                : "Send to Parents"}
+                            </>
+                          ) : (
+                            <>
+                              {suggestedNextStep === "Send Task" ? (
+                                <>
+                                  Continue <Icons name="chevron-right" />
+                                </>
+                              ) : (
+                                "Complete"
+                              )}
+                            </>
+                          )}
+                        </>
+                      )} */}
+                      {getButtonText()}
                     </button>
                   </div>
                 </div>

src/components/Helpers/DataIteration.jsx

@@ -7,7 +7,7 @@ function DataIteration(props) {
       {datas &&
         datas?.length >= endLength &&
         datas?.slice(startLength, endLength)
-          .map((value) => children({ datas: value }))}
+          .map((value, index) => children({ datas: value, index }))}
     </>
   );
 }

src/components/Helpers/Inputs/InputCom/index.jsx

@@ -14,6 +14,7 @@ export default function InputCom({
   forgotPassword,
   parentClass,
   labelClass,
+  labalClass,
   inputClass,
   fieldClass,
   onClick,
@@ -53,7 +54,7 @@ export default function InputCom({
       <div className={`flex items-center justify-between mb-2.5 ${labelClass}`}>
         {label && (
           <label
-            className="input-label text-[#181c32] text-[13.975px] leading-[20.9625px] font-semibold flex items-center gap-1"
+            className={`job-label ${error && 'job-label-flex'} ${labalClass}`}
             htmlFor={name}
           >
             {label}

src/components/Home/FamilyDash.jsx

@@ -5,15 +5,16 @@ import MyOffersFamilyTable from "../MyTasks/MyOffersFamilyTable";
 import FamilyActiveLSlde from "./FamilyActiveLSlde";
 import { useDispatch, useSelector } from "react-redux";
 import { tableReload } from "../../store/TableReloads";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
 
-export default function FamilyDash({ familyOffers, MyActiveJobList }) {
+export default function FamilyDash({ MyActiveJobList=[], serverImg }) {
   // console.log("PROPS IN FAMILY DASH->", familyOffers?.result_list);
 
   const dispatch = useDispatch();
   
   const userApi = new usersService();
 
-  const trending = MyActiveJobList;
+  // const trending = MyActiveJobList;
   
   const { familyBannersList } = useSelector((state) => state.familyBannersList);
 
@@ -23,25 +24,6 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) {
 
   let [reloadBanner, setReloadBanner] = useState(0)
 
-  // DO NOT UNCOMMENT THE CODE BELOW
-  
-  // let [familyBannersList, setFamilyBannersList] = useState({loading:false, result:{}})
-  // const getFamilyBanners = async () => { // FUNCTION TO GET FAMILY BANNERS
-  //   setFamilyBannersList({loading:true, result:[]});
-  //   try {
-  //     const res = await userApi.getFamilyBannersList();
-  //     setFamilyBannersList({loading:false, result:res.data});
-  //     console.log('TEST RESPONSE', res.data)
-  //   } catch (error) {
-  //     setFamilyBannersList({loading:false, result:[]});
-  //     console.log("Error getting tasks");
-  //   }
-  // };
-
-  // useEffect(()=>{
-  //   getFamilyBanners()
-  // },[])
-
   useEffect(()=>{
     if(reloadBanner >= 2){
       dispatch(tableReload({ type: "FAMILYBANNERSLIST" })); // RELOAD FAMILY BANNERS LIST EVERY 10 MINS
@@ -59,31 +41,36 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) {
   return (
     <div>
       <div className="home-page-wrapper">
-        {/* <CommonHead commonHeadData={props.commonHeadData} /> */}
-
         {/* Header */}
-        <div className="text-white mb-4 p-2 w-full rounded-xl bg-sky-blue place-content-center">
-          <div className="w-full flex flex-wrap gap-x-4">
-            <p className="text-lg font-normal leading-5">Welcome</p>
-            <div className="">
-              <h1 className="text-lg font-normal leading-5">{`${userDetails?.firstname} ${userDetails?.lastname}`}</h1>
+        <div className="text-white mb-4 min-h-[3rem] px-2 w-full flex justify-between items-center rounded-xl bg-family-header-bg">
+          <div className="w-full">
+            <div className="w-full flex flex-wrap gap-x-4 ">
+              <p className="text-lg font-normal leading-5">Welcome</p>
+              <div className="">
+                <h1 className="text-lg font-normal leading-5">{`${userDetails?.firstname} ${userDetails?.lastname}`}</h1>
+              </div>
             </div>
           </div>
-          <div className="w-full text-sm flex justify-end items-end">
+          <div className="py-1 w-full text-sm text-right self-end">
             <p className="leading-4">Last Login: {`${userDetails?.last_login.split(' ')[0]}`}</p>
           </div>
         </div>
 
         {process.env.REACT_APP_SHOW_NEW_FAMILY_DASH == '1' &&
         <>
-          {familyBannersList?.result_list && Object.keys(familyBannersList?.result_list).length > 0 &&
+          {familyBannersList?.loading ?
+          <div className="w-full bg-white rounded-2xl">
+            <LoadingSpinner size='10' color='sky-blue' height='h-[20rem]' />
+          </div>
+          :
+          familyBannersList?.result_list && Object.keys(familyBannersList?.result_list).length > 0 ?
             // Loop for Family Banners
             <div className="w-full mb-4 grid grid-cols-2 md:grid-cols-3 gap-2 md:gap-4">
               {Object.keys(familyBannersList?.result_list).map((item, index) => {
                 let content = familyBannersList?.result_list[item]
-                let action = item == 'recommend' ? 'familymarket' : 'mytask'
+                // let action = item == 'recommend' ? 'familymarket' : 'mytask'
                 return (
-                  <Link key={item} to={`/${action}`} className={`rounded-xl bg-white dark:bg-dark-white shadow-md flex justify-center items-center transition-all duration-300 hover:shadow-sm`}>
+                  <Link key={item} to={`/${content.banner.action}`} className={`rounded-xl bg-white dark:bg-dark-white shadow-md flex justify-center items-center transition-all duration-300 hover:shadow-sm`}>
                     <div className="h-full w-full">
                       <img className="w-full h-[10rem] object-cover rounded-t-xl" src={content.banner.image} alt='banner image' />
                       <div className="flex flex-col justify-between">
@@ -97,6 +84,8 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) {
                 )
               })}
             </div>
+            :
+            null
           }
           
           {tab_categories?.data &&
@@ -104,9 +93,10 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) {
             <h1 className="my-4 text-26 font-bold text-dark-gray dark:text-white tracking-wide">Resources</h1>
             <div className="w-full grid grid-cols-2 md:grid-cols-4 gap-2 md:gap-4">
               {tab_categories.data.map((item) => {
-                if(item.enabled){
+                // if(item.enabled){
+                // }
                 return (
-                  <Link key={item.uid} to={item?.action} className={`group rounded-xl bg-white dark:bg-dark-white shadow-md flex justify-center items-center transition-all duration-300 hover:shadow-sm`}>
+                  <Link key={item.uid} to={`/${item?.action}`} className={`group rounded-xl bg-white dark:bg-dark-white shadow-md flex justify-center items-center transition-all duration-300 hover:shadow-sm`}>
                     <div className="h-full w-full">
                       <div className="w-full h-[8rem] rounded-t-xl overflow-hidden">
                         <img className="w-full h-full group-hover:scale-110 object-cover transition-all duration-300" src={item?.banner} alt='banner image' />
@@ -123,7 +113,7 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) {
                       </div>
                     </div>
                   </Link>
-                  )}
+                  )
                 })}
             </div>
           </div>
@@ -131,20 +121,21 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) {
         </>
         }
 
-        {familyOffers?.result_list && familyOffers?.result_list.length > 0 && (
+        {/* {familyOffers?.result_list && familyOffers?.result_list.length > 0 && (
           <MyOffersFamilyTable
             familyOffers={familyOffers?.result_list}
             image_server={familyOffers?.session_image_server}
             className="mb-10"
           />
-        )}
-        {trending && trending.length > 0 && (
+        )} */}
+
+        {/* {trending && trending.length > 0 && (
           <FamilyActiveLSlde
             trending={trending}
             className="mb-10"
-            image_server={familyOffers?.session_image_server}
+            image_server={serverImg}
           />
-        )}
+        )} */}
       </div>
     </div>
   );

src/components/Home/FullAccountDash.jsx

@@ -8,8 +8,6 @@ import {
 } from "../Dashboards";
 import MyJobTable from "../MyTasks/MyJobTable";
 import MyOffersTable from "../MyTasks/MyOffersTable";
-import LoadingSpinner from "../Spinners/LoadingSpinner";
-import HomeActivities from "./HomeActivities";
 
 export default function FullAccountDash(props) {
   // console.log("PROPS IN HOME->", props);
@@ -86,24 +84,17 @@ export default function FullAccountDash(props) {
               imageServer={props.offersList?.data?.session_image_server}
             />
           </>
-        ) : !props.offersList?.loading && !props.MyActiveJobList?.loading ? (
-          <HomeActivities className="mb-10" />
-        ) : (
-          <div className="w-full h-[220px] flex items-center justify-center">
-            <LoadingSpinner size="16" color="sky-blue" />
-          </div>
-        )}
-
-        {/*<UpdateTable className="mb-10"/>*/}
-        {/*<SellHistoryMarketVisitorAnalytic className="mb-10"/>*/}
-        {/*<TopSellerTopBuyerSliderSection className="mb-10" />*/}
-
-        {/*<HomeTaskDisplay*/}
-        {/*    jobData={jobData}*/}
-        {/*    className="mb-10"*/}
-        {/*    bannerList={props.bannerList}*/}
-        {/*/>*/}
+        ) : null}
       </div>
     </>
   );
 }
+
+// : !props.offersList?.loading && !props.MyActiveJobList?.loading ? (
+//   <HomeActivities className="mb-10" />
+// ) 
+// : (
+//   <div className="w-full h-[220px] flex items-center justify-center">
+//     <LoadingSpinner size="16" color="sky-blue" />
+//   </div>
+// )

src/components/Home/HomeActivities.jsx

@@ -53,7 +53,7 @@ export default function HomeActivities({ className }) {
 
   return (
     <div
-      className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow relative min-h-[520px] ${
+      className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl relative min-h-[520px] ${
         className || ""
       }`}
     >

src/components/Home/index.jsx

@@ -58,14 +58,11 @@ export default function Home(props) {
 
   useEffect(() => {
     const fetchData = async () => {
-      await Promise.all([getHomeDate(), getMyOffersList()]);
+      await Promise.all([getHomeDate(), getMyOffersList(), getMyActiveJobList()]);
     };
-
-    fetchData();
-  }, []);
-
-  useEffect(() => {
-    getMyActiveJobList();
+    if(userDetails?.account_type == 'FULL'){
+      fetchData();
+    }
   }, []);
 
   return (
@@ -75,8 +72,9 @@ export default function Home(props) {
           <FamilyDash
             account={userDetails}
             commonHeadData={props.bannerList}
-            familyOffers={MyOffersList?.data}
-            MyActiveJobList={MyActiveJobList?.data}
+            // familyOffers={MyOffersList?.data}
+            serverImg = {userDetails?.session_image_server}
+            // MyActiveJobList={MyActiveJobList?.data}
           />
         ) : userDetails && userDetails?.account_type == "FULL" ? (
           <FullAccountDash
@@ -95,21 +93,3 @@ export default function Home(props) {
     </Layout>
   );
 }
-// /*
-//      <Layout>
-//             <div className="home-page-wrapper">
-//                 <Hero className="mb-10" data={userDetails} />
-//                 {/* <CreateNft />
-//         <TrendingSection trending={trending} className="mb-10" />*/}
-// <HomeTaskDisplay
-//     jobData={jobData}
-//     className="mb-10"
-//     bannerList={props.bannerList}
-// />
-{
-  /*  <SellHistoryMarketVisitorAnalytic className="mb-10"/>
-                <TopSellerTopBuyerSliderSection className="mb-10" />
-                <UpdateTable className="mb-10"/>*/
-}
-// </div>
-// </Layout>

src/components/Iframe/Iframe.jsx

@@ -0,0 +1,12 @@
+import React from 'react'
+
+export default function Iframe({src, title}) {
+  return (
+    <iframe 
+        src={src}
+        title={title}
+        className='w-full h-full' 
+    >
+    </iframe>
+  )
+}

src/components/ImageCon/ImageElement.jsx

@@ -0,0 +1,9 @@
+import React from 'react'
+
+export default function ImageElement({className, src, alt}) {
+  return (
+    <div className='w-full h-full flex justify-center items-center'>
+        <img src={src} alt={alt} className={`object-cover w-auto h-full ${className && className}`} />
+    </div>
+  )
+}

src/components/JobGroups/AddGroup.jsx

@@ -89,13 +89,13 @@ export default function AddGroup({ action, situation, setUpdateList }) {
   return (
     <ModalCom action={action} situation={situation}>
       <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
-        <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
-          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
             Add Group
           </h1>
           <button
             type="button"
-            className="text-[#374557] dark:text-red-500"
+            className="modal-close-btn"
             onClick={action}
           >
             <svg
@@ -139,9 +139,9 @@ export default function AddGroup({ action, situation, setUpdateList }) {
             <button
               onClick={action}
               type="button"
-              className="text-base text-light-red tracking-wide "
+              className="w-[152px] h-[46px] flex justify-center items-center rounded-full text-base text-light-red tracking-wide border border-light-red"
             >
-              <span className="border-b dark:border-[#5356fb29]  border-light-red">
+              <span className="">
                 Cancel
               </span>
             </button>

src/components/JobGroups/DeleteMember.jsx

@@ -21,13 +21,13 @@ export default function DeleteMember({action, situation, details}) {
         situation={situation}
     >
       <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
-        <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
-          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
             Remove Member
           </h1>
           <button
             type="button"
-            className="text-[#374557] dark:text-red-500"
+            className="modal-close-btn"
             onClick={action}
           >
             <svg

src/components/JobGroups/MemberList.jsx

@@ -24,12 +24,6 @@ export default function MemberList({
 
   const handleFieldsChange = ({ target: { name, value } }) => {
     setFields((prev) => ({ ...prev, [name]: value }));
-    // let error = requestState?.errors?.indexOf(name) //// checks if the input field was in error array and removes it when the input changes
-    // if(error >= 0){
-    //   let oldErrorArr = requestState.errors
-    //   let newErrorArr = oldErrorArr.splice(error, 1)
-    //   setRequestState(prev => ({...prev, errors:oldErrorArr}))
-    // }
 
     if (value == "") {
       setRequestState({
@@ -89,6 +83,63 @@ export default function MemberList({
     // return
     // }
 
+    if(fields.firstname.length > 25){ // checks if firstname length is more than 25
+      setRequestState({
+        loading: false,
+        status: false,
+        message: "Firstname must not be more than 25 characters",
+        data: [],
+        errors: [],
+      });
+      return setTimeout(() => {
+        setRequestState({
+          loading: false,
+          status: false,
+          message: "",
+          data: [],
+          errors: [],
+        });
+      }, 3000);
+    }
+
+    if(fields.lastname.length > 25){ // checks if lastname length is more than 25
+      setRequestState({
+        loading: false,
+        status: false,
+        message: "Lastname must not be more than 25 characters",
+        data: [],
+        errors: [],
+      });
+      return setTimeout(() => {
+        setRequestState({
+          loading: false,
+          status: false,
+          message: "",
+          data: [],
+          errors: [],
+        });
+      }, 3000);
+    }
+
+    if(fields.email.length > 45){ // checks if email length is more than 45
+      setRequestState({
+        loading: false,
+        status: false,
+        message: "Email must not be more than 45 characters",
+        data: [],
+        errors: [],
+      });
+      return setTimeout(() => {
+        setRequestState({
+          loading: false,
+          status: false,
+          message: "",
+          data: [],
+          errors: [],
+        });
+      }, 3000);
+    }
+
     //checks if email is a valid email address
     let regEx = /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/;
     if (!EmailValidator(fields.email)) {
@@ -201,7 +252,7 @@ export default function MemberList({
               {selectedGroup?.name}
             </h1>
             <div className="w-full flex flex-col-reverse lg:flex-col">
-              <div className="py-3 w-full">
+              <div className="relative py-3 w-full">
                 <div className="relative grid grid-cols-1 sm:grid-cols-2 gap-2 place-content-center">
                   <div className="input-item">
                     <InputCom
@@ -229,12 +280,15 @@ export default function MemberList({
                       // iconName="message"
                     />
                   </div>
-                  <div className="input-item w-full sm:w-[150%]">
+                </div>
+                <div className="sm:flex gap-2 items-center">
+                  <div className="input-item my-2 w-full sm:w-9/12">
                     <InputCom
                       labelClass="tracking-wider"
                       fieldClass="sm:px-6 px-2"
                       value={fields.email}
                       inputHandler={handleFieldsChange}
+                      inputClass=""
                       placeholder="Email"
                       // label="Email"
                       name="email"
@@ -242,7 +296,7 @@ export default function MemberList({
                       // iconName="message"
                     />
                   </div>
-                  <div className="flex justify-end items-end">
+                  <div className="flex justify-end items-end w-full sm:w-3/12">
                     {requestState.loading ? (
                       <LoadingSpinner size="8" color="sky-blue" />
                     ) : (
@@ -265,10 +319,11 @@ export default function MemberList({
                       </button>
                     )}
                   </div>
-
+                </div>
+                <div className="absolute top-full w-full my-1 text-center">
                   {!requestState.loading && requestState.message && (
                     <p
-                      className={`text-lg absolute -bottom-7 left-0 ${
+                      className={`text-base ${
                         requestState.status ? "text-green-500" : "text-red-500"
                       }`}
                     >

src/components/MarketPlace/MainSection.jsx

@@ -4,6 +4,8 @@ import ListView from "../../assets/images/list-view.png";
 import AvailableJobsCard from "../Cards/AvailableJobsCard";
 import DataIteration from "../Helpers/DataIteration";
 import SelectBox from "../Helpers/SelectBox";
+import NewPaginatedList from "../Pagination/NewPaginatedList";
+import InfiniteScroll from "../infiniteScroll/InfiniteScroll";
 
 export default function MainSection({
   className,
@@ -18,7 +20,7 @@ export default function MainSection({
   );
   const [tab, setTab] = useState(Object.keys(marketCategories)[0]);
 
-  let [contentDisplay, setContentDisplay] = useState("grid"); // STATE TO HOLD LIST VIEW STYLE
+  let [contentDisplay, setContentDisplay] = useState("list"); // STATE TO HOLD LIST VIEW STYLE
 
   // Convert to array in order to map
   const mappedArray = Object.entries(marketCategories).map(([key, value]) => {
@@ -95,7 +97,9 @@ export default function MainSection({
           </div>
           {/* end of contentDisplay toggler */}
         </div>
-        <div className="filter-navigate-content w-full min-h-screen">
+
+        {/* OLD MARKET JOB LISTING */}
+        {/* <div className="filter-navigate-content w-full min-h-screen">
           <div
             className={
               contentDisplay == "grid"
@@ -108,8 +112,8 @@ export default function MainSection({
               startLength={process.env.REACT_APP_ZERO_STATE}
               endLength={products?.length}
             >
-              {({ datas }) => (
-                <div key={datas.job_uid}>
+              {({ datas, index }) => (
+                <div key={datas.job_uid+index}>
                   <AvailableJobsCard
                     contentDisplay={contentDisplay}
                     image_server={image_server}
@@ -119,7 +123,78 @@ export default function MainSection({
               )}
             </DataIteration>
           </div>
+        </div> */}
+        {/* END OF OLD MARKET JOB LISTING */}
+
+        {products?.length ?
+        <NewPaginatedList
+            data={products}
+            itemsPerPage={9}
+            filterItem=''
+            tableTitle='' 
+        >
+          {
+            ({data})=>(
+              <div className="filter-navigate-content w-full min-h-[600px]">
+                <div
+                  className={
+                    contentDisplay == "grid"
+                      ? "grid lg:grid-cols-3 sm:grid-cols-2 gap-[30px]"
+                      : "w-full"
+                  }
+                >
+                {
+                  data.map((datum, index) => (
+                    <div key={datum.job_uid+index}>
+                      <AvailableJobsCard
+                        contentDisplay={contentDisplay}
+                        image_server={image_server}
+                        datas={datum}
+                      />
+                    </div>
+                  ))
+                }
+                </div>
+              </div>
+            )
+          }
+        </NewPaginatedList>
+        // <InfiniteScroll
+        // allData={products}
+        // addItemBy={3}
+        // intialItemsToShow={9}
+        // >
+        //   {
+        //     ({dataToShow})=>(
+        //       <div className="filter-navigate-content w-full min-h-[600px]">
+        //         <div
+        //           className={
+        //             contentDisplay == "grid"
+        //               ? "grid lg:grid-cols-3 sm:grid-cols-2 gap-[30px]"
+        //               : "w-full"
+        //           }
+        //         >
+        //         {
+        //           dataToShow.map((datum, index) => (
+        //             <div key={datum.job_uid+index}>
+        //               <AvailableJobsCard
+        //                 contentDisplay={contentDisplay}
+        //                 image_server={image_server}
+        //                 datas={datum}
+        //               />
+        //             </div>
+        //           ))
+        //         }
+        //         </div>
+        //       </div>
+        //     )
+        //   }
+        // </InfiniteScroll>
+        :
+        <div className="w-full h-[40rem] bg-white dark:bg-dark-white flex justify-center items-center">
+          No Jobs Found!
         </div>
+        }
       </div>
     </div>
   );

src/components/MarketPlace/PopUp/MarketPopUp.jsx

@@ -1,11 +1,27 @@
-import { useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { toast } from "react-toastify";
 import usersService from "../../../services/UsersService";
 import ModalCom from "../../Helpers/ModalCom";
 import { PriceFormatter } from "../../Helpers/PriceFormatter";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import { SocketValues } from "../../Contexts/SocketIOContext";
 
 const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
+
+  let {sendJobInterestToOwner} = SocketValues() // function to emit job interest request
+  const emitOfferInterest = () => {
+    let message = {
+      "audience": "MERCHANT", 
+      "action": "REFRESH_OFFERS",
+      "offer_code": details?.offer_code,
+      "offer_uid": details?.offer_uid,
+      "job_uid": details?.job_uid,
+      "market_uid": details?.market_uid
+    }
+    let room = `INTEREST-${details?.market_uid}`
+    sendJobInterestToOwner(message, room)
+  }
+
   const [textValue, setTextValue] = useState("");
   const [errMsg, setErrMsg] = useState({
     market: false,
@@ -88,7 +104,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
             state: true,
           });
         }
-
+        emitOfferInterest() // FUNCTIONS TO EMIT EVENT INDICATING SOMEONE SENDS AN INTEREST IN YOUR JOB
         setTimeout(() => setManageInt({ msg: "" }), 3000);
       } catch (error) {
         throw new Error(error);
@@ -118,9 +134,9 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
 
   return (
     <ModalCom action={onClose} situation={situation}>
-      <div className="logout-modal-wrapper w-11/12 md:w-[650px] md:h-[580px] h-full bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
-        <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px]">
-          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+      <div className="w-11/12 md:w-[650px] bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
             {details.offer_code}
           </h1>
           <CloseIcon onClose={onClose} />
@@ -128,7 +144,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
 
         <div className="md:flex bg-white dark:bg-dark-white text-slate-900 dark:text-white rounded-lg">
           <div className="p-4 w-full md:w-[75%] md:border-r-1">
-            <div className="max-h-[240px] h-full">
+            <div className="min-h-[240px]">
               <h2 className="font-semibold text-slate-900 dark:text-white tracking-wide">
                 {details?.title}
               </h2>
@@ -153,7 +169,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
                 },
               ].map(({ name, content, danger }, idx) => (
                 <div className={`my-3 md:flex items-center`} key={idx}>
-                  <label className="w-full md:w-[19%] tracking-wide font-semibold whitespace-pre-wrap">
+                  <label className="job-label w-full md:w-[19%]">
                     {name}
                   </label>
                   <div
@@ -198,7 +214,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
             <hr />
             <div className="w-full flex flex-col gap-3">
               <div className="w-full">
-                <label className="w-full text-slate-900 dark:text-white tracking-wide font-semibold">
+                <label className="job-label w-full">
                   If you have any questions about this task:
                 </label>
                 <textarea
@@ -218,7 +234,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
                   {errMsg.market && "Something went wrong"}
                 </span>
                 <button
-                  className="self-end w-[150px] h-[48px] rounded-full text-base bg-yellow-500 text-white"
+                  className="custom-btn self-end bg-yellow-500 text-white"
                   name="market-message"
                   onClick={MarketDetail}
                 >
@@ -235,19 +251,21 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
           <div className="w-full md:w-[23%] h-full flex flex-col">
             <div className="mx-auto bg-[#f1f8ff] dark:bg-[#C2C8D3] px-4 rounded-md md:min-h-[420px] flex flex-col justify-between">
               <div className="w-full flex flex-col justify-center pb-4 gap-2">
-                <p className="w-full text-slate-900 tracking-wide my-1 font-semibold">
+                <p className="job-label w-full">
                   Interested in the task?
                 </p>
                 <hr />
                 <button
-                  className="bg-[#57cd89] text-center text-lg font-semibold text-white py-2 px-4 rounded-md inline-flex sm:flex-col flex-row sm:gap-0 gap-1 items-center justify-center"
+                  className="btn-gradient text-white px-2 py-2 border-4 border-slate-300 text-lg lg:text-xl font-medium rounded-2xl"
                   name="market-interest"
                   onClick={ManageInterest}
                 >
                   {" "}
-                  <span>Send</span>
-                  <span>Interest</span>
-                  <span>Request</span>
+                  <div className="w-full flex flex-col justify-between gap-2">
+                    <span>Send</span>
+                    <span>Interest</span>
+                    <span>Request</span>
+                  </div>
                 </button>
                 <>
                   {manageInt.loading ? (
@@ -270,33 +288,39 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
 
               <div className="text-slate-900">
                 <p className="flex items-center tracking-wide">
-                  Interest: <b className="ml-1">{details.interest_count}</b>
+                  <span className="job-label">Interest: </span> <b className="ml-1">{details.interest_count}</b>
                 </p>
                 <hr />
-                <p className="my-1">Expire: {details.expire}</p>
+                <p className="my-1 flex flex-col">
+                  <span className="job-label">Expire: </span> 
+                  <span> {new Date(details.expire).toLocaleString()} </span>
+                </p>
               </div>
             </div>
-            <button
-              className="self-center w-[150px] mt-2 h-[48px] rounded-full text-base bg-transparent border border-red-500 text-red-500 mx-auto"
-              name="cancel"
-              onClick={onClose}
-            >
-              Cancel
-            </button>
           </div>
           {/* END OF ACTION SECTION */}
         </div>
+        <div className="modal-footer-wrapper">
+          <button
+            className="custom-btn bg-transparent border border-red-500 text-red-500 ml-auto"
+            name="cancel"
+            onClick={onClose}
+          >
+            Cancel
+          </button>
+        </div>
       </div>
     </ModalCom>
   );
 };
 
+
 export default MarketPopUp;
 
 const CloseIcon = ({ onClose }) => (
   <button
     type="button"
-    className="text-[#374557] dark:text-red-500"
+    className="modal-close-btn"
     onClick={onClose}
   >
     <svg

src/components/MarketPlace/index.jsx

@@ -2,6 +2,8 @@ import { useSelector } from "react-redux";
 import Layout from "../Partials/Layout";
 import CommonHead from "../UserHeader/CommonHead";
 import MainSection from "./MainSection";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
 
 export default function MarketPlace({ commonHeadData }) {
   let { jobLists } = useSelector((state) => state.jobLists);
@@ -13,12 +15,29 @@ export default function MarketPlace({ commonHeadData }) {
     <>
       <Layout>
         <CommonHead commonHeadData={commonHeadData} />
+        <div className="mb-5">
+            <CustomBreadcrumb 
+            title = {'Market'}
+            breadcrumb={
+                [
+                { link: "/", title: "Home" },
+                { link: "/market", title: "Market", active: true},
+                ]
+            }
+            />
+        </div>
+        {jobLists.loading ?
+        <div className="w-full flex justify-center items-center bg-white dark:bg-dark-white">
+          <LoadingSpinner size='20' height='h-[40rem]' />
+        </div>
+        :
         <MainSection
           marketPlaceProduct={marketData}
           categories={categories}
           image_server={image_server}
           className="mb-10"
         />
+        }
       </Layout>
     </>
   );

src/components/MyActiveJobs/ActiveJobMessage.jsx

@@ -20,7 +20,7 @@ export default function ActiveJobMessage({ activeJobMesList }) {
 
   return (
     <div className='flex flex-col justify-between'>
-    <div className="w-full min-h-[450px] max-h-[450px] overflow-y-scroll">
+    <div className="w-full h-full min-h-[400px] max-h-[400px] overflow-y-auto">
         <table className="wallet-activity w-full table-auto border-collapse text-left">
             <thead className='border-b-2'>
                 <tr className='text-slate-600'>

src/components/MyActiveJobs/ActiveJobMessageMedia.jsx

@@ -0,0 +1,63 @@
+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";
+
+export default function ActiveJobMessageMedia({ activeJobMesList }) {
+  return (
+    <div className='flex flex-col justify-between'>
+        <div className="w-full h-full min-h-[250px] max-h-[250px] overflow-y-auto">
+            <table className="wallet-activity w-full table-auto border-collapse text-left">
+                <thead className='border-b-2'>
+                    <tr className='text-slate-600'>
+                    <th className="p-2"></th>
+                    </tr>
+                </thead>
+                {activeJobMesList?.data?.length ?
+                (
+                <tbody>
+                    {activeJobMesList.data.map((item, index) => 
+                    {
+                        let imageLink = `${activeJobMesList?.image}${localStorage.getItem('session_token')}/contracts/${item.msg_uid}`
+                        return (
+                            <tr key={index} className='text-slate-500'>
+                                <td>
+                                    <div className={`msg_box ${item.who}`}>
+                                        <div className="msg_header">{item.msg_date} {item.msg_firstname}</div>
+                                        {item.msg_type == 'FILE' ?
+                                        <a href={imageLink} target="_blank" className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></a>
+                                        :
+                                        <span className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></span>
+                                        }
+                                    </div>
+            
+                                </td>
+                            </tr>
+                        )
+                    }
+                    )}
+                </tbody>
+                )
+                :
+                activeJobMesList.error ? 
+                (
+                <tbody>
+                    <tr className='text-slate-500'>
+                        <td className="p-2" colSpan={4}>Opps! an error occurred. Please try again!</td>
+                    </tr>
+                </tbody>
+                )
+                :
+                <tbody>
+                    <tr className='text-slate-500'>
+                        <td className="p-2" colSpan={4}>No Message Found!</td>
+                    </tr>
+                </tbody>
+                }
+            </table>
+        </div>
+    </div>
+  )
+}

src/components/MyActiveJobs/ActiveJobs.jsx

@@ -11,8 +11,11 @@ import IndexJobActions from "./JobActions/IndexJobActions";
 
 import usersService from "../../services/UsersService";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
+import { SocketValues } from "../Contexts/SocketIOContext";
 
 function ActiveJobs(props) {
+  let {sendMessage, joinRoom} = SocketValues() // destructures 'SEND MESSAGE' and 'JOIN ROOM' FUNCTIONS FROM SOCKET
+  
   const ApiCall = new usersService();
   const navigate = useNavigate();
 
@@ -139,6 +142,9 @@ function ActiveJobs(props) {
           status: true,
           message: "Message Sent Successfully",
         });
+        // function to trigger socket to emit 'send_message'
+        sendMessage(messageToSend, `${props.details.contract}-${props.details.contract_uid}`)
+        
         props.reloadActiveJobList((prev) => !prev); // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
         setMessageToSend(""); // SENDS MESSAGE TO SEND BACK TO EMPTY STRINGS
       })
@@ -255,6 +261,12 @@ function ActiveJobs(props) {
     props.details?.currency
   );
 
+
+  useEffect(()=>{
+    // calls function to add user to a room
+    joinRoom(`${props.details.contract}-${props.details.contract_uid}`)
+  },[props.details.contract, props.details.contract_uid])
+
   return (
     <Layout>
       <div className="py-[20px] bg-white dark:bg-black dark:text-white px-4 rounded-2xl shadow-md md:flex justify-between items-start gap-16">
@@ -286,7 +298,7 @@ function ActiveJobs(props) {
                 <path d="M19 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H19v-2z" />
               </svg>
             </button>
-            <h1 className="text-xl lg:text-2xl font-bold text-dark-gray dark:text-white tracking-wide">
+            <h1 className="text-[20px] font-bold text-dark-gray dark:text-white tracking-wide">
               {props.details?.title && props.details.title}
             </h1>
           </div>
@@ -412,7 +424,7 @@ function ActiveJobs(props) {
               </div>
               {tab == "message" ? (
                 <textarea
-                  className="p-4 w-full h-[300px] text-base text-slate-600 dark:text-white bg-white dark:bg-black border border-slate-300 outline-none"
+                  className="p-4 w-full h-[200px] text-base text-slate-600 dark:text-white bg-white dark:bg-black border border-slate-300 outline-none"
                   // rows="10"
                   style={{ resize: "none" }}
                   name="message"
@@ -421,7 +433,7 @@ function ActiveJobs(props) {
                   autoFocus
                 />
               ) : (
-                <div className="p-4 w-full h-[300px] text-base text-slate-600 border border-slate-300">
+                <div className="p-4 w-full h-[200px] text-base text-slate-600 border border-slate-300">
                   <div className="files">
                     <label
                       htmlFor="file"
@@ -535,16 +547,23 @@ function ActiveJobs(props) {
         {/* MESSAGE SECTION */}
         <div className="w-full lg:w-1/2">
           <div className="flex justify-between items-center gap-5">
-            <p className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">
-              Message
+            <p className="w-full text-lg font-bold text-dark-gray dark:text-white tracking-wide flex items-center gap-2 justify-between"> 
+              <span>Message</span>
+              <button
+              type="button"
+              onClick={popUpHandler}
+              className="text-[12px] tracking-wider text-gray-400 dark:text-slate-400"
+            >
+              View all
+            </button>
             </p>
-            <button
+            {/* <button
               type="button"
               onClick={popUpHandler}
               className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer flex justify-center items-center"
             >
               View all
-            </button>
+            </button> */}
           </div>
           {props.activeJobMesList.loading ? (
             <LoadingSpinner size="16" color="sky-blue" />

src/components/MyActiveJobs/ActiveJobsMedia.jsx

@@ -0,0 +1,744 @@
+import React, { lazy, useEffect, useRef, useState } from "react";
+import { useSelector } from "react-redux";
+import { useNavigate } from "react-router-dom";
+import { useReactToPrint } from "react-to-print";
+import CountDown from "../Helpers/CountDown";
+import ModalCom from "../Helpers/ModalCom";
+import Layout from "../Partials/Layout";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import ActiveJobMessageMedia from "./ActiveJobMessageMedia";
+import IndexJobActions from "./JobActions/IndexJobActions";
+import MediaLayout from "../Partials/MediaLayout";
+
+const VideoElement = lazy(() => import("../VideoCom/VideoElement"));
+
+import usersService from "../../services/UsersService";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+import { SocketValues } from "../Contexts/SocketIOContext";
+
+function ActiveJobsMedia(props) {
+  let {sendMessage, joinRoom} = SocketValues() // destructures 'SEND MESSAGE' and 'JOIN ROOM' FUNCTIONS FROM SOCKET
+  
+  const ApiCall = new usersService();
+  const navigate = useNavigate();
+
+  const { userDetails } = useSelector((state) => state.userDetails);
+
+  const [passDue, setPassDue] = useState(
+    new Date() > new Date(props.details?.delivery_date)
+  ); // STATE TO KNOW IF TASK IS PASSED DUE TIME
+
+  const [messageToSend, setMessageToSend] = useState(""); // State to hold the value of message to be sent
+
+  const [filesToSend, setFilesToSend] = useState([]); // State to hold the value of files to be sent
+
+  const [tab, setTab] = useState("message");
+
+  const [requestStatus, setRequestStatus] = useState({
+    loading: false,
+    status: false,
+    message: "",
+  });
+
+  let [popUp, setPopUp] = useState(false); // STATE FOR POPOUT MODAL
+
+  const printRef = useRef();
+  // to handle printing
+  const handlePrint = useReactToPrint({
+    content: () => printRef.current,
+  });
+
+  const popUpHandler = () => {
+    // FUNCTION TO HANDLE POPOUT
+    setPopUp((prev) => !prev);
+  };
+
+  // FUNCTION TO HANDLE MESSAGE CHANGE
+  const handleMessageChange = ({ target: { value } }) => {
+    setMessageToSend(value);
+  };
+
+  // FUNCTION TO HANDLE FILE UPlOAD CHANGE
+  const handleFileChange = ({ target: { files } }) => {
+    setRequestStatus({ loading: false, status: false, message: "" }); // State to determine error state
+
+    if (!files[0]) {
+      // IF NO FILE SELECTED RETURN
+      return;
+    }
+    if (files[0].size > Number(process.env.REACT_APP_MAX_FILE_SIZE)) {
+      setRequestStatus({
+        loading: false,
+        status: false,
+        message: "File must be <= 1mb",
+      });
+      setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 5000);
+      return;
+    }
+    if (filesToSend.length >= Number(process.env.REACT_APP_TOTAL_NUM_FILE)) {
+      setRequestStatus({
+        loading: false,
+        status: false,
+        message: `Total number of attachment is ${Number(
+          process.env.REACT_APP_TOTAL_NUM_FILE
+        )}`,
+      });
+      setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 5000);
+      return;
+    }
+    // INCLUDE FILE IF NO ERROR
+    setFilesToSend((prev) => [...prev, files[0]]);
+  };
+
+  // FUNCTION TO CLEAR ALL TYPED MESSAGE OR FILES
+  const handleClearAll = ({ target: { name } }) => {
+    if (tab == "message") {
+      setMessageToSend("");
+    } else if (tab == "files") {
+      setFilesToSend([]);
+    } else {
+      return;
+    }
+  };
+
+  // FUNCTION TO REMOVE AND IMAGE
+  const handleRemoveImage = (imageToDelete) => {
+    setFilesToSend((prev) =>
+      prev.filter((item) => item.name != imageToDelete.name)
+    );
+  };
+
+  // FUNCTION TO SEND TASK MESSAGE
+  const sendTaskMessage = () => {
+    let reqData = {
+      message: messageToSend,
+      msg_type: "TEXT",
+      contract: props.details.contract,
+    };
+    if (!reqData.message) {
+      setRequestStatus({
+        loading: false,
+        status: false,
+        message: "Message is empty",
+      });
+      return setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 5000);
+    }
+    setRequestStatus({ loading: true, status: false, message: "" });
+    ApiCall.sendTaskMessage(reqData)
+      .then((res) => {
+        if (res.status != 200 || res.data.internal_return < 0) {
+          setRequestStatus({
+            loading: false,
+            status: false,
+            message: "Message could not be sent, try again later",
+          });
+          return;
+        }
+        setRequestStatus({
+          loading: false,
+          status: true,
+          message: "Message Sent Successfully",
+        });
+        // function to trigger socket to emit 'send_message'
+        sendMessage(messageToSend, `${props.details.contract}-${props.details.contract_uid}`)
+        
+        props.reloadActiveJobList((prev) => !prev); // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
+        setMessageToSend(""); // SENDS MESSAGE TO SEND BACK TO EMPTY STRINGS
+      })
+      .catch((error) => {
+        setRequestStatus({
+          loading: false,
+          status: false,
+          message: "Opps! something went wrong",
+        });
+      })
+      .finally(() => {
+        setTimeout(() => {
+          setRequestStatus({ loading: false, status: false, message: "" });
+        }, 5000);
+      });
+  };
+
+  // FUNCTION TO SEND FILES
+  const sendFile = async () => {
+    setRequestStatus({ loading: true, status: false, message: "" });
+
+    if (!filesToSend.length) {
+      // checks if file to send is empty
+      setRequestStatus({
+        loading: false,
+        status: false,
+        message: "No File(s) selected",
+      });
+      return setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 5000);
+    }
+
+    for (let i = 0; i <= filesToSend.length - 1; i++) {
+      // Loops through files to send array and trigger upload API call
+
+      const fileToBase64 = async () => {
+        // Converts file data to base64 string
+        try {
+          const base64String = await convertFileToBase64(filesToSend[i]);
+          return base64String;
+        } catch (error) {
+          return false;
+        }
+      };
+
+      // if(await !fileToBase64()){
+      //   return
+      // }
+
+      let reqData = {
+        file_name: filesToSend[i].name,
+        file_size: filesToSend[i].size,
+        file_type: "image/png",
+        file_data: await fileToBase64(),
+        msg_type: "FILE",
+        contract: props.details.contract,
+      };
+
+      ApiCall.sendFiles(reqData)
+        .then((res) => {
+          // if(res.status != 200 || res.data.internal_return < 0){
+          //   setRequestStatus({loading: false, status: false, message: 'Files(s) could not be sent, try again later'})
+          //   return
+          // }
+          // setRequestStatus({loading: false, status: true, message: 'File(s) Uploaded Successfully'})
+          // props.reloadActiveJobList(prev => !prev) // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
+          // setFilesToSend([]) // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
+        })
+        .catch((error) => {
+          // setRequestStatus({loading: false, status: false, message: 'Opps! something went wrong'})
+        })
+        .finally(() => {
+          if (i == filesToSend.length - 1) {
+            setRequestStatus({
+              loading: false,
+              status: true,
+              message: "File(s) Uploaded Successfully",
+            });
+            setFilesToSend([]); // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
+            props.reloadActiveJobList((prev) => !prev); // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
+            setTimeout(() => {
+              setRequestStatus({ loading: false, status: false, message: "" });
+            }, 5000);
+          }
+        });
+    }
+  };
+
+  // FUNCTION TO CHECK IF TASK PASS DUE IS REACHED
+  let isPassedDue = () => {
+    // console.log('TESTING',new Date() > new Date(props.details?.delivery_date) )
+    if (new Date() > new Date(props.details?.delivery_date)) {
+      setPassDue(true);
+    } else {
+      setPassDue(false);
+    }
+  };
+
+  useEffect(() => {
+    if (!passDue) {
+      let passDueInterval = setInterval(() => {
+        isPassedDue();
+      }, 1000);
+      return () => {
+        clearInterval(passDueInterval);
+      };
+    }
+  }, [passDue]);
+
+  let thePrice = PriceFormatter(
+    props.details?.price * 0.01,
+    props.details?.currency_code,
+    props.details?.currency
+  );
+
+
+  useEffect(()=>{
+    // calls function to add user to a room
+    joinRoom(`${props.details.contract}-${props.details.contract_uid}`)
+  },[props.details.contract, props.details.contract_uid])
+
+  return (
+    <MediaLayout
+        backpath={props.details.pathname}
+        title={props.details?.title ? props.details.title : ''}
+    >
+        {/* job title */}
+            {/* <div className="py-[20px] bg-white dark:bg-black dark:text-white px-4 rounded-2xl shadow-md md:flex justify-between items-start gap-16">
+                <div className="w-full">
+                    <div className="w-full flex justify-start space-x-3 items-start">
+                        <button
+                        type="button"
+                        className="min-w-[45px] h-auto text-[#374557] border border-sky-blue p-1 rounded-full"
+                        onClick={() => {
+                            if (props.details.pathname == "/manage-family") {
+                            navigate(
+                                props.details.pathname,
+                                { state: { ...props.details.accountDetails } },
+                                { replace: true }
+                            );
+                            } else {
+                            navigate(props.details.pathname, { replace: true });
+                            }
+                        }}
+                        >
+                        <svg
+                            xmlns="http://www.w3.org/2000/svg"
+                            width="35"
+                            height="35"
+                            viewBox="0 0 24 24"
+                            fill="skyblue"
+                        >
+                            <path d="M19 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H19v-2z" />
+                        </svg>
+                        </button>
+                        <h1 className="text-base md:text-[20px] font-bold text-dark-gray dark:text-white tracking-wide">
+                        {props.details?.title && props.details.title}
+                        </h1>
+                    </div>
+                </div>
+            </div> */}
+        {/* end of job title */}
+
+        <div className="my-4 lg:flex justify-between items-start space-y-4 lg:space-x-4 lg:space-y-0">
+            <div className="w-full mb-4 border-b pb-4 lg:pb-0 lg:mb-0 lg:border-b-0">
+            
+            <div className="mb-4 w-full h-auto">
+                <VideoElement videoId={props?.details?.media_uid} />
+            </div>
+
+            <div className="w-full p-4 bg-white dark:bg-black rounded-2xl shadow-md md:flex md:justify-between gap-8">
+                <div className="w-full flex flex-col justify-between">
+                    <div className="w-full">
+                        <p className="w-full text-base text-right text-sky-blue">
+                        {props?.details && props.details.job_to}
+                        </p>
+                        <div className="text-base tracking-wide">
+                            <p className="font-semibold text-black dark:text-white tracking-wider">
+                                Description:{" "}
+                            </p>
+                            <p className="p-2 ml-8 border-b border-sky-blue">
+                                {props?.details && props.details.description}
+                            </p>
+                        </div>
+                        <div className="mt-6 w-full lg:flex gap-8">
+                            <div className="w-full text-base tracking-wide">
+                                <p className="font-semibold text-black dark:text-white tracking-wider">
+                                    Delivery Detail:{" "}
+                                </p>
+                                <p className="p-2 ml-8">
+                                    {props?.details && props.details.job_description}
+                                </p>
+                            </div>
+                            <div className="my-2 lg:my-0">
+                                <IndexJobActions details={props.details} />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                {/* job details */}
+                <div className="w-full md:w-[200px] flex flex-col justify-center gap-4">
+                    {/* <p className="text-base text-sky-blue">Delivery Detail</p> */}
+                    {passDue ? (
+                        <div className="my-1">
+                            <p className="text-base text-slate-700">
+                                <span className="font-semibold">Due: </span>
+                                {props?.details && props.details.delivery_date.split(" ")[0]}
+                            </p>
+                            {props?.delivery_date && (
+                                <p className="py-2 text-base text-slate-700">
+                                {props.details.delivery_date.split(" ")[1]}
+                                </p>
+                            )}
+                        </div>
+                    ) : (
+                        <div className="my-1 flex items-start gap-3">
+                            <p className="font-semibold">Due: </p>
+                            <div className="flex flex-col justify-between">
+                                <p className="text-base text-slate-700 tracking-wide">
+                                <CountDown
+                                    lastDate={props?.details && props.details.delivery_date}
+                                />
+                                </p>
+                                <div className="text-base text-slate-700 tracking-wide flex gap-[5px]">
+                                <span>Hrs</span>
+                                <span>Min</span>
+                                <span>Sec</span>
+                                </div>
+                            </div>
+                        </div>
+                    )}
+
+                    <div className="my-1 text-base text-slate-700 tracking-wide flex items-center gap-3">
+                        <span className="font-semibold text-black dark:text-white">
+                        Reward:{" "}
+                        </span>
+                        <span className="">{thePrice}</span>
+                    </div>
+
+                    <div className="my-1 text-base text-slate-700 tracking-wide flex items-center gap-3">
+                        <span className="font-semibold text-black dark:text-white">
+                        Duration:{" "}
+                        </span>
+                        <span className="">
+                        {props.details?.timeline_days && props.details.timeline_days}{" "}
+                        day(s)
+                        </span>
+                    </div>
+                    {/* <div className="my-1 text-base text-slate-700 tracking-wide flex items-center gap-3">
+                        <span className="font-semibold text-black dark:text-white">
+                        No:{" "}
+                        </span>
+                        <span className="">
+                        {props.details?.contract && props.details.contract}
+                        </span>
+                    </div> */}
+                </div>
+                {/* end of job details */}
+            </div>
+            </div>
+
+            <div className="w-full lg:w-2/5 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-1 gap-4">
+                {/* TEXTAREA SECTION */}
+                <div className="w-full mb-3">
+                    <div className="w-full">
+                        <div className="pl-7 flex items-center gap-3">
+                            <button
+                                name="message"
+                                onClick={(e) => setTab(e.target.name)}
+                                className={`px-4 xl:px-1 xxl:px-4 text-sm py-1 rounded-t-2xl ${
+                                tab == "message"
+                                    ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white"
+                                    : "bg-white text-[#000] border-t-[2px]"
+                                }`}
+                            >
+                                Send Message
+                            </button>
+                            <button
+                                name="files"
+                                onClick={(e) => setTab(e.target.name)}
+                                className={`px-4 xl:px-1 xxl:px-4 text-sm py-1 rounded-t-2xl ${
+                                tab == "files"
+                                    ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white"
+                                    : "bg-white text-[#000] border-t-[2px]"
+                                }`}
+                            >
+                                Send Files
+                            </button>
+                        </div>
+                        {tab == "message" ? (
+                        <textarea
+                            className="p-4 w-full h-[150px] text-base text-slate-600 dark:text-white bg-white dark:bg-black border-4 border-[#4687ba] outline-none"
+                            // rows="10"
+                            style={{ resize: "none" }}
+                            name="message"
+                            onChange={handleMessageChange}
+                            value={messageToSend}
+                            autoFocus
+                        />
+                        ) : (
+                        <div className="p-4 mb-2 h-[150px] text-base text-slate-600 border-4 border-[#4687ba]">
+                            <div className="files flex">
+                            <label
+                                htmlFor="file"
+                                className="custom-btn btn-gradient text-base text-white"
+                            >
+                                Select Files to Upload
+                            </label>
+                            <input
+                                type="file"
+                                id="file"
+                                accept="image/*"
+                                style={{ display: "none" }}
+                                onChange={handleFileChange}
+                            />
+                            </div>
+                            <div className="selected_file my-2 overflow-y-auto">
+                            {filesToSend.length > 0 &&
+                                filesToSend.map((item, index) => (
+                                <p key={index} className="flex items-center space-x-2">
+                                    <span>{item.name}</span>
+                                    <button
+                                    name="remove"
+                                    onClick={() => handleRemoveImage(item)}
+                                    className="px-2 flex justify-center items-center rounded-full border border-red-500 text-red-500"
+                                    >
+                                    x
+                                    </button>
+                                </p>
+                                ))}
+                            </div>
+                        </div>
+                        )}
+                    </div>
+
+                    {/* ERROR DISPLAY AND SUBMIT BUTTON */}
+                    <div className="w-full">
+                        {/* error or success display */}
+                        {requestStatus.message != "" &&
+                        (!requestStatus.status ? (
+                            <div
+                            className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                            >
+                            {requestStatus.message}
+                            </div>
+                        ) : (
+                            requestStatus.status && (
+                            <div
+                                className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                            >
+                                {requestStatus.message}
+                            </div>
+                            )
+                        ))}
+                    </div>
+                    {/* End of error or success display */}
+
+                    {/* Buttons Sections */}
+                    <div className="py-1 grid grid-cols-1 xxs:grid-cols-3">
+                        <div className="w-full col-span-3 col-start-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center gap-4">
+                            <button
+                                type="button"
+                                onClick={handleClearAll}
+                                className="custom-btn border-gradient"
+                            >
+                                <span className="text-gradient">Clear</span>
+                            </button>
+                            {tab == "files" ? (
+                                <button
+                                onClick={sendFile}
+                                type="button"
+                                className="custom-btn btn-gradient text-white"
+                                >
+                                {requestStatus.loading ? (
+                                    <LoadingSpinner size="6" color="sky-blue" />
+                                ) : (
+                                    <>
+                                    <svg
+                                        xmlns="http://www.w3.org/2000/svg"
+                                        viewBox="0 0 24 24"
+                                        width="20"
+                                        height="20"
+                                        fill="white"
+                                    >
+                                        <path d="M12 2L2 12h3v8h14v-8h3L12 2zm0 16v-6h-2v6H7l5-5 5 5h-3z" />
+                                    </svg>
+
+                                    <span className="text-white">Upload Files</span>
+                                    </>
+                                )}
+                                </button>
+                            ) : (
+                                <button
+                                onClick={sendTaskMessage}
+                                type="button"
+                                className="custom-btn btn-gradient text-white"
+                                >
+                                {requestStatus.loading ? (
+                                    <LoadingSpinner size="6" color="sky-blue" />
+                                ) : (
+                                    <span className="text-white">Send</span>
+                                )}
+                                </button>
+                            )}
+                        </div>
+                    </div>
+                    {/* end of Buttons Sections  */}
+                </div>
+                {/* END OF TEXTAREA */}
+
+                {/* MESSAGE SECTION */}
+                <div className="w-full p-4 bg-white dark:bg-black rounded-2xl shadow-md">
+                    <div className="flex justify-between items-center gap-5">
+                        <p className="w-full text-lg font-bold text-dark-gray dark:text-white tracking-wide flex items-center gap-2 justify-between"> 
+                        <span>Message</span>
+                        <button
+                        type="button"
+                        onClick={popUpHandler}
+                        className="text-[12px] tracking-wider text-gray-400 dark:text-slate-400"
+                        >
+                        View all
+                        </button>
+                        </p>
+                    </div>
+                    {props.activeJobMesList.loading ? (
+                        <LoadingSpinner size="16" color="sky-blue" />
+                    ) : (
+                        <ActiveJobMessageMedia activeJobMesList={props.activeJobMesList} />
+                    )}
+                </div>
+                {/* END OF MESSAGE */}
+            </div>
+        </div>
+
+      {/* POPOUT SECTION */}
+      {popUp && (
+        <PopModal
+          popUpHandler={popUpHandler}
+          popUp={popUp}
+          details={props.details}
+          activeJobMesList={props.activeJobMesList}
+          handlePrint={handlePrint}
+          myRef={printRef}
+        />
+      )}
+      {/* END OF POPOUT SECTION */}
+    </MediaLayout>
+  );
+}
+
+export default ActiveJobsMedia;
+
+function convertFileToBase64(file) {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+
+    reader.onload = () => {
+      const base64String = reader.result.split(",")[1];
+      resolve(base64String);
+    };
+
+    reader.onerror = (error) => {
+      reject(error);
+    };
+
+    reader.readAsDataURL(file);
+  });
+}
+
+//POPOUT COMPONENT FUNCTION
+const PopModal = ({
+  popUpHandler,
+  popUp,
+  details,
+  activeJobMesList,
+  handlePrint,
+  myRef,
+}) => {
+  return (
+    <ModalCom action={popUpHandler} situation={popUp}>
+      <div
+        ref={myRef}
+        className="message-modal-wrapper w-11/12 min-w-[350px] max-w-[700px] bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto"
+      >
+        <div className="modal-header-con">
+          <h1 className="modal-title">
+            {details?.contract}
+          </h1>
+          <button
+            type="button"
+            className="modal-close-btn"
+            onClick={popUpHandler}
+          >
+            <svg
+              width="36"
+              height="36"
+              viewBox="0 0 36 36"
+              fill="none"
+              className="fill-current"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                fill=""
+                fillOpacity="0.6"
+              />
+              <path
+                d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                fill="#"
+                fillOpacity="0.6"
+              />
+            </svg>
+          </button>
+        </div>
+        <div className="job-action-modal-body w-full px-10 py-8 gap-4">
+          <div className="w-full flex flex-col items-center">
+            {activeJobMesList.loading ? (
+              <LoadingSpinner size="16" color="sky-blue" />
+            ) : (
+              <div className="message-table h-[500px] overflow-y-auto">
+                <table className="wallet-activity w-full table-auto border-collapse text-left">
+                  <thead className="border-b-2">
+                    <tr className="text-slate-600">
+                      <th className="p-2"></th>
+                    </tr>
+                  </thead>
+                  {activeJobMesList?.data?.length ? (
+                    <tbody>
+                      {activeJobMesList?.data?.map((item, index) => (
+                        <tr key={index} className="text-slate-500">
+                          <td>
+                            <div className="msg_box">
+                              <div className="msg_header">
+                                {item.msg_date} {item.msg_firstname}
+                              </div>
+                              <span
+                                className="p-2"
+                                dangerouslySetInnerHTML={{
+                                  __html: item.message,
+                                }}
+                              ></span>
+                            </div>
+                          </td>
+                        </tr>
+                      ))}
+                    </tbody>
+                  ) : activeJobMesList.error ? (
+                    <tbody>
+                      <tr className="text-slate-500">
+                        <td className="p-2" colSpan={4}>
+                          Opps! an error occurred. Please try again!
+                        </td>
+                      </tr>
+                    </tbody>
+                  ) : (
+                    <tbody>
+                      <tr className="text-slate-500">
+                        <td className="p-2" colSpan={4}>
+                          No Message Found!
+                        </td>
+                      </tr>
+                    </tbody>
+                  )}
+                </table>
+              </div>
+            )}
+          </div>
+
+          {/* btn */}
+          <div className="flex justify-end items-center">
+            <div className="py-3 w-full lg:w-1/2 flex justify-between items-center">
+              <button
+                onClick={handlePrint}
+                type="button"
+                className="custom-btn btn-gradient text-white"
+              >
+                <span className="text-white">Print</span>
+              </button>
+              <button
+                onClick={popUpHandler}
+                type="button"
+                className="custom-btn border-gradient text-white"
+              >
+                <span className="text-gradient">Cancel</span>
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </ModalCom>
+  );
+};

src/components/MyActiveJobs/JobActions/CurrentJobAction.jsx

@@ -3,29 +3,20 @@ import React from 'react'
 function CurrentJobAction() {
   return (
     <div className='job-action  dark:bg-black'>
-      <p className="my-3 py-1 text-base active-owner">
-          <table className="w-full text-sm text-left text-gray-500 ">
-              <tbody>
-              <tr>
-                  <td>
-                      <div className="flex space-x-2 items-center w-full task_action_panel">
+      <table className="w-full my-3 py-1  text-sm text-left text-gray-500">
+          <tbody>
+          <tr>
+              <td>
+                  <div className="flex space-x-2 items-center w-full task_action_panel">
 
-                              <div>
-                                  Waiting for the completion message from the client before you can approve.
-                              </div>
-                              {/*<div className="flex flex-col flex-[0.9]">  </div>*/}
-                      </div>
-                  </td>
-
-                  <td className="text-right py-4 px-2">
-                      <div className="flex justify-center items-center">
-                          .
-                      </div>
-                  </td>
-              </tr>
-              </tbody>
-          </table>
-      </p>
+                          <div>
+                              Waiting for the completion message from the client before you can approve.
+                          </div>
+                  </div>
+              </td>
+          </tr>
+          </tbody>
+      </table>
     </div>
   )
 }

src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx

@@ -60,44 +60,42 @@ function CurrentTaskAction({jobDetails}) {
     }
 
   return (
-    <div className='job-action  dark:bg-black'>
+    <div className='dark:bg-black'>
 
-          <table className="w-full text-sm text-left text-gray-500 active-worker ">
-              <tbody>
-              <tr>
-                  <td>
-                      <div className="flex space-x-2 items-center w-full task_action_panel">
-                          <div>
-                              I completed this task and ready for review and acceptance.
-                          </div>
-                          {/*<div className="flex flex-col flex-[0.9]">*/}
+          <div className="w-full text-sm text-left text-gray-500">
+            {jobDetails.job_type == 'MEDIA' ?
+            <div className="flex justify-center items-center">
+                <button onClick={popUpHandler} type="button" className="btn-gradient text-white p-1 lg:p-2 border-4 border-slate-300 text-lg lg:text-xl font-medium rounded-2xl">
+                    I have completed this task
+                </button>
+            </div>
+            :
+            <div className='job-action active-worker'>
+                <div className="flex space-x-2 items-center w-full task_action_panel">
+                    <div>
+                        I completed this task and ready for review and acceptance.
+                    </div>
+                </div>
 
-                          {/*</div>*/}
-                      </div>
-                  </td>
-              </tr>
-              <tr>
-                  <td>
-                      <div className="flex justify-center items-center">
-                          <button onClick={popUpHandler} type="button" className="w-[150px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
-                              Send of Review
-                          </button>
-                      </div>
-                  </td>
-              </tr>
-              </tbody>
-          </table>
+                <div className="flex justify-center items-center">
+                    <button onClick={popUpHandler} type="button" className="custom-btn btn-gradient text-white">
+                        Send for Review
+                    </button>
+                </div>
+            </div>
+            }
+          </div>
 
           {popUp && (
             <ModalCom action={popUpHandler} situation={popUp}>
                 <div className="logout-modal-wrapper lg:w-[460px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
-                    <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 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">
+                    <div className="modal-header-con">
+                        <h1 className="modal-title">
                         Confirm Completion
                         </h1>
                         <button
                         type="button"
-                        className="text-[#374557] dark:text-red-500"
+                        className="modal-clode-btn"
                         onClick={popUpHandler}
                         >
                           <svg
@@ -145,33 +143,21 @@ function CurrentTaskAction({jobDetails}) {
 
                             {/* FOR SUCCESS/ERROR DISPLAY SECTION*/}
                             <div className="w-full">
-                            {reqStatus.message != "" &&
-                                (!reqStatus.status ? (
                                 <div
-                                    className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                    className={`relative p-4 text-center text-md font-light leading-[19.5px] text-[13px] ${reqStatus.status ? 'text-green-700':'text-[#912741]'}`}
                                 >
                                     {reqStatus.message}
                                 </div>
-                                ) : (
-                                reqStatus.status && (
-                                    <div
-                                    className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
-                                    >
-                                    {reqStatus.message}
-                                    </div>
-                                )
-                                ))}
                             </div>
                             {/* END OF FOR SUCCESS/ERROR DISPLAY SECTION*/}
-                        </div>
-                        
-                        {/* cancel btn */}
-                        <div className='flex justify-end items-center'>
-                            <button onClick={popUpHandler} type="button" className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white">
-                                <span className='text-gradient'>Cancel</span>
-                            </button>
-                        </div>
+                        </div> 
                     </div> 
+                    {/* cancel btn */}
+                    <div className='modal-footer-wrapper flex justify-end items-center'>
+                        <button onClick={popUpHandler} type="button" className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white">
+                            <span className='text-gradient'>Cancel</span>
+                        </button>
+                    </div>
                 </div>
             </ModalCom>
         )}

src/components/MyActiveJobs/JobActions/PastDueJobAction.jsx

@@ -121,7 +121,7 @@ function PastDueJobAction({jobDetails}) {
                         <button 
                             type="button" 
                             onClick={popUpHandler} 
-                            className="px-4 h-[48px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            className="custom-btn btn-gradient text-base text-white"
                         >
                             Cancel or Extend Timeline
                         </button>
@@ -133,14 +133,14 @@ function PastDueJobAction({jobDetails}) {
 
         {popUp && (
             <ModalCom action={popUpHandler} situation={popUp}>
-                <div className="logout-modal-wrapper lg:w-[460px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
-                    <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 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">
+                <div className="logout-modal-wrapper lg:w-[460px] h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+                    <div className="modal-header-con">
+                        <h1 className="modal-title">
                         Past Due Task
                         </h1>
                         <button
                         type="button"
-                        className="text-[#374557] dark:text-red-500"
+                        className="modal-close-btn"
                         onClick={popUpHandler}
                         >
                           <svg
@@ -164,7 +164,7 @@ function PastDueJobAction({jobDetails}) {
                             </svg>
                         </button>
                     </div>
-                    <div className="job-action-modal-body w-full px-10 py-8 gap-4">
+                    <div className="relative job-action-modal-body w-full px-10 py-8 gap-4">
                         <div className="w-full flex flex-col items-center">
                             <div className="mb-5 flex justify-center items-center gap-2">
                                 <input 
@@ -173,26 +173,26 @@ function PastDueJobAction({jobDetails}) {
                                     onChange={()=>{setChecked(prev => !prev)}} 
                                     className='w-6 h-6 text-sky-blue bg-gray-100 focus:ring-sky-blue' 
                                 />
-                                <p className='font-bold text-base tracking-wide text-dark-gray dark:text-white'>I am ready to cancel this task</p>
+                                <p className='job-label'>I am ready to cancel this task</p>
                             </div>
 
-                            <div className="mb-5 flex justify-center items-center">
+                            <div className="mb-5 w-full flex justify-end items-center">
                                 {reqStatus.loading && action=='cancel'?
                                     <LoadingSpinner color='sky-blue' size='10' />
                                 :
-                                    <button disabled={reqStatus.loading} onClick={cancelTask} type="button" className="px-2 py-1 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white">
+                                    <button disabled={reqStatus.loading} onClick={cancelTask} type="button" className="custom-btn border-gradient text-base text-white">
                                         <span className='text-gradient'>Cancel this task</span>
                                     </button>
                                 }
                             </div>
 
                             {/* EXTEND TIMELINE SECTION */}
-                            <div className='w-full my-3 py-3 border-y flex flex-col items-center'>
+                            <div className='w-full my-3 py-3 border-t flex flex-col items-center'>
                                 <div className='mb-5 flex items-center gap-2'>
-                                    <p className='font-bold text-base tracking-wide text-dark-gray dark:text-white'>Extend the timeline by:</p>
+                                    <p className='job-label'>Extend the timeline by:</p>
                                     <select 
                                         onChange={({target})=>{setExtendedTime(target.value)}}
-                                        className='text-base p-2 text-dark-gray dark:text-white rounded-md border border-slate-300 outline-0'
+                                        className='text-base p-2 text-dark-gray dark:text-white border border-slate-300 outline-0 rounded-full'
                                     >
                                         <option className='text-slate-500 text-lg' value=''>select</option>
                                         <option className='text-slate-500 text-lg' value='2'>1 days</option>
@@ -204,25 +204,27 @@ function PastDueJobAction({jobDetails}) {
                                 {reqStatus.loading && action=='extend' ?
                                     <LoadingSpinner color='sky-blue' size='10' />
                                 :
-                                <button disabled={reqStatus.loading} type="button" onClick={extendTime} className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
-                                    Extend Timeline
-                                </button>
+                                <div className='w-full flex justify-end items-center'>
+                                    <button disabled={reqStatus.loading} type="button" onClick={extendTime} className="custom-btn btn-gradient text-base text-white">
+                                        Extend Timeline
+                                    </button>
+                                </div>
 }                               
                             </div>
 
                             {/* FOR SUCCESS/ERROR DISPLAY SECTION*/}
-                            <div className="w-full">
+                            <div className="w-full absolute left-0 bottom-0 text-center">
                             {reqStatus.message != "" &&
                                 (!reqStatus.status ? (
                                 <div
-                                    className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                    className={`relative p-2 mx-2 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
                                 >
                                     {reqStatus.message}
                                 </div>
                                 ) : (
                                 reqStatus.status && (
                                     <div
-                                    className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                    className={`relative p-2 mx-2 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
                                     >
                                     {reqStatus.message}
                                     </div>
@@ -232,17 +234,17 @@ function PastDueJobAction({jobDetails}) {
                             {/* END OF FOR SUCCESS/ERROR DISPLAY SECTION*/}
                         </div>
                         
-                        {/* cancel btn */}
-                        <div className='flex justify-end items-center'>
-                            <button onClick={popUpHandler} type="button" 
-                                // className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white"
-                                className='w-[150px] mt-2 h-[48px] rounded-full text-base bg-transparent border border-red-500 text-red-500'
-                            >
-                                Cancel
-                                {/* <span className='text-gradient'>Cancel</span> */}
-                            </button>
-                        </div>
                     </div> 
+                    {/* cancel btn */}
+                    <div className='modal-footer-wrapper flex justify-center items-center'>
+                        <button onClick={popUpHandler} type="button" 
+                            // className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white"
+                            className='custom-btn text-base bg-transparent border border-red-500 text-red-500'
+                        >
+                            Cancel
+                            {/* <span className='text-gradient'>Cancel</span> */}
+                        </button>
+                    </div>
                 </div>
             </ModalCom>
         )}

src/components/MyActiveJobs/JobActions/ReviewJobAction.jsx

@@ -112,7 +112,7 @@ function ReviewJobAction({jobDetails}) {
               <tr>
                   <td>
                       <div className="flex justify-center items-center">
-                          <button  type="button" onClick={popUpHandler} className="w-[150px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                          <button  type="button" onClick={popUpHandler} className="w-[130px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
                              Reject or Accept
                           </button>
                       </div>

src/components/MyActiveJobs/MyPastDueTaskTable.jsx

@@ -0,0 +1,153 @@
+import React, { useState } from "react";
+import { useLocation, useNavigate } from "react-router-dom";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+import { handlePagingFunc } from "../Pagination/HandlePagination";
+import PaginatedList from "../Pagination/PaginatedList";
+
+export default function MyPastDueTaskTable({ MyJobList, className }) {
+  const navigate = useNavigate();
+  let { pathname } = useLocation();
+
+  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);
+  };
+
+  return (
+    <div
+      className={`update-table w-full p-3 sm:p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
+        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>
+              {
+                <>
+                  {MyJobList &&
+                  MyJobList?.result_list &&
+                  MyJobList.result_list.length > 0 ? (
+                    currentActiveJobList.map((value, index) => {
+                      let deliveryDate = value?.delivery_date?.split(" ")[0];
+                      let thePrice = PriceFormatter(
+                        value?.price * 0.01,
+                        value?.currency_code,
+                        value?.currency
+                      );
+                      let image = `${
+                        MyJobList.session_image_server
+                      }${localStorage.getItem("session_token")}/job/${
+                        value.job_uid
+                      }`;
+                      return (
+                        <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="max-w-[60px] max-h-[60px] min-w-[60px] min-h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
+                                <img
+                                  src={image}
+                                  alt="data"
+                                  className="w-full h-full rounded-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 flex flext-start gap-1">
+                                  Price:{" "}
+                                  <span className="text-purple">
+                                    {thePrice}
+                                  </span>
+                                </span>
+                                <div className="flex flex-col sm:flex-row items-start gap-1 md:gap-4 md:items-center">
+                                  <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">
+                                    Due:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {deliveryDate}
+                                    </span>
+                                  </span>
+                                  <span className="text-sm text-thin-light-gray">
+                                    Sent to:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {value.job_to === null
+                                        ? "public"
+                                        : value.job_to}
+                                    </span>
+                                  </span>
+                                </div>
+                              </div>
+                            </div>
+                          </td>
+
+                          <td className="text-right py-4 px-2">
+                            <div className="flex justify-center items-center">
+                              <button
+                                type="button"
+                                onClick={() => {
+                                  navigate("/manage-active-job", {
+                                    state: { ...value, pathname },
+                                  });
+                                }}
+                                className="px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                              >
+                                {value.owner_status == "OWNER"
+                                  ? "Review"
+                                  : "Send Updates"}
+                              </button>
+                            </div>
+                          </td>
+                        </tr>
+                      );
+                    })
+                  ) : (
+                    <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                      <td className="p-2">No Past Due Task!</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>
+      )}
+    </div>
+  );
+}

src/components/MyActiveJobs/MyPastDueTasks.jsx

@@ -0,0 +1,57 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+import MyPastDueTaskTable from "./MyPastDueTaskTable";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import { useSelector } from "react-redux";
+
+export default function MyPastDueTasks(props) {
+
+  const { userDetails: { account_type } } = useSelector((state) => state?.userDetails); // Gets user details
+
+  return (
+    <Layout>
+      {account_type == 'FULL' &&
+        <CommonHead commonHeadData={props.commonHeadData} />
+      }
+      <div className="notification-page w-full mb-10">
+        <div className="notification-wrapper w-full">
+          {/* heading */}
+          {account_type == 'FULL' ?
+          <div className="sm:flex justify-between items-center mb-6">
+            <div className="mb-5 sm:mb-0">
+              <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                <span
+                >
+                  Past Due Task(s)
+                </span>
+              </h1>
+            </div>
+          </div>
+          :
+          <div className="mb-5">
+            <CustomBreadcrumb 
+            title = {'Past Due Task(s)'}
+            breadcrumb={
+                [
+                { link: "/", title: "Home" },
+                { link: "/pastdue", title: "Past Due", active: true},
+                ]
+            }
+            />
+          </div>
+          }
+          {props.loading ?
+          <div className="w-full flex justify-center items-center bg-white rounded-2xl">
+            <LoadingSpinner size='10' color='sky-blue' height='h-[20rem]' />
+          </div>
+          :
+          <MyPastDueTaskTable MyJobList={props.MyJobList} />
+          }
+        </div>
+      </div>
+    </Layout>
+  );
+}

src/components/MyJobs/index.jsx

@@ -4,6 +4,7 @@ import Layout from "../Partials/Layout";
 import MyJobTable from "./MyJobTable";
 import CommonHead from "../UserHeader/CommonHead";
 import AddJobPage from "../../views/AddJobPage";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
 
 export default function MyJobs(props) {
   let { state } = useLocation();
@@ -32,8 +33,8 @@ export default function MyJobs(props) {
       <div className="notification-page w-full mb-10">
         <div className="notification-wrapper w-full">
           {/* heading */}
-          <div className="sm:flex items-center mb-6">
-            <div className="mb-5 sm:mb-0">
+          <div className="sm:flex items-center mb-2">
+            <div className="w-full">
               <h1 className="text-26 font-bold flex items-center space-x-1  text-dark-gray dark:text-white gap-2">
                 <span>My Jobs</span>
 
@@ -46,6 +47,17 @@ export default function MyJobs(props) {
               </h1>
             </div>
           </div>
+          <div className="mb-5">
+              <CustomBreadcrumb 
+              // title = 'My Jobs'
+              breadcrumb={
+                  [
+                  { link: "/", title: "Home" },
+                  { link: "/myjobs", title: "My Jobs", active: true},
+                  ]
+              }
+              />
+          </div>
           <MyJobTable MyJobList={props.MyJobList} />
         </div>
       </div>

src/components/MyOffers/ParentWaiting.jsx

@@ -3,6 +3,7 @@ import { Link } from "react-router-dom";
 import { toast } from "react-toastify";
 import activeAidsBanner from "../../assets/images/kids-waiting.jpg";
 import ParentWaitingTable from "./ParentWaitingTable";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
 
 export default function ParentWaiting({ className }) {
   const [addFavorite, setValue] = useState(false);
@@ -19,9 +20,20 @@ export default function ParentWaiting({ className }) {
     <>
       <div className={`overview-section w-full ${className || ""}`}>
         <div className="w-full mb-3 flex justify-between items-center gap-1">
-          <h1 className="text-26 font-bold text-dark-gray dark:text-white">
+          {/* <h1 className="text-26 font-bold text-dark-gray dark:text-white">
             Waiting for Parent to Get Started...
-          </h1>
+          </h1> */}
+
+          <CustomBreadcrumb 
+          title = {'Waiting for Parent to Get Started...'}
+          breadcrumb={
+              [
+              { link: "/", title: "Home" },
+              { link: "/suggested", title: "Suggested", active: true},
+              ]
+          }
+          />
+
           <Link
             to='/familymarket'
             className="px-4 h-10 flex justify-center items-center btn-gradient text-base rounded-full text-white"
@@ -31,17 +43,17 @@ export default function ParentWaiting({ className }) {
         </div>
         {/* <div className="overview-section-wrapper py-2 min-h-[450px] lg:flex lg:space-x-2 flex-1 lg:gap-8"> */}
         <div className="overview-section-wrapper py-2 min-h-[400px] lg:grid grid-cols-2 gap-4">
-          <div className="mb-10 lg:mb-0 h-full w-full bg-white dark:bg-dark-white rounded-2xl overflow-hidden">
+          <div className="overview-countdown mb-10 lg:mb-0 h-full w-full flex flex-col justify-between p-4 rounded-2xl bg-white dark:bg-dark-white">
+            {<ParentWaitingTable />}
+          </div>
+
+          <div className="h-full w-full bg-white dark:bg-dark-white rounded-2xl overflow-hidden">
             <img
               src={activeAidsBanner}
               alt="banner"
               className="w-full h-full"
             />
           </div>
-
-          <div className="overview-countdown h-full w-full flex flex-col justify-between p-4 rounded-2xl bg-white dark:bg-dark-white">
-            {<ParentWaitingTable />}
-          </div>
         </div>
       </div>
     </>

src/components/MyTasks/MyOffersFamilyTable.jsx

@@ -3,6 +3,7 @@ import OfferCard from "../Cards/OfferCard";
 import Icons from "../Helpers/Icons";
 import SliderCom from "../Helpers/SliderCom";
 import FamilyOfferJobPopout from "../jobPopout/FamilyOfferJobPopout";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
 
 export default function MyOffersFamilyTable({ className, familyOffers, image_server }) {
   let [offerPopout, setOfferPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
@@ -60,10 +61,21 @@ export default function MyOffersFamilyTable({ className, familyOffers, image_ser
         >
           {/* heading */}
           <div className="flex justify-between items-center mb-6">
-            <div>
+            {/* <div>
               <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
                 Ready to Start?
               </h1>
+            </div> */}
+            <div className="">
+                <CustomBreadcrumb 
+                title = {'Ready to Start'}
+                breadcrumb={
+                    [
+                    { link: "/", title: "Home" },
+                    { link: "/pending", title: "Pending", active: true},
+                    ]
+                }
+                />
             </div>
             <div className="slider-btns flex space-x-3">
               <button onClick={nextHandler} type="button">
@@ -107,7 +119,7 @@ export default function MyOffersFamilyTable({ className, familyOffers, image_ser
             </div>
           </div>
           {/* trending products */}
-          <div className="trending-products slider-left relative w-full rounded-2xl p-[10px] bg-alice-blue">
+          <div className="trending-products slider-left relative w-full rounded-2xl p-[10px] bg-alice-blue dark:bg-dark-white/50 transition-all duration-300">
             <SliderCom selector={trendingSlider} settings={settings}>
               {familyOffers &&
                 familyOffers.length > 0 &&

src/components/MyTasks/index.jsx

@@ -75,7 +75,7 @@ export default function MyTasks({
               />
             )}
             <div className="w-full mb-5 flex justify-between items-center gap-1">
-              {userDetails.account_type == 'FULL'? 
+              {/* {userDetails.account_type == 'FULL'? 
                 <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
                   <span
                     className={`${selectTab === "today" ? "block" : "hidden"}`}
@@ -83,7 +83,7 @@ export default function MyTasks({
                     My Tasks
                   </span>
                 </h1>
-                :
+                : */}
                 <CustomBreadcrumb 
                   title = 'My Tasks'
                   breadcrumb={
@@ -93,7 +93,7 @@ export default function MyTasks({
                     ]
                   }
                 />
-              }
+              {/* } */}
 
               {ActiveJobList?.data?.length > 0 && userDetails.account_type == 'FAMILY' &&
                 <button

src/components/MyWallet/FamilyWalletBox.jsx

@@ -0,0 +1,110 @@
+import { useSelector } from "react-redux";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import WalletItemCard from "./WalletItemCard";
+import WalletItemCardFamily from "./WalletItemCardFamily";
+import { useEffect, useState } from "react";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+import SearchCom from "../Helpers/SearchCom";
+import { localImgLoad } from "../../lib";
+import background from "../../assets/images/bg-sky-blue.jpg";
+import FamilyWalletRedeemOptions from "./FamilyWalletRedeemOptions";
+
+/**
+ * Renders a list of wallet items or a loading spinner depending on the state of the `wallet` object.
+ */
+export default function FamilyWalletBox({ wallet, payment }) {
+  // const { loading, data } = wallet;
+  
+  // const { userDetails } = useSelector((state) => state.userDetails);
+  // const accountType = userDetails?.account_type === "FAMILY";
+  
+  const [selectedWallet, setSelectedWallet] = useState('')
+
+  const [activeWalletBtn, setActiveWalletBtn] = useState('')
+  
+  const handleChangeWallet = ({target:{name}}) => {  // FUNCTION TO SWITCH WALLET IF USER HAS MORE THAN TWO WALLETS
+    const currentWalletSelected = wallet?.data?.filter((item) => item.code == name);
+    setSelectedWallet(currentWalletSelected[0])
+    setActiveWalletBtn(name)
+    // console.log(name, currentWalletSelected)
+  }
+
+  const image = selectedWallet?.code
+  ? `${selectedWallet?.code.toLowerCase()}.svg`
+  : "default.png";
+
+  useEffect(()=>{
+    setSelectedWallet(wallet.data[0])
+    setActiveWalletBtn(wallet?.data[0]?.code)
+  },[wallet])
+
+  return (
+    <div className="w-full">
+      <div className="my-wallet-wrapper w-full">
+        <div className="main-wrapper w-full mb-10">
+          <div className="w-full mb-10 sm:grid grid-cols-2 gap-4">
+            <div className="w-full mb-4 sm:mb-0 rounded-2xl bg-white dark:bg-dark-white overflow-hidden">
+              {wallet?.loading ? 
+                <div className="w-full h-full flex items-center justify-center bg-white">
+                  <LoadingSpinner size="16" color="sky-blue" height='min-h-[240px]' />
+                </div>
+                : wallet?.data.length > 0 ?
+                <>
+                {wallet?.data?.length > 1 && 
+                  <div className="wal-selection px-5 py-2 text-black dark:text-white flex items-center gap-2">
+                    {wallet?.data?.map(item =>(
+                      <button 
+                        className={`py-0.5 px-1 mb-1 rounded-lg border border-orange-500 ${activeWalletBtn == item?.code && 'bg-orange-500'}`} 
+                        key={item?.wallet_uid} 
+                        name={item?.code}
+                        onClick={handleChangeWallet}
+                      >
+                        {item?.description}
+                      </button>
+                    ))}
+                  </div>
+                  }
+                  <div className="p-5 bg-white-opacity min-h-[240px]"
+                      style={{
+                        background: `url(${background}) 0% 0% / cover no-repeat`,
+                      }}
+                    >
+                    {/* image */}
+                    <div className="min-w-[100px] min-h-[100px] max-w-min md:max-w-[100px] max-h-min md:max-h-[100px] rounded-full bg-[#e3e3e3] flex justify-center items-center">
+                      <img
+                        src={localImgLoad(`images/currency/${image}`)}
+                        className="w-full h-full"
+                        alt="currency-icon"
+                      />
+                    </div>
+                    <p className="text-base sm:text-lg text-white opacity-[70%] tracking-wide my-3">Current Balance</p>
+                    <p className="text-[44px] lg:text-[62px] font-bold text-white tracking-wide leading-10">
+                      {PriceFormatter(selectedWallet?.amount/100, selectedWallet?.code, undefined, "text-[2rem]")}
+                    </p>
+                  </div>
+                </>
+                :
+                <div className="w-full h-full flex justify-center items-center rounded-2xl bg-white">
+                  <p>No Wallet Record Found</p>
+                </div>
+              }
+            </div>
+              <div className="p-5 w-full rounded-2xl bg-white dark:bg-dark-white text-black dark:text-white h-full min-h-[240px] max-h-96">
+                <h1 className="text-xl font-bold text-black dark:text-white">Recent Activities</h1>
+              </div>
+          </div>
+        </div>
+        <div className="w-full">
+          <FamilyWalletRedeemOptions />
+        </div>
+      </div>
+    </div>
+  );
+}
+
+
+// data.length>0 && data.map((item) => (
+//   <div key={item.wallet_uid} className="w-full h-full mb-10 ">
+//     {/* <WalletItemCardFamily walletItem={item} payment={payment} countries={countries} /> */}
+//   </div>
+// ))

src/components/MyWallet/FamilyWalletCon.jsx

@@ -0,0 +1,84 @@
+import React, { Suspense, lazy, useEffect, useState } from "react";
+import { useSelector } from "react-redux";
+import usersService from "../../services/UsersService";
+import Layout from "../Partials/Layout";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
+const FamilyWalletBox = lazy(() => import("./FamilyWalletBox"));
+
+const FamilyWalletCon = () => {
+  const apiCall = new usersService();
+  // const { walletDetails } = useSelector((state) => state?.walletDetails); // WALLET STORE
+
+  const {userDetails} = useSelector((state) => state?.userDetails); // GETS USER INFO
+
+  const { walletTable } = useSelector((state) => state.tableReload);
+
+  const [paymentHistory, setPaymentHistory] = useState({
+    loading: true,
+    data: [],
+  });
+
+  const [familyWalletBal, setFamilyWalletBal] = useState({
+    loading: true,
+    data: []
+  });
+
+  const getFamilyWalletBal = () => {
+    setFamilyWalletBal({loading:true, data: []})
+    apiCall.getFamilyWallet({family_uid: userDetails.uid}).then(res => {
+      setFamilyWalletBal({loading:false, data: res?.data?.result_list})
+    }).catch(error => {
+      setFamilyWalletBal({loading:false, data: []})
+    })
+  };
+
+  const getPaymentHistory = () => {
+    apiCall
+      .getPaymentHx()
+      .then((res) => {
+        if (res.data.internal_return < 0) {
+          setPaymentHistory({ loading: false, data: [] });
+        } else {
+          setPaymentHistory({ loading: false, data: res.data?.result_list });
+          // console.log('Hist', res.data?.result_list)
+        }
+      })
+      .catch(() => {
+        setPaymentHistory({ loading: false, data: [] });
+      });
+  };
+
+  useEffect(() => {
+    getPaymentHistory();
+    getFamilyWalletBal()
+  }, [walletTable]);
+
+  return (
+    <Layout>
+      <div className='mb-4'>
+        <CustomBreadcrumb 
+            title={'Wallet'} 
+            breadcrumb = {
+            [
+                { link: "/", title: "Home" },
+                { link: '/family-wallet', title: 'Wallet', active: true},
+            ]
+            }
+        />
+      </div>
+      <Suspense fallback={
+        <div className="bg-white rounded-2xl">
+          <LoadingSpinner size="16" color="sky-blue" height='h-[30rem]' />
+        </div>
+      }>
+        <FamilyWalletBox
+          wallet={familyWalletBal}
+          payment={paymentHistory}
+        />
+      </Suspense>
+    </Layout>
+  );
+};
+
+export default FamilyWalletCon;

src/components/MyWallet/FamilyWalletRedeemOptions.jsx

@@ -0,0 +1,82 @@
+import React, { useEffect, useState } from 'react'
+import SearchCom from '../Helpers/SearchCom'
+import LoadingSpinner from '../Spinners/LoadingSpinner';
+import { Link } from 'react-router-dom';
+import { useSelector } from 'react-redux';
+
+export default function FamilyWalletRedeemOptions() {
+
+    const { familyWalletRedeemOptList } = useSelector((state) => state.familyWalletRedeemOptList); // FAMILY WALLET REDDEM OPTIONS LIST
+
+    const [filteredRedeemData, setFilteredRedeemData] = useState({value: '', data:{}}) // State to hold filtered redeem banner option
+  
+    const handleFilterRedeemData = ({target}) => {
+        // thiskey01
+      let filterWord = target.value
+      let filteredData = {}
+      if(!filterWord){
+        filteredData = {...familyWalletRedeemOptList?.data}
+      }else{
+        let matchedData = Object.keys(familyWalletRedeemOptList?.data)?.filter(item => (item.toLowerCase().startsWith(filterWord.toLowerCase())))
+        filteredData = matchedData.map(item => familyWalletRedeemOptList.data[item])
+      }
+      setFilteredRedeemData({value:target.value, data: {...filteredData}})
+    }
+
+    useEffect(()=>{
+        setFilteredRedeemData(prev => ({...prev, data:{...familyWalletRedeemOptList?.data}}))
+    }, [familyWalletRedeemOptList.image])
+
+  return (
+    <div className="w-full">
+        <div className="w-full sm:flex items-center gap-4">
+            <h1 className="text-2xl font-bold text-black dark:text-white">Redeem Options</h1>
+            <div className="sm:w-1/2 w-full sm:pr-20 pr-0 mb-5 sm:mb-0">
+                <SearchCom 
+                placeholder='Search...' 
+                value={filteredRedeemData.value}
+                handleSearch={handleFilterRedeemData}
+                />
+            </div>
+        </div>
+
+        {/* redeem options */}
+            {familyWalletRedeemOptList.loading ? 
+            <div className='mt-5 w-full h-[20rem] rounded-2xl bg-white dark:bg-dark-white text-black dark:text-white flex justify-center items-center'>
+                <LoadingSpinner size='10' color='sky-blue' height='h-[30rem]' />
+            </div>
+            : familyWalletRedeemOptList?.data && Object.keys(familyWalletRedeemOptList?.data)?.length > 0 ?
+                Object.keys(filteredRedeemData?.data)?.length ?
+                    <div className="mt-5 grid sm:grid-cols-2 lg:grid-cols-3 xxl:grid-cols-4 gap-4">
+                        { Object.keys(filteredRedeemData?.data)?.map((item)=>{
+                            // text, image, description, action
+                            let newData = filteredRedeemData?.data[item].banner
+                            let bgImage = `url(${newData?.image})`
+                            return (
+                                <Link to={''} key={item}>
+                                    <div className={`group relative h-60 text-black dark:text-white rounded-2xl shadow-lg hover:shadow-md transition-all duration-300 overflow-hidden`}
+                                    style={{
+                                        // background: `#ffffff ${bgImage} no-repeat center center / cover`
+                                    }}
+                                    >
+                                        <img src={newData?.image} alt='Redeem Image' className='w-full h-full bg-cover rounded-2xl group-hover:scale-110 transition-all duration-300' />
+                                        <div className='absolute bottom-0 mb-1 left-1/2 -translate-x-1/2 p-2 bg-white/80 rounded-2xl w-[90%] flex flex-col justify-center items-center gap-2'>
+                                            <h1 className='text-lg font-bold text-[#083e21]'>{newData.text}</h1>
+                                        </div>
+                                    </div>
+                                </Link>
+                            )
+                        })}
+                    </div>
+                :
+                <div className='mt-5 w-full h-[20rem] rounded-2xl bg-white dark:bg-dark-white text-black dark:text-white flex justify-center items-center'>
+                    <p>Search Item not Found!</p>
+                </div>
+            :
+            <div className='mt-5 w-full h-[20rem] rounded-2xl bg-white dark:bg-dark-white text-black dark:text-white flex justify-center items-center'>
+                <p>No Redeem Options Found!</p>
+            </div>
+            }
+    </div>
+  )
+}

src/components/MyWallet/Popup/AddFundDollars.jsx

@@ -259,14 +259,14 @@ function AddFundDollars(props) {
       <div className="w-full">
         {/* switch button */}
         <div className="flex">
-          <form className="add-fund-info flex items-center gap-3">
-            <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+          <form className="add-fund-info flex items-center gap-3 md:px-8 md:pt-4 px-4 pt-2">
+            <h1 className="job-label my-1">
               {countryWallet == "US" && "Payment Method"}
             </h1>
             <div className="my-1 flex items-center gap-2">
               <label
                 htmlFor="previous"
-                className="cursor-pointer flex items-center gap-1"
+                className="flex items-center gap-1"
               >
                 <input
                   type="radio"
@@ -283,7 +283,7 @@ function AddFundDollars(props) {
               </label>
               <label
                 htmlFor="new"
-                className={`cursor-pointer flex items-center gap-1 ${
+                className={`flex items-center gap-1 ${
                   payListCards.data.length >= MaxNoOfCards
                     ? "pointer-events-none"
                     : ""
@@ -313,7 +313,7 @@ function AddFundDollars(props) {
 
         {/* previous selectedOption */}
         {selectedOption === "previous" && (
-          <div className="p-4 previous-details w-full min-h-[16.5rem] flex flex-col">
+          <div className="px-8 py-4 previous-details w-full h-[300px] flex flex-col">
             {payListCards.loading ? (
               <LoadingSpinner size="10" color="sky-blue" />
             ) : payListCards?.data?.length ? (
@@ -367,7 +367,7 @@ function AddFundDollars(props) {
         )}
 
         {selectedOption === "new" && (
-          <div className="new-details w-full max-h-[22rem]">
+          <div className="new-details w-full">
             {payListCards.loading ? (
               <div className="pt-10 flex w-full h-full justify-center items-center">
                 <LoadingSpinner size="10" color="sky-blue" />
@@ -381,14 +381,14 @@ function AddFundDollars(props) {
                 >
                   {(props) => {
                     return (
-                      <Form className="md:pl-8">
-                        <div className="flex flex-col-reverse sm:flex-row">
+                      <Form className="w-full">
+                        <div className="flex flex-col-reverse sm:flex-row md:px-8 md:pt-4 px-4 pt-2">
                           <div className="flex-1 sm:mr-10">
                             <div className="fields w-full">
                               {/* Inputs */}
                               {/* Name */}
                               <div className="flex items-center field w-full my-2 flex-[0.4] gap-3">
-                                <label className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex items-center gap-1">
+                                <label className="job-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex items-center gap-1">
                                   Name:
                                 </label>
                                 <p className="input-label text-[#181c32] dark:text-white text-[16px] leading-[20.9625px] font-semibold flex items-center gap-1">{`${firstname} ${lastname}`}</p>
@@ -423,7 +423,7 @@ function AddFundDollars(props) {
                                         className={`flex items-center justify-between mb-2.5`}
                                       >
                                         <label
-                                          className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold line-clamp-3 flex items-center"
+                                          className="job-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold line-clamp-3 flex items-center"
                                           htmlFor="expiration"
                                         >
                                           Exp Month{" "}
@@ -588,26 +588,28 @@ function AddFundDollars(props) {
                           </div>
                         </div>
 
-                        <div className="add-fund-btn flex justify-end items-center gap-2 mt-4">
-                          <button
-                            className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center bg-[#f5a430] text-black items-center text-base rounded-full"
-                            onClick={handleClose}
-                          >
-                            Cancel
-                          </button>
-                          <button
-                            type="submit"
-                            className="px-4 py-1 h-11 max-w-[115px] w-full flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                          >
-                            {loadingState ? (
-                              <LoadingSpinner size="6" color="sky-blue" />
-                            ) : (
-                              <>
-                                <span className="text-white">Continue</span>{" "}
-                                <Icons name="chevron-right" />
-                              </>
-                            )}
-                          </button>
+                        <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
+                          <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center">
+                            <button
+                              className="custom-btn bg-[#f5a430] text-black text-base"
+                              onClick={handleClose}
+                            >
+                              Cancel
+                            </button>
+                            <button
+                              type="submit"
+                              className="custom-btn btn-gradient text-base text-white"
+                            >
+                              {loadingState ? (
+                                <LoadingSpinner size="6" color="sky-blue" />
+                              ) : (
+                                <>
+                                  <span className="text-white">Continue</span>{" "}
+                                  <Icons name="chevron-right" />
+                                </>
+                              )}
+                            </button>
+                          </div>
                         </div>
                       </Form>
                     );
@@ -620,25 +622,27 @@ function AddFundDollars(props) {
       </div>
 
       {selectedOption == "previous" && (
-        <div className="md:py-8 add-fund-btn flex justify-end items-center gap-2 py-4">
-          <button
-            className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center bg-[#f5a430] text-black items-center text-base rounded-full"
-            onClick={props.onClose}
-          >
-            Cancel
-          </button>
-          <button
-            onClick={handleSubmit}
-            name="previous"
-            type="button"
-            className="px-4 py-1 h-11 max-w-[115px] w-full flex justify-center items-center btn-gradient text-base rounded-full text-white"
-          >
-            {loadingState ? (
-              <LoadingSpinner size="6" color="sky-blue" />
-            ) : (
-              <span className="text-white">Continue</span>
-            )}
-          </button>
+        <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
+          <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center">
+            <button
+              className="custom-btn bg-[#f5a430] text-black text-base"
+              onClick={props.onClose}
+            >
+              Cancel
+            </button>
+            <button
+              onClick={handleSubmit}
+              name="previous"
+              type="button"
+              className="custom-btn btn-gradient text-base text-white"
+            >
+              {loadingState ? (
+                <LoadingSpinner size="6" color="sky-blue" />
+              ) : (
+                <span className="text-white">Continue</span>
+              )}
+            </button>
+          </div>
         </div>
       )}
     </>

src/components/MyWallet/Popup/AddFundPop.jsx

@@ -126,12 +126,12 @@ function AddFundPop({
   };
 
   return (
-    <div className="h-[33rem] w-full">
+    <div className="w-full">
       <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
         <div className="lg:w-2/2 w-full mb-10 lg:mb-0">
           <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl">
             <form className="md:px-8 md:pt-4 px-4 pt-2 add-fund-info flex items-center gap-[2.1rem]">
-              <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+              <h1 className="job-label my-1">
                 Amount({currency})
               </h1>
               <div className="field w-full max-w-[250px]">
@@ -149,51 +149,53 @@ function AddFundPop({
                 </p>
               </div>
             </form>
-
-            {countryWallet === "US" && (
-              <div className="w-full md:px-8 md:pt-4 px-4 pt-2 bg-white dark:bg-dark-white rounded-2xl">
-                <AddFundDollars
-                  setInputError={setInputError}
-                  walletItem={walletItem}
-                  input={input}
-                  setInput={setInput}
-                  currency={currency}
-                  onClose={onClose}
-                  confirmCredit={confirmCredit}
-                  setConfirmCredit={setConfirmCredit}
-                />
-              </div>
-            )}
-
-            {countryWallet == "NG" && <div className="h-[19rem]"></div>}
-
-            {countryWallet == "NG" && (
-              <div className="md:p-8 p-4 add-fund-btn flex justify-end items-center py-4 gap-4">
-                <button
-                  className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center items-center bg-[#f5a430] text-black text-base rounded-full"
-                  onClick={onClose}
-                >
-                  Cancel
-                </button>
-                <button
-                  onClick={handleSubmit}
-                  type="button"
-                  className="px-4 py-1 h-11 flex justify-center space-x-1 items-center btn-gradient text-base rounded-full text-white max-w-[100px] w-full"
-                >
-                  {__awaitComponent.loader ? (
-                    <LoadingSpinner size="6" color="sky-blue" />
-                  ) : (
-                    <>
-                      <span className="text-white">Continue</span>{" "}
-                      <Icons name="chevron-right" />
-                    </>
-                  )}
-                </button>
-              </div>
-            )}
           </div>
         </div>
       </div>
+
+      {countryWallet === "US" && (
+        <div className="w-full bg-white dark:bg-dark-white rounded-2xl">
+          <AddFundDollars
+            setInputError={setInputError}
+            walletItem={walletItem}
+            input={input}
+            setInput={setInput}
+            currency={currency}
+            onClose={onClose}
+            confirmCredit={confirmCredit}
+            setConfirmCredit={setConfirmCredit}
+          />
+        </div>
+      )}
+
+      {countryWallet == "NG" && <div className="h-[19rem]"></div>}
+
+      {countryWallet == "NG" && (
+        <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
+          <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center">
+            <button
+              className="custom-btn bg-[#f5a430] text-black text-base"
+              onClick={onClose}
+            >
+              Cancel
+            </button>
+            <button
+              onClick={handleSubmit}
+              type="button"
+              className="custom-btn btn-gradient text-base text-white"
+            >
+              {__awaitComponent.loader ? (
+                <LoadingSpinner size="6" color="sky-blue" />
+              ) : (
+                <>
+                  <span className="text-white">Continue</span>{" "}
+                  <Icons name="chevron-right" />
+                </>
+              )}
+            </button>
+          </div>
+        </div>
+      )}
     </div>
   );
 }

src/components/MyWallet/Popup/CompleteConfirmCredit.jsx

@@ -8,7 +8,7 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
     data?.result === "Charge success" || data?.status === "successful";
 
   return (
-    <div className="logout-modal-body w-full flex flex-col items-center">
+    <div className="logout-modal-body w-full">
       <div className="content-wrapper w-full h-[32rem]">
         <div className="w-full mb-10">
           <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl">
@@ -49,7 +49,7 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
                     </svg>
                   </div>
 
-                  <div className="flex items-center">
+                  <div className="w-full flex justify-center items-center">
                     <h1 className="text-xl font-semibold text-dark-gray dark:text-white tracking-tighter my-1">
                       {isSuccess
                         ? "Credit was Successful!"
@@ -59,55 +59,56 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
 
                   {data?.internal_return >= 0 &&
                     data?.result !== "Charge failed" && (
-                      <>
-                        <div className="flex items-center gap-8">
-                          <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                      <div className="w-full md:w-[60%] mx-auto">
+                        <div className="grid grid-cols-2 gap-8 my-2">
+                          <h1 className="job-label">
                             Amount({data?.currency || ""})
                           </h1>
-                          <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          <span className="w-full text-base text-dark-gray dark:text-white tracking-tighter flex justify-end items-end">
                             {`${data?.symbol || ""} ${
-                              Number(data?.amount * 0.01).toLocaleString() || ""
+                              Number(data?.amount * 0.01).toFixed(2) || ""
                             }`}
                           </span>
                         </div>
                         
                         {data?.curr_balance &&
-                        <div className="flex items-center gap-8">
-                          <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                        <div className="grid grid-cols-2 gap-8 my-2">
+                          <h1 className="job-label">
                             Wallet Balance
                           </h1>
-                          <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                            {data?.curr_balance * 0.01}
+                          <span className="w-full text-base text-dark-gray dark:text-white tracking-tighter flex justify-end items-end">
+                            {(data?.curr_balance * 0.01).toFixed(2)}
                           </span>
                         </div>
                         }
 
                         {isSuccess && (
-                          <div className="flex items-center gap-8">
-                            <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          <div className="grid grid-cols-2 gap-8 my-2">
+                            <h1 className="job-label">
                               Confirmation Number
                             </h1>
-                            <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                            <span className="w-full text-base text-dark-gray dark:text-white tracking-tighter flex justify-end items-end">
                               {data?.confirmation}
                             </span>
                           </div>
                         )}
-                      </>
-                    )}
+                      </div>
+                    )
+                  }
                 </div>
               </div>
             </div>
-            <div className="md:p-8 p-4 add-fund-btn flex justify-end items-center py-4 gap-4">
-              <button
-                className="px-4 h-11 flex justify-center items-center btn-gradient text-white text-base rounded-full w-[100px]"
-                onClick={onClose}
-              >
-                Ok
-              </button>
-            </div>
           </div>
         </div>
       </div>
+      <div className="modal-footer-wrapper w-full flex justify-end items-center gap-4">
+        <button
+          className="custom-btn btn-gradient text-white text-base"
+          onClick={onClose}
+        >
+          Ok
+        </button>
+      </div>
     </div>
   );
 }

src/components/MyWallet/Popup/ConfirmAddFund.jsx

@@ -29,10 +29,10 @@ function ThePaymentText({ value, type }) {
   return (
     <div className="my-2 flex items-center gap-5">
       <div className="card-details flex items-center gap-3">
-        <h1 className="text-xl font-normal text-dark-gray dark:text-white tracking-tighter my-1 space-x-1">
+        <h1 className="text-base">
           {description} Card
         </h1>
-        <p className="text-xl font-normal text-dark-gray dark:text-white tracking-wide">
+        <p className="text-base font-normal text-dark-gray dark:text-white tracking-wide">
           Bank **************{digits}
         </p>
       </div>
@@ -46,14 +46,14 @@ function ThePaymentText({ value, type }) {
  */
 function AmountSection({ currency, amount, country }) {
   const formattedAmount = (+amount * 0.01)?.toFixed(2);
-  const gapClassName = country === "US" ? "gap-14" : "gap-4";
 
   return (
-    <div className={`flex items-center ${gapClassName}`}>
-      <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+    <div className={`flex items-center gap-8`}>
+      {/* text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1 */}
+      <h1 className="min-w-[150px] job-label">
         Amount({currency})
       </h1>
-      <span className="text-xl font-normal text-dark-gray dark:text-white tracking-tighter my-1">
+      <span className="min-w-[100px] text-base text-right font-normal text-dark-gray dark:text-white tracking-tighter my-1">
         {formattedAmount}
       </span>
     </div>
@@ -66,14 +66,13 @@ function AmountSection({ currency, amount, country }) {
  */
 function TransactionFeeSection({ currency, fee, country }) {
   const formattedFee = (+fee).toFixed(2);
-  const gapClass = country === "US" ? "gap-[2.7rem]" : "gap-4";
 
   return (
-    <div className={`flex items-center border-b border-gray-600 ${gapClass}`}>
-      <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+    <div className={`flex items-center gap-8 border-b border-gray-600`}>
+      <h1 className="min-w-[150px] job-label">
         Transaction Fee
       </h1>
-      <span className="text-xl font-normal text-dark-gray dark:text-white tracking-tighter my-1">
+      <span className="min-w-[100px] text-base text-right font-normal text-dark-gray dark:text-white tracking-tighter my-1">
         {formattedFee}
       </span>
     </div>
@@ -89,14 +88,12 @@ function TotalSection({ currency, amount, fee, country }) {
   const total = Number(amount) + Number(fee);
   const formattedTotal = (total * 0.01)?.toFixed(2);
 
-  const gap = country === "US" ? "gap-[8rem]" : "gap-[6.3rem]";
-
   return (
-    <div className={`flex items-center ${gap}`}>
-      <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+    <div className={`flex items-center gap-8`}>
+      <h1 className="min-w-[150px] job-label">
         Total
       </h1>
-      <span className="text-xl font-normal text-dark-gray dark:text-white tracking-tighter my-1">
+      <span className="min-w-[100px] text-base text-right font-normal text-dark-gray dark:text-white tracking-tighter my-1">
         {formattedTotal}
       </span>
     </div>
@@ -356,103 +353,104 @@ function ConfirmAddFund({
   };
 
   return (
-    <div className="content-wrapper w-full h-[32rem]">
-      <div className="w-full mb-10">
-        <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl">
-          <div className="px-4 md:p-8 py-4 add-fund-info">
-            <div className="field w-full mb-3 min-h-[45px]">
-              {confirmCredit?.show?.awaitConfirm?.state && (
-                <div className="flex flex-col gap-2">
-                  <AmountSection
-                    currency={__confirmData?.currency}
-                    amount={__confirmData?.amount}
-                    country={__confirmCountry}
-                  />
-                  <TransactionFeeSection
-                    currency={__confirmData?.currency}
-                    fee={__confirmData?.fee}
-                    country={__confirmCountry}
-                  />
-                  <TotalSection
-                    currency={__confirmData?.currency}
-                    amount={__confirmData?.amount}
-                    fee={__confirmData?.fee}
-                    country={__confirmCountry}
-                  />
-                  {__confirmCountry === "US" && (
-                    <div className="flex items-center gap-8">
-                      <label
-                        htmlFor="payment"
-                        className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1"
-                      >
-                        Payment Method
-                      </label>
-                      <span className="text-[#181c32] dark:text-white">
-                        <ThePaymentText
-                          value={__confirmCardDetails}
-                          type={__confirmData?.cardType}
-                        />
+    <>    
+      <div className="content-wrapper w-full h-[32rem]">
+        <div className="w-full mb-10">
+          <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl">
+            <div className="px-4 md:p-8 py-4 add-fund-info">
+              <div className="field w-full mb-3 min-h-[45px]">
+                {confirmCredit?.show?.awaitConfirm?.state && (
+                  <div className="flex flex-col gap-2">
+                    <AmountSection
+                      currency={__confirmData?.currency}
+                      amount={__confirmData?.amount}
+                      country={__confirmCountry}
+                    />
+                    <TransactionFeeSection
+                      currency={__confirmData?.currency}
+                      fee={__confirmData?.fee}
+                      country={__confirmCountry}
+                    />
+                    <TotalSection
+                      currency={__confirmData?.currency}
+                      amount={__confirmData?.amount}
+                      fee={__confirmData?.fee}
+                      country={__confirmCountry}
+                    />
+                    {__confirmCountry === "US" && (
+                      <div className="flex items-center gap-8">
+                        <label
+                          htmlFor="payment"
+                          className="min-w-[150px] job-label"
+                        >
+                          Payment Method
+                        </label>
+                        <span className="text-[#181c32] dark:text-white">
+                          <ThePaymentText
+                            value={__confirmCardDetails}
+                            type={__confirmData?.cardType}
+                          />
+                        </span>
+                      </div>
+                    )}
+                    <div
+                      className={`gap-8 flex items-center`}
+                    >
+                      <h1 className="min-w-[150px] job-label">
+                        Reference No
+                      </h1>
+                      <span className="text-base font-normal text-dark-gray dark:text-white tracking-tighter my-1">
+                        {/* Displays only half of the string */}
+                        {__confirmData?.credit_reference.slice(0, (Math.floor(__confirmData?.credit_reference.length/2)))}
                       </span>
                     </div>
-                  )}
-                  <div
-                    className={`${
-                      __confirmCountry === "US"
-                        ? "gap-[3.7rem]"
-                        : "gap-[1.81rem]"
-                    } flex items-center`}
-                  >
-                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      Reference No
-                    </h1>
-                    <span className="text-xl font-normal text-dark-gray dark:text-white tracking-tighter my-1">
-                      {__confirmData?.credit_reference}
-                    </span>
                   </div>
-                </div>
-              )}
-            </div>
-          </div>
-
-          <div
-            className={
-              __confirmCountry === "US" ? "min-h-[96px]" : "min-h-[157px]"
-            }
-          ></div>
-          <hr />
-          <div className="md:p-8 p-4 add-fund-btn flex justify-end items-center py-4 gap-4">
-            <button
-              className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center bg-[#f5a430] text-black items-center text-base rounded-full"
-              onClick={getBack}
-            >
-              Back
-            </button>
-            {__confirmCountry === "US" && (
-              <button
-                className="px-4 h-11 flex justify-center items-center btn-gradient text-white text-base rounded-full"
-                onClick={
-                  __confirmData?.cardType === "prev"
-                    ? handlePrevCard
-                    : handleNewCard
-                }
-              >
-                {confirmCredit?.show?.acceptConfirm?.loader ? (
-                  <LoadingSpinner size="6" color="sky-blue" />
-                ) : (
-                  "Proceed"
                 )}
-              </button>
-            )}
-            {__confirmCountry === "NG" && (
-              <FlutterWaveButton
-                {...fwConfig}
-                className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-              />
-            )}
+              </div>
+            </div>
+
+            <div
+              className={
+                __confirmCountry === "US" ? "min-h-[96px]" : "min-h-[157px]"
+              }
+            ></div>
           </div>
         </div>
       </div>
-    </div>
+
+      <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
+        <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center">
+          <button
+            className="custom-btn bg-[#f5a430] text-black text-base"
+            onClick={getBack}
+          >
+            Back
+          </button>
+          {__confirmCountry === "US" && (
+            <button
+              className="custom-btn btn-gradient text-white text-base"
+              onClick={
+                __confirmData?.cardType === "prev"
+                  ? handlePrevCard
+                  : handleNewCard
+              }
+            >
+              {confirmCredit?.show?.acceptConfirm?.loader ? (
+                <LoadingSpinner size="6" color="sky-blue" />
+              ) : (
+                "Proceed"
+              )}
+            </button>
+          )}
+          {__confirmCountry === "NG" && (
+            <FlutterWaveButton
+              {...fwConfig}
+              className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+            />
+          )}
+        </div>
+      </div>
+    </>
   );
 }
 

src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx

@@ -58,13 +58,12 @@ function ConfirmNairaWithdraw({
       .sendMoney(reqData)
       .then((res) => {
         if (res.data.internal_return < 0) {
-          // if (res.data?.status_message?.toLowerCase().includes("limit")) {
-          //   setRequestStatus({
-          //     message: ,
-          //     loading: false,
-          //     status: false,
-          //   });
-          // }
+          setRequestStatus({
+            message: 'Unable to complete, try again',
+            loading: false,
+            status: false,
+          });
+
           return setTimeout(() => {
             setRequestStatus({
               message: "",
@@ -79,19 +78,19 @@ function ConfirmNairaWithdraw({
           }, 5000);
         }
 
+        setRequestStatus({
+          message: "Withdrawal sucessful",
+          loading: false,
+          status: true,
+        });
+        setShowCompleteNairaWithdraw({
+          show: true,
+          load: false,
+          state: res.data,
+        });
         setTimeout(() => {
-          setRequestStatus({
-            message: "",
-            loading: false,
-            status: false,
-          });
-          setShowCompleteNairaWithdraw({
-            show: true,
-            load: false,
-            state: res.data,
-          });
+          dispatch(tableReload({ type: "WALLETTABLE" }));
         }, 5000);
-        dispatch(tableReload({ type: "WALLETTABLE" }));
         return;
       })
       .catch((error) => {
@@ -105,10 +104,10 @@ function ConfirmNairaWithdraw({
 
   return (
     <ModalCom action={action} situation={situation}>
-      <div className="logout-modal-wrapper w-[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-wrapper w-[90%] md:w-[768px] h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
         <div className="w-full">
-          <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">
-            <h2 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+          <div className="modal-header-con">
+            <h2 className="modal-title">
               {completeNairaWithdraw.load ? (
                 "Confirming..."
               ) : (
@@ -126,7 +125,7 @@ function ConfirmNairaWithdraw({
             </h2>
             <button
               type="button"
-              className="text-[#374557] dark:text-red-500"
+              className="modal-close-btn"
               onClick={action}
             >
               <svg
@@ -151,7 +150,7 @@ function ConfirmNairaWithdraw({
             </button>
           </div>
           <hr />
-          <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl shadow">
+          <div className="add-fund w-full bg-white dark:bg-dark-white">
             {completeNairaWithdraw.load ? (
               <div className="h-[35rem] flex items-center justify-center">
                 <LoadingSpinner size="12" color="sky-blue" />
@@ -376,28 +375,28 @@ function ConfirmNairaWithdraw({
                 </div>
               </div>
             )}
+          </div>
+
+          {!completeNairaWithdraw.load && (
+            <>
+              <p
+                className={`text-lg text-center font-bold ${
+                  requestStatus.status ? "text-emerald-600" : "text-red-500"
+                } px-4 md:px-8 py-4`}
+              >
+                {requestStatus.message && requestStatus.message}
+              </p>
+              <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
+                <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center">
+
+                  <button
+                    type="button"
+                    onClick={action}
+                    className="custom-btn bg-[#f5a430] text-black text-base"
+                  >
+                    Cancel
+                  </button>
 
-            {!completeNairaWithdraw.load && (
-              <>
-                {" "}
-                <hr />
-                <p
-                  className={`text-base ${
-                    requestStatus.status ? "text-green-500" : "text-red-500"
-                  } px-4 md:px-8 py-4 h-5`}
-                >
-                  {requestStatus.message && requestStatus.message}
-                </p>
-                <div className="px-4 md:px-8 py-4 add-fund-btn flex justify-end items-center gap-2">
-                  {!completeNairaWithdraw.show && (
-                    <button
-                      type="button"
-                      onClick={action}
-                      className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center items-center bg-[#f5a430] text-black text-base rounded-full"
-                    >
-                      Cancel
-                    </button>
-                  )}
 
                   <button
                     onClick={
@@ -407,7 +406,7 @@ function ConfirmNairaWithdraw({
                         ? action
                         : handleSubmit
                     }
-                    className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer min-w-[100px]"
+                    className="custom-btn btn-gradient text-base text-white"
                   >
                     {requestStatus.loading ? (
                       <LoadingSpinner size="6" color="sky-blue" />
@@ -420,9 +419,10 @@ function ConfirmNairaWithdraw({
                     )}
                   </button>
                 </div>
-              </>
-            )}
-          </div>
+              </div>
+            </>
+          )}
+
         </div>
       </div>
     </ModalCom>

src/components/MyWallet/Popup/CreditPopup.jsx

@@ -4,6 +4,7 @@ import LoadingSpinner from "../../Spinners/LoadingSpinner";
 import AddFundPop from "./AddFundPop";
 import CompleteConfirmCredit from "./CompleteConfirmCredit";
 import ConfirmAddFund from "./ConfirmAddFund";
+import CustomTimer from "../../countdown/CustomTimer";
 
 const CreditPopup = ({ details, onClose, situation, walletItem }) => {
   const [input, setInput] = useState("");
@@ -35,16 +36,16 @@ const CreditPopup = ({ details, onClose, situation, walletItem }) => {
       situation={situation}
       className="assign-task-popup"
     >
-      <div className="logout-modal-wrapper w-[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-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">
+      <div className="logout-modal-wrapper w-[90%] md:w-[768px] h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
             {confirmCredit?.show?.acceptConfirm?.loader
               ? "Confirming Credit..."
               : getTitle()}
           </h1>
           <button
             type="button"
-            className="text-[#374557] dark:text-red-500"
+            className="modal-close-btn"
             onClick={onClose}
           >
             <svg
@@ -68,10 +69,16 @@ const CreditPopup = ({ details, onClose, situation, walletItem }) => {
             </svg>
           </button>
         </div>
-        <div className="logout-modal-body w-full flex flex-col items-center">
+        <div className="w-full">
           {confirmCredit?.show?.acceptConfirm?.loader ? (
             <div className="h-[32rem] flex items-center justify-center">
-              <LoadingSpinner size="12" color="sky-blue" />
+              <div className="h-[32rem] flex flex-col items-center justify-center gap-4">
+                <p className="text-lg md:text-2xl text-emerald-600 tracking-wide font-bold">Processing payment</p>
+                <p className="text-lg md:text-2xl text-emerald-600 tracking-wide font-bold">Please do not refresh</p>
+                <LoadingSpinner size="6" color="sky-blue" height='h-20' />
+                {/* <p className="text-lg md:text-2xl text-emerald-600 tracking-wide font-bold">Timer countdown</p> */}
+                <CustomTimer className="text-lg text-center md:text-2xl text-emerald-600 tracking-wide font-bold" />
+              </div>
             </div>
           ) : (
             <>

src/components/MyWallet/WalletAction.jsx

@@ -23,14 +23,14 @@ function WalletAction({ walletItem, payment, openPopUp }) {
           }}
           className={`${
             walletItem.code != "NAIRA" && "invisible"
-          } px-4 h-10 flex justify-center items-center btn-gradient text-base rounded-full text-white`}
+          } logout-btn btn-gradient text-white`}
         >
           Spend
         </button>
       </div>
       <div className="w-1/2 flex justify-center items-center">
         <button
-          className="px-4 h-10 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+          className="logout-btn btn-gradient text-white"
           onClick={() => {
             openPopUp({
               payment: payment,

src/components/MyWallet/WalletBox.jsx

@@ -15,21 +15,6 @@ export default function WalletBox({ wallet, payment, countries }) {
   return (
     <div className="my-wallet-wrapper w-full mb-10">
       <div className="main-wrapper w-full">
-        {accountType ?
-        <div className="balance-inquery w-auto grid sm:grid-cols-2 lg:grid-cols-2 xl:grid-cols-[repeat(auto-fill,_minmax(354px,_1fr))] min-[1440px]:grid-cols-[repeat(auto-fill,_minmax(415px,_1fr))] gap-5 mb-11 h-auto">
-          {loading ? (
-            <div className="w-full h-full flex items-center justify-center">
-              <LoadingSpinner size="16" color="sky-blue" />
-            </div>
-          ) : (
-            data.length > 0 && data.map((item) => (
-              <div key={item.wallet_uid} className="lg:w-full h-full mb-10 lg:mb-0">
-                <WalletItemCardFamily walletItem={item} payment={payment} countries={countries} />
-              </div>
-            ))
-          )}
-        </div>
-        :
         <div className="balance-inquery w-auto grid sm:grid-cols-2 lg:grid-cols-2 xl:grid-cols-[repeat(auto-fill,_minmax(354px,_1fr))] min-[1440px]:grid-cols-[repeat(auto-fill,_minmax(415px,_1fr))] gap-5 mb-11 h-auto">
           {loading ? (
             <div className="w-full h-full flex items-center justify-center">
@@ -43,7 +28,6 @@ export default function WalletBox({ wallet, payment, countries }) {
             ))
           )}
         </div>
-        }
       </div>
     </div>
   );

src/components/MyWallet/WalletHeader.jsx

@@ -7,8 +7,11 @@ import Icons from "../Helpers/Icons";
 import Accordion from "../Helpers/Accordion";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 import localImgLoad from "../../lib/localImgLoad";
+import { useSelector } from "react-redux";
 
 export default function WalletHeader(props) {
+
+  const {userDetails: { account_type }} = useSelector((state) => state?.userDetails);
   //  debugger;
   //props.myWalletList.result_list
   let { pathname } = useLocation();
@@ -21,187 +24,196 @@ export default function WalletHeader(props) {
   }
   return (
     <>
-      <div className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]  items-center rounded-full relative  bg-sky-blue pr-1.5 pl-4">
-        <div
-          onClick={() => props.handlerBalance()}
-          className="flex items-center lg:justify-between justify-center w-full h-full"
-        >
-          <span className="lg:block hidden">
-            <Icons name="wallet" />
-          </span>
-          <p className="lg:text-xl text-lg font-bold text-white">Wallet</p>
-          <span className="lg:block hidden">
-            <Icons name="deep-plus" />
-          </span>
-        </div>
-        <div
-          className={`balance-dropdown w-96 z-30 bg-white dark:bg-dark-white   absolute -left-24 rounded-lg cursor-pointer ${
-            props.balanceDropdown ? "active" : ""
-          }`}
-        >
-          <div className="heading border-b dark:border-[#5356fb29]  border-light-purple px-7 py-6">
-            <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
-              Wallet
-            </h3>
+      {account_type == 'FULL' ?
+        <div className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]  items-center rounded-full relative  bg-sky-blue pr-1.5 pl-4">
+          <div
+            onClick={() => props.handlerBalance()}
+            className="flex items-center lg:justify-between justify-center w-full h-full"
+          >
+            <span className="lg:block hidden">
+              <Icons name="wallet" />
+            </span>
+            <p className="lg:text-xl text-lg font-bold text-white">Wallet</p>
+            <span className="lg:block hidden">
+              <Icons name="deep-plus" />
+            </span>
           </div>
-          <div className="content px-7 pb-7">
-            <ul>
-              {props.myWalletList &&
-                props.myWalletList?.length > 0 &&
-                props.myWalletList.map((value, index) => 
-                {
-                  let image = value.code ? `${value.code.toLocaleLowerCase()}.svg` : 'default.png'
-                  return(
-                    <li
-                      key={index}
-                      className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple"
-                      onClick={onWalletClick}
-                    >
-                      <div className="sm:flex justify-between items-center">
-                        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">
-                          <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">
-                            <img src={localImgLoad(`images/currency/${image}`)} className="w-14 h-14" alt="" />
+          <div
+            className={`balance-dropdown w-96 z-30 bg-white dark:bg-dark-white   absolute -left-24 rounded-lg cursor-pointer ${
+              props.balanceDropdown ? "active" : ""
+            }`}
+          >
+            <div className="heading border-b dark:border-[#5356fb29]  border-light-purple px-7 py-6">
+              <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
+                Wallet
+              </h3>
+            </div>
+            <div className="content px-7 pb-7">
+              <ul>
+                {props.myWalletList &&
+                  props.myWalletList?.length > 0 &&
+                  props.myWalletList.map((value, index) => 
+                  {
+                    let image = value.code ? `${value.code.toLocaleLowerCase()}.svg` : 'default.png'
+                    return(
+                      <li
+                        key={index}
+                        className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple"
+                        onClick={onWalletClick}
+                      >
+                        <div className="sm:flex justify-between items-center">
+                          <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">
+                            <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">
+                              <img src={localImgLoad(`images/currency/${image}`)} className="w-14 h-14" alt="" />
+                            </div>
+                            <div className="name">
+                              <p className="text-2xl font-bold text-dark-gray dark:text-white">
+                                {value.description}
+                              </p>
+                            </div>
                           </div>
-                          <div className="name">
-                            <p className="text-2xl font-bold text-dark-gray dark:text-white">
-                              {value.description}
+                          <div>
+                            <p className="eth text-xl font-bold text-purple">
+                              {PriceFormatter(value.amount * 0.01, value.code)}
                             </p>
                           </div>
                         </div>
-                        <div>
-                          <p className="eth text-xl font-bold text-purple">
-                            {PriceFormatter(value.amount * 0.01, value.code)}
-                          </p>
-                        </div>
-                      </div>
-                    </li>
-                  )
-                }
-                )}
+                      </li>
+                    )
+                  }
+                  )}
 
-              {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
-              {/*    <div className="sm:flex justify-between items-center">*/}
-              {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
-              {/*            <div*/}
-              {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
-              {/*                <img src={bank1} alt=""/>*/}
-              {/*            </div>*/}
-              {/*            <div className="name">*/}
-              {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
-              {/*                    MetaMask*/}
-              {/*                </p>*/}
-              {/*            </div>*/}
-              {/*        </div>*/}
-              {/*        <div>*/}
-              {/*            <p className="eth text-xl font-bold text-purple">*/}
-              {/*                75,320 ETH*/}
-              {/*            </p>*/}
-              {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
-              {/*                (773.69 USD)*/}
-              {/*            </p>*/}
-              {/*        </div>*/}
-              {/*    </div>*/}
-              {/*</li>*/}
-              {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
-              {/*    <div className="sm:flex justify-between items-center">*/}
-              {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
-              {/*            <div*/}
-              {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
-              {/*                <img src={bank2} alt=""/>*/}
-              {/*            </div>*/}
-              {/*            <div className="name">*/}
-              {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
-              {/*                    Coinbase Wallet*/}
-              {/*                </p>*/}
-              {/*            </div>*/}
-              {/*        </div>*/}
-              {/*        <div>*/}
-              {/*            <p className="eth text-xl font-bold text-purple">*/}
-              {/*                56,124 ETH*/}
-              {/*            </p>*/}
-              {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
-              {/*                (773.69 USD)*/}
-              {/*            </p>*/}
-              {/*        </div>*/}
-              {/*    </div>*/}
-              {/*</li>*/}
-              {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
-              {/*    <div className="sm:flex justify-between items-center">*/}
-              {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
-              {/*            <div*/}
-              {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
-              {/*                <img src={bank3} alt=""/>*/}
-              {/*            </div>*/}
-              {/*            <div className="name">*/}
-              {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
-              {/*                    Bitski*/}
-              {/*                </p>*/}
-              {/*            </div>*/}
-              {/*        </div>*/}
-              {/*        <div>*/}
-              {/*            <p className="eth text-xl font-bold text-purple">*/}
-              {/*                99,123 ETH*/}
-              {/*            </p>*/}
-              {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
-              {/*                (773.69 USD)*/}
-              {/*            </p>*/}
-              {/*        </div>*/}
-              {/*    </div>*/}
-              {/*</li>*/}
-              {/*<li className="content-item py-5">*/}
-              {/*    <div className="sm:flex justify-between items-center">*/}
-              {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
-              {/*            <div*/}
-              {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
-              {/*                <img src={bank4} alt=""/>*/}
-              {/*            </div>*/}
-              {/*            <div className="name">*/}
-              {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
-              {/*                    WalletConnect*/}
-              {/*                </p>*/}
-              {/*            </div>*/}
-              {/*        </div>*/}
-              {/*        <div>*/}
-              {/*            <p className="eth text-xl font-bold text-purple">*/}
-              {/*                43,728 ETH*/}
-              {/*            </p>*/}
-              {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
-              {/*                (773.69 USD)*/}
-              {/*            </p>*/}
-              {/*        </div>*/}
-              {/*    </div>*/}
-              {/*</li>*/}
-            </ul>
-            <div className="add-money-btn flex justify-center items-center mt-3">
-              {/* <button
-                                onClick={() => {
-                                if(pathname == '/my-wallet') props.setBalanceDropdown.toggle()
-                                else navigate('/my-wallet', {replace: true})
-                                }}
-                                type="button"
-                                className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                            >
-                                Manage
-                            </button> */}
-              <Link
-                to="/my-wallet"
-                onClick={onWalletClick}
-                className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-              >
-                Manage
-              </Link>
+                {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
+                {/*    <div className="sm:flex justify-between items-center">*/}
+                {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
+                {/*            <div*/}
+                {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+                {/*                <img src={bank1} alt=""/>*/}
+                {/*            </div>*/}
+                {/*            <div className="name">*/}
+                {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
+                {/*                    MetaMask*/}
+                {/*                </p>*/}
+                {/*            </div>*/}
+                {/*        </div>*/}
+                {/*        <div>*/}
+                {/*            <p className="eth text-xl font-bold text-purple">*/}
+                {/*                75,320 ETH*/}
+                {/*            </p>*/}
+                {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
+                {/*                (773.69 USD)*/}
+                {/*            </p>*/}
+                {/*        </div>*/}
+                {/*    </div>*/}
+                {/*</li>*/}
+                {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
+                {/*    <div className="sm:flex justify-between items-center">*/}
+                {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
+                {/*            <div*/}
+                {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+                {/*                <img src={bank2} alt=""/>*/}
+                {/*            </div>*/}
+                {/*            <div className="name">*/}
+                {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
+                {/*                    Coinbase Wallet*/}
+                {/*                </p>*/}
+                {/*            </div>*/}
+                {/*        </div>*/}
+                {/*        <div>*/}
+                {/*            <p className="eth text-xl font-bold text-purple">*/}
+                {/*                56,124 ETH*/}
+                {/*            </p>*/}
+                {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
+                {/*                (773.69 USD)*/}
+                {/*            </p>*/}
+                {/*        </div>*/}
+                {/*    </div>*/}
+                {/*</li>*/}
+                {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
+                {/*    <div className="sm:flex justify-between items-center">*/}
+                {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
+                {/*            <div*/}
+                {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+                {/*                <img src={bank3} alt=""/>*/}
+                {/*            </div>*/}
+                {/*            <div className="name">*/}
+                {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
+                {/*                    Bitski*/}
+                {/*                </p>*/}
+                {/*            </div>*/}
+                {/*        </div>*/}
+                {/*        <div>*/}
+                {/*            <p className="eth text-xl font-bold text-purple">*/}
+                {/*                99,123 ETH*/}
+                {/*            </p>*/}
+                {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
+                {/*                (773.69 USD)*/}
+                {/*            </p>*/}
+                {/*        </div>*/}
+                {/*    </div>*/}
+                {/*</li>*/}
+                {/*<li className="content-item py-5">*/}
+                {/*    <div className="sm:flex justify-between items-center">*/}
+                {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
+                {/*            <div*/}
+                {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+                {/*                <img src={bank4} alt=""/>*/}
+                {/*            </div>*/}
+                {/*            <div className="name">*/}
+                {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
+                {/*                    WalletConnect*/}
+                {/*                </p>*/}
+                {/*            </div>*/}
+                {/*        </div>*/}
+                {/*        <div>*/}
+                {/*            <p className="eth text-xl font-bold text-purple">*/}
+                {/*                43,728 ETH*/}
+                {/*            </p>*/}
+                {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
+                {/*                (773.69 USD)*/}
+                {/*            </p>*/}
+                {/*        </div>*/}
+                {/*    </div>*/}
+                {/*</li>*/}
+              </ul>
+              <div className="add-money-btn flex justify-center items-center mt-3">
+                {/* <button
+                                  onClick={() => {
+                                  if(pathname == '/my-wallet') props.setBalanceDropdown.toggle()
+                                  else navigate('/my-wallet', {replace: true})
+                                  }}
+                                  type="button"
+                                  className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                              >
+                                  Manage
+                              </button> */}
+                <Link
+                  to="/my-wallet"
+                  onClick={onWalletClick}
+                  className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                >
+                  Manage
+                </Link>
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      {/*<div*/}
-      {/*    className="lg:hidden flex user-balance cursor-pointer lg:w-[252px] w-[150px] h-[48px]  items-center rounded-full relative  bg-purple">*/}
-      {/*    <div className="flex items-center lg:justify-between justify-center w-full h-full">*/}
-      {/*        <p className="lg:text-xl text-lg font-bold text-white">*/}
-      {/*            $ 234,435.34*/}
-      {/*        </p>*/}
-      {/*    </div>*/}
-      {/*</div>*/}
+        :
+        <div className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]  items-center rounded-full relative  bg-sky-blue pr-1.5 pl-4">
+          <div
+            onClick={() => navigate("/family-wallet", { replace: true })}
+            className="flex items-center lg:justify-between justify-center w-full h-full"
+          >
+            <span className="lg:block hidden">
+              <Icons name="wallet" />
+            </span>
+            <p className="lg:text-xl text-lg font-bold text-white">Wallet</p>
+            <span className="lg:block hidden">
+              <Icons name="deep-plus" />
+            </span>
+          </div>
+        </div>
+      }
       <div className="lg:hidden block"></div>
     </>
   );

src/components/MyWallet/WalletItemCard.jsx

@@ -34,9 +34,7 @@ export default function WalletItemCard({ walletItem, payment, countries }) {
     dispatch(tableReload({ type: "WALLETTABLE" }));
   };
 
-  const currentWalletCurrency = countries
-    // .map((country) => country)
-    .filter((country) => country.code === walletItem.country);
+  const currentWalletCurrency = countries?.filter((country) => country.code === walletItem.country);
 
   const image = walletItem.code
     ? `${walletItem.code.toLowerCase()}.svg`
@@ -83,7 +81,7 @@ export default function WalletItemCard({ walletItem, payment, countries }) {
               walletItem.escrow * 0.01,
               walletItem.code,
               undefined,
-              "text-[2rem]"
+              "text-[1.5rem]"
             )}
           </span>
         </p>

src/components/MyWallet/WalletItemCardFamily.jsx

@@ -4,7 +4,6 @@ import background from "../../assets/images/bg-sky-blue.jpg"; //shape/balance-bg
 import localImgLoad from "../../lib/localImgLoad";
 import { tableReload } from "../../store/TableReloads";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
-import CreditPopup from "./Popup/CreditPopup";
 import WalletAction from "./WalletAction";
 
 /**
@@ -13,30 +12,17 @@ import WalletAction from "./WalletAction";
 export default function WalletItemCardFamily({ walletItem, payment, countries }) {
 
   const dispatch = useDispatch();
-  const [creditPopup, setCreditPopup] = useState({ show: false, data: {} });
 
   /**
    * Opens the credit popup.
    * @param {Object} value - The value object.
    */
-  const openPopUp = (value) => {
-    setCreditPopup({
-      show: true,
-      data: { ...value },
-    });
-  };
 
   /**
    * Closes the credit popup and dispatches a table reload action.
    */
-  const closePopUp = () => {
-    setCreditPopup({ show: false, data: {} });
-    dispatch(tableReload({ type: "WALLETTABLE" }));
-  };
 
-  const currentWalletCurrency = countries
-    // .map((country) => country)
-    .filter((country) => country.code === walletItem.country);
+  const currentWalletCurrency = countries?.filter((country) => country.code === walletItem.country);
 
   const image = walletItem.code
     ? `${walletItem.code.toLowerCase()}.svg`
@@ -45,10 +31,10 @@ export default function WalletItemCardFamily({ walletItem, payment, countries })
   return (
     <>
       <div
-        className="current-balance-widget w-full h-full rounded-2xl overflow-hidden flex flex-col items-center gap-2 p-8 justify-between"
-        style={{
-          background: `url(${background}) 0% 0% / cover no-repeat`,
-        }}
+        className="current-balance-widget w-full h-full rounded-2xl overflow-hidden flex flex-col items-center gap-2 p-8 justify-between bg-family-header-bg"
+        // style={{
+        //   background: `url(${background}) 0% 0% / cover no-repeat`,
+        // }}
       >
         <div className="wallet w-full flex justify-between items-center gap-3">
           <div className="min-w-[100px] min-h-[100px] max-w-min md:max-w-[150px] max-h-min md:max-h-[150px] rounded-full bg-[#e3e3e3] flex justify-center items-center">
@@ -74,24 +60,7 @@ export default function WalletItemCardFamily({ walletItem, payment, countries })
             </div>
           </div>
         </div>
-
-        <div className="my-2 w-full h-[1px] bg-white"></div>
-
-           {/* <WalletAction
-             walletItem={{ ...walletItem, walletCountry: currentWalletCurrency }}
-             payment={payment}
-             openPopUp={openPopUp}
-           /> */}
       </div>
-
-      {creditPopup.show && (
-        <CreditPopup
-          details={creditPopup.data}
-          walletItem={walletItem}
-          onClose={closePopUp}
-          situation={openPopUp}
-        />
-      )}
     </>
   );
 }

src/components/OffersInterest/OffersInterestTable.jsx

@@ -28,6 +28,7 @@ export default function OffersInterestTable({offerInterestList, className}) {
         handlePagingFunc(e, setCurrentPage);
     };
 
+    let imgServer = offerInterestList?.imgServer // FOR RENDERING IMAGE FROM SERVER
     return (
         <div
             className={`update-table w-full my-8 p-8 bg-white dark:bg-dark-white rounded-2xl section-shadow min-h-[520px] ${
@@ -54,14 +55,19 @@ export default function OffersInterestTable({offerInterestList, className}) {
                             </thead>
                             <tbody className="h-full">
                             {currentOfferInterestList?.map((item, index) => {
-                                let image = item.banner ? item.banner : 'default.jpg'
+                                // let image = item.banner ? item.banner : 'default.jpg'
+                                const image = localStorage.getItem("session_token")
+                                ? `${imgServer}${localStorage.getItem("session_token")}/job/${
+                                    item.job_uid
+                                  }`
+                                : "";
                                 return (
                                 <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] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
+                                            <div className="min-w-[60px] max-w-[60px] min-h-[60px] max-h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
                                                 <img
-                                                    src={localImgLoad(`images/taskbanners/${image}`)}
+                                                    src={`${image}`}
                                                     alt="data"
                                                     className="w-full h-full rounded-full"
                                                 />
@@ -90,7 +96,7 @@ export default function OffersInterestTable({offerInterestList, className}) {
                                         <button
                                             onClick={() => {
                                                 navigate("/manage-offer", {
-                                                    state: { ...item, pathname },
+                                                    state: { ...item, pathname, jobImage:image },
                                                 });
                                             }}
                                             type="button"

src/components/OffersInterest/OthersInterestedTable.jsx

@@ -56,13 +56,18 @@ export default function OthersInterestTable({othersInterestedList, className}) {
                             </thead>
                             <tbody className="h-full">
                             {currentOthersInterestedList?.map((item, index) => {
+                                const image = localStorage.getItem("session_token")
+                                ? `${othersInterestedList.imageServer}${localStorage.getItem("session_token")}/job/${
+                                    item.job_uid
+                                  }`
+                                : "";
                                 return (
                                 <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="min-w-[60px] min-h-[60px] rounded-full overflow-hidden flex justify-center items-center">
                                                 <img
-                                                    src={dataImage1}
+                                                    src={image}
                                                     alt="data"
                                                     className="w-full h-full"
                                                 />

src/components/OffersInterest/index.jsx

@@ -9,6 +9,7 @@ export default function OffersInterest(props) {
     const filterHandler = (value) => {
         setValue(value);
     };
+    
     return (
         <Layout>
             <CommonHead

src/components/Pagination/NewPaginatedList.jsx

@@ -0,0 +1,124 @@
+import { useEffect, useState } from "react";
+
+const data1 = [];
+
+export default function NewPaginatedList({
+  data = data1,
+  itemsPerPage = 5,
+  filterItem,
+  tableTitle,
+  children,
+}) {
+  const [searchTerm, setSearchTerm] = useState("");
+  const [filteredData, setFilteredData] = useState(data);
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const [newData, setNewData] = useState([]);
+
+  const numberOfSelection = itemsPerPage;
+
+  const handlePrev = () => {
+    if (currentPage != 0) {
+      setCurrentPage((prev) => prev - numberOfSelection);
+    }
+  };
+  const handleNext = () => {
+    if (currentPage < data.length) {
+      setCurrentPage((prev) => prev + numberOfSelection);
+    }
+  };
+
+  const handleSearch = ({ target: { value } }, name) => {
+    setSearchTerm(value);
+    let newFilteredData = data.filter((item) =>
+      item[name].toLowerCase().startsWith(value.toLowerCase())
+    );
+    setFilteredData(newFilteredData);
+    setCurrentPage(0);
+  };
+
+  useEffect(() => {
+    setNewData(
+      filteredData?.slice(currentPage, numberOfSelection + currentPage)
+    );
+  }, [currentPage, filteredData]);
+
+  useEffect(()=>{
+    setCurrentPage(0)
+  },[itemsPerPage])
+
+  return (
+    <div className="w-full">
+      <h1 className="text-2xl mb-5 font-semibold">{tableTitle}</h1>
+
+      {data.length > 0 && filterItem && (
+        <div className="mb-10 flex justify-end items-center gap-2">
+          {filterItem.map((item, index) => (
+            <label
+              key={index}
+              className="flex flex-col sm:flex-row items-center gap-2 text-slate-600 dark:text-slate-100 transition-all duration-500"
+            >
+              Search by {item[0].toUpperCase() + item.slice(1)}
+              <input
+                name={item}
+                type="text"
+                className="py-1 px-2 text-sm min-w-[100px] text-black dark:text-white bg-white dark:bg-slate-800 rounded-full border-0 outline-none ring-1 ring-slate-300 dark:ring-white transition-all duration-500"
+                value={searchTerm}
+                onChange={(e) => {
+                  handleSearch(e, item);
+                }}
+              />
+            </label>
+          ))}
+        </div>
+      )}
+
+      {children({ data: newData })}
+
+      {/* show prev and next button if data exist */}
+      {data.length > 0 && (
+        <div className="mt-10 w-full flex gap-4 justify-center items-center">
+        <button
+          onClick={handlePrev}
+          className={`w-12 h-12 rounded-full flex justify-center items-center transition-all duration-300 ${
+            currentPage == 0
+              ? "text-slate-400 border-slate-400 dark:text-slate-400 dark:border-slate-400 pointer-events-none"
+              : "text-slate-600 border-slate-600 dark:text-white dark:border-white"
+          }`}
+        >
+          &lt;
+        </button>
+
+        {data.length && data.map((item, index)=>{
+          if(index%itemsPerPage == 0 && index >= currentPage && index <= currentPage+itemsPerPage){
+            return (
+              <button
+                key={index}
+                onClick={handleNext}
+                className={`w-12 h-12 rounded-full flex justify-center items-center border transition-all duration-300 ${
+                  currentPage != index
+                    ? "text-slate-400 border-slate-400 dark:text-slate-400 dark:border-slate-400"
+                    : "text-slate-600 border-slate-600 dark:text-white dark:border-white pointer-events-none"
+                }`}
+              >
+                {index/itemsPerPage +1}
+              </button>
+            )
+          }
+        })}
+
+        <button
+          onClick={handleNext}
+          className={`w-12 h-12 rounded-full flex justify-center items-center transition-all duration-300 ${
+            currentPage + numberOfSelection >= data.length
+              ? "text-slate-400 border-slate-400 dark:text-slate-400 dark:border-slate-400 pointer-events-none"
+              : "text-slate-600 border-slate-600 dark:text-white dark:border-white"
+          }`}
+        >
+          &gt;
+        </button>
+      </div>
+      )}
+    </div>
+  );
+}

src/components/Partials/Header.jsx

@@ -1,18 +1,17 @@
-import React, { useContext, useMemo, useState } from "react";
-import { Link, useLocation, useNavigate } from "react-router-dom";
+import React, { useContext } from "react";
+import { Link, useLocation } from "react-router-dom";
 import bank1 from "../../assets/images/bank-1.png";
 import bank2 from "../../assets/images/bank-2.png";
 import bank3 from "../../assets/images/bank-3.png";
 import bank4 from "../../assets/images/bank-4.png";
 import profileImg from "../../assets/images/profile.jpg";
 import useToggle from "../../hooks/useToggle";
-import usersService from "../../services/UsersService";
 import DarkModeContext from "../Contexts/DarkModeContext";
 import Icons from "../Helpers/Icons";
 import ModalCom from "../Helpers/ModalCom";
 import WalletHeader from "../MyWallet/WalletHeader";
 
-import { useDispatch, useSelector } from "react-redux";
+import { useSelector } from "react-redux";
 import Flag from "../../assets/images/united-states.svg";
 import siteLogo from "../../assets/images/wrenchboard-logo-text.png";
 // import { updateWalletDetails } from "../../store/walletDetails";
@@ -21,17 +20,15 @@ import TimeDifference from "../Helpers/TimeDifference";
 const DEFAULT_PROFILE_IMAGE = require("../../assets/images/profile.jpg");
 
 export default function Header({ logoutModalHandler, sidebarHandler }) {
+
+  const {userDetails: { account_type }} = useSelector((state) => state?.userDetails);
+
   const [balanceDropdown, setbalanceValue] = useToggle(false);
   const [notificationDropdown, setNotificationValue] = useToggle(false);
   const [userProfileDropdown, setProfileDropdown] = useToggle(false);
   const [moneyPopup, setPopup] = useToggle(false);
   const darkMode = useContext(DarkModeContext);
   const { userDetails } = useSelector((state) => state?.userDetails);
-  const { walletTable } = useSelector((state) => state.tableReload); // DETERMINES WHEN WALLET RELOADS
-  const [myWalletList, setMyWalletList] = useState([]);
-  const api = useMemo(() => new usersService(), []);
-  const dispatch = useDispatch();
-  const navigate = useNavigate();
 
   const { notifications } = useSelector((state) => state?.notifications); // NOTIFICATION STORE
   const { walletDetails } = useSelector((state) => state?.walletDetails); // WALLET STORE
@@ -48,7 +45,6 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
 
   // 9308RDR122
 
-
   const handlerBalance = () => {
     setbalanceValue.toggle();
     if (notificationDropdown) {
@@ -158,9 +154,10 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
               </defs>
             </svg>
           </button>
-          {/* search bar */}
-          <div className="search-bar lg:block hidden w-[376px]">
-            {/*<SearchCom />*/}
+
+          <div className="search-bar xl:hidden justify-center items-center w-[376px]">
+            {/* Home */}
+            <HomeButton />
           </div>
 
           {/* user info */}
@@ -241,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
@@ -408,7 +405,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                       </li>
                     )}
                     <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
-                      <Link to="/my-wallet" className="notifications">
+                      <Link to={ account_type == "FULL" ? "/my-wallet" : "/family-wallet"} 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">
                             My Wallet
@@ -506,15 +503,6 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                 </div>
               </div>
             </div>
-            {/* <div className="for-mobile-profile lg:hidden block">
-              <div
-                // to="/profile"
-                onClick={() => handlerProfile()}
-                className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden block"
-              >
-                <img src={profileImg} alt="profile" className="w-full h-full" />
-              </div>
-            </div> */}
           </div>
         </div>
       </div>
@@ -697,3 +685,33 @@ const PageButton = () => {
     </Link>
   );
 };
+
+const HomeButton = () => {
+  return (
+    <Link
+      to="/"
+      className="flex user-balance cursor-pointer w-[110px] h-[48px] items-center rounded-full relative bg-sky-blue pr-1.5 pl-4"
+    >
+      <div className="flex items-center lg:justify-between justify-center w-full h-full">
+        <span className="">
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 24 24"
+            strokeWidth={1.5}
+            stroke="currentColor"
+            className="w-7 h-7 stroke-white fill-white"
+          >
+            <path
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              d="m2.25 12 8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25"
+            />
+          </svg>
+        </span>
+        <p className="lg:text-xl text-lg font-bold text-white">Home</p>
+        <span className=""></span>
+      </div>
+    </Link>
+  );
+};

src/components/Partials/Layout.jsx

@@ -10,6 +10,8 @@ import RightSideBar from "./RightSideBar";
 import Sidebar from "./Sidebar";
 
 export default function Layout({ children }) {
+  const { userDetails } = useSelector((state) => state?.userDetails); // CHECKS FOR USER Details
+
   const { drawer } = useSelector((state) => state.drawer);
   const { userJobList } = useSelector((state) => state.userJobList);
   const dispatch = useDispatch();
@@ -20,10 +22,7 @@ export default function Layout({ children }) {
   };
   const navigate = useNavigate();
   const logOut = () => {
-    localStorage.removeItem("session_token");
-    localStorage.removeItem("member_id");
-    localStorage.removeItem("uid");
-    sessionStorage.removeItem("family_uid");
+    sessionStorage.clear();
     localStorage.clear();
     // toast.success("Come Back Soon", {
     //   icon: `🙂`,
@@ -55,8 +54,8 @@ export default function Layout({ children }) {
 
   return (
     <>
-      <div className="nft-main-wrapper-layout">
-        <div className={`nft-wrapper-layout-container 2xl:pr-20 md:pr-10 pr-2 pl-2 md:pl-0 w-full min-h-screen flex`}>
+      <div className="nft-main-wrapper-layout container mx-auto">
+        <div className={`relative nft-wrapper-layout-container 2xl:pr-20 md:pr-10 pr-2 pl-2 md:pl-0 w-full min-h-screen flex`}>
           {/* sidebar */}
           <div className={`nft-sidebar xl:block hidden section-shadow ${drawer ? "2xl:w-[335px] w-[280px] 2xl:pl-20 pl-10 pr-6 " : "w-[70px]"} bg-white dark:bg-dark-white h-full overflow-y-scroll overflow-style-none fixed left-0 top-0 pt-[30px]`}>
             <Sidebar logoutModalHandler={logoutModalHandler} sidebar={drawer} action={() => dispatch(drawerToggle())} myJobList={userJobList} />
@@ -74,10 +73,11 @@ export default function Layout({ children }) {
               <Header sidebarHandler={() => setMobileSidebar.toggle()} logoutModalHandler={logoutModalHandler} />
             </div>
             {/* container */}
-            <div className="nft-container 2xl:flex 2xl:space-x-8 h-full mb-12 lg:mt-[140px] mt-24 xl:mt-10 flex flex-col xl:flex-row items-start justify-center gap-4">
-              <div className="nft-main-container flex-[80%] w-full">
+            <div className="nft-container container mx-auto 2xl:flex 2xl:space-x-8 h-full mb-12 lg:mt-[140px] mt-24 xl:mt-10 flex flex-col xl:flex-row items-start justify-center gap-4">
+              <div className="flex-[80%] w-full">
                 {children && children}
               </div>
+
               <div className="nft-right-side-content 2xl:w-[270px] w-full h-full 2xl:flex justify-center relative flex-[20%]">
                 <RightSideBar myJobList={userJobList} />
               </div>
@@ -88,11 +88,11 @@ export default function Layout({ children }) {
       {logoutModal && (
         <ModalCom action={logoutModalHandler} situation={logoutModal}>
           <div className="logout-modal-wrapper w-11/12 sm:w-[460px] bg-white dark:bg-dark-white lg:rounded-2xl">
-            <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple dark:border-[#5356fb29] ">
-              <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+            <div className="modal-header-con">
+              <h1 className="modal-title">
                 Confirm
               </h1>
-              <button type="button" className="text-[#374557] dark:text-red-500" onClick={logoutModalHandler}>
+              <button type="button" className="modal-close-btn" onClick={logoutModalHandler}>
                 <svg width="36" height="36" viewBox="0 0 36 36" fill="none" className="fill-current" xmlns="http://www.w3.org/2000/svg">
                   <path d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z" fill="" fillOpacity="0.6" />
                   <path d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z" fill="#" fillOpacity="0.6" />
@@ -112,14 +112,14 @@ export default function Layout({ children }) {
                   Are you sure you want to Logout of your WrenchBoard account?
                 </p>
               </div>
-              <div className="flex space-x-2.5">
-                <button onClick={logOut} type="button" className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full">
-                  {`Yes ${process.env.REACT_APP_LOGOUT_TEXT}`}
-                </button>
-                <button onClick={logoutModalHandler} type="button" className=" border-gradient text-18 tracking-wide px-4 py-3 rounded-full">
-                  <span className="text-gradient">Not Now</span>
-                </button>
-              </div>
+            </div>
+            <div className="modal-footer-wrapper flex justify-center items-center gap-5">
+              <button onClick={logOut} type="button" className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full">
+                {`Yes ${process.env.REACT_APP_LOGOUT_TEXT}`}
+              </button>
+              <button onClick={logoutModalHandler} type="button" className=" border-gradient text-18 tracking-wide px-4 py-3 rounded-full">
+                <span className="text-gradient">Not Now</span>
+              </button>
             </div>
           </div>
         </ModalCom>

src/components/Partials/MediaHeader.jsx

@@ -0,0 +1,620 @@
+import React, { useContext } from "react";
+import { Link, useLocation, useNavigate } from "react-router-dom";
+import bank1 from "../../assets/images/bank-1.png";
+import bank2 from "../../assets/images/bank-2.png";
+import bank3 from "../../assets/images/bank-3.png";
+import bank4 from "../../assets/images/bank-4.png";
+import profileImg from "../../assets/images/profile.jpg";
+import useToggle from "../../hooks/useToggle";
+import DarkModeContext from "../Contexts/DarkModeContext";
+import Icons from "../Helpers/Icons";
+import ModalCom from "../Helpers/ModalCom";
+import WalletHeader from "../MyWallet/WalletHeader";
+
+import { useSelector } from "react-redux";
+import Flag from "../../assets/images/united-states.svg";
+import siteLogo from "../../assets/images/wrenchboard-logo-text.png";
+// import { updateWalletDetails } from "../../store/walletDetails";
+import TimeDifference from "../Helpers/TimeDifference";
+
+const DEFAULT_PROFILE_IMAGE = require("../../assets/images/profile.jpg");
+
+export default function MediaHeader({ logoutModalHandler, sidebarHandler, backpath, title }) {
+
+  const darkMode = useContext(DarkModeContext);
+
+  const navigate = useNavigate()
+
+  const {userDetails: { account_type }} = useSelector((state) => state?.userDetails);
+
+  const [balanceDropdown, setbalanceValue] = useToggle(false);
+  const [notificationDropdown, setNotificationValue] = useToggle(false);
+  const [userProfileDropdown, setProfileDropdown] = useToggle(false);
+  const [moneyPopup, setPopup] = useToggle(false);
+
+  const { userDetails } = useSelector((state) => state?.userDetails);
+
+  const { notifications } = useSelector((state) => state?.notifications); // NOTIFICATION STORE
+  const { walletDetails } = useSelector((state) => state?.walletDetails); // WALLET STORE
+
+  const image = localStorage.getItem("session_token")
+    ? userDetails.account_type === "FAMILY"
+      ? `${userDetails.session_image_server}${localStorage.getItem(
+          "session_token"
+        )}/family/${sessionStorage.getItem("family_uid")}`
+      : `${userDetails.session_image_server}${localStorage.getItem(
+          "session_token"
+        )}/profile/${userDetails.uid}`
+    : "";
+
+  // 9308RDR122
+
+  const handlerBalance = () => {
+    setbalanceValue.toggle();
+    if (notificationDropdown) {
+      setNotificationValue.toggle();
+    }
+    if (userProfileDropdown) {
+      setProfileDropdown.toggle();
+    }
+  };
+  const handlerNotification = () => {
+    setNotificationValue.toggle();
+    if (balanceDropdown) {
+      setbalanceValue.toggle();
+    }
+    if (userProfileDropdown) {
+      setProfileDropdown.toggle();
+    }
+  };
+  const handlerProfile = () => {
+    setProfileDropdown.toggle();
+    if (balanceDropdown) {
+      setbalanceValue.toggle();
+    }
+    if (notificationDropdown) {
+      setNotificationValue.toggle();
+    }
+  };
+  const clickAwayhandler = () => {
+    if (balanceDropdown) {
+      setbalanceValue.toggle();
+    }
+    if (notificationDropdown) {
+      setNotificationValue.toggle();
+    }
+    if (userProfileDropdown) {
+      setProfileDropdown.toggle();
+    }
+  };
+  const addMoneyHandler = () => {
+    setPopup.toggle();
+    setbalanceValue.set(false);
+  };
+
+  // getting the location of head
+  let { pathname } = useLocation();
+
+  const handleWalletBtn = () => {
+    if (pathname === "/my-wallet") {
+      setbalanceValue.set(false);
+    } else return balanceDropdown;
+  };
+
+  // User Profile
+  let { firstname, lastname, email, profile_pic_url } = userDetails;
+  let userEmail = email?.split("@")[0];
+  const userProfileImage = image || DEFAULT_PROFILE_IMAGE;
+
+  return (
+    <>
+      <div className="header-wrapper backdrop-blur-sm bg-[#efedfe5e]/60 dark:bg-transparent w-full h-full flex items-center xl:px-0 md:px-10 px-5">
+        <div className="flex justify-between items-center w-full">
+          {/* <button
+            className="xl:hidden block mr-10"
+            type="button"
+            onClick={sidebarHandler}
+          >
+            <svg
+              width="25"
+              height="19"
+              viewBox="0 0 25 19"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M24.3544 8.45953L16.9855 0.271831C16.8283 0.0982522 16.6089 0 16.3763 0H11.4637C11.1411 0 10.848 0.189955 10.7153 0.484712C10.5843 0.781107 10.6384 1.12663 10.8545 1.36571L17.7306 9.00647L10.8545 16.6456C10.6384 16.8863 10.5827 17.2318 10.7153 17.5266C10.848 17.823 11.1411 18.0129 11.4637 18.0129H16.3763C16.6089 18.0129 16.8283 17.913 16.9855 17.7427L24.3544 9.55505C24.6344 9.24391 24.6344 8.76903 24.3544 8.45953Z"
+                fill="url(#paint0_linear_700_68145)"
+              />
+              <path
+                d="M13.7104 8.45953L6.34147 0.271831C6.18427 0.0982522 5.96484 0 5.73231 0H0.819691C0.497095 0 0.203976 0.189955 0.071335 0.484712C-0.0596682 0.781107 -0.00562942 1.12663 0.210526 1.36571L7.08656 9.00647L0.210526 16.6456C-0.00562942 16.8863 -0.0613058 17.2318 0.071335 17.5266C0.203976 17.823 0.497095 18.0129 0.819691 18.0129H5.73231C5.96484 18.0129 6.18427 17.913 6.34147 17.7427L13.7104 9.55505C13.9904 9.24391 13.9904 8.76903 13.7104 8.45953Z"
+                fill="url(#paint1_linear_700_68145)"
+              />
+              <defs>
+                <linearGradient
+                  id="paint0_linear_700_68145"
+                  x1="10.644"
+                  y1="0"
+                  x2="28.9548"
+                  y2="13.8495"
+                  gradientUnits="userSpaceOnUse"
+                >
+                  <stop stopColor="#F539F8" />
+                  <stop offset="0.416763" stopColor="#C342F9" />
+                  <stop offset="1" stopColor="#5356FB" />
+                </linearGradient>
+                <linearGradient
+                  id="paint1_linear_700_68145"
+                  x1="0"
+                  y1="0"
+                  x2="18.3108"
+                  y2="13.8495"
+                  gradientUnits="userSpaceOnUse"
+                >
+                  <stop stopColor="#F539F8" />
+                  <stop offset="0.416763" stopColor="#C342F9" />
+                  <stop offset="1" stopColor="#5356FB" />
+                </linearGradient>
+              </defs>
+            </svg>
+          </button> */}
+
+          {/* Home */}
+          {/* <div className="search-bar xl:hidden justify-center items-center w-[376px]">
+            <HomeButton />
+          </div> */}
+
+          {/* Back BTN AND TITLE */}
+          <div className="pl-4 w-full flex justify-start gap-3 items-center">
+            <button
+            type="button"
+            className="min-w-[35px] h-auto text-[#374557] border border-sky-blue p-1 rounded-full"
+            onClick={() => {
+                if (backpath == "/manage-family") {
+                navigate(backpath,
+                    { replace: true }
+                );
+                } else {
+                navigate(backpath, { replace: true });
+                }
+            }}
+            >
+            <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="25"
+                height="25"
+                viewBox="0 0 24 24"
+                fill="skyblue"
+            >
+                <path d="M19 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H19v-2z" />
+            </svg>
+            </button>
+
+            <div className="">
+                {darkMode.theme === "light" ? (
+                    <img className="w-28 h-auto" src={siteLogo} alt="nft" />
+                ) : (
+                    <img className="w-28 h-auto" src={siteLogo} alt="nft" />
+                )}
+            </div>
+
+            <h1 className="text-base md:text-[20px] font-bold text-dark-gray dark:text-white tracking-wide line-clamp-1">
+            {title && title}
+            </h1>
+          </div>
+          
+
+          {/* user info */}
+          <div className="user-info flex items-center justify-end w-full xl:space-x-7 space-x-2 z-10 ">
+            {/* dark mode */}
+            {/* <button
+              onClick={darkMode.handleThemeSwitch}
+              type="button"
+              className="xl:w-[176px] w-[52px] h-[52px] dark:bg-white bg-dark-gray border border-pink rounded-full flex justify-center items-center"
+            >
+              <div className="flex space-x-2.5 items-center">
+                <span className="dark:text-dark-gray text-white">
+                  <svg
+                    width="27"
+                    height="27"
+                    viewBox="0 0 27 27"
+                    fill="none"
+                    xmlns="http://www.w3.org/2000/svg"
+                    className="fill-current"
+                  >
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M18.3065 16.3771C18.1572 16.6304 17.986 16.8743 17.7937 17.1062C17.7118 17.2044 17.7247 17.3515 17.8228 17.4339C17.9208 17.5163 18.0665 17.5028 18.1484 17.4046C18.3569 17.1532 18.5419 16.8897 18.7043 16.6155C18.7695 16.5051 18.7334 16.3622 18.6238 16.2966C18.5142 16.2304 18.3722 16.2668 18.3065 16.3771ZM18.9591 14.722C18.8948 15.0116 18.8078 15.2975 18.6982 15.5759C18.6511 15.6955 18.7093 15.831 18.8282 15.878C18.9466 15.9255 19.0812 15.8668 19.1283 15.7477C19.2472 15.446 19.3411 15.1368 19.4104 14.8231C19.4382 14.6978 19.3596 14.5735 19.2347 14.5456C19.1103 14.5176 18.9864 14.5968 18.9591 14.722ZM19.0673 12.944C19.0955 13.2411 19.1006 13.5395 19.0825 13.8375C19.0747 13.9655 19.1718 14.0763 19.2994 14.0837C19.4266 14.0917 19.5362 13.9939 19.5441 13.8659C19.564 13.5437 19.5584 13.2206 19.5274 12.8994C19.5154 12.7713 19.4021 12.6777 19.2754 12.6899C19.1482 12.702 19.0548 12.816 19.0673 12.944ZM18.6229 11.2201C18.7422 11.4948 18.8388 11.7769 18.9128 12.0641C18.9447 12.1884 19.071 12.2629 19.1949 12.2308C19.3184 12.1987 19.3924 12.0716 19.3605 11.9473C19.2805 11.6363 19.1755 11.3304 19.0465 11.0334C18.9951 10.9156 18.8587 10.8616 18.7417 10.9133C18.6247 10.9649 18.5715 11.1023 18.6229 11.2201ZM17.6651 9.72283C17.8653 9.94816 18.0448 10.1856 18.2034 10.4333C18.2723 10.5413 18.4157 10.5725 18.523 10.5026C18.6303 10.4333 18.6612 10.2889 18.5919 10.1809C18.4208 9.91324 18.2265 9.65578 18.0092 9.4123C17.9241 9.31639 17.7779 9.30848 17.6827 9.39414C17.5879 9.4798 17.58 9.62738 17.6651 9.72283Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M13.4409 5.61267C9.08757 5.61267 5.55359 9.14665 5.55359 13.5C5.55359 17.8533 9.08757 21.3873 13.4409 21.3873C17.7942 21.3873 21.3282 17.8533 21.3282 13.5C21.3282 9.14665 17.7942 5.61267 13.4409 5.61267ZM13.9049 6.5559C17.5298 6.79484 20.4003 9.81475 20.4003 13.5C20.4003 17.1852 17.5298 20.2051 13.9049 20.4441V6.5559Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M12.1116 1.32213V3.46343C12.1116 4.19318 12.7072 4.78556 13.4409 4.78556C14.1746 4.78556 14.7702 4.19318 14.7702 3.46343V1.32213C14.7702 0.592374 14.1746 0 13.4409 0C12.7072 0 12.1116 0.592374 12.1116 1.32213Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M21.0877 4.01472L19.5511 5.5513C19.0274 6.07499 19.0274 6.92528 19.5511 7.44898C20.0748 7.97267 20.9251 7.97267 21.4488 7.44898L22.9854 5.9124C23.509 5.38871 23.509 4.53841 22.9854 4.01472C22.4617 3.49102 21.6114 3.49102 21.0877 4.01472Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M25.6581 12.3649H23.4849C22.7443 12.3649 22.1431 12.9661 22.1431 13.7068C22.1431 14.4474 22.7443 15.0486 23.4849 15.0486H25.6581C26.3988 15.0486 27 14.4474 27 13.7068C27 12.9661 26.3988 12.3649 25.6581 12.3649Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M22.9854 21.5012L21.4488 19.9646C20.9251 19.4409 20.0748 19.4409 19.5511 19.9646C19.0274 20.4883 19.0274 21.3386 19.5511 21.8623L21.0877 23.3989C21.6114 23.9226 22.4617 23.9226 22.9854 23.3989C23.509 22.8752 23.509 22.0249 22.9854 21.5012Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M14.7702 25.6778V23.5365C14.7702 22.8068 14.1746 22.2144 13.4409 22.2144C12.7072 22.2144 12.1116 22.8068 12.1116 23.5365V25.6778C12.1116 26.4076 12.7072 27 13.4409 27C14.1746 27 14.7702 26.4076 14.7702 25.6778Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M5.78958 23.0647L7.29553 21.5372C7.80878 21.0166 7.80878 20.1714 7.29553 19.6508C6.78228 19.1302 5.94893 19.1302 5.43568 19.6508L3.92974 21.1783C3.41649 21.6989 3.41649 22.5441 3.92974 23.0647C4.44299 23.5853 5.27633 23.5853 5.78958 23.0647Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M1.32213 14.8293H3.46343C4.19318 14.8293 4.78556 14.2337 4.78556 13.5C4.78556 12.7663 4.19318 12.1707 3.46343 12.1707H1.32213C0.592374 12.1707 0 12.7663 0 13.5C0 14.2337 0.592374 14.8293 1.32213 14.8293Z"
+                    />
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M3.92974 5.82165L5.43568 7.34911C5.94893 7.86969 6.78228 7.86969 7.29553 7.34911C7.80878 6.82853 7.80878 5.98328 7.29553 5.46269L5.78958 3.93524C5.27633 3.41465 4.44299 3.41465 3.92974 3.93524C3.41649 4.45582 3.41649 5.30107 3.92974 5.82165Z"
+                    />
+                  </svg>
+                </span>
+                <span className="dark:text-dark-gray font-medium text-white xl:block hidden">
+                  {darkMode.theme === "light" ? "Dark" : "Light"} Mode
+                </span>
+              </div>
+            </button> */}
+            {/* balance */}
+
+            {/* My Page Button */}
+            {/* {userDetails.account_type === "FULL" ? <PageButton /> : null} */}
+
+            {/*<div className="lg:hidden block"></div>*/}
+            <WalletHeader
+              myWalletList={walletDetails.data}
+              handlerBalance={handlerBalance}
+              balanceDropdown={balanceDropdown}
+              addMoneyHandler={addMoneyHandler}
+              setBalanceDropdown={setbalanceValue}
+            />
+            {/* notification */}
+            <div className="user-notification lg:block hidden relative">
+              <div
+                onClick={() => handlerNotification()}
+                className="lg:w-[48px] lg:h-[48px] w-[38px] h-[38px] bg-white   flex justify-center items-center rounded-full overflow-hidden relative"
+              >
+                <Icons name="notification" />
+                <span className="absolute right-2 top-2 z-10 text-xs lg:w-5 lg:h-5 w-4 h-4 flex justify-center items-center rounded-full primary-gradient text-white cursor-default">
+                  {notifications?.loading ? "●" : notifications?.data?.length}
+                </span>
+              </div>
+              <div
+                className={`notification-dropdown z-30 w-96 bg-white dark:bg-dark-white   absolute -right-12 rounded-lg cursor-pointer ${
+                  notificationDropdown ? "active" : ""
+                }`}
+              >
+                <div className="heading border-b dark:border-[#5356fb29]  border-light-purple px-7 py-6">
+                  <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
+                    Recent Notifications
+                  </h3>
+                </div>
+
+                <div className="content px-7 pb-7">
+                  <ul>
+                    {notifications?.data?.length &&
+                      notifications?.data?.map((item, idx) => {
+                        if (idx < 5) {
+                          return (
+                            <li
+                              className={`content-item ${
+                                idx == 4
+                                  ? "py-5 "
+                                  : "py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple"
+                              }`}
+                              key={idx}
+                            >
+                              <div className="notifications flex space-x-4 items-center">
+                                <div className="icon max-w-[52px] max-h-[52px] w-full h-full rounded-full object-cover">
+                                  <img
+                                    src={require(`../../assets/images/notifications/${item?.icon}`)}
+                                    alt="icon"
+                                    className="w-full h-full"
+                                  />
+                                </div>
+                                <div className="name">
+                                  <p className="text-base text-dark-gray dark:text-white font-medium mb-2">
+                                    {item?.title}
+                                    {/* <span className="ml-1 font-bold">
+                                successfully done
+                              </span> */}
+                                  </p>
+                                  <p className="text-sm text-thin-light-gray font-medium">
+                                    <TimeDifference
+                                      time={item?.date}
+                                      key={item?.uid}
+                                    />
+                                  </p>
+                                </div>
+                              </div>
+                            </li>
+                          );
+                        }
+                      })}
+                  </ul>
+
+                  <div className="add-money-btn flex justify-center items-center">
+                    <Link
+                      to="/notification"
+                      className="text-purple text-sm font-medium"
+                      onClick={handlerNotification}
+                    >
+                      See all Notification
+                    </Link>
+                    {/* <button className="text-purple text-sm font-medium" onClick={()=>{
+                      handlerNotification()
+                      navigate('/notification', {replace: true})
+                    }}>See all Notification</button> */}
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div className="lg:hidden block">
+              <Link
+                to="/notification"
+                className="lg:w-[48px] lg:h-[48px] w-[38px] h-[38px] bg-white   flex justify-center items-center rounded-full overflow-hidden relative"
+              >
+                <Icons name="notification" />
+                <span className="absolute right-2 top-2 z-10 text-xs lg:w-5 lg:h-5 w-4 h-4 flex justify-center items-center rounded-full primary-gradient text-white">
+                  10
+                </span>
+              </Link>
+            </div>
+            {/* profile */}
+            <div className="user-profile relative">
+              <div
+                onClick={() => handlerProfile()}
+                className="hidden lg:flex items-center space-x-3.5"
+              >
+                {/* profile-image */}
+                <div className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden">
+                  <img
+                    src={userProfileImage}
+                    alt="profile"
+                    className="w-full h-full object-cover"
+                  />
+                </div>
+                <div className="lg:block hidden">
+                  <h1 className="text-xl font-bold   text-dark-gray dark:text-white">
+                    {firstname}
+                  </h1>
+                  {userDetails && userDetails?.account_type !== "FAMILY" && (
+                    <p className="text-sm text-thin-light-gray">@{userEmail}</p>
+                  )}
+                </div>
+              </div>
+
+              <div className="for-mobile-profile lg:hidden block">
+                <div
+                  // to="/profile"
+                  onClick={() => handlerProfile()}
+                  className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden block"
+                >
+                  <img
+                    src={profileImg}
+                    alt="profile"
+                    className="w-full h-full object-cover object-center"
+                  />
+                </div>
+              </div>
+
+              <div
+                className={`profile-dropdown w-[293px] z-30 bg-white dark:bg-dark-white   absolute lg:right-16 -right-[16px]  rounded-lg ${
+                  userProfileDropdown ? "active" : ""
+                }`}
+              >
+                <div className="heading border-b dark:border-[#5356fb29]  border-light-purple px-7 py-2">
+                  <img src={siteLogo} alt="Logo" className="w-[150px]" />
+                </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">
+                    {`${firstname} ${lastname}`}
+                  </h3>
+                </div>
+                <div className="content">
+                  <ul className="px-7">
+                    {userDetails && userDetails?.account_type !== "FAMILY" && (
+                      <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
+                        <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">
+                              My Profile
+                            </p>
+                          </div>
+                        </Link>
+                      </li>
+                    )}
+                    <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
+                      <Link to={ account_type == "FULL" ? "/my-wallet" : "/family-wallet"} 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">
+                            My Wallet
+                          </p>
+                        </div>
+                      </Link>
+                    </li>
+                    {userDetails && userDetails?.account_type !== "FAMILY" && (
+                      <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
+                        <Link to="/yourpage" 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">
+                              My Page
+                            </p>
+                          </div>
+                        </Link>
+                      </li>
+                    )}
+                    {userDetails && userDetails?.account_type !== "FAMILY" && (
+                      <>
+                        <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
+                          <Link to="#" className="notifications">
+                            <div className="name">
+                              <p className="text-sm py-2 px-4 text-dark-gray dark:text-white font-medium">
+                                My Statements
+                              </p>
+                            </div>
+                          </Link>
+                        </li>
+                      </>
+                    )}
+                  </ul>
+                  <hr />
+                  <ul className="px-7">
+                    {userDetails && userDetails?.account_type !== "FAMILY" && (
+                      <>
+                        <li className="content-item relative my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
+                          <Link to="#" className="notifications">
+                            <div className="name">
+                              <div className="flex items-center justify-between text-sm py-2 px-4 text-dark-gray dark:text-white hover:text-sky-blue transition font-medium">
+                                <p>Language</p>
+                                <div className="px-1 flex items-center space-x-1 bg-slate-100 rounded-sm">
+                                  <p className="text-[10px]">English </p>
+                                  <img
+                                    className="w-[10px] h-[10px]"
+                                    src={Flag}
+                                    alt="U.S.A Flag"
+                                  />
+                                </div>
+                              </div>
+                            </div>
+                          </Link>
+                          {/* langauge list items*/}
+                          <div className="inner-list-items absolute rounded-lg">
+                            <ul className="p-3">
+                              <li className="content-item my-1 hover:bg-slate-100 transition duration-500 rounded-lg">
+                                <Link to="#" className="notifications">
+                                  <div className="name">
+                                    <div className="px-1 flex items-center space-x-1 bg-slate-100 rounded-sm text-sm py-1 text-dark-gray dark:text-white hover:text-sky-blue transition font-medium">
+                                      <img
+                                        className="w-[15px] h-[15px]"
+                                        src={Flag}
+                                        alt="U.S.A Flag"
+                                      />
+                                      <p className="text-sm">English </p>
+                                    </div>
+                                  </div>
+                                </Link>
+                              </li>
+                            </ul>
+                          </div>
+                          {/* end Language list items*/}
+                        </li>
+                        <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
+                          <Link to="#" 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
+                              </p>
+                            </div>
+                          </Link>
+                        </li>
+                      </>
+                    )}
+
+                    <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg cursor-pointer">
+                      <div className="name" onClick={logoutModalHandler}>
+                        <p className="text-sm py-2 px-4 text-dark-gray dark:text-white hover:text-sky-blue transition font-medium">
+                          {process.env.REACT_APP_LOGOUT_TEXT}
+                        </p>
+                      </div>
+                    </li>
+                  </ul>
+                  <hr className="mb-3" />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      {balanceDropdown || notificationDropdown || userProfileDropdown ? (
+        <div
+          onClick={clickAwayhandler}
+          className="w-full h-screen fixed left-0"
+          style={{ zIndex: "-1" }}
+        ></div>
+      ) : (
+        ""
+      )}
+    </>
+  );
+}
+
+const PageButton = () => {
+  return (
+    <Link
+      to="/yourpage"
+      className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]  items-center rounded-full relative  bg-sky-blue pr-1.5 pl-4"
+    >
+      <div className="flex items-center lg:justify-between justify-center w-full h-full">
+        <span className="lg:block hidden w-[25px]">
+          <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>
+        </span>
+        <p className="lg:text-xl text-lg font-bold text-white">My Page</p>
+        <span className="lg:block hidden">
+          {/* <Icons name="deep-plus" /> */}
+        </span>
+      </div>
+    </Link>
+  );
+};
+
+const HomeButton = () => {
+  return (
+    <Link
+      to="/"
+      className="flex user-balance cursor-pointer w-[110px] h-[48px] items-center rounded-full relative bg-sky-blue pr-1.5 pl-4"
+    >
+      <div className="flex items-center lg:justify-between justify-center w-full h-full">
+        <span className="">
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 24 24"
+            strokeWidth={1.5}
+            stroke="currentColor"
+            className="w-7 h-7 stroke-white fill-white"
+          >
+            <path
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              d="m2.25 12 8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25"
+            />
+          </svg>
+        </span>
+        <p className="lg:text-xl text-lg font-bold text-white">Home</p>
+        <span className=""></span>
+      </div>
+    </Link>
+  );
+};

src/components/Partials/MediaLayout.jsx

@@ -0,0 +1,127 @@
+import React, { useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { useNavigate } from "react-router-dom";
+import useToggle from "../../hooks/useToggle";
+import { drawerToggle } from "../../store/drawer";
+import ModalCom from "../Helpers/ModalCom";
+// import Header from "./Header";
+import MobileSidebar from "./MobileSideBar";
+import RightSideBar from "./RightSideBar";
+import Sidebar from "./Sidebar";
+import MediaHeader from "./MediaHeader";
+
+export default function MediaLayout({backpath, title, children }) {
+    const { drawer } = useSelector((state) => state.drawer);
+    const { userJobList } = useSelector((state) => state.userJobList);
+    const dispatch = useDispatch();
+    const [MobileSideBar, setMobileSidebar] = useToggle(false);
+    const [logoutModal, setLogoutModal] = useState(false);
+    const logoutModalHandler = () => {
+        setLogoutModal(!logoutModal);
+    };
+    const navigate = useNavigate();
+    const logOut = () => {
+        sessionStorage.clear();
+        localStorage.clear();
+        // toast.success("Come Back Soon", {
+        //   icon: `🙂`,
+        // });
+
+        navigate("/login", { replace: true });
+    };
+
+    //---------------------------------------
+    /* LET U DEAL WITH JOB LIST - we need to centralize this list  */
+    // const {jobListTable} = useSelector((state) => state.tableReload)
+    // const [myJobList, setMyJobList] = useState({loading: true, data:[]});
+    // const api = new usersService();
+
+    // const getMyJobList = async () => {
+    //   setMyJobList({loading: true, data:[]})
+    //   try {
+    //     const res = await api.getMyJobList();
+    //     setMyJobList({loading: false, data:res.data})
+    //     // setMyJobList(res.data);
+    //   } catch (error) {
+    //     setMyJobList({loading: false, data:[]})
+    //     console.log("Error getting mode");
+    //   }
+    // };
+    // useEffect(() => {
+    //   getMyJobList();
+    // }, [jobListTable]);
+
+    return (
+        <>
+            <div className="nft-main-wrapper-layout media container mx-auto">
+                <div className={`nft-wrapper-layout-container 2xl:pr-20 md:pr-10 pr-2 pl-2 md:pl-0 w-full min-h-screen flex`}>
+                    {/* sidebar */}
+                    {/*<div className={`nft-sidebar xl:block hidden section-shadow ${drawer ? "2xl:w-[335px] w-[280px] 2xl:pl-20 pl-10 pr-6 " : "w-[70px]"} bg-white dark:bg-dark-white h-full overflow-y-scroll overflow-style-none fixed left-0 top-0 pt-[30px]`}>*/}
+                    {/*    <Sidebar logoutModalHandler={logoutModalHandler} sidebar={drawer} action={() => dispatch(drawerToggle())} myJobList={userJobList} />*/}
+                    {/*</div>*/}
+                    {/*{MobileSideBar && (*/}
+                    {/*    <div onClick={() => setMobileSidebar.toggle()} className="bg-black bg-opacity-20 fixed left-0 top-0 w-full h-full z-[50] block xl:hidden"></div>*/}
+                    {/*)}*/}
+                    {/*<div className={`nft-sidebar block xl:hidden section-shadow w-[280px] pl-3 bg-white dark:bg-dark-white h-full overflow-y-scroll overflow-style-none fixed z-[60] top-0 pt-8 ${MobileSideBar ? "left-0" : "-left-[290px]"}`}>*/}
+                    {/*    <MobileSidebar logoutModalHandler={logoutModalHandler} sidebar={MobileSideBar} action={() => setMobileSidebar.toggle()} myJobList={userJobList} />*/}
+                    {/*</div>*/}
+                    {/* end sidebar */}
+                    <div className={`nft-header-container-wrapper flex-1 md:ml-12 xl:ml-[110px]  h-full`}>
+                        {/* header */}
+                        <div className="nft-header w-full lg:h-[100px] h-[70px] default-border-bottom dark:border-[#292967] z-40 xl:sticky fixed top-0 left-0 ">
+                            <MediaHeader backpath={backpath} title={title} sidebarHandler={() => setMobileSidebar.toggle()} logoutModalHandler={logoutModalHandler} />
+                        </div>
+                        {/* container */}
+                        <div className="nft-container container mx-auto 2xl:flex 2xl:space-x-8 h-full mb-12 lg:mt-[140px] mt-24 xl:mt-10 flex flex-col xl:flex-row items-start justify-center gap-4">
+                            <div className="nft-main-container_media flex-[100%] w-full">
+                                {children && children}
+                            </div>
+                            {/*<div className="nft-right-side-content 2xl:w-[270px] w-full h-full 2xl:flex justify-center relative flex-[20%]">*/}
+                            {/*    <RightSideBar myJobList={userJobList} />*/}
+                            {/*</div>*/}
+                        </div>
+                    </div>
+                </div>
+            </div>
+            {logoutModal && (
+                <ModalCom action={logoutModalHandler} situation={logoutModal}>
+                    <div className="logout-modal-wrapper w-11/12 sm:w-[460px] bg-white dark:bg-dark-white lg:rounded-2xl">
+                        <div className="modal-header-con">
+                            <h1 className="modal-title">
+                                Confirm
+                            </h1>
+                            <button type="button" className="modal-close-btn" onClick={logoutModalHandler}>
+                                <svg width="36" height="36" viewBox="0 0 36 36" fill="none" className="fill-current" xmlns="http://www.w3.org/2000/svg">
+                                    <path d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z" fill="" fillOpacity="0.6" />
+                                    <path d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z" fill="#" fillOpacity="0.6" />
+                                </svg>
+                            </button>
+                        </div>
+                        <div className="logout-modal-body w-full flex flex-col items-center px-10 py-8">
+                            <div className="what-icon mb-6 cursor-pointer">
+                                <svg width="136" height="136" viewBox="0 0 136 136" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                    <circle cx="68" cy="68" r="68" fill="#4687ba" />
+                                    <path d="M69.8844 35.7891C71.1588 36.0357 72.4569 36.1967 73.7044 36.5423C81.5447 38.7098 87.2705 45.5378 87.9574 53.6156C88.5113 60.1147 86.3075 65.6006 81.5043 70.0195C79.8359 71.5545 78.0497 72.9604 76.3408 74.4534C76.127 74.6397 75.9654 75.0037 75.9604 75.2872C75.9284 77.2752 75.9435 79.2649 75.9435 81.2965C70.8895 81.2965 65.8758 81.2965 60.7915 81.2965C60.7915 81.0616 60.7915 80.8385 60.7915 80.6137C60.7915 76.5454 60.7999 72.4772 60.7797 68.4106C60.778 67.9392 60.9312 67.649 61.2831 67.3537C64.5643 64.5957 67.8271 61.8175 71.1033 59.0545C72.2616 58.0781 72.9215 56.8702 72.9081 55.3419C72.8878 52.916 70.8608 50.9146 68.423 50.8911C65.9701 50.8693 63.9145 52.8053 63.832 55.2328C63.8084 55.8988 63.8286 56.5665 63.8286 57.2695C58.7745 57.2695 53.7744 57.2695 48.6917 57.2695C48.6917 56.3149 48.6462 55.3385 48.6984 54.3655C49.222 44.699 56.7442 36.8745 66.4331 35.8914C66.5762 35.8763 66.7142 35.8243 66.854 35.7891C67.8641 35.7891 68.8742 35.7891 69.8844 35.7891Z" fill="white" />
+                                    <path d="M67.485 100.21C66.1617 99.9268 64.9041 99.5091 63.803 98.6787C61.3804 96.8484 60.2877 93.7699 61.0386 90.7888C61.7726 87.8747 64.2138 85.6703 67.2089 85.2157C71.273 84.6 75.2024 87.3681 75.8135 91.277C76.4937 95.6153 73.8202 99.3782 69.544 100.103C69.4429 100.12 69.3487 100.172 69.2527 100.209C68.6635 100.21 68.0742 100.21 67.485 100.21Z" fill="white" />
+                                </svg>
+                            </div>
+                            <div className="mb-6">
+                                <p className="text-2xl tracking-wide text-center text-dark-gray dark:text-white">
+                                    Are you sure you want to Logout of your WrenchBoard account?
+                                </p>
+                            </div>
+                        </div>
+                        <div className="modal-footer-wrapper flex justify-center items-center gap-5">
+                            <button onClick={logOut} type="button" className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full">
+                                {`Yes ${process.env.REACT_APP_LOGOUT_TEXT}`}
+                            </button>
+                            <button onClick={logoutModalHandler} type="button" className=" border-gradient text-18 tracking-wide px-4 py-3 rounded-full">
+                                <span className="text-gradient">Not Now</span>
+                            </button>
+                        </div>
+                    </div>
+                </ModalCom>
+            )}
+        </>
+    );
+}

src/components/Partials/MobileSideBar.jsx

@@ -89,7 +89,9 @@ export default function MobileSidebar({
             <ul className="flex flex-col space-y-6">
               {/* Using mini component reduces the bulk amount of html */}
               <ListItem
-                title= {userDetails?.account_type == "FULL" ? "Dashboard" : "Home"}
+                title={
+                  userDetails?.account_type == "FULL" ? "Dashboard" : "Home"
+                }
                 route="/"
                 sidebar={sidebar}
                 iconName="new-dashboard"
@@ -190,17 +192,21 @@ export default function MobileSidebar({
                 <div className="items">
                   <ul className="flex flex-col space-y-6">
                     {[
-                      { name: "List", path: "/myjobs", iconName: "job-list" },
+                      {
+                        name: "List",
+                        path: "/myjobs",
+                        iconName: "job-list",
+                      },
+                      // {
+                      //   name: "Waiting",
+                      //   path: "/pend-interest",
+                      //   iconName: "pending-job",
+                      // },
                       {
                         name: "Offers",
                         path: "/my-offers",
                         iconName: "pending-job",
                       },
-                      {
-                        name: "Waiting",
-                        path: "/pend-interest",
-                        iconName: "pending-job",
-                      },
                       {
                         name: "Active",
                         path: "/my-active-jobs",

src/components/Partials/RightSideBar.jsx

@@ -4,6 +4,7 @@ import { NavLink } from "react-router-dom";
 //import SideStatistics from "./SideStatistics";
 import { localImgLoad } from "../../lib";
 import DarkModeContext from "../Contexts/DarkModeContext";
+import Icons from "../Helpers/Icons";
 
 export default function RightSideBar({ myJobList }) {
   const filterDatas = ["Last 15 days", "Last Month", "Last 6 month"];
@@ -39,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-10 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-6 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">
@@ -48,10 +49,10 @@ export default function RightSideBar({ myJobList }) {
             <div></div>
           </div>
 
-          <div className="platform-list">
+          <div className="platform-list flex flex-col gap-y-2.5">
             {userDetails && userDetails?.account_type !== "FAMILY" && (
               <>
-                <div className="item flex space-x-3 items-center mb-4">
+                <div className="item flex space-x-3 items-center">
                   {/* image */}
                   <div className="w-8 h-8 rounded-full">
                     <svg
@@ -81,7 +82,20 @@ export default function RightSideBar({ myJobList }) {
                   {/* action */}
                 </div>
 
-                <div className="item flex space-x-3 items-center mb-4">
+                <div className="item flex space-x-3 items-center">
+                  {/* image */}
+                  <div className="w-8 h-8 rounded-full flex items-center justify-center">
+                    <Icons name="pending-job" />
+                  </div>
+                  {/* name */}
+                  <div>
+                    <p className="text-thin-light-gray text-base font-medium">
+                      <NavLink to="/pend-interest">Waiting</NavLink>
+                    </p>
+                  </div>
+                  {/* action */}
+                </div>
+                <div className="item flex space-x-3 items-center">
                   {/* image */}
                   <div className="w-8 h-8 rounded-full">
                     <svg
@@ -115,10 +129,29 @@ 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 mb-4">
+            <div className="item flex space-x-3 items-center">
               {/* image */}
               <div className="w-8 h-8 rounded-full">
                 <svg
@@ -158,7 +191,7 @@ export default function RightSideBar({ myJobList }) {
             {/* dark mode */}
             <div
               onClick={darkMode.handleThemeSwitch}
-              className="item flex space-x-5 items-center mb-4 cursor-pointer"
+              className="item flex space-x-5 items-center cursor-pointer"
             >
               <span className="dark:text-dark-gray text-white">
                 {darkMode.theme === "light" ? (
@@ -235,6 +268,7 @@ export default function RightSideBar({ myJobList }) {
                     />
                   </svg>
                 )}
+
               </span>
               <p className="text-thin-light-gray text-base font-medium">
                 {darkMode.theme === "light" ? "Dark" : "Light"} Mode
@@ -255,8 +289,8 @@ export default function RightSideBar({ myJobList }) {
                 <div></div>
               </div>
 
-              <div className="platform-list">
-                <div className="px-8 item flex space-x-3 items-center mb-4">
+              <div className="platform-list flex flex-col gap-y-2.5">
+                <div className="px-8 item flex space-x-3 items-center">
                   {/* image */}
                   <div className="w-8 h-8 p-[4px] rounded-full">
                     <img
@@ -274,7 +308,25 @@ export default function RightSideBar({ myJobList }) {
                   {/* action */}
                 </div>
 
-                <div className="px-8 item flex space-x-3 items-center mb-4">
+                <div className="px-8 item flex space-x-3 items-center">
+                  {/* image */}
+                  <div className="w-8 h-8 p-[4px] rounded-full">
+                    <img
+                      src={localImgLoad("images/icons/job_active.svg")}
+                      className="w-full h-full"
+                      alt="Active Task"
+                    />
+                  </div>
+                  {/* name */}
+                  <div>
+                    <p className="text-thin-light-gray text-base font-medium">
+                      <NavLink to="/offer-interest">Offers Interest</NavLink>
+                    </p>
+                  </div>
+                  {/* action */}
+                </div>
+
+                <div className="px-8 item flex space-x-3 items-center">
                   {/* image */}
                   <div className="w-8 h-8 p-[4px] rounded-full">
                     <img
@@ -291,7 +343,7 @@ export default function RightSideBar({ myJobList }) {
                   </div>
                 </div>
 
-                <div className="px-8 item flex space-x-3 items-center mb-4">
+                <div className="px-8 item flex space-x-3 items-center">
                   {/* image */}
                   <div className="w-8 h-8 p-[4px] rounded-full">
                     <img
@@ -311,7 +363,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 mb-4">
+                <div className="px-8 item flex space-x-3 items-center">
                   {/* image */}
                   <div className="w-8 h-8 p-[4px] rounded-full">
                     <img

src/components/Partials/Sidebar.jsx

@@ -216,11 +216,11 @@ export default function Sidebar({
                         path: "/myjobs",
                         iconName: "job-list",
                       },
-                      {
-                        name: "Waiting",
-                        path: "/pend-interest",
-                        iconName: "pending-job",
-                      },
+                      // {
+                      //   name: "Waiting",
+                      //   path: "/pend-interest",
+                      //   iconName: "pending-job",
+                      // },
                       {
                         name: "Offers",
                         path: "/my-offers",

src/components/Resources/index.jsx

@@ -33,6 +33,9 @@ export default function Resources(props) {
   const CreatedBits = __resources?.productdata?.datas;
   const blogItems = __resources?.blogdata?.payload;
 
+  console.log(__resources);
+  console.log("Blog data >> ", blogItems);
+
   // My Items Data
   const [uploadedFiles, setUploadedFiles] = useState({
     loading: false,
@@ -63,7 +66,7 @@ export default function Resources(props) {
         loading: false,
         msg: "success",
         data: res?.result_list,
-        image:res?.session_image_server
+        image: res?.session_image_server,
       }));
     } catch (error) {
       setUploadedFiles((prev) => ({
@@ -79,7 +82,13 @@ export default function Resources(props) {
   }, [uploadsTable]);
 
   // const [tab, setTab] = useState(tab_categories ? tab_categories[0]?.name : "");
-  const [tab, setTab] = useState(props.activeTab? props.activeTab : tab_categories ? tab_categories[0]?.name : "");
+  const [tab, setTab] = useState(
+    props.activeTab
+      ? props.activeTab
+      : tab_categories
+      ? tab_categories[0]?.name
+      : ""
+  );
 
   const tabHandler = (value) => {
     setTab(value);
@@ -105,8 +114,12 @@ export default function Resources(props) {
 
   // const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
 
-    const defaultTabComponent = props.activeTab ? tabComponents[props.activeTab] : <BlogTab blogdata={blogItems} />;
-    const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
+  const defaultTabComponent = props.activeTab ? (
+    tabComponents[props.activeTab]
+  ) : (
+    <BlogTab blogdata={blogItems} />
+  );
+  const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
 
   // Tab Item Component
   const TabItem = ({ tabValue, isActive }) => {
@@ -160,17 +173,16 @@ export default function Resources(props) {
       <ul className="lg:flex lg:space-x-14 space-x-8">
         {tabCategories?.length > 0 &&
           tabCategories?.map((tabValue, idx) => {
-            if(tabValue.enabled){
+            if (tabValue.enabled) {
               return (
                 <TabItem
                   key={tabValue.id}
                   tabValue={tabValue}
                   isActive={tab === tabValue.name || (idx === 0 && tab === "")}
                 />
-              )
+              );
             }
-          }
-          )}
+          })}
       </ul>
     );
   };