family QR scan value changed

Merge branch 'Recent-Activities' of WrenchBoard/Users-Wrench into master
change btn type to submit
2023-09-09 21:29:24 +01:00 · 2023-09-09 06:07:32 +00:00 · 2023-09-09 07:00:18 +01:00 · 2023-09-08 19:54:33 +00:00 · 2023-09-08 19:54:23 +00:00 · 2023-09-08 19:54:17 +00:00
49 changed files with 1168 additions and 1185 deletions
@@ -24,7 +24,6 @@ REACT_APP_SESSION_EXPIRE_CHECKER=60000
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
 REACT_APP_SIGNUP_ERROR_TIMEOUT=7000

-REACT_APP_FLUTTERWAVE_APIKEY=FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X

 # Had to change the error time to 3sec cause it took too long
 REACT_APP_RESET_START_ERROR_TIMEOUT=3000
@@ -24,7 +24,6 @@ REACT_APP_SESSION_EXPIRE_CHECKER=60000
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
 REACT_APP_SIGNUP_ERROR_TIMEOUT=7000

-REACT_APP_FLUTTERWAVE_APIKEY=FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X

 # Had to change the error time to 3sec cause it took too long
 REACT_APP_RESET_START_ERROR_TIMEOUT=3000
@@ -24,7 +24,6 @@ REACT_APP_SESSION_EXPIRE_CHECKER=60000
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
 REACT_APP_SIGNUP_ERROR_TIMEOUT=7000

-REACT_APP_FLUTTERWAVE_APIKEY=FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X

 # Had to change the error time to 3sec cause it took too long
 REACT_APP_RESET_START_ERROR_TIMEOUT=3000
@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
@@ -57,6 +57,7 @@ export default function Routers() {
        {/* guest routes */}
        <Route exact path="/login" element={<LoginPage />} />
        <Route exact path="/eoffer" element={<LoginPage />} />
+        <Route exact path="/invite" element={<LoginPage />} />

        <Route exact path="/signup" element={<SignupPage />} />
        <Route exact path="/login/auth" element={<AuthRedirect />} />
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" id="files"><circle cx="64" cy="64" r="64" fill="#EF4C45"></circle><path fill="#CD2E30" d="M128 64v-2L92.4 26.5l-63.1 74 27.2 27c2.4.3 4.9.4 7.4.4C99.3 128 128 99.3 128 64z"></path><path fill="#E5E8EC" d="M93.5 78.4V29c0-1.9-1.5-3.4-3.4-3.4H41.8c-1.9 0-3.4 1.5-3.4 3.4v49.4h55.1z"></path><path fill="#FFF" d="M89.5 78.4V44.6H78.1c-1.9 0-3.4-1.5-3.4-3.4V29.9H37.8c-1.9 0-3.4 1.5-3.4 3.4v45.1h55.1z"></path><path fill="#FFCC04" d="m79.3 65.9-1.5 4c-.5 1.2-1.6 2-2.9 2H53.1c-1.3 0-2.4-.8-2.9-2l-1.5-4c-.5-1.3-1.7-2.2-3.1-2.2H30.9c-1.9 0-3.4 1.5-3.4 3.4v28.8c0 3.5 2.9 6.4 6.4 6.4H94c3.5 0 6.4-2.9 6.4-6.4V67.1c0-1.9-1.5-3.4-3.4-3.4H82.5c-1.4 0-2.7.9-3.2 2.2z"></path><path fill="#CED4DF" d="m74.9 45.8-.1-.1.1.1z"></path><path fill="#22D2FC" d="M74.7 29.9v11.4c0 1.9 1.5 3.4 3.4 3.4h11.4L74.7 29.9z"></path><path fill="#FFF" d="M74.1 81.6H53.9c-2 0-3.7 1.6-3.7 3.7 0 2 1.6 3.7 3.7 3.7h20.2c2 0 3.7-1.6 3.7-3.7 0-2-1.7-3.7-3.7-3.7z"></path></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 51 51" id="jpg"><circle cx="25.5" cy="25.5" r="24" fill="#FED000"></circle><path fill="#F39F03" d="M37.462 16.607v4.741a.924.924 0 0 1-.877.924v16.361c0 1.027-.84 1.867-1.867 1.867H18.282a1.866 1.866 0 0 1-1.867-1.867V22.272a.924.924 0 0 1-.877-.924v-4.741c0-.495.392-.906.877-.924v-1.316a1.86 1.86 0 0 1 1.867-1.867h16.436c1.027 0 1.867.83 1.867 1.867v1.316c.485.018.877.43.877.924z"></path><path fill="#FFF" d="M35.585 13.367v24.266c0 1.031-.836 1.867-1.867 1.867H17.282a1.867 1.867 0 0 1-1.867-1.867V13.367c0-1.031.836-1.867 1.867-1.867h16.436c1.03 0 1.867.836 1.867 1.867z" opacity=".96"></path><path fill="#33ACFE" d="M18.143 25.5h14.715v9.894H18.143z"></path><path fill="#273E56" d="M32.859 35.394h-7.622l3.959-4.357z"></path><path fill="#334861" d="M29.048 35.394H18.143l5.664-7.357z"></path><circle cx="27.697" cy="28.037" r="1.094" fill="#FED000"></circle><path fill="#EB4B33" d="M35.462 21.28H15.538a1 1 0 0 1-1-1v-4.604a1 1 0 0 1 1-1h19.924a1 1 0 0 1 1 1v4.605a1 1 0 0 1-1 1z"></path><path fill="#FFF" d="M22.511 18.797c0 .57-.155 1.499-1.475 1.499-.737 0-1.456-.403-1.456-1.37v-.384h.88v.199c0 .427.105.737.564.737.514 0 .514-.409.514-.725v-2.987h.973v3.03zm.857-3.031h1.996c1.109 0 1.53.7 1.53 1.42 0 .718-.421 1.418-1.53 1.418H24.34v1.587h-.973v-4.425zm.973 2.082h.756c.446 0 .855-.099.855-.663 0-.564-.409-.663-.855-.663h-.756v1.326zm6.36 1.84a1.49 1.49 0 0 1-1.214.608c-1.364 0-2.176-1.023-2.176-2.299 0-1.314.812-2.336 2.176-2.336.905 0 1.766.552 1.865 1.561h-.93c-.117-.496-.47-.743-.935-.743-.874 0-1.202.743-1.202 1.518 0 .738.328 1.48 1.202 1.48.638 0 .997-.334 1.053-.953h-.98V17.8h1.86v2.392h-.62l-.099-.502z"></path></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" viewBox="0 0 512 512" id="mp4-file"><circle cx="256" cy="256" r="256" fill="#8ABE4F"></circle><path fill="#7BA840" d="M511.9 262.5 346.6 96.8c-1.1-1.1-3.1-1.1-4.3 0l-37.4 43.4c-.6.6-.8 1.2-.7 1.9l-3.4-6.1H159.2c-13.1 0-23.7 10.6-23.7 23.7v145.6l7.9 5.9h-16.2v66.6l8.3 7.9v6.6c0 7.6 3.5 14.3 9 18.6.7.9 58.1 58.3 100.6 100.9 3.6.1 7.2.2 10.8.2 139.3 0 252.5-111.1 256-249.5z"></path><g fill="#FFF"><path d="M169.1 193.7h145.4V206H169.1zM169.1 213.5h145.4v12.3H169.1zM169.1 233.4h145.4v12.3H169.1zM169.1 253.3h145.4v12.3H169.1zM169.1 273.1H282v12.3H169.1zM384.1 140.2l-37.4-43.4c-1.1-1.1-3.1-1.1-4.3 0L305 140.2c-1.7 1.6-.4 4.3 2.1 4.3h17.6v34h39.8v-34h17.6c2.3 0 3.6-2.6 2-4.3zM324.6 184.7h39.8v15.5h-39.8zM324.6 212c0 1.4 1.3 2.6 2.9 2.6h34c1.6 0 2.9-1.1 2.9-2.6v-5.7h-39.8v5.7z"></path><path d="M339.7 389.3c0 10.1-8.2 18.3-18.3 18.3H162.2c-10.1 0-18.3-8.2-18.3-18.3v-5.6h-8.4v8.6c0 13.1 10.6 23.7 23.7 23.7h165.2c13.1 0 23.7-10.6 23.7-23.7V220.4h-8.4v168.9zM143.9 162.7c0-10.1 8.2-18.3 18.3-18.3h136.4c-.9-2.8-.2-6 1.9-8.2l.2-.3H159.2c-13.1 0-23.7 10.6-23.7 23.7v145.6h8.4V162.7z"></path><path d="M313.2 344.5c0-18.4-14.9-33.3-33.3-33.3H127.2v66.6h152.7c18.4 0 33.3-14.9 33.3-33.3zm-109 19.2h-6.4v-27.6h-.2L187 363.7h-4.4l-10.8-28.1-.2.1v28.1h-6.4v-38.4h8.4l11 29.5h.2l11.1-29.5h8.2v38.3zm34.4-17.8c-2.4 2.2-5.7 3.3-10 3.3h-8.3v14.6h-6.4v-38.4h14.7c4.2 0 7.6 1.1 10 3.3 2.4 2.2 3.6 5.1 3.6 8.6s-1.2 6.4-3.6 8.6zm36.5 9.3h-4.9v8.5h-6.4v-8.5h-16.1l-.2-3.9 16-26h6.6V350h4.9v5.2z"></path><path d="m263.1 335.8-9.2 14.2h9.9v-15.7h-.1zM228.6 330.4h-8.3V344h8.3c2.4 0 4.2-.6 5.4-1.9 1.2-1.3 1.8-2.9 1.8-4.8s-.6-3.6-1.8-4.9c-1.2-1.3-3-2-5.4-2z"></path></g></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 90 90" viewBox="0 0 90 90" id="pdf"><circle cx="45" cy="45" r="44.5" fill="#84D2ED"></circle><polygon fill="#EFC41C" stroke="#010101" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="1.978" points="35.6 18.8 35.6 31.9 22.5 31.9 22.5 71.2 62.8 71.2 62.8 18.8"></polygon><polygon fill="#8CC749" stroke="#010101" stroke-miterlimit="10" stroke-width="1.978" points="22.5 31.9 22.5 31.9 22.5 31.9"></polygon><polygon fill="#EB665F" stroke="#010101" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="1.978" points="35.6 18.8 22.5 31.9 22.5 31.9 35.6 31.9"></polygon><rect width="35.9" height="15.7" x="31.6" y="40.2" fill="#F2DFD5" stroke="#010101" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="1.978"></rect><path fill="#010101" d="M43 44c.7.6 1 1.5 1 2.7 0 1.2-.4 2.1-1.1 2.7-.7.6-1.8.9-3.3.9h-1.3v2.8h-2.2v-9.9h3.5C41.2 43.1 42.3 43.4 43 44zM41.4 47.9c.3-.3.4-.7.4-1.3 0-.6-.2-1-.5-1.2C41 45.2 40.4 45 39.7 45h-1.3v3.3h1.5C40.6 48.4 41.2 48.2 41.4 47.9zM53.4 44.4c.9.9 1.4 2.1 1.4 3.6 0 1.5-.5 2.8-1.4 3.7-.9.9-2.3 1.3-4.2 1.3h-3.4v-9.9h3.5C51.1 43.1 52.5 43.6 53.4 44.4zM51.8 50.3c.5-.5.8-1.3.8-2.2s-.3-1.7-.8-2.3c-.5-.5-1.4-.8-2.5-.8H48v6h1.4C50.5 51.1 51.2 50.9 51.8 50.3zM63.6 43.1v1.9H59v2.1h4.4v1.9H59v3.9h-2.2v-9.9H63.6z"></path></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="655.359" height="655.359" fill-rule="evenodd" clip-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" viewBox="0 0 6.827 6.827" id="png-file"><circle cx="3.413" cy="3.413" r="3.413" fill="#42a5f5"></circle><path fill="#fffffe" d="M1.744 4.074h.27V1.75a.164.164 0 0 1 .164-.164H4.3l.023.022.544.545.023.023v1.898h.191a.198.198 0 0 1 .198.199v.77a.198.198 0 0 1-.198.198H1.744a.198.198 0 0 1-.198-.199v-.769a.198.198 0 0 1 .198-.199zm.425 0h2.567V2.24l-.004-.004h-.498v-.495H2.178a.009.009 0 0 0-.007.003.009.009 0 0 0-.002.006v2.324zm.389-.7h1.789v.156h-1.79v-.156zm0-.544h1.789v.156h-1.79V2.83zm.07 2.094V4.37h.179c.068 0 .112.003.132.009a.145.145 0 0 1 .08.054.172.172 0 0 1 .032.107.18.18 0 0 1-.018.086.152.152 0 0 1-.047.055.162.162 0 0 1-.058.026.637.637 0 0 1-.116.008h-.073v.209h-.111zm.111-.46v.157H2.8a.29.29 0 0 0 .089-.009.074.074 0 0 0 .034-.027.075.075 0 0 0 .013-.043.072.072 0 0 0-.018-.05.077.077 0 0 0-.044-.024.532.532 0 0 0-.08-.004h-.055zm.405.46V4.37h.109l.226.37v-.37h.104v.554h-.112l-.223-.361v.36h-.104zm.814-.204v-.093H4.2v.22a.372.372 0 0 1-.237.086.304.304 0 0 1-.15-.036.232.232 0 0 1-.098-.105.337.337 0 0 1-.032-.147.32.32 0 0 1 .036-.154.244.244 0 0 1 .106-.102.285.285 0 0 1 .132-.028.26.26 0 0 1 .161.043.195.195 0 0 1 .075.12l-.111.02a.118.118 0 0 0-.044-.064.133.133 0 0 0-.08-.024.152.152 0 0 0-.117.047c-.029.03-.043.077-.043.138 0 .065.014.114.044.147.029.033.067.05.114.05a.194.194 0 0 0 .07-.014.244.244 0 0 0 .061-.034v-.07h-.128z"></path><path fill="none" d="M1.547 1.547H5.28V5.28H1.547z"></path></svg>
@@ -0,0 +1,3 @@
+<svg width="1200" height="1227" viewBox="0 0 1200 1227" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M714.163 519.284L1160.89 0H1055.03L667.137 450.887L357.328 0H0L468.492 681.821L0 1226.37H105.866L515.491 750.218L842.672 1226.37H1200L714.137 519.284H714.163ZM569.165 687.828L521.697 619.934L144.011 79.6944H306.615L611.412 515.685L658.88 583.579L1055.08 1150.3H892.476L569.165 687.854V687.828Z" fill="white"/>
+</svg>
@@ -1,6 +1,6 @@
 import { Field, Form, Formik } from "formik";
 import React, { useEffect, useState } from "react";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import * as Yup from "yup";
 import usersService from "../../services/UsersService";
 import { tableReload } from "../../store/TableReloads";
@@ -11,7 +11,7 @@ const validationSchema = Yup.object().shape({
  country: Yup.string()
    .min(1, "Minimum 3 characters")
    .max(25, "Maximum 25 characters")
-    .required("Country is required"),
+    .required("Currency is required"),
  price: Yup.string()
    .typeError("Invalid number")
    .min(1, "Price must be greater than 0")
@@ -43,15 +43,9 @@ const validationSchema = Yup.object().shape({

 function AddJob({ popUpHandler, categories }) {
  const ApiCall = new usersService();
-
+  const { walletDetails } = useSelector((state) => state.walletDetails);
  let dispatch = useDispatch();

-  let [currency, setCurrency] = useState({
-    loading: true,
-    status: false,
-    data: null,
-  }); // To Hold the array of currency getUserCurrency returns
-
  let initialValues = {
    // initial values for formik
    country: "",
@@ -69,30 +63,15 @@ function AddJob({ popUpHandler, categories }) {
    message: "",
  }); // Holds state when submit button is pressed

-  // 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;
-        }
-
-        setCurrency({
-          loading: false,
-          status: true,
-          data: res.data.result_list,
-        });
-      })
-      .catch((err) => {
-        setCurrency({ loading: false, status: false, data: [] });
-      });
+  const getWalletDetail = (country) => { // A FUNCTION TO GET USER BALANCE BASED ON COUNTRY SELECTED
+    const walletChecker = walletDetails?.data.find(
+      (item) => item.country === country
+    );
+    return walletChecker ? walletChecker.amount : 0;
  };

-  // FUNCTION TO HANDLE ADD JOB FORM
-  const handleAddJob = (values, helpers) => {
-    let reqData = {
+  const handleAddJob = async (values, helpers) => {
+    const reqData = {
      country: values?.country,
      price: Number(values.price) * 100,
      title: values?.title,
@@ -102,20 +81,35 @@ function AddJob({ popUpHandler, categories }) {
      category: values.category?.join("@"),
    };

+    const walletAmount = getWalletDetail(reqData.country); // GETTING USER BALANCE BASED ON COUNTRY SELECTED
+
+    if (reqData.price > walletAmount) {
+      setRequestStatus({
+        loading: false,
+        status: false,
+        message: "Insufficient Balance",
+      });
+
+      setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 1500);
+      return;
+    }
+
    setRequestStatus({ loading: true, status: false, message: "" });
-    ApiCall.jobManagerCreateJob(reqData)
-      .then((res) => {
-        if (res.data.internal_return < 1) {
-          setRequestStatus({
-            loading: false,
-            status: false,
-            message: "Could not complete your request at the moment",
-          });
-          setTimeout(() => {
-            popUpHandler();
-          }, 1500);
-          return;
-        }
+
+    try {
+      const res = await ApiCall.jobManagerCreateJob(reqData);
+      if (res.data.internal_return < 1) {
+        setRequestStatus({
+          loading: false,
+          status: false,
+          message: "Could not complete your request at the moment",
+        });
+        setTimeout(() => {
+          popUpHandler();
+        }, 1500);
+      } else {
        setRequestStatus({
          loading: false,
          status: true,
@@ -125,25 +119,20 @@ function AddJob({ popUpHandler, categories }) {
          dispatch(tableReload({ type: "JOBTABLE" }));
          popUpHandler();
        }, 1000);
-      })
-      .catch((err) => {
-        setRequestStatus({
-          loading: false,
-          status: false,
-          message: "Opps! something went wrong. Try Again",
-        });
-      })
-      .finally(() => {
-        setTimeout(() => {
-          setRequestStatus({ loading: false, status: false, message: "" });
-        }, 5000);
+      }
+    } catch (err) {
+      setRequestStatus({
+        loading: false,
+        status: false,
+        message: "Oops! Something went wrong. Try Again",
      });
+    } finally {
+      setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 5000);
+    }
  };

-  useEffect(() => {
-    getUserCurrency();
-  }, []);
-
  return (
    <div className="add-job p-5 w-full bg-white rounded-md flex flex-col justify-between">
      <Formik
@@ -164,7 +153,11 @@ function AddJob({ popUpHandler, categories }) {
                        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>}
+                        {props.errors.country && props.touched.country && (
+                          <span className="text-[12px] text-red-500">
+                            {props.errors.country}
+                          </span>
+                        )}
                      </label>
                      <select
                        id="country"
@@ -174,16 +167,16 @@ function AddJob({ popUpHandler, categories }) {
                        onChange={props.handleChange}
                        onBlur={props.handleBlur}
                      >
-                        {currency.loading ? (
+                        {walletDetails.loading ? (
                          <option className="text-slate-500 text-lg" value="">
                            Loading...
                          </option>
-                        ) : currency.data.length ? (
+                        ) : walletDetails.data.length ? (
                          <>
                            <option className="text-slate-500 text-lg" value="">
                              Select a currency
                            </option>
-                            {currency.data?.map((item, index) => (
+                            {walletDetails.data?.map((item, index) => (
                              <option
                                key={index}
                                className="text-slate-500 text-lg"
@@ -214,7 +207,11 @@ function AddJob({ popUpHandler, categories }) {
                        value={props.values.price}
                        inputHandler={props.handleChange}
                        blurHandler={props.handleBlur}
-                        error={props.errors.price && props.touched.price && props.errors.price}
+                        error={
+                          props.errors.price &&
+                          props.touched.price &&
+                          props.errors.price
+                        }
                      />
                    </div>
                  </div>
@@ -231,7 +228,11 @@ function AddJob({ popUpHandler, categories }) {
                      value={props.values.title}
                      inputHandler={props.handleChange}
                      blurHandler={props.handleBlur}
-                      error={props.errors.title && props.touched.title && props.errors.title}
+                      error={
+                        props.errors.title &&
+                        props.touched.title &&
+                        props.errors.title
+                      }
                    />
                  </div>

@@ -247,7 +248,11 @@ function AddJob({ popUpHandler, categories }) {
                      value={props.values.description}
                      inputHandler={props.handleChange}
                      blurHandler={props.handleBlur}
-                      error={props.errors.description && props.touched.description && props.errors.description}
+                      error={
+                        props.errors.description &&
+                        props.touched.description &&
+                        props.errors.description
+                      }
                    />
                  </div>

@@ -259,7 +264,12 @@ function AddJob({ popUpHandler, categories }) {
                        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>}
+                        {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"
@@ -286,19 +296,28 @@ function AddJob({ popUpHandler, categories }) {
                        role="group"
                        aria-labelledby="checked-group"
                      >
-                        {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>
+                        {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 &&
@@ -335,6 +354,7 @@ function AddJob({ popUpHandler, categories }) {
                      <option value="">Select Duration</option>
                      {publicArray.map(({ name, duration }, idx) => (
                        <option
+                          key={idx}
                          className="text-slate-500 text-lg"
                          value={duration}
                        >
@@ -1,26 +1,26 @@
-import React, { useEffect } from 'react';
-import { useLocation, useNavigate } from 'react-router-dom';
-import usersService from '../../../services/UsersService';
-import {updateUserDetails} from "../../../store/UserDetails";
+import React, { useEffect } from "react";
 import { useDispatch } from "react-redux";
+import { useLocation, useNavigate } from "react-router-dom";
+import usersService from "../../../services/UsersService";
+import { updateUserDetails } from "../../../store/UserDetails";
 import AuthLayout from "../AuthLayout";

 function Redirect() {
-    const location = useLocation();
-    const navigate = useNavigate();
-    const userApi = new usersService();
-    const dispatch = useDispatch()
+  const location = useLocation();
+  const navigate = useNavigate();
+  const userApi = new usersService();
+  const dispatch = useDispatch();

-    const queryParams = new URLSearchParams(location?.search);
-    const codeResponse = queryParams.get("code");
+  const queryParams = new URLSearchParams(location?.search);
+  const codeResponse = queryParams.get("code");

-    useEffect(()=>{
-      if(!codeResponse){
-        navigate('/login', {state: {error: true}})
-        return
-      }
-      console.log(codeResponse);
-      /*
+  useEffect(() => {
+    if (!codeResponse) {
+      navigate("/login", { state: { error: true } });
+      return;
+    }
+    console.log(codeResponse);
+    /*
      POST /token HTTP/1.1
      Host: oauth2.googleapis.com
      Content-Type: application/x-www-form-urlencoded
@@ -31,34 +31,40 @@ function Redirect() {
      redirect_uri=https%3A//oauth2.example.com/code&
      grant_type=authorization_code
      */
-      var reqData = {
-        auth_type: "GOOGLE",
-        code: codeResponse,
-        redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
-      };
-      userApi
-        .authStart(reqData)
-        .then((res) => {
-          if (res.status == 200  && res.data.internal_return >= 0 && res.data.member_id && res.data.uid && res.data.session) {
-            localStorage.setItem("member_id", `${res.data.member_id}`);
-            localStorage.setItem("uid", `${res.data.uid}`);
-            localStorage.setItem("session_token", `${res.data.session}`);
-            dispatch(updateUserDetails({...res.data}));
-            navigate('/', {replace: true})
-            return
-          }
-          navigate('/login', {state: {error: true}})
-        })
-        .catch((error) => {
-          navigate('/login', {state: {error: true}})
-          console.log(error);
-        });
-    },[])
+    var reqData = {
+      auth_type: "GOOGLE",
+      code: codeResponse,
+      redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
+    };
+    userApi
+      .authStart(reqData)
+      .then((res) => {
+        if (
+          res.status == 200 &&
+          res.data.internal_return >= 0 &&
+          res.data.member_id &&
+          res.data.uid &&
+          res.data.session
+        ) {
+          localStorage.setItem("member_id", `${res.data.member_id}`);
+          localStorage.setItem("uid", `${res.data.uid}`);
+          localStorage.setItem("session_token", `${res.data.session}`);
+          dispatch(updateUserDetails({ ...res.data }));
+          navigate("/", { replace: true });
+          return;
+        }
+        navigate("/login", { state: { error: true } });
+      })
+      .catch((error) => {
+        navigate("/login", { state: { error: true } });
+        console.log(error);
+      });
+  }, []);
  return (
    <AuthLayout>
-    <div className='min-h-[70vh]'>Redirecting ... </div>
-  </AuthLayout>
-  )
+      <div className="min-h-[70vh]">Redirecting ... </div>
+    </AuthLayout>
+  );
 }

-export default Redirect
+export default Redirect;
@@ -342,6 +342,7 @@ export default function Login() {
                          imgSrc={appleLogo}
                          brand="Apple"
                          isAnchor={true}
+                          style={{visibility: 'hidden'}}
                        />
                      </div>
                      <div className="sm:flex sm:justify-between sm:items-center sm:space-x-2">
@@ -446,7 +447,7 @@ export default function Login() {
  );
 }

-const BrandBtn = ({ link, imgSrc, brand, onClick, isAnchor = false }) => {
+const BrandBtn = ({ link, imgSrc, brand, onClick, isAnchor = false, style = {visibility: 'visible' } }) => {
  // const doGoogle = async () => {
  //   alert("start google");
  // };
@@ -466,7 +467,7 @@ const BrandBtn = ({ link, imgSrc, brand, onClick, isAnchor = false }) => {
  //   alert("start facebook");
  // };
  return (
-    <div className="w-full sm:w-1/2 flex justify-center bottomMargin">
+    <div className="w-full sm:w-1/2 flex justify-center bottomMargin" style={style}>
      {isAnchor ? (
        <a
          href={link}
@@ -1,9 +1,7 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
-import MarketPopUp from "../MarketPlace/PopUp/MarketPopUp";
-import usersService from "../../services/UsersService";
-import { PriceFormatter } from "../Helpers/PriceFormatter";
+import { useEffect, useState } from "react";
 import dataImage2 from "../../assets/images/data-table-user-2.png";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+import MarketPopUp from "../MarketPlace/PopUp/MarketPopUp";

 export default function AvailableJobsCard({
  className,
@@ -156,27 +154,6 @@ export default function AvailableJobsCard({
                </p>
              </div>

-              {/* <div className="card-two-info flex gap-2 items-center">
-              <div className="owned-by flex space-x-2 items-center">
-                <div>
-                  <p className="text-thin-light-gray text-sm leading-3">Added</p>
-                  <p className="text-base   text-dark-gray dark:text-white">
-                    {datas.offer_added}
-                  </p>
-                </div>
-              </div>
-              <div className="w-[1px] bg-light-purple dark:bg-dark-light-purple  h-7"></div>
-              <div className="created-by flex space-x-2 items-center flex-row-reverse">
-                <div>
-                  <p className="text-thin-light-gray text-sm leading-3 text-right">
-                    Expires
-                  </p>
-                  <p className="text-base text-dark-gray dark:text-white text-right">
-                    {datas.expire}
-                  </p>
-                </div>
-              </div>
-            </div> */}
              <div className="block sm:flex flex-wrap gap-4">
                <p className="text-sm text-thin-light-gray flex flext-start gap-1">
                  Price: <span className="text-purple">{thePrice}</span>
@@ -197,7 +197,7 @@ const  AssignTaskPopout = React.memo(({ action, details, situation, familyDetail
        <div className="w-full h-full lg:w-[700px] lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
          <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 {familyDetails?.firstname || details.firstName}
+              Assign task to {familyDetails?.firstname || details?.firstName}
            </h1>
            <button
              type="button"
@@ -263,7 +263,7 @@ const  AssignTaskPopout = React.memo(({ action, details, situation, familyDetail
                  </div>
                  {/* Task Type === select */}
                  {taskType == "select" && (
-                    <div className="p-4 w-full h-[400px] overflow-y-auto bg-slate-100">
+                    <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
@@ -283,7 +283,7 @@ const  AssignTaskPopout = React.memo(({ action, details, situation, familyDetail
                              }
                              className="w-[15px] h-[15px] cursor-pointer"
                            />
-                            <p className="w-full text-dark-gray tracking-wide">
+                            <p className="w-full text-dark-gray dark:text-white tracking-wide">
                              {item?.title}
                            </p>
                          </div>
@@ -354,7 +354,7 @@ const  AssignTaskPopout = React.memo(({ action, details, situation, familyDetail
                              Delivery Detail
                            </label>
                            <textarea
-                              className={`p-1 w-full text-sm text-slate-900 outline-none border border-slate-300 rounded-md`}
+                              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}
@@ -1,7 +1,10 @@
 import { forwardRef } from "react";
 import QRCode from "react-qr-code";
+import { useSelector } from "react-redux";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";

-const FamilyAccount = forwardRef(({ familyData, myRef, handlePrint }, ref) => {
+const FamilyAccount = forwardRef(({ familyData, myRef, handlePrint, loader }, ref) => {
+  const { userDetails } = useSelector((state) => state.userDetails);
  return (
    <div
      className="w-full lg:min-h-[538px] p-3 h-full flex flex-col items-center justify-center"
@@ -32,12 +35,19 @@ const FamilyAccount = forwardRef(({ familyData, myRef, handlePrint }, ref) => {
            <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 ?
+            <div className="w-full">
+              <LoadingSpinner size='8' color='sky-blue' />
+            </div>
+            :
            <QRCode
              size={256}
              style={{ height: "auto", maxWidth: "100%", width: "100%" }}
-              value={`https://www.google.com`}
+              // value={`https://www.google.com`}
+              value={`${userDetails?.uid}@${familyData?.username}@${familyData?.pin}`}
              viewBox={`0 0 256 256`}
            />
+            }
          </div>
        </div>
        <div className="h-[50px] w-full flex justify-center items-center">
@@ -92,8 +92,8 @@ export default function InputCom({
          value={value}
          onChange={inputHandler}
          className={`input-field placeholder:text-base text-dark-gray w-full h-full ${
-            inputBg ? inputBg : "bg-[#FAFAFA] tracking-wide"
-          } dark:bg-[#11131F] focus:ring-0 focus:outline-none ${fieldClass}`}
+            inputBg ? inputBg : "bg-[#FAFAFA] dark:bg-[#11131F] tracking-wide"
+          } focus:ring-0 focus:outline-none ${fieldClass}`}
          type={type}
          id={name}
          name={name}
@@ -1,267 +1,129 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import dataImage1 from "../../assets/images/data-table-user-1.png";
-import dataImage2 from "../../assets/images/data-table-user-2.png";
-import dataImage3 from "../../assets/images/data-table-user-3.png";
-import dataImage4 from "../../assets/images/data-table-user-4.png";
-import SelectBox from "../Helpers/SelectBox";
+import usersService from "../../services/UsersService";
+import LoadingSpinner from "../Spinners/LoadingSpinner";

 export default function HomeActivities({ className }) {
-    const filterCategories = ["All Categories", "Explore", "Featured"];
-    const [selectedCategory, setCategory] = useState(filterCategories[0]);
-    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 || ""
-            }`}
-        >
-            <div className="header w-full sm:flex justify-between items-center mb-5">
-                <div className="flex space-x-2 items-center mb-2 sm:mb-0">
-                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
-                       Recent Activities
-                    </h1>
+  const [recentActivitiesData, setRecentActivitiesData] = useState({
+    loading: false,
+    status: false,
+    msg: "",
+    data: null,
+  });

-                </div>
-            </div>
-            <div className="relative w-full overflow-x-auto sm:rounded-lg">
-                <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
-                    <tbody>
-                    {/* table heading */}
-                    {/*<tr className="text-base text-thin-light-gray whitespace-nowrap px-2 border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
-                    {/*    <td className="py-4 w-[300px] block whitespace-nowrap">*/}
-                    {/*        All Product*/}
-                    {/*    </td>*/}
-                    {/*    <td className="py-4 whitespace-nowrap text-center">.</td>*/}
-                    {/*    <td className="py-4 whitespace-nowrap text-center"></td>*/}
+  const _apiCall = new usersService();

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

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

-                        <td className="text-right py-4">
-                            <button
-                                type="button"
-                                className="text-sm text-white bg-light-green px-2.5 py-1.5 rounded-full"
-                            >
-                                Complated
-                            </button>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
+  console.log(recentActivitiesData);
+
+  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 || ""
+      }`}
+    >
+      <div className="header w-full sm:flex justify-between items-center mb-5">
+        <div className="flex space-x-2 items-center mb-2 sm:mb-0">
+          <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
+            Recent Activities
+          </h1>
        </div>
-    );
+      </div>
+      <div className="relative w-full overflow-x-auto sm:rounded-lg">
+        <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+          <tbody>
+            {/* table heading */}
+            {/*<tr className="text-base text-thin-light-gray whitespace-nowrap px-2 border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
+            {/*    <td className="py-4 w-[300px] block whitespace-nowrap">*/}
+            {/*        All Product*/}
+            {/*    </td>*/}
+            {/*    <td className="py-4 whitespace-nowrap text-center">.</td>*/}
+            {/*    <td className="py-4 whitespace-nowrap text-center"></td>*/}
+
+            {/*    <td className="py-4 whitespace-nowrap text-right"></td>*/}
+            {/*</tr>*/}
+
+            {recentActivitiesData.loading ? (
+              <div className="h-[100px] w-full flex justify-center items-center">
+                <LoadingSpinner color="sky-blue" size="16" />
+              </div>
+            ) : recentActivitiesData.data ? (
+              recentActivitiesData.data?.map((item) => {
+                let addedDate = item?.added?.split(" ")[0];
+                return (
+                  <tr
+                    className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50"
+                    key={item.uid}
+                  >
+                    <td className=" py-8">
+                      <div className="flex space-x-2 items-center">
+                        <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                          <img
+                            src={dataImage1}
+                            alt="data"
+                            className="w-full h-full"
+                          />
+                        </div>
+                        <div className="flex flex-col">
+                          <h1 className="font-bold text-xl   text-dark-gray dark:text-white">
+                            {item.title ? item.title : "Title"}
+                          </h1>
+                          <span className="text-sm text-thin-light-gray">
+                            {item.description ? item.description : ""}
+                          </span>
+                        </div>
+                      </div>
+                    </td>
+
+                    <td className="text-right py-4">
+                      <div className="flex space-x-1 items-center justify-center">
+                        <span className="text-base text-dark-gray dark:text-white font-medium">
+                          {item.added ? addedDate : ""}
+                        </span>
+                      </div>
+                    </td>
+                  </tr>
+                );
+              })
+            ) : null}
+          </tbody>
+        </table>
+      </div>
+    </div>
+  );
 }
@@ -7,7 +7,7 @@ import FamilyDash from "./FamilyDash";
 import FullAccountDash from "./FullAccountDash";

 export default function Home(props) {
-  console.log("PROPS IN HOME->", props);
+ // console.log("PROPS IN HOME->", props);
  const userApi = new usersService();
  const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);

@@ -1,8 +1,8 @@
 import React, { useEffect, useMemo, useState } from "react";
-import DataIteration from "../Helpers/DataIteration";
-import AvailableJobsCard from "../Cards/AvailableJobsCard";
-import ListView from "../../assets/images/list-view.png";
 import GridView from "../../assets/images/grid-view.svg";
+import ListView from "../../assets/images/list-view.png";
+import AvailableJobsCard from "../Cards/AvailableJobsCard";
+import DataIteration from "../Helpers/DataIteration";
 import SelectBox from "../Helpers/SelectBox";

 export default function MainSection({
@@ -125,10 +125,10 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
          <CloseIcon onClose={onClose} />
        </div>

-        <div className="md:flex bg-white rounded-lg">
+        <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="min-h-[263px]">
-              <h2 className="font-semibold text-slate-900 dark:text-black tracking-wide">
+              <h2 className="font-semibold text-slate-900 dark:text-white tracking-wide">
                {details?.title}
              </h2>

@@ -152,11 +152,11 @@ 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%] text-slate-900 tracking-wide font-semibold whitespace-pre-wrap">
+                  <label className="w-full md:w-[19%] tracking-wide font-semibold whitespace-pre-wrap">
                    {name}
                  </label>
                  <div
-                    className={`w-full md:w-3/4 text-slate-900 market-pop ${
+                    className={`w-full md:w-3/4 text-slate-900 dark:text-white market-pop ${
                      name !== "Delivery Detail"
                        ? " h-full max-h-28 flex items-center"
                        : " overflow-y-auto max-h-[100px]"
@@ -164,20 +164,20 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
                  >
                    {danger ? (
                      <p
-                        className={``}
+                        className={`dark:text-white`}
                        dangerouslySetInnerHTML={{
                          __html: danger && content,
                        }}
                      />
                    ) : (
-                      <p className={`w-full text-slate-900`}>
+                      <p className={`w-full text-slate-900 dark:text-white`}>
                        {name !== "Delivery Detail" ? (
                          <>
                            {typeof content !== "object" ? content : null}
                            {typeof content === "object" && (
                              <>
                                <hr className="mb-1" />
-                                <span className="flex items-center gap-2">
+                                <span className="flex items-center gap-2 dark:text-white">
                                  {content?.text}
                                  <strong>{thePrice}</strong>
                                </span>
@@ -197,11 +197,11 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
            <hr />
            <div className="my-3 w-full flex flex-col gap-3">
              <div className="w-full">
-                <label className="w-full text-slate-900 tracking-wide">
+                <label className="w-full text-slate-900 dark:text-white tracking-wide">
                  If you have any questions about this task:
                </label>
                <textarea
-                  className={`p-1 w-full text-sm text-slate-900 outline-none border border-slate-300 rounded-md`}
+                  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" }}
                  placeholder="Enter message here ..."
@@ -226,7 +226,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
          </div>

          <div className="w-full md:w-[23%] h-full ">
-            <div className="mx-auto bg-[#f1f8ff] p-4 rounded-md md:min-h-[498px] flex flex-col justify-between">
+            <div className="mx-auto bg-[#f1f8ff] dark:bg-[#C2C8D3] p-4 rounded-md md:min-h-[498px] flex flex-col justify-between">
              <div className="w-full flex flex-col justify-center py-4 gap-2">
                <p className="w-full text-slate-900 tracking-wide my-1">
                  Interested in the task?
@@ -261,7 +261,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
                </>
              </div>

-              <div className="">
+              <div className="text-slate-900">
                <p className="flex items-center tracking-wide">
                  Interest: <b className="ml-1">{details.interest_count}</b>
                </p>
@@ -1,7 +1,7 @@
-import Layout from "../Partials/Layout";
-import MainSection from "./MainSection";
-import CommonHead from "../UserHeader/CommonHead";
 import { useSelector } from "react-redux";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+import MainSection from "./MainSection";

 export default function MarketPlace({ commonHeadData }) {
  let { jobLists } = useSelector((state) => state.jobLists);
@@ -20,4 +20,4 @@ export default function MarketPlace({ commonHeadData }) {
      </Layout>
    </>
  );
-}
+}
@@ -35,7 +35,11 @@ export default function ActiveJobMessage({ activeJobMesList }) {
                    <td>
                        <div className={`msg_box ${item.who}`}>
                            <div className="msg_header">{item.msg_date} {item.msg_firstname}</div>
+                            {item.msg_type == 'FILE' ?
+                            <a href='' className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></a>
+                            :
                            <span className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></span>
+                            }
                        </div>

                    </td>
@@ -1,13 +1,13 @@
-import React, { useEffect, useState, useRef } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { useSelector } from "react-redux";
-import Layout from "../Partials/Layout";
 import { useNavigate } from "react-router-dom";
-import ActiveJobMessage from "./ActiveJobMessage";
-import LoadingSpinner from "../Spinners/LoadingSpinner";
-import CountDown from "../Helpers/CountDown";
-import IndexJobActions from "./JobActions/IndexJobActions";
-import ModalCom from "../Helpers/ModalCom";
 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 ActiveJobMessage from "./ActiveJobMessage";
+import IndexJobActions from "./JobActions/IndexJobActions";

 import usersService from "../../services/UsersService";

@@ -259,14 +259,17 @@ function ActiveJobs(props) {
            <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 })
-                  }
+              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"
@@ -367,15 +370,17 @@ function ActiveJobs(props) {
          {/* TEXTAREA SECTION */}
          <div className="mt-5">
            <div className="">
-              <div 
+              <div
                className="pl-7 my-2 flex items-center border-b border-slate-300 gap-3"
                // className='ml-7 flex justify-start items-center gap-3'
-                >
+              >
                <button
                  name="message"
                  onClick={(e) => setTab(e.target.name)}
                  className={`px-4 py-1 rounded-t-2xl ${
-                    tab == "message" ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
+                    tab == "message"
+                      ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white"
+                      : "bg-white text-[#000] border-t-[2px]"
                  }`}
                >
                  Send Message
@@ -384,7 +389,9 @@ function ActiveJobs(props) {
                  name="files"
                  onClick={(e) => setTab(e.target.name)}
                  className={`px-4 py-1 rounded-t-2xl ${
-                    tab == "files" ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
+                    tab == "files"
+                      ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white"
+                      : "bg-white text-[#000] border-t-[2px]"
                  }`}
                >
                  Send Files
@@ -471,7 +478,7 @@ function ActiveJobs(props) {
                  <button
                    onClick={sendFile}
                    type="button"
-                    className='btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer flex justify-center items-center'
+                    className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer flex justify-center items-center"
                  >
                    {requestStatus.loading ? (
                      <LoadingSpinner size="6" color="sky-blue" />
@@ -495,7 +502,7 @@ function ActiveJobs(props) {
                  <button
                    onClick={sendTaskMessage}
                    type="button"
-                    className='btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer'
+                    className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer"
                  >
                    {requestStatus.loading ? (
                      <LoadingSpinner size="6" color="sky-blue" />
@@ -26,7 +26,8 @@ const CouponPopup = ({ popUpHandler, data }) => {
        setStatusMsg({ error: "An error occurred" });
      else setStatusMsg({ success: res.data?.status_text });

-      dispatch(tableReload({ type: "COUPONTABLE" }));
+      // dispatch(tableReload({ type: "COUPONTABLE" }));
+      dispatch(tableReload({ type: "WALLETTABLE" }));
      setTimeout(() => {
        popUpHandler();
        setLoader(false);
@@ -7,7 +7,7 @@ import { useSelector } from "react-redux";

 export default function MyCoupons() {
  const apiCall = useMemo(() => new usersService(), []);
-  const {couponTable} = useSelector(state => state.tableReload)
+  const {couponTable, walletTable} = useSelector(state => state.tableReload)
  let [couponHistory, setCouponHistory] = useState({
    // FOR COUPON HISTORY
    loading: true,
@@ -38,7 +38,7 @@ export default function MyCoupons() {

  useEffect(() => {
    getCouponHistory();
-  }, [couponTable]);
+  }, [couponTable, walletTable]);

  return (
    <>
@@ -33,11 +33,6 @@ export default function MyPendingJobTable({ MyJobList, className }) {
        <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
          <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
            <tbody>
-              {/*<tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
-              {/*    <td className="py-4">All Product</td>*/}
-              {/*    <td className="py-4 text-right">.</td>*/}
-              {/*</tr>*/}
-
              {
                <>
                  {MyJobList &&
@@ -1,45 +1,21 @@
-import React, {
-  Suspense,
-  lazy,
-  useCallback,
-  useEffect,
-  useMemo,
-  useState,
-} from "react";
+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";
 const WalletBox = lazy(() => import("./WalletBox"));

+
 const WalletRoutes = () => {
  const apiCall = new usersService();
+  const { walletDetails } = useSelector((state) => state?.walletDetails); // WALLET STORE
  const { walletTable } = useSelector((state) => state.tableReload);
-  const [walletList, setWalletList] = useState({
-    loading: true,
-    data: [],
-    reload: false,
-  });
+
  const [paymentHistory, setPaymentHistory] = useState({
    loading: true,
    data: [],
  });

-  const getWalletList = () => {
-    apiCall
-      .getUserWallets()
-      .then((res) => {
-        if (res.data.internal_return < 0) {
-          setWalletList({ loading: false, data: [] });
-        } else {
-          setWalletList({ loading: false, data: res.data?.result_list });
-        }
-      })
-      .catch(() => {
-        setWalletList({ loading: false, data: [] });
-      });
-  }
-
  const getPaymentHistory = () => {
    apiCall
      .getPaymentHx()
@@ -53,24 +29,16 @@ const WalletRoutes = () => {
      .catch(() => {
        setPaymentHistory({ loading: false, data: [] });
      });
-  }
+  };

  useEffect(() => {
-    // const fetchData = async () => {
-    //   await Promise.all([getWalletList(), getPaymentHistory()]);
-    // };
-
-    // if (walletList.loading) {
-    //   fetchData();
-    // }
-    getWalletList()
-    getPaymentHistory()
+    getPaymentHistory();
  }, [walletTable]);

  return (
    <Layout>
      <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>
-        <WalletBox wallet={walletList} payment={paymentHistory} />
+        <WalletBox wallet={walletDetails} payment={paymentHistory} />
      </Suspense>
    </Layout>
  );
@@ -13,7 +13,7 @@ export default function WalletBox({ wallet, payment }) {
              </div>
            ) : wallet.data.length ? (
              wallet.data.map((item, index) => (
-                <div className="lg:w-full h-full mb-10 lg:mb-0">
+                <div key={item.wallet_uid} className="lg:w-full h-full mb-10 lg:mb-0">
                  <WalletItemCard walletItem={item} payment={payment} />
                </div>
              ))
@@ -41,8 +41,8 @@ export default function WalletHeader(props) {
          <div className="content px-7 pb-7">
            <ul>
              {props.myWalletList &&
-                props.myWalletList?.result_list?.length > 0 &&
-                props.myWalletList.result_list.map((value, index) => 
+                props.myWalletList?.length > 0 &&
+                props.myWalletList.map((value, index) => 
                {
                  let image = value.code ? `${value.code.toLocaleLowerCase()}.svg` : 'default.png'
                  return(
@@ -15,6 +15,7 @@ import WalletHeader from "../MyWallet/WalletHeader";
 import { useDispatch, 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");
@@ -33,19 +34,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
  const navigate = useNavigate();

  const { notifications } = useSelector((state) => state?.notifications); // NOTIFICATION STORE
-
-  const getMyWalletList = async () => {
-    try {
-      const res = await api.getUserWallets(null);
-      console.log("wallet - > ", res.data);
-      setMyWalletList(res.data);
-    } catch (error) {
-      console.log("Error getting mode");
-    }
-  };
-  useEffect(() => {
-    getMyWalletList();
-  }, [walletTable]);
+  const { walletDetails } = useSelector((state) => state?.walletDetails); // WALLET STORE

  const handlerBalance = () => {
    setbalanceValue.toggle();
@@ -104,7 +93,6 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
  let userEmail = email?.split("@")[0];
  const userProfileImage = profile_pic_url || 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">
@@ -241,7 +229,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {

            {/*<div className="lg:hidden block"></div>*/}
            <WalletHeader
-              myWalletList={myWalletList}
+              myWalletList={walletDetails.data}
              handlerBalance={handlerBalance}
              balanceDropdown={balanceDropdown}
              addMoneyHandler={addMoneyHandler}
@@ -1,21 +1,21 @@
-import React, { useState } from "react";
-import { Link } from "react-router-dom";
+import React, { useEffect, useState } from "react";
 // import authProfilePic from "../../assets/images/auth-profile-picture.png";
 // import profileBanner from "../../assets/images/profile-cover.png";
 // import collections from "../../data/collectionplan_data.json"; Should this be cleaned off?
 // import marketPlace from "../../data/marketplace_data.json";
+import { useSelector } from "react-redux";
 import LoadingSpinner from "../../components/Spinners/LoadingSpinner";
 import products from "../../data/product_data.json";
+import usersService from "../../services/UsersService";
 import Layout from "../Partials/Layout";
 import {
-  ActivitiesTab, BlogTab,
-  QuestionsTab,
+  ActivitiesTab,
+  BlogTab,
  CollectionTab,
-  CreatedTab,
  HiddenProductsTab,
  MyUploadedFiles,
-  OnSaleTab,
  OwnTab,
+  QuestionsTab,
 } from "./tabs";
 //import MyUploadedFiles from "./tabs/MyUploadedFiles";

@@ -24,16 +24,61 @@ export default function Resources(props) {
  const ownProducts = products.datas;
  // Resource Props
  const __resources = props.MyResourceData;
-//debugger;
+  //debugger;
  // Collection Items
  const CreatedSell = __resources?.marketdata?.data;
  const tab_categories = __resources?.tab_categories?.data;
  const collectionProducts = __resources?.collectiondata?.data;
  const onSaleProducts = __resources?.marketdata?.data;
  const CreatedBits = __resources?.productdata?.datas;
-  const blogItems =   __resources?.blogdata?.payload;
+  const blogItems = __resources?.blogdata?.payload;

-  const [tab, setTab] = useState(tab_categories ? tab_categories[0]?.name : "");
+  // My Items Data
+  const [uploadedFiles, setUploadedFiles] = useState({
+    loading: false,
+    msg: "",
+    data: null,
+  });
+  const { uploadsTable } = useSelector((state) => state.tableReload);
+
+  const apiCall = new usersService();
+
+  const getUploadedFiles = async () => {
+    setUploadedFiles((prev) => ({ ...prev, loading: true }));
+
+    let res;
+
+    try {
+      res = await apiCall.getUploadedList();
+      res = res.data;
+      if (res?.internal_return < 0) {
+        setUploadedFiles((prev) => ({
+          ...prev,
+          loading: false,
+          msg: "something went wrong",
+        }));
+      }
+      setUploadedFiles((prev) => ({
+        ...prev,
+        loading: false,
+        msg: "success",
+        data: res?.result_list,
+      }));
+    } catch (error) {
+      setUploadedFiles((prev) => ({
+        ...prev,
+        loading: false,
+        msg: "An error occurred",
+      }));
+    }
+  };
+
+  useEffect(() => {
+    getUploadedFiles();
+  }, [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 tabHandler = (value) => {
    setTab(value);
@@ -44,7 +89,7 @@ export default function Resources(props) {
    blog: <BlogTab blogdata={blogItems} />,
    onsale: <QuestionsTab products={onSaleProducts} />,
    owned: <OwnTab products={ownProducts} />,
-    created: <MyUploadedFiles marketProducts={CreatedSell} mainProducts={CreatedBits} />,
+    created: <MyUploadedFiles uploadedFiles={uploadedFiles} />,
    hidden: (
      <HiddenProductsTab
        marketProducts={CreatedSell}
@@ -55,26 +100,30 @@ export default function Resources(props) {
    activity: <ActivitiesTab />,
  };

-  const defaultTabComponent = <BlogTab blogdata={blogItems} />;
+  // const defaultTabComponent = <BlogTab blogdata={blogItems} />;

-  const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
+  // 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 }) => {
-    let countNumber = (name) => { // FUNCTION TO DETERMINE THE COUNT NUMBER
-      if(name == 'blog'){
-        return blogItems?.blogdata?.length
-      }else if(name == 'onsale'){
-        return onSaleProducts?.length
+    let countNumber = (name) => {
+      // FUNCTION TO DETERMINE THE COUNT NUMBER
+      if (name == "blog") {
+        return blogItems?.blogdata?.length;
+      } else if (name == "onsale") {
+        return onSaleProducts?.length;
        // return null
-      }else if(name == 'owned'){
-        return ownProducts?.length
-      }else if(name == 'created'){
-        return CreatedSell?.length + CreatedBits?.length
-      }else{
-        return 0
+      } else if (name == "owned") {
+        return ownProducts?.length;
+      } else if (name == "created") {
+        return uploadedFiles?.data?.length;
+      } else {
+        return 0;
      }
-    }
+    };
    return (
      <li
        className={`relative group inline`}
@@ -89,17 +138,17 @@ export default function Resources(props) {
        >
          {tabValue.content}
        </span>
-        {tabValue.name != 'onsale' &&
-        <span
-          className={`w-5 h-5 group-hover:bg-pink group-hover:text-white text-[10px] rounded-full absolute -top-2 -right-5 flex justify-center items-center ${
-            isActive
-              ? "text-white bg-pink"
-              : "text-thin-light-gray bg-[#F2B8FD]"
-          }`}
-        >
-          {countNumber(tabValue.name)}
-        </span>
-        }
+        {tabValue.name != "onsale" && (
+          <span
+            className={`w-5 h-5 group-hover:bg-pink group-hover:text-white text-[10px] rounded-full absolute -top-2 -right-5 flex justify-center items-center ${
+              isActive
+                ? "text-white bg-pink"
+                : "text-thin-light-gray bg-[#F2B8FD]"
+            }`}
+          >
+            {countNumber(tabValue.name)}
+          </span>
+        )}
      </li>
    );
  };
@@ -109,13 +158,18 @@ export default function Resources(props) {
    return (
      <ul className="lg:flex lg:space-x-14 space-x-8">
        {tabCategories?.length > 0 &&
-          tabCategories?.map((tabValue, idx) => (
-            <TabItem
-              key={tabValue.id}
-              tabValue={tabValue}
-              isActive={tab === tabValue.name || (idx === 0 && tab === "")}
-            />
-          ))}
+          tabCategories?.map((tabValue, idx) => {
+            if(tabValue.enabled){
+              return (
+                <TabItem
+                  key={tabValue.id}
+                  tabValue={tabValue}
+                  isActive={tab === tabValue.name || (idx === 0 && tab === "")}
+                />
+              )
+            }
+          }
+          )}
      </ul>
    );
  };
@@ -136,14 +190,6 @@ export default function Resources(props) {
                    <div className="tab-items">
                      <TabList tabCategories={tab_categories} />
                    </div>
-                    {/* <div style={{ transform: "translateY(-22px)" }}>
-                      <Link
-                        to="/my-uploads"
-                        className="btn-gradient lg:flex hidden w-[153px] h-[46px] rounded-full text-white justify-center items-center"
-                      >
-                        Add My Item
-                      </Link>
-                    </div> */}
                  </div>
                  <div className="hidden lg:block w-full h-[1px] bg-[#DCD5FE] dark:bg-[#5356fb29] absolute top-[42px] left-0"></div>
                </div>
@@ -1,278 +1,162 @@
 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 { Link } from "react-router-dom";
-// import dataImage3 from "../../../assets/images/data-table-user-3.png";
-// import dataImage4 from "../../../assets/images/data-table-user-4.png";
-// import SelectBox from "../Helpers/SelectBox";
+import defaultImg from "../../../assets/images/myfiles/default.svg";
+import localImgLoad from "../../../lib/localImgLoad";
+import { PaginatedList, handlePagingFunc } from "../../Pagination";

-export default function MyUploadedFiles({ className }) {
-    const filterCategories = ["All Categories", "Explore", "Featured"];
-    const [selectedCategory, setCategory] = useState(filterCategories[0]);
-    return (
-        <>
-        <div className="mb-4 w-full flex justify-end item-center">
-            <Link
-            to="/my-uploads"
-            className="btn-gradient lg:flex hidden w-[153px] h-[46px] rounded-full text-white justify-center items-center"
-            >
-            Add My Item
-            </Link>
-        </div>
-        <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 || ""
-            }`}
+export default function MyUploadedFiles({ uploadedFiles }) {
+  const [currentPage, setCurrentPage] = useState(0);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentFiles = uploadedFiles?.data?.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );
+
+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };
+  return (
+    <>
+      <div className="mb-4 w-full flex justify-end item-center">
+        <Link
+          to="/my-uploads"
+          className="btn-gradient lg:flex hidden w-[153px] h-[46px] rounded-full text-white justify-center items-center"
        >
-            <div className="header w-full sm:flex justify-between items-center mb-5">
-                <div className="flex space-x-2 items-center mb-2 sm:mb-0">
-                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
-                        My Uploads
-                    </h1>
-
-                </div>
-            </div>
-            <div className="relative w-full overflow-x-auto sm:rounded-lg">
-                <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
-                    <tbody>
-                    {/* table heading */}
-                    {/*<tr className="text-base text-thin-light-gray whitespace-nowrap px-2 border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
-                    {/*    <td className="py-4 w-[300px] block whitespace-nowrap">*/}
-                    {/*        All Product*/}
-                    {/*    </td>*/}
-                    {/*    <td className="py-4 whitespace-nowrap text-center">.</td>*/}
-                    {/*    <td className="py-4 whitespace-nowrap text-center"></td>*/}
-
-                    {/*    <td className="py-4 whitespace-nowrap text-right"></td>*/}
-                    {/*</tr>*/}
-                    <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                        <td className=" py-4">
-                            <div className="flex space-x-2 items-center">
-                                <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                                    <img
-                                        src={dataImage1}
-                                        alt="data"
-                                        className="w-full h-full"
-                                    />
-                                </div>
-                                <div className="flex flex-col">
-                                    <h1 className="font-bold text-xl   text-dark-gray dark:text-white">
-                                        Mullican Computer Joy
-                                    </h1>
-                                    <span className="text-sm text-thin-light-gray">
-                          Owned by <span className="text-purple">Xoeyam</span>
-                        </span>
-                                </div>
-                            </div>
-                        </td>
-                        <td className="text-center py-4 px-2">
-                            <div className="flex space-x-1 items-center justify-center">
-                      <span>
-                        <svg
-                            width="18"
-                            height="18"
-                            viewBox="0 0 18 18"
-                            fill="none"
-                            xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                              d="M9 18C13.9706 18 18 13.9706 18 9C18 4.02944 13.9706 0 9 0C4.02944 0 0 4.02944 0 9C0 13.9706 4.02944 18 9 18Z"
-                              fill="#627EEA"
-                          />
-                          <path
-                              d="M9.28125 2.25V7.23937L13.4983 9.12375L9.28125 2.25Z"
-                              fill="white"
-                              fillOpacity="0.602"
-                          />
-                          <path
-                              d="M9.28012 2.25L5.0625 9.12375L9.28012 7.23937V2.25Z"
-                              fill="white"
-                          />
-                          <path
-                              d="M9.28125 12.3582V15.7483L13.5011 9.91016L9.28125 12.3582Z"
-                              fill="white"
-                              fillOpacity="0.602"
-                          />
-                          <path
-                              d="M9.28012 15.7483V12.3576L5.0625 9.91016L9.28012 15.7483Z"
-                              fill="white"
-                          />
-                          <path
-                              d="M9.28125 11.572L13.4983 9.12348L9.28125 7.24023V11.572Z"
-                              fill="white"
-                              fillOpacity="0.2"
-                          />
-                          <path
-                              d="M5.0625 9.12348L9.28012 11.572V7.24023L5.0625 9.12348Z"
-                              fill="white"
-                              fillOpacity="0.602"
-                          />
-                        </svg>
-                      </span>
-                                <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                        7473 ETH
-                      </span>
-                            </div>
-                        </td>
-                        <td className="text-center py-4 px-2">
-                            <div className="flex space-x-1 items-center justify-center">
-                      <span>
-                        <svg
-                            width="16"
-                            height="16"
-                            viewBox="0 0 16 16"
-                            fill="none"
-                            xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                              d="M7.55225 0C7.8457 0 8.13914 0 8.43205 0C8.44829 0.026534 8.47537 0.0151623 8.49756 0.0162453C9.28966 0.0649812 10.0606 0.220936 10.8013 0.505229C12.7699 1.26172 14.2323 2.58354 15.183 4.46638C15.5999 5.29218 15.8506 6.16997 15.9561 7.08891C15.9691 7.201 15.9621 7.3158 16 7.42465C16 7.80858 16 8.19251 16 8.57698C15.9778 8.5916 15.9854 8.61543 15.9838 8.63546C15.9475 9.10387 15.8744 9.56686 15.7515 10.0206C15.1787 12.1342 13.9524 13.7603 12.0818 14.8942C11.1516 15.4579 10.1397 15.8002 9.06064 15.941C8.89497 15.9626 8.72875 15.98 8.56308 15.9995C8.17217 15.9995 7.78127 15.9995 7.39036 16C7.3752 15.9789 7.35138 15.9865 7.33135 15.9848C6.96752 15.9545 6.60639 15.9009 6.25068 15.8197C4.77639 15.4829 3.48998 14.793 2.4131 13.7311C0.998917 12.3372 0.204656 10.6461 0.0270709 8.66687C0.0205739 8.59431 0.033568 8.51904 0 8.44972C0 8.15081 0 7.85244 0 7.55352C0.0265295 7.53403 0.0151597 7.50479 0.016784 7.47988C0.0730915 6.64162 0.251218 5.83044 0.564158 5.05066C1.10179 3.71043 1.93774 2.59058 3.07634 1.70142C4.33839 0.715876 5.77098 0.159745 7.36762 0.0270755C7.4288 0.0216604 7.49432 0.0341151 7.55225 0ZM7.24635 9.86252C7.24635 10.2383 7.24526 10.6147 7.24743 10.9905C7.24797 11.0457 7.23389 11.0679 7.17596 11.0593C7.09691 11.0479 7.01678 11.0446 6.93774 11.0338C6.26746 10.9461 5.63563 10.7371 5.03952 10.4192C5.00379 10.4002 4.97834 10.3802 4.9621 10.4425C4.81375 11.0176 4.66324 11.5926 4.51164 12.1666C4.50027 12.2094 4.51272 12.2278 4.54954 12.2473C4.66486 12.3096 4.78235 12.3665 4.90309 12.4152C5.5961 12.6968 6.31998 12.8408 7.06497 12.8842C7.14131 12.8885 7.16134 12.9112 7.1608 12.9865C7.15701 13.4159 7.16026 13.8453 7.15809 14.2747C7.15755 14.3397 7.17488 14.3619 7.2431 14.3614C7.69085 14.3581 8.13914 14.3576 8.5869 14.3614C8.66432 14.3619 8.67731 14.3359 8.67731 14.2666C8.67461 13.8026 8.67677 13.3385 8.67461 12.8744C8.67407 12.8089 8.68544 12.7786 8.76015 12.765C9.09962 12.7049 9.4288 12.6058 9.74228 12.4607C10.3498 12.1802 10.8408 11.7703 11.1603 11.1724C11.4288 10.6699 11.51 10.1327 11.4618 9.56957C11.4158 9.03239 11.2366 8.55207 10.8787 8.14431C10.5506 7.77121 10.1402 7.51129 9.69843 7.29522C9.39145 7.14523 9.07363 7.02284 8.75041 6.91129C8.7098 6.89721 8.67407 6.88693 8.67407 6.82736C8.67623 6.14993 8.67569 5.4725 8.67461 4.79507C8.67461 4.75121 8.68489 4.73117 8.73308 4.73767C8.87547 4.75717 9.01895 4.77016 9.16134 4.79236C9.634 4.86493 10.0796 5.02467 10.5116 5.22395C10.5717 5.25157 10.5945 5.24886 10.6123 5.17684C10.7434 4.6467 10.8771 4.1171 11.0162 3.58913C11.0379 3.5079 11.0244 3.47541 10.948 3.44076C10.2799 3.13751 9.57282 3.01025 8.8457 2.97614C8.78018 2.97289 8.76123 2.95556 8.76178 2.88896C8.76503 2.50232 8.76232 2.11568 8.76448 1.72904C8.76503 1.66785 8.75041 1.64727 8.68489 1.64727C8.23173 1.64998 7.77802 1.64998 7.32485 1.64727C7.26151 1.64673 7.24418 1.66406 7.24418 1.72742C7.24689 2.1433 7.24256 2.55972 7.24797 2.9756C7.24905 3.06116 7.2209 3.08661 7.14239 3.10285C6.73579 3.18679 6.34651 3.32271 5.98646 3.53281C5.20628 3.98822 4.72117 4.64724 4.61938 5.5586C4.51597 6.48837 4.83812 7.2427 5.57661 7.81778C6.05739 8.19251 6.60639 8.43781 7.1738 8.64683C7.2274 8.66633 7.24743 8.68907 7.24689 8.7481C7.24472 9.12066 7.24635 9.49159 7.24635 9.86252Z"
-                              fill="#59BE59"
-                          />
-                          <path
-                              d="M7.2452 9.86252C7.2452 9.49158 7.24358 9.12119 7.24683 8.75026C7.24737 8.69123 7.22734 8.66903 7.17374 8.64899C6.60687 8.43997 6.05787 8.19467 5.57655 7.81994C4.8386 7.24486 4.51591 6.49053 4.61933 5.56076C4.72057 4.6494 5.20568 3.99092 5.98641 3.53497C6.34645 3.32486 6.73519 3.18894 7.14233 3.10501C7.22084 3.08876 7.24899 3.06277 7.24791 2.97775C7.2425 2.56187 7.24683 2.14545 7.24412 1.72957C7.24358 1.66621 7.2609 1.64888 7.32479 1.64943C7.77796 1.65213 8.23167 1.65213 8.68483 1.64943C8.7498 1.64888 8.76442 1.66946 8.76442 1.73119C8.76171 2.11783 8.76496 2.50447 8.76171 2.89111C8.76117 2.95717 8.78012 2.97504 8.84563 2.97829C9.57276 3.01295 10.2793 3.13966 10.948 3.44291C11.0243 3.47757 11.0373 3.51006 11.0162 3.59128C10.877 4.11926 10.7433 4.64885 10.6123 5.17899C10.5944 5.25156 10.5717 5.25372 10.5116 5.2261C10.079 5.02683 9.63394 4.86708 9.16128 4.79452C9.01889 4.77286 8.87595 4.75932 8.73302 4.73983C8.68483 4.73333 8.67455 4.75337 8.67455 4.79723C8.67563 5.47466 8.67617 6.15209 8.674 6.82952C8.674 6.88908 8.70974 6.89937 8.75034 6.91345C9.07303 7.02446 9.39138 7.14684 9.69837 7.29738C10.1396 7.51344 10.5506 7.77283 10.8787 8.14647C11.2365 8.55369 11.4157 9.03455 11.4618 9.57173C11.51 10.1349 11.4287 10.6726 11.1602 11.1746C10.8408 11.7724 10.3497 12.1818 9.74222 12.4629C9.42874 12.608 9.09956 12.7071 8.76009 12.7672C8.68483 12.7802 8.674 12.811 8.67455 12.8766C8.67671 13.3406 8.67455 13.8047 8.67725 14.2688C8.67779 14.3381 8.66426 14.3646 8.58684 14.3636C8.13908 14.3598 7.69079 14.3608 7.24304 14.3636C7.17536 14.3641 7.15803 14.3424 7.15803 14.2769C7.1602 13.8475 7.15695 13.4181 7.16074 12.9887C7.16128 12.9128 7.14179 12.8906 7.06491 12.8863C6.31992 12.843 5.59658 12.699 4.90303 12.4174C4.78229 12.3681 4.66426 12.3112 4.54948 12.2495C4.51321 12.23 4.50075 12.2116 4.51158 12.1688C4.66318 11.5943 4.81369 11.0197 4.96204 10.4446C4.97829 10.3824 5.00373 10.4024 5.03947 10.4214C5.63557 10.7387 6.2674 10.9477 6.93768 11.036C7.01672 11.0463 7.09685 11.0501 7.1759 11.0614C7.23383 11.0695 7.24737 11.0479 7.24737 10.9927C7.24412 10.6147 7.2452 10.2383 7.2452 9.86252ZM8.68537 9.36325C8.67942 9.37245 8.67455 9.37678 8.67455 9.38112C8.674 9.83978 8.67401 10.2984 8.67292 10.7571C8.67292 10.8177 8.70216 10.7928 8.72598 10.7755C8.82452 10.7046 8.90736 10.619 8.96691 10.5123C9.17698 10.1333 9.05679 9.63725 8.68537 9.36325ZM7.23871 6.11147C7.23871 5.75354 7.23871 5.40589 7.23871 5.05174C6.92522 5.33982 6.92522 5.77249 7.23871 6.11147Z"
-                              fill="#FEFEFE"
-                          />
-                          <path
-                              d="M8.68433 9.36328C9.05574 9.63729 9.17539 10.1333 8.96586 10.5118C8.90631 10.619 8.82347 10.7046 8.72493 10.775C8.70111 10.7918 8.67188 10.8172 8.67188 10.7566C8.67242 10.2979 8.67296 9.83927 8.6735 9.38061C8.67404 9.37682 8.67891 9.37249 8.68433 9.36328Z"
-                              fill="#59BE59"
-                          />
-                          <path
-                              d="M7.23882 6.11149C6.92533 5.77305 6.92587 5.33984 7.23882 5.05176C7.23882 5.40591 7.23882 5.75355 7.23882 6.11149Z"
-                              fill="#59BE59"
-                          />
-                        </svg>
-                      </span>
-                                <span className="text-base text-dark-gray dark:text-white font-medium">
-                        6392.99$
-                      </span>
-                            </div>
-                        </td>
-
-                        <td className="text-right py-4">
-                            <button
-                                type="button"
-                                className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full"
-                            >
-                                Active
-                            </button>
-                        </td>
-                    </tr>
-                    <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                        <td className=" py-4">
-                            <div className="flex space-x-2 items-center">
-                                <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                                    <img
-                                        src={dataImage2}
-                                        alt="data"
-                                        className="w-full h-full"
-                                    />
-                                </div>
-                                <div className="flex flex-col">
-                                    <h1 className="font-bold text-xl   text-dark-gray dark:text-white">
-                                        Mullican Computer Joy
-                                    </h1>
-                                    <span className="text-sm text-thin-light-gray">
-                          Owned by <span className="text-purple">Xoeyam</span>
-                        </span>
-                                </div>
-                            </div>
-                        </td>
-                        <td className="text-center py-4 px-2">
-                            <div className="flex space-x-1 items-center justify-center">
-                      <span>
-                        <svg
-                            width="18"
-                            height="18"
-                            viewBox="0 0 18 18"
-                            fill="none"
-                            xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                              d="M9 18C13.9706 18 18 13.9706 18 9C18 4.02944 13.9706 0 9 0C4.02944 0 0 4.02944 0 9C0 13.9706 4.02944 18 9 18Z"
-                              fill="#627EEA"
-                          />
-                          <path
-                              d="M9.28125 2.25V7.23937L13.4983 9.12375L9.28125 2.25Z"
-                              fill="white"
-                              fillOpacity="0.602"
-                          />
-                          <path
-                              d="M9.28012 2.25L5.0625 9.12375L9.28012 7.23937V2.25Z"
-                              fill="white"
-                          />
-                          <path
-                              d="M9.28125 12.3582V15.7483L13.5011 9.91016L9.28125 12.3582Z"
-                              fill="white"
-                              fillOpacity="0.602"
-                          />
-                          <path
-                              d="M9.28012 15.7483V12.3576L5.0625 9.91016L9.28012 15.7483Z"
-                              fill="white"
-                          />
-                          <path
-                              d="M9.28125 11.572L13.4983 9.12348L9.28125 7.24023V11.572Z"
-                              fill="white"
-                              fillOpacity="0.2"
-                          />
-                          <path
-                              d="M5.0625 9.12348L9.28012 11.572V7.24023L5.0625 9.12348Z"
-                              fill="white"
-                              fillOpacity="0.602"
-                          />
-                        </svg>
-                      </span>
-                                <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                        7473 ETH
-                      </span>
-                            </div>
-                        </td>
-                        <td className="text-center py-4 px-2">
-                            <div className="flex space-x-1 items-center justify-center">
-                      <span>
-                        <svg
-                            width="16"
-                            height="16"
-                            viewBox="0 0 16 16"
-                            fill="none"
-                            xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                              d="M7.55225 0C7.8457 0 8.13914 0 8.43205 0C8.44829 0.026534 8.47537 0.0151623 8.49756 0.0162453C9.28966 0.0649812 10.0606 0.220936 10.8013 0.505229C12.7699 1.26172 14.2323 2.58354 15.183 4.46638C15.5999 5.29218 15.8506 6.16997 15.9561 7.08891C15.9691 7.201 15.9621 7.3158 16 7.42465C16 7.80858 16 8.19251 16 8.57698C15.9778 8.5916 15.9854 8.61543 15.9838 8.63546C15.9475 9.10387 15.8744 9.56686 15.7515 10.0206C15.1787 12.1342 13.9524 13.7603 12.0818 14.8942C11.1516 15.4579 10.1397 15.8002 9.06064 15.941C8.89497 15.9626 8.72875 15.98 8.56308 15.9995C8.17217 15.9995 7.78127 15.9995 7.39036 16C7.3752 15.9789 7.35138 15.9865 7.33135 15.9848C6.96752 15.9545 6.60639 15.9009 6.25068 15.8197C4.77639 15.4829 3.48998 14.793 2.4131 13.7311C0.998917 12.3372 0.204656 10.6461 0.0270709 8.66687C0.0205739 8.59431 0.033568 8.51904 0 8.44972C0 8.15081 0 7.85244 0 7.55352C0.0265295 7.53403 0.0151597 7.50479 0.016784 7.47988C0.0730915 6.64162 0.251218 5.83044 0.564158 5.05066C1.10179 3.71043 1.93774 2.59058 3.07634 1.70142C4.33839 0.715876 5.77098 0.159745 7.36762 0.0270755C7.4288 0.0216604 7.49432 0.0341151 7.55225 0ZM7.24635 9.86252C7.24635 10.2383 7.24526 10.6147 7.24743 10.9905C7.24797 11.0457 7.23389 11.0679 7.17596 11.0593C7.09691 11.0479 7.01678 11.0446 6.93774 11.0338C6.26746 10.9461 5.63563 10.7371 5.03952 10.4192C5.00379 10.4002 4.97834 10.3802 4.9621 10.4425C4.81375 11.0176 4.66324 11.5926 4.51164 12.1666C4.50027 12.2094 4.51272 12.2278 4.54954 12.2473C4.66486 12.3096 4.78235 12.3665 4.90309 12.4152C5.5961 12.6968 6.31998 12.8408 7.06497 12.8842C7.14131 12.8885 7.16134 12.9112 7.1608 12.9865C7.15701 13.4159 7.16026 13.8453 7.15809 14.2747C7.15755 14.3397 7.17488 14.3619 7.2431 14.3614C7.69085 14.3581 8.13914 14.3576 8.5869 14.3614C8.66432 14.3619 8.67731 14.3359 8.67731 14.2666C8.67461 13.8026 8.67677 13.3385 8.67461 12.8744C8.67407 12.8089 8.68544 12.7786 8.76015 12.765C9.09962 12.7049 9.4288 12.6058 9.74228 12.4607C10.3498 12.1802 10.8408 11.7703 11.1603 11.1724C11.4288 10.6699 11.51 10.1327 11.4618 9.56957C11.4158 9.03239 11.2366 8.55207 10.8787 8.14431C10.5506 7.77121 10.1402 7.51129 9.69843 7.29522C9.39145 7.14523 9.07363 7.02284 8.75041 6.91129C8.7098 6.89721 8.67407 6.88693 8.67407 6.82736C8.67623 6.14993 8.67569 5.4725 8.67461 4.79507C8.67461 4.75121 8.68489 4.73117 8.73308 4.73767C8.87547 4.75717 9.01895 4.77016 9.16134 4.79236C9.634 4.86493 10.0796 5.02467 10.5116 5.22395C10.5717 5.25157 10.5945 5.24886 10.6123 5.17684C10.7434 4.6467 10.8771 4.1171 11.0162 3.58913C11.0379 3.5079 11.0244 3.47541 10.948 3.44076C10.2799 3.13751 9.57282 3.01025 8.8457 2.97614C8.78018 2.97289 8.76123 2.95556 8.76178 2.88896C8.76503 2.50232 8.76232 2.11568 8.76448 1.72904C8.76503 1.66785 8.75041 1.64727 8.68489 1.64727C8.23173 1.64998 7.77802 1.64998 7.32485 1.64727C7.26151 1.64673 7.24418 1.66406 7.24418 1.72742C7.24689 2.1433 7.24256 2.55972 7.24797 2.9756C7.24905 3.06116 7.2209 3.08661 7.14239 3.10285C6.73579 3.18679 6.34651 3.32271 5.98646 3.53281C5.20628 3.98822 4.72117 4.64724 4.61938 5.5586C4.51597 6.48837 4.83812 7.2427 5.57661 7.81778C6.05739 8.19251 6.60639 8.43781 7.1738 8.64683C7.2274 8.66633 7.24743 8.68907 7.24689 8.7481C7.24472 9.12066 7.24635 9.49159 7.24635 9.86252Z"
-                              fill="#59BE59"
-                          />
-                          <path
-                              d="M7.2452 9.86252C7.2452 9.49158 7.24358 9.12119 7.24683 8.75026C7.24737 8.69123 7.22734 8.66903 7.17374 8.64899C6.60687 8.43997 6.05787 8.19467 5.57655 7.81994C4.8386 7.24486 4.51591 6.49053 4.61933 5.56076C4.72057 4.6494 5.20568 3.99092 5.98641 3.53497C6.34645 3.32486 6.73519 3.18894 7.14233 3.10501C7.22084 3.08876 7.24899 3.06277 7.24791 2.97775C7.2425 2.56187 7.24683 2.14545 7.24412 1.72957C7.24358 1.66621 7.2609 1.64888 7.32479 1.64943C7.77796 1.65213 8.23167 1.65213 8.68483 1.64943C8.7498 1.64888 8.76442 1.66946 8.76442 1.73119C8.76171 2.11783 8.76496 2.50447 8.76171 2.89111C8.76117 2.95717 8.78012 2.97504 8.84563 2.97829C9.57276 3.01295 10.2793 3.13966 10.948 3.44291C11.0243 3.47757 11.0373 3.51006 11.0162 3.59128C10.877 4.11926 10.7433 4.64885 10.6123 5.17899C10.5944 5.25156 10.5717 5.25372 10.5116 5.2261C10.079 5.02683 9.63394 4.86708 9.16128 4.79452C9.01889 4.77286 8.87595 4.75932 8.73302 4.73983C8.68483 4.73333 8.67455 4.75337 8.67455 4.79723C8.67563 5.47466 8.67617 6.15209 8.674 6.82952C8.674 6.88908 8.70974 6.89937 8.75034 6.91345C9.07303 7.02446 9.39138 7.14684 9.69837 7.29738C10.1396 7.51344 10.5506 7.77283 10.8787 8.14647C11.2365 8.55369 11.4157 9.03455 11.4618 9.57173C11.51 10.1349 11.4287 10.6726 11.1602 11.1746C10.8408 11.7724 10.3497 12.1818 9.74222 12.4629C9.42874 12.608 9.09956 12.7071 8.76009 12.7672C8.68483 12.7802 8.674 12.811 8.67455 12.8766C8.67671 13.3406 8.67455 13.8047 8.67725 14.2688C8.67779 14.3381 8.66426 14.3646 8.58684 14.3636C8.13908 14.3598 7.69079 14.3608 7.24304 14.3636C7.17536 14.3641 7.15803 14.3424 7.15803 14.2769C7.1602 13.8475 7.15695 13.4181 7.16074 12.9887C7.16128 12.9128 7.14179 12.8906 7.06491 12.8863C6.31992 12.843 5.59658 12.699 4.90303 12.4174C4.78229 12.3681 4.66426 12.3112 4.54948 12.2495C4.51321 12.23 4.50075 12.2116 4.51158 12.1688C4.66318 11.5943 4.81369 11.0197 4.96204 10.4446C4.97829 10.3824 5.00373 10.4024 5.03947 10.4214C5.63557 10.7387 6.2674 10.9477 6.93768 11.036C7.01672 11.0463 7.09685 11.0501 7.1759 11.0614C7.23383 11.0695 7.24737 11.0479 7.24737 10.9927C7.24412 10.6147 7.2452 10.2383 7.2452 9.86252ZM8.68537 9.36325C8.67942 9.37245 8.67455 9.37678 8.67455 9.38112C8.674 9.83978 8.67401 10.2984 8.67292 10.7571C8.67292 10.8177 8.70216 10.7928 8.72598 10.7755C8.82452 10.7046 8.90736 10.619 8.96691 10.5123C9.17698 10.1333 9.05679 9.63725 8.68537 9.36325ZM7.23871 6.11147C7.23871 5.75354 7.23871 5.40589 7.23871 5.05174C6.92522 5.33982 6.92522 5.77249 7.23871 6.11147Z"
-                              fill="#FEFEFE"
-                          />
-                          <path
-                              d="M8.68433 9.36328C9.05574 9.63729 9.17539 10.1333 8.96586 10.5118C8.90631 10.619 8.82347 10.7046 8.72493 10.775C8.70111 10.7918 8.67188 10.8172 8.67188 10.7566C8.67242 10.2979 8.67296 9.83927 8.6735 9.38061C8.67404 9.37682 8.67891 9.37249 8.68433 9.36328Z"
-                              fill="#59BE59"
-                          />
-                          <path
-                              d="M7.23882 6.11149C6.92533 5.77305 6.92587 5.33984 7.23882 5.05176C7.23882 5.40591 7.23882 5.75355 7.23882 6.11149Z"
-                              fill="#59BE59"
-                          />
-                        </svg>
-                      </span>
-                                <span className="text-base text-dark-gray dark:text-white font-medium">
-                        6392.99$
-                      </span>
-                            </div>
-                        </td>
-
-                        <td className="text-right py-4">
-                            <button
-                                type="button"
-                                className="text-sm text-white bg-light-green px-2.5 py-1.5 rounded-full"
-                            >
-                                Complated
-                            </button>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
+          Add My Item
+        </Link>
+      </div>
+      <div
+        className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow relative min-h-[520px]`}
+      >
+        <div className="header w-full sm:flex justify-between items-center mb-5">
+          <div className="flex space-x-2 items-center mb-2 sm:mb-0">
+            <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
+              My Uploads
+            </h1>
+          </div>
        </div>
-        </>
-    );
+        <div className="relative w-full overflow-x-auto sm:rounded-lg">
+          <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+            <tbody>
+              <>
+                {uploadedFiles?.data && uploadedFiles?.data.length ? (
+                  currentFiles.map((value, idx) => {
+                    let addedDate = value?.added?.split(" ")[0];
+                    let formattedSize = formatFileSize(value?.file_size);
+                    return (
+                      <tr
+                        key={value?.file_uid}
+                        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={
+                                  localImgLoad(
+                                    `images/myfiles/${value.banner}`
+                                  ) || defaultImg
+                                }
+                                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 || "Dummy Text"}
+                              </h1>
+                              <div>
+                                {value.description || "Dummy Description"}
+                              </div>
+                              <span className="text-sm text-thin-light-gray flex flext-start gap-1">
+                                Added:{" "}
+                                <span className="text-purple">{addedDate}</span>
+                              </span>
+                              <div className="flex gap-4 items-center">
+                                <span className="text-sm text-thin-light-gray">
+                                  File Name:{" "}
+                                  <span className="text-purple">
+                                    {" "}
+                                    {value.file_name}
+                                  </span>
+                                </span>
+                                <span className="text-sm text-thin-light-gray">
+                                  File Size:{" "}
+                                  <span className="text-purple">
+                                    {" "}
+                                    {formattedSize}
+                                  </span>
+                                </span>
+                                <span className="text-sm text-thin-light-gray">
+                                  File Type:{" "}
+                                  <span className="text-purple">
+                                    {" "}
+                                    {value?.file_type}
+                                  </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="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            >
+                              View
+                            </button>
+                          </div>
+                        </td>
+                      </tr>
+                    );
+                  })
+                ) : (
+                  <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                    <td className="p-2" colSpan={3}>
+                      No Files Currently!
+                    </td>
+                  </tr>
+                )}
+              </>
+            </tbody>
+          </table>
+          {/* PAGINATION BUTTON */}
+          <PaginatedList
+            onClick={handlePagination}
+            prev={currentPage == 0 ? true : false}
+            next={
+              currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+              uploadedFiles?.data.length
+                ? true
+                : false
+            }
+            data={uploadedFiles?.data}
+            start={indexOfFirstItem}
+            stop={indexOfLastItem}
+          />
+          {/* END OF PAGINATION BUTTON */}
+        </div>
+      </div>
+    </>
+  );
 }
+
+const formatFileSize = (sizeInBytes) => {
+  if (sizeInBytes < 1024) {
+    return `${sizeInBytes} bytes`;
+  } else if (sizeInBytes < 1024 * 1024) {
+    const sizeInKB = (sizeInBytes / 1024).toFixed(2);
+    return `${sizeInKB} KB`;
+  } else {
+    const sizeInMB = (sizeInBytes / (1024 * 1024)).toFixed(2);
+    return `${sizeInMB} MB`;
+  }
+};
@@ -8,13 +8,16 @@ export default function TermsConditionTab() {
          <h1 className="text-3xl tracking-wide font-bold text-dark-gray dark:text-white mb-4">
            Terms of use
          </h1>
-          <p className="text-base text-thin-light-gray leading-[28px] ">
+          <p className="text-base text-thin-light-gray leading-[28px]">
+            (updated August 10, 2023)
+          </p>
+          <p className="text-base text-thin-light-gray leading-[28px]">
            These Website Terms & Conditions (“T&Cs”) apply to your access and
-            use of www.wrenchboard.com,dashboard.wrenchboard.com (the “Site”),
-            including all software, data, reports, text, images, sounds, video,
-            and all contents made available through any portion of the Site
-            (collectively, the “Content”). Content includes all such elements as
-            a whole, as well as individual elements and portions thereof.
+            use of www.wrenchboard.com,users.wrenchboard.com (the “Site”),
+            native apps, including all software, data, reports, text, images,
+            sounds, video, and all contents made available through any portion
+            of the Site (collectively, the “Content”). The range includes all
+            such elements as whole, individual, and parts.
          </p>
        </div>
        <hr />
@@ -37,103 +40,138 @@ export default function TermsConditionTab() {
          <h1 className="text-2xl tracking-wide font-bold text-dark-gray dark:text-white mb-4">
            General Conditions of Use
          </h1>
-          <p className="text-base text-thin-light-gray leading-[28px] ">
-            <b> Authorization to Access and Use Site and Content.</b> Subject to
-            your compliance with these T&Cs and the provisions hereof, you may
-            access or use the Site and Content solely for the purpose of your
-            evaluation of WRENCHBOARD and WRENCHBOARD’s products and services.
-            You may only link to the Site or Content, or any portion thereof, as
-            expressly permitted by WRENCHBOARD.
-            <br />
-            <b> Ownership and Restrictions.</b> All rights, title, and interest
-            in and to the Site and Content will remain with and belong
-            exclusively to WRENCHBOARD. You will not (a) sublicense, resell,
-            rent, lease, transfer, assign, time share or otherwise commercially
-            exploit or make the Site and any Content available to any third
-            party, (b) use the Site and Content in any unlawful manner
-            (including without limitation in violation of any data, privacy or
-            export control laws) or in any manner that interferes with or
-            disrupts the integrity or performance of the Site and Content or
-            their related components, or (c) modify, adapt or hack the Site and
-            Content to, or try to, gain unauthorized access to the restricted
-            portions of the Site and Content or related systems or networks
-            (i.e., circumvent any encryption or other security measures, gain
-            access to any source code or any other underlying form of technology
-            or information, and gain access to any part of the Site and Content,
-            or any other products or services of WRENCHBOARD that are not
-            readily made available to the general public). You are not permitted
-            to copy, modify, frame, repost, publicly perform or display, sell,
-            reproduce, distribute, or create derivative works of the Site and
-            Content, except that you may download, display, and print one copy
-            of the publicly available materials (i.e., the Content that does not
-            require an Account name or password to access) on any single
-            computer solely for your personal, non-commercial use, provided that
-            you do not modify the material in any way and you keep intact all
-            copyright, trademark, and other proprietary notices. You agree not
-            to access the Site or Content by any means other than through the
-            interface that is provided by WRENCHBOARD to access the same. You
-            may not use any “page-scrape,” “deep-link,” “spider,” or “robot or
-            other automatic program, device, algorithm or methodology, or any
-            similar manual process, to access, copy, acquire, or monitor any
-            portion of the Site or any Content, or in any way reproduce or
-            circumvent the presentation or navigational structure of the Site or
-            any Content, to obtain or attempt to obtain any Content or other
-            information through any means not made generally available through
-            the Site by WRENCHBOARD. WRENCHBOARD reserves the right to take any
-            lawful measures to prevent any such activity. You may not forge
-            headers or otherwise manipulate identifiers in order to disguise the
-            origin of any message or transmittal you send to WRENCHBOARD on or
-            through the Site or any service offered on or through the Site. You
-            may not pretend that you are, or that you represent, someone else,
-            or impersonate any other individual or entity.
-            <b> Responsibility for Your Data.</b> You are solely responsible for
-            all data, information, and other content, that you upload, post, or
-            otherwise provide or store (hereafter “post(ing)”) in connection
-            with or relating to the Site.
-          </p>
-        </div>
-        <hr />
-
-        <div className="my-8">
-          <h1 className="text-2xl tracking-wide font-bold text-dark-gray dark:text-white mb-4">
-            Use of Intellectual Property.
-          </h1>
-          <p className="text-base text-thin-light-gray leading-[28px] ">
-            <b> Rights in User Content.</b> By posting your information and
-            other content (“User Content”) on or through the Site and Content,
-            you grant WRENCHBOARD a worldwide, non-exclusive, perpetual,
-            irrevocable, royalty-free, fully paid, sublicensable and
-            transferable license to use, modify, reproduce, distribute, display,
-            publish and perform User Content in connection with the Site and
-            Content. WRENCHBOARD has the right, but not the obligation, to
-            monitor the Site and Content and User Content. WRENCHBOARD may
-            remove or disable any User Content at any time for any reason, or
-            for no reason at all. You, the user, acknowledge that you bear sole
-            responsibility for adequate security, protection, and backup of User
-            Content. WRENCHBOARD will have no liability to you for any
-            unauthorized access or use of any of User Content, or any
-            corruption, deletion, destruction, or loss of any of User Content.
-          </p>
-        </div>
-        <hr />
-
-        <div className="my-8">
-          <h1 className="text-2xl tracking-wide font-bold text-dark-gray dark:text-white mb-4">
-            Feedback
-          </h1>
-          <p className="text-base text-thin-light-gray leading-[28px] ">
-            You may submit ideas, suggestions, or comments (“Feedback”)
-            regarding the Site and Content or WRENCHBOARD’s business, products,
-            or services. By submitting any Feedback, you acknowledge and agree
-            that (a) your Feedback is provided by you voluntarily and
-            WRENCHBOARD may, without any obligations or limitation, use and
-            exploit such Feedback in any manner and for any purpose, (b) you
-            will not seek and are not entitled to any money or other form of
-            compensation, consideration, or attribution with respect to your
-            Feedback regardless of whether WRENCHBOARD considered or used your
-            Feedback in any manner, and (c) your Feedback is not the
-            confidential or proprietary information of you or any third party.
-          </p>
+          <ul className="ml-8">
+            <li className="text-base text-thin-light-gray leading-[28px]">
+              <h1 className="text-lg tracking-wide font-bold text-dark-gray dark:text-white my-4">
+                Authorization to Access and Use Site and Content.
+              </h1>
+              <p className="text-base font-bold text-thin-light-gray leading-[28px]">
+                Subject to your compliance with these T&Cs and the provisions
+                hereof, you may access or use the Site and Content solely to
+                evaluate WRENCHBOARD and WRENCHBOARD’s products and services.
+                You may only link to the Site or Content, or any portion
+                thereof, as expressly permitted by WRENCHBOARD.
+              </p>
+            </li>
+            <li className="text-base font-bold text-thin-light-gray leading-[28px]">
+              <h1 className="text-lg tracking-wide font-bold text-dark-gray dark:text-white my-4">
+                Ownership and Restrictions
+              </h1>
+              <p className="text-base text-thin-light-gray leading-[28px]">
+                All rights, title, and interest in and to the Site and Content
+                will remain exclusive to WRENCHBOARD. You will not:
+              </p>
+              <ol className="ml-8 list-decimal">
+                <li className="my-2 text-base font-bold text-thin-light-gray leading-[28px]">
+                  Sublicense, resell, rent, lease, transfer, assign, timeshare,
+                  or commercially exploit or make the Site and any Content
+                  available to any third party.
+                </li>
+                <li className="my-2 text-base font-bold text-thin-light-gray leading-[28px]">
+                  Use the Site and Content in any unlawful manner (including
+                  without limitation in violation of any data, privacy, or
+                  export control laws) or in any way that interferes with or
+                  disrupts the integrity or performance of the Site and Content
+                  or their related components.
+                </li>
+                <li className="my-2 text-base font-bold text-thin-light-gray leading-[28px]">
+                  Modify, adapt, or hack the Site and Content to, or try to,
+                  gain unauthorized access to the restricted portions of the
+                  Site and Content or related systems or networks (i.e.,
+                  circumvent any encryption or other security measures, gain
+                  access to any source code or any other underlying form of
+                  technology or information, and gain access to any part of the
+                  Site and Content, or any other products or services of
+                  WRENCHBOARD that are not readily made available to the general
+                  public).
+                </li>
+              </ol>
+              <p className="my-4 text-base font-bold text-thin-light-gray leading-[28px]">
+                You are not permitted to copy, modify, frame, repost, publicly
+                perform or display, sell, reproduce, distribute, or create
+                derivative works of the Site and Content, except that you may
+                download and print one copy of the publicly available materials
+                (i.e., the Content that does not require an Account name or
+                password to access) on any single computer solely for your
+                personal, non-commercial use, provided that you do not modify
+                the material in any way. You keep intact all copyright,
+                trademark, and other proprietary notices.
+              </p>
+              <p className="my-4 text-base font-bold text-thin-light-gray leading-[28px]">
+                You agree not to access the Site or Content by any means other
+                than through the interface that WRENCHBOARD provides to access
+                the same. You may not use any “page-scrape,” “deep-link,”
+                “spider,” or “robot or other automatic program, device,
+                algorithm or methodology, or any similar manual process, to
+                access, copy, acquire, or monitor any portion of the Site or any
+                Content, or in any way reproduce or circumvent the presentation
+                or navigational structure of the Site or any Content, to obtain
+                or attempt to obtain any Content or other information through
+                any means not made generally available through the Site by
+                WRENCHBOARD.
+              </p>
+              <p className="my-4 text-base font-bold text-thin-light-gray leading-[28px]">
+                WRENCHBOARD reserves the right to take lawful measures to
+                prevent such activity. You may not forge headers or otherwise
+                manipulate identifiers to disguise the origin of any message or
+                transmittal you send to WRENCHBOARD on or through the Site or
+                any service offered on or through the Site. You may not pretend
+                that you are, or that you represent, someone else or impersonate
+                any other individual or entity.
+              </p>
+            </li>
+            <li className="text-base text-thin-light-gray leading-[28px]">
+              <h1 className="text-lg tracking-wide font-bold text-dark-gray dark:text-white my-4">
+                Responsibility for Your Data
+              </h1>
+              <p className="text-base font-bold text-thin-light-gray leading-[28px]">
+                You are solely responsible for all data, information, and other
+                Content, that you upload, post, or otherwise provide or store
+                (hereafter “post(ing)”) in connection with or relating to the
+                Site. By posting your information and other Content (“User
+                Content”) on or through the Site and Content, you grant
+                WRENCHBOARD a worldwide, non-exclusive, perpetual, irrevocable,
+                royalty-free, sublicensable, and transferable license to use,
+                modify, reproduce, distribute, display, publish and perform User
+                Content in connection with the Site and Content. WRENCHBOARD has
+                the right, but not the obligation, to monitor the Site and
+                Content and User Content. <br />
+                WRENCHBOARD may remove or turn off any User Content at any time
+                for any reason or no reason. WRENCHBOARD will have no liability
+                to you for any unauthorized access or use of any of User Content
+                or any corruption, deletion, destruction, or loss of any of User
+                Content.
+              </p>
+            </li>
+            <li className="text-base text-thin-light-gray leading-[28px]">
+              <h1 className="text-lg tracking-wide font-bold text-dark-gray dark:text-white my-4">
+                Feedback
+              </h1>
+              <p className="text-base font-bold text-thin-light-gray leading-[28px]">
+                You may submit ideas, suggestions, or comments (“Feedback”)
+                regarding the Site and Content or WRENCHBOARD’s business,
+                products, or services. By submitting any Feedback, you
+                acknowledge and agree that:{" "}
+              </p>
+              <ol className="ml-8 list-decimal">
+                <li className="my-2 text-base font-bold text-thin-light-gray leading-[28px]">
+                  Your Feedback is provided by you voluntarily, and WRENCHBOARD
+                  may, without any obligations or limitations, use and exploit
+                  such Feedback in any manner and for any purpose.
+                </li>
+                <li className="my-2 text-base font-bold text-thin-light-gray leading-[28px]">
+                  You will not seek and are not entitled to any money or other
+                  form of compensation, consideration, or attribution concerning
+                  your Feedback, regardless of whether WRENCHBOARD considered or
+                  used your Feedback in any manner.
+                </li>
+                <li className="my-2 text-base font-bold text-thin-light-gray leading-[28px]">
+                  Your Feedback is not confidential or proprietary information
+                  of you or any third party.
+                </li>
+              </ol>
+            </li>
+          </ul>
        </div>
        <hr />

@@ -141,36 +179,32 @@ export default function TermsConditionTab() {
          <h1 className="text-2xl tracking-wide font-bold text-dark-gray dark:text-white mb-4">
            Termination of Access Due to Violations
          </h1>
-          <p className="text-base text-thin-light-gray leading-[28px] ">
+          <p className="font-bold text-base text-thin-light-gray leading-[28px] ">
            WRENCHBOARD may, in its sole discretion and without prior notice,
-            terminate your access to the Site and/or block your future access to
+            terminate your access to the Site and block your future access to
            the Site if we determine that you have violated these T&Cs or other
            agreements or guidelines which may be associated with your use of
-            the Site. You also agree that any violation by you of these T&Cs
-            will cause irreparable harm to WRENCHBOARD, for which monetary
-            damages would be inadequate, and you consent to WRENCHBOARD
-            obtaining any injunctive or equitable relief that WRENCHBOARD deems
-            necessary or appropriate in such circumstances, without limiting
-            WRENCHBOARD’s other available remedies. Further, WRENCHBOARD may, in
-            its sole discretion and without prior notice, terminate your access
-            to the Site, for cause, which includes (but is not limited to) (1)
-            requests by law enforcement or other government agencies, (2)
-            discontinuance or material modification of the Site or any service
-            offered on or through the Site, or (3) unexpected technical issues
-            or problems.
+            the Site. Further, WRENCHBOARD may, in its sole discretion and
+            without prior notice, terminate your access to the Site for cause,
+            which includes (but is not limited to):
          </p>
-        </div>
-        <hr />
-
-        <div className="my-8">
-          <h1 className="text-2xl tracking-wide font-bold text-dark-gray dark:text-white mb-4">
-            T&Cs Updates
-          </h1>
+          <ol className="ml-8 list-decimal font-bold">
+            <li className="my-2 text-base font-bold text-thin-light-gray leading-[28px]">
+              Requests by law enforcement or other government agencies
+            </li>
+            <li className="my-2 text-base font-bold text-thin-light-gray leading-[28px]">
+              Discontinuance or material modification of the Site or any service
+              offered on or through the Site
+            </li>
+            <li className="my-2 text-base font-bold text-thin-light-gray leading-[28px]">
+              Unexpected technical issues or problems.T&Cs Updates
+            </li>
+          </ol>
          <p className="text-base text-thin-light-gray leading-[28px] ">
            WRENCHBOARD reserves the right, at its sole discretion, to change or
            modify portions of these T&Cs at any time. WRENCHBOARD will post the
-            changes to these T&Cs on the Site and will indicate at the top of
-            this page the date these terms were last revised. It is your
+            changes to these T&Cs on the Site and indicate at the top of this
+            page the date these terms were last revised. It is your
            responsibility to check the T&Cs periodically for changes. Your
            continued use of the Site and Content after the date any such
            changes become effective constitutes your acceptance of the new or
@@ -193,42 +227,36 @@ export default function TermsConditionTab() {
            REPRESENTATIONS OR WARRANTIES ARISING FROM COURSE OF DEALING, COURSE
            OF PERFORMANCE OR USAGE OF TRADE. YOU ACKNOWLEDGE THAT WRENCHBOARD
            DOES NOT WARRANT THAT YOUR ACCESS OR USE OR BOTH OF THE SITE AND
-            CONTENT WILL BE UNINTERRUPTED, TIMELY, SECURE, ERROR-FREE OR
+            CONTENT WILL BE UNINTERRUPTED, TIMELY, SECURE, ERROR-FREE, OR
            VIRUS-FREE, AND WRENCHBOARD DOES NOT MAKE ANY WARRANTY AS TO THE
-            RESULTS THAT MAY BE OBTAINED FROM USE OF THE SITE AND CONTENT. NO
-            INFORMATION, ADVICE OR SERVICES OBTAINED BY YOU FROM WRENCHBOARD OR
-            THROUGH THE SITE WILL CREATE ANY WARRANTY NOT EXPRESSLY STATED IN
-            THESE TERMS and CONDITIONS AND YOU SHOULD NOT RELY ON THE SITE AND
+            RESULTS THAT MAY BE OBTAINED FROM THE USE OF THE SITE AND CONTENT.
+            NO INFORMATION, ADVICE, OR SERVICES OBTAINED BY YOU FROM WRENCHBOARD
+            OR THROUGH THE SITE WILL CREATE ANY WARRANTY NOT EXPRESSLY STATED IN
+            THESE TERMS and CONDITIONS, AND YOU SHOULD NOT RELY ON THE SITE AND
            THE GENERAL CONTENT ALONE AS THE BASIS FOR YOUR BUSINESS DECISIONS.
          </p>
        </div>
        <hr />

        <div className="my-8">
-          <p className="text-base text-thin-light-gray leading-[28px] ">
+          <p className="font-bold text-base text-thin-light-gray leading-[28px] ">
            WRENCHBOARD reserves the right to do any of the following, at any
-            time, without notice: (1) to modify, suspend or terminate operation
+            time, without notice: ( 1 ); to modify, suspend or terminate operation
            of or access to the Site, or any portion of the Site, for any
-            reason; (2) to modify or change the Site, or any portion of the
-            Site, for any reason; and (3) to interrupt the operation of the
+            reason; ( 2 ) to modify or change the Site, or any portion of the
+            Site, for any reason; and ( 3 ) to interrupt the operation of the
            Site, or any portion of the Site, as necessary to perform routine or
-            non-routine maintenance, error correction, or other changes..
+            non-routine maintenance, error correction, or other changes. Changes
+            to the Policy
          </p>
-        </div>
-        <hr />

-        <div className="mt-8">
-          <h1 className="text-2xl tracking-wide font-bold text-dark-gray dark:text-white mb-4">
-            Changes To the Policy
-          </h1>
-          <p className="text-base text-thin-light-gray leading-[28px] ">
-            We reserve the rights to update and make changes to this Privacy
-            policy at anytime. Changes will become effective once posted.
-            However, we will notify you by email or when you log on to the
-            service or website about any changes that fundamentally affect how
-            we manage your personal information. Contacting Us: You may contact
-            us about this policy through our email address anytime :
-            support@wrenchboard.com
+          <p className="my-4 text-base text-thin-light-gray leading-[28px] ">
+            We reserve the right to update and change this Privacy policy at any
+            time. Changes will become effective once posted. However, we will
+            notify you by email or when you log on to the service or website
+            about any changes that fundamentally affect how we manage your
+            personal information. Contacting Us: You may contact us about this
+            policy through our email address anytime: support@wrenchboard.com
          </p>
        </div>
      </div>
@@ -7,10 +7,12 @@ import Layout from "../Partials/Layout";
 import ProductUploadField from "./ProductUploadField";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import usersService from "../../services/UsersService";
+import { useNavigate } from "react-router-dom";

-export default function UploadProduct() {
+export default function UploadProduct({uploadTypes}) {
  const apiCall = new usersService()
  const [requestStatus, setRequestStatus] = useState({loading: false, status: null, message: ''}) // DETERMINES THE STATUS OF UPLOAD
+  const navigate = useNavigate()

  // preview modal
  const [previewProductModal, setPreviewProductModal] = useState(false);
@@ -79,22 +81,28 @@ export default function UploadProduct() {
  const [imgDetails, setImgDetails] = useState('')
  const changeFile = (e, file) => {
    if (e) {
+      let uploadedFileType = e.target.files[0].type.split("/")[0].toLowerCase();
+      
+
      setSelectedFile(e.target.files[0].name);
      setImgDetails(e?.target?.files[0])
      const imgRead = new FileReader();
      imgRead.onload = (event) => {
-        setImg(event.target.result);
+        // setImg(event.target.result);
+        setImg({ type: uploadedFileType, file: event.target.result });
      };
      // most importend
      imgRead.readAsDataURL(e.target.files[0]);
    }
-    if (file.length) {
+    if (file?.length) {
+      let uploadedFileType = file[0].type.split("/")[0].toLowerCase();
      if (file[0].name) {
        setSelectedFile(file?.[0].name);
        setImgDetails(file?.[0])
        const imgRead = new FileReader();
        imgRead.onload = (event) => {
-          setImg(event.target.result);
+          // setImg(event.target.result);
+          setImg({ type: uploadedFileType, file: event.target.result });
        };
        // most importend
        imgRead.readAsDataURL(file[0]);
@@ -134,28 +142,35 @@ export default function UploadProduct() {
        setRequestStatus({loading: false, status: false, message: ''})
      },5000)
    }
+    
+    let reqData = { // PAYLOAD FOR API CALL
+      file_name: selectedFile.substring(0,21).replace(/ /gi, ""),//selectedFile.replace(/[ -]/gi, ""),
+      file_size: imgDetails.size,
+      file_type: imgDetails.type,
+      file_data: img.file,
+      title: itemName,
+      description: description,
+      msg_type: 'FILE',
+      // action: 'WRENCHBOARD_RESOURCE_MYFILES',
+      action: 11307
+    }

-    if(imgDetails.size > 2097152){ // CHECKS IF IMAGE SIZE IS MORE THAN "MB"
-      setRequestStatus({loading: false, status: null, message: 'Image must be less than 2MB'})
+    if(!isValidFile(imgDetails, uploadTypes?.data)){ // FUNCTION TO CHECK IF FILE TYPE IS VALID
+      setRequestStatus({loading: false, status: null, message: 'File type not supported'})
+      return setTimeout(()=>{
+        setRequestStatus({loading: false, status: false, message: ''})
+      },5000)
+    }
+
+    let validSize = isValidFileSize(imgDetails, uploadTypes?.data) // FUNCTION TO CHECK IF FILE SIZE IS VALID
+    if(!validSize.status){
+      setRequestStatus({loading: false, status: null, message: validSize.message})
      return setTimeout(()=>{
        setRequestStatus({loading: false, status: false, message: ''})
      },5000)
    }
    
-    let reqData = { // PAYLOAD FOR API CALL
-      file_name: selectedFile,
-      file_size: imgDetails.size,
-      file_type: imgDetails.type,
-      file_data: img,
-      item_name: itemName,
-      item_description: description,
-      msg_type: 'FILE',
-      // action: 'WRENCHBOARD_RESOURCE_MYFILES',
-      action: 11307
-    }
-    // console.log('TESTING', reqData)
-    
-    //API CALL TO UPLOAD COMES HERE
+    // API CALL TO UPLOAD COMES HERE
    setRequestStatus({loading: true, status: null, message: ''}) // SETS REQUEST LOADING TRUE
    apiCall.sendFiles(reqData).then(res=>{
      if(res.status != 200 || res.data.internal_return < 0){
@@ -263,8 +278,15 @@ export default function UploadProduct() {
                    Image,Video,Audio or Documents
                  </h1>
                  <p className="text-thin-light-gray text-base tracking-wide font-medium">
-                    File types supported: JPG, PNG, GIP, SVG, MP4, MP3, WEBM,
-                    OGG, GLB, GLTF
+                    File types supported: {uploadTypes.loading && <span className="italic">loading...</span>}
+                    {/* JPG, PNG, GIP, SVG, MP4, MP3, WEBM, OGG, GLB, GLTF */}
+                    {uploadTypes?.data?.length ?
+                    uploadTypes?.data?.map((item, index) => {
+                      return index != uploadTypes.data.length-1 ? `${item.name}, ` : `${item.name}`
+                    })
+                    :
+                    null
+                    }
                  </p>
                </div>
                <div className="main-content w-full lg:flex justify-between lg:px-9 px-4">
@@ -275,17 +297,29 @@ export default function UploadProduct() {
                    >
                      {img ? (
                        <div className="w-full h-full">
-                          <img
-                            src={img}
-                            alt=""
-                            className="w-full h-full object-cover"
-                          />
+                          {img.type === "image" ? (
+                            <img
+                              src={img.file}
+                              alt=""
+                              className="w-full h-full object-cover"
+                            />
+                          ) : img.type === "video" ? (
+                            <video
+                              type=""
+                              src={img.file}
+                              className="w-full h-full object-cover"
+                              controls
+                            ></video>
+                          ) : img.type != null ? (
+                            <p>{selectedFile}</p>
+                          ) : null}
+                          
                          <input
                            type="file"
                            id="fileElem"
                            name="file"
                            className="hidden"
-                            accept="image/*"
+                            // accept="image/*"
                            ref={fileRef}
                            value={selectedFile.name}
                            onChange={(e) => changeFile(e)}
@@ -342,7 +376,7 @@ export default function UploadProduct() {
                                id="fileElem"
                                name="file"
                                className="hidden"
-                                accept="image/*"
+                                // accept="image/*"
                                ref={fileRef}
                                value={selectedFile.name}
                                onChange={(e) => changeFile(e)}
@@ -376,7 +410,8 @@ export default function UploadProduct() {
                  <div className="flex sm:space-x-4 space-x-2 sm:mr-9 mr-2">
                    <button
                      type="button"
-                      onClick={cancelUploadModalHandler}
+                      // onClick={cancelUploadModalHandler}
+                      onClick={()=>navigate('/resources', {state:{tab:'created'}})}
                      className="sm:text-18 text-sm text-light-red tracking-wide "
                    >
                      <span className="border-b dark:border-[#5356fb29]  border-light-red">
@@ -415,7 +450,7 @@ export default function UploadProduct() {
                    <div className="preview-upload-product lg:w-[580px] lg:h-[622px] w-full h-full bg-white dark:bg-[#11131F]   lg:rounded-2xl">
                      <div className="w-full h-full flex flex-col justify-between">
                        {/* heading */}
-                        <div className="lg:px-[40px] lg:py-[33px] px-[30px] py-[23px] flex justify-between border-b dark:border-[#5356fb29]  border-light-purple dark:border-[#5356fb29]  mb-4 lg:mb-0">
+                        <div className="lg:px-[40px] lg:py-[33px] px-[30px] py-[23px] flex justify-between border-b border-light-purple dark:border-[#5356fb29]  mb-4 lg:mb-0">
                          <h1 className="text-dark-gray dark:text-white tracking-wide text-26 font-bold">
                            Item Privew
                          </h1>
@@ -561,3 +596,37 @@ export default function UploadProduct() {
    </>
  );
 }
+
+
+
+
+//FUNCTIONS to check if file upload type is valid
+const isValidFile = (file, supportedFile=[]) => {
+  let fileType = file.type.split("/")[1];
+  let valid = supportedFile.filter(item => (
+    item.name.toLowerCase() == fileType.toLowerCase()
+  ))
+  if(valid.length){
+    return true
+  }else{
+    return false
+  }
+}
+
+//FUNCTIONS TO CHECK IF FILE SIZE IS VALID
+const isValidFileSize = (file, supportedFile=[]) => {
+  let fileType = file.type.split("/")[1];
+  let fileSize = file.size;
+  let valid = supportedFile.filter(item => (
+    item.name.toLowerCase() == fileType.toLowerCase()
+  ))
+  if(valid.length){
+    if((Number(valid[0].max_size_mb) * 1048576) >= fileSize){
+      return {status: true}
+    }else{
+      return {status: false, message: `File must not exceed ${valid[0].max_size_mb}MB`}
+    }
+  }else{
+    return false
+  }
+}
@@ -1,11 +1,11 @@
+import { Field, Form, Formik } from "formik";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
-import Detail from "./popoutcomponent/Detail";
-import ModalCom from "../Helpers/ModalCom";
-import InputCom from "../Helpers/Inputs/InputCom/index";
-import SiteService from "../../services/SiteService";
-import { Form, Formik, Field } from "formik";
 import * as Yup from "yup";
+import SiteService from "../../services/SiteService";
+import InputCom from "../Helpers/Inputs/InputCom/index";
+import ModalCom from "../Helpers/ModalCom";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
+import Detail from "./popoutcomponent/Detail";

 const validationSchema = Yup.object().shape({
  family: Yup.string().required("This is required "),
@@ -202,7 +202,7 @@ function JobListPopout({ details, onClose, situation }) {
            </svg>
          </button>
        </div>
-        <div className="md:flex bg-white rounded-lg shadow-lg">
+        <div className="md:flex bg-white dark:bg-dark-white rounded-lg shadow-lg">
          <div className="p-4 w-full md:w-2/4 md:border-r-2">
            {/* <p className='text-lg font-semibold text-slate-900 tracking-wide'>{details.title}</p> */}

@@ -230,11 +230,11 @@ function JobListPopout({ details, onClose, situation }) {
            </div>

            <div className="my-3">
-              <label className="w-full text-slate-900 tracking-wide font-semibold">
+              <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 outline-none border border-slate-300 rounded-md`}
+                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={textArea}
@@ -322,7 +322,7 @@ function JobListPopout({ details, onClose, situation }) {
                      input={true}
                      inputName="individual"
                      value={props?.values.individual}
-                      placeholder="enter email of individual"
+                      placeholder="Enter email of individual"
                      inputHandler={props?.handleChange}
                      btnText="Send Offer to Individual"
                      loader={loader?.jobFields.individual}
@@ -396,7 +396,7 @@ const JobFieldInput = ({
  data,
 }) => {
  return (
-    <div className="field w-full p-3 mb-2 bg-red-50 rounded-md">
+    <div className="field w-full p-3 mb-2 bg-red-50 dark:bg-[#D85A5A] rounded-md">
      {select && (
        <>
          <div className={`input-com ${parentClass}`}>
@@ -468,7 +468,10 @@ const JobFieldInput = ({
          type="submit"
          name={inputName}
          onClick={errorHandler}
-          className="px-2 py-1 text-sm text-white btn-gradient tracking-wide rounded-md"
+          className={`px-2 py-1 text-sm text-white btn-gradient tracking-wide rounded-md ${
+            !value && "disabled:grayscale-[65%] transition duration-300"
+          }`}
+          disabled={!value}
        >
          {loader ? <LoadingSpinner size={5} /> : btnText}
        </button>
@@ -1,11 +1,11 @@
-import React, { useMemo, useState } from "react";
+import React, { useState } from "react";
+import { useNavigate } from "react-router-dom";
 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 Detail from "./popoutcomponent/Detail";
-import { useNavigate } from "react-router-dom";

 import { useDispatch } from "react-redux";
 import { tableReload } from "../../store/TableReloads";
@@ -18,85 +18,95 @@ const showSuccessToast = (message) => {
 };

 function PendingJobsPopout({ details, onClose, situation }) {
-
-  const dispatch = useDispatch()
-  const navigate = useNavigate()
+  const dispatch = useDispatch();
+  const navigate = useNavigate();

  const [pendingJobLoader, setPendingJobLoader] = useState({
    extend: false,
    offer: false,
  });

-  let [requestMessage, setRequestMessage] = useState({status: false, message: ''})
+  let [requestMessage, setRequestMessage] = useState({
+    status: false,
+    message: "",
+  });

  const apiCall = new usersService();

  const handlePendingJobsBtn = ({ target: { name } }) => {
-      let { job_uid, offer_code } = details;
+    let { job_uid, offer_code } = details;

-      let reqData;
+    let reqData;

-      let pendingData = { job_uid, offer_code };
-      if(name=='extend'){ // RUNS THIS TO EXTEND JOB EXPIRY BY ONE WEEK
-        reqData = { ...pendingData };
-        setPendingJobLoader({ extend: true });
-        apiCall.pendingJobExtend(reqData).then(res => {
-          setRequestMessage({status: true, message: res.data.status})
+    let pendingData = { job_uid, offer_code };
+    if (name == "extend") {
+      // RUNS THIS TO EXTEND JOB EXPIRY BY ONE WEEK
+      reqData = { ...pendingData };
+      setPendingJobLoader({ extend: true });
+      apiCall
+        .pendingJobExtend(reqData)
+        .then((res) => {
+          setRequestMessage({ status: true, message: res.data.status });
          setTimeout(() => {
            setPendingJobLoader({ extend: false, offer: false });
-            setRequestMessage({status: false, message: ''})
+            setRequestMessage({ status: false, message: "" });
            onClose();
            dispatch(tableReload({ type: "PENDINGTABLE" }));
          }, 4000);
-        }).catch(error => {
-          setRequestMessage({status: false, message:'Try Again'})
-          setTimeout(() => {
-            setPendingJobLoader({ extend: false, offer: false });
-            setRequestMessage({status: false, message: ''})
-          }, 3000);
        })
-      }else if(name=='offer'){ // RUNS THIS IF JOB IS SENT TO USER
-        reqData = { ...pendingData };
-        setPendingJobLoader({ offer: true });
-        apiCall.pendingJobSendTome(reqData).then(res => {
-          setRequestMessage({status: true, message: res.data.status})
+        .catch((error) => {
+          setRequestMessage({ status: false, message: "Try Again" });
          setTimeout(() => {
            setPendingJobLoader({ extend: false, offer: false });
-            setRequestMessage({status: false, message: ''})
+            setRequestMessage({ status: false, message: "" });
+          }, 3000);
+        });
+    } else if (name == "offer") {
+      // RUNS THIS IF JOB IS SENT TO USER
+      reqData = { ...pendingData };
+      setPendingJobLoader({ offer: true });
+      apiCall
+        .pendingJobSendTome(reqData)
+        .then((res) => {
+          setRequestMessage({ status: true, message: res.data.status });
+          setTimeout(() => {
+            setPendingJobLoader({ extend: false, offer: false });
+            setRequestMessage({ status: false, message: "" });
          }, 4000);
-        }).catch(error => {
-          setRequestMessage('Try Again')
+        })
+        .catch((error) => {
+          setRequestMessage("Try Again");
          setTimeout(() => {
            setPendingJobLoader({ extend: false, offer: false });
-            setRequestMessage({status: false, message: ''})
+            setRequestMessage({ status: false, message: "" });
          }, 3000);
-        })
-      } else return
-      // try {
-      //   if (name === "extend") {
-      //     setPendingJobLoader({ extend: true });
-      //     reqData = { ...pendingData };
-      //     // let { data } =
-      //     await apiCall.pendingJobExtend(reqData);
-      //     showSuccessToast("Job has been extended by a week!");
-      //     dispatch(tableReload({ type: "PENDINGTABLE" }));
-      //   } else if (name === "offer") {
-      //     setPendingJobLoader({ offer: true });
-      //     reqData = { ...pendingData };
-      //     // let { data } =
-      //     await apiCall.pendingJobSendTome(reqData);
-      //     showSuccessToast("Offer sent, check your email");
-      //   } else return;
+        });
+    } else return;
+    // try {
+    //   if (name === "extend") {
+    //     setPendingJobLoader({ extend: true });
+    //     reqData = { ...pendingData };
+    //     // let { data } =
+    //     await apiCall.pendingJobExtend(reqData);
+    //     showSuccessToast("Job has been extended by a week!");
+    //     dispatch(tableReload({ type: "PENDINGTABLE" }));
+    //   } else if (name === "offer") {
+    //     setPendingJobLoader({ offer: true });
+    //     reqData = { ...pendingData };
+    //     // let { data } =
+    //     await apiCall.pendingJobSendTome(reqData);
+    //     showSuccessToast("Offer sent, check your email");
+    //   } else return;

-      //   setTimeout(() => {
-      //     setPendingJobLoader({ extend: false, offer: false });
-      //     onClose();
-      //   }, 2700);
-      // } catch (error) {
-      //   setPendingJobLoader({ extend: false, offer: false });
-      //   throw new Error(error);
-      // }
-    }
+    //   setTimeout(() => {
+    //     setPendingJobLoader({ extend: false, offer: false });
+    //     onClose();
+    //   }, 2700);
+    // } catch (error) {
+    //   setPendingJobLoader({ extend: false, offer: false });
+    //   throw new Error(error);
+    // }
+  };

  return (
    <ModalCom action={onClose} situation={situation} className="edit-popup">
@@ -131,9 +141,9 @@ function PendingJobsPopout({ details, onClose, situation }) {
            </svg>
          </button>
        </div>
-        <div className="md:flex bg-white rounded-lg shadow-lg">
+        <div className="md:flex bg-white dark:bg-dark-white rounded-lg shadow-lg">
          <div className="p-4 w-full md:w-3/4 md:border-r-2">
-            <p className="text-base font-semibold text-slate-900 tracking-wide">
+            <p className="text-base font-semibold text-slate-900 dark:text-white tracking-wide">
              {details.title}
            </p>
            <div className="my-2 p-2 flex justify-start items-center space-x-2 bg-red-100 border-2 border-red-300">
@@ -177,7 +187,11 @@ function PendingJobsPopout({ details, onClose, situation }) {
              <Detail
                label="Price"
                // value={`${details.price * 0.01} ${details.currency}`}
-                value={PriceFormatter(details.price * 0.01, details?.currency_code, details.currency)}
+                value={PriceFormatter(
+                  details.price * 0.01,
+                  details?.currency_code,
+                  details.currency
+                )}
              />
            </div>

@@ -194,19 +208,11 @@ function PendingJobsPopout({ details, onClose, situation }) {
                value={details.job_description || details.description}
              />
            </div>
-
-            {/* <div className="my-2 md:flex">
-              <Detail
-                label="Public Link"
-                value="https://work.wrenchboard.com/plb/viewjob/218B4BWB83"
-                bg="bg-slate-200"
-              />
-            </div> */}
          </div>

          {/* ACTION SECTION */}
          <div className="p-4 w-full md:w-1/4 h-full">
-            <p className="mb-6 text-sm">Actions</p>
+            <p className="mb-6 text-sm dark:text-white">Actions</p>

            <div className="mb-3">
              <p className="px-2 py-1 text-sm bg-slate-100">
@@ -229,11 +235,15 @@ function PendingJobsPopout({ details, onClose, situation }) {
                )}
              </button>
            </div>
-            {pendingJobLoader.extend && requestMessage.message &&
-              <div className={`p-1 ${requestMessage.status ? 'bg-green-500':'bg-red-500'} text-white rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}>
+            {pendingJobLoader.extend && requestMessage.message && (
+              <div
+                className={`p-1 ${
+                  requestMessage.status ? "bg-green-500" : "bg-red-500"
+                } text-white rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+              >
                <p>{requestMessage.message}</p>
              </div>
-            }
+            )}

            <div className="my-3">
              <button
@@ -251,11 +261,15 @@ function PendingJobsPopout({ details, onClose, situation }) {
              </button>
            </div>

-            {pendingJobLoader.offer && requestMessage.message &&
-              <div className={`p-1 ${requestMessage.status ? 'bg-green-500':'bg-red-500'} text-white rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}>
+            {pendingJobLoader.offer && requestMessage.message && (
+              <div
+                className={`p-1 ${
+                  requestMessage.status ? "bg-green-500" : "bg-red-500"
+                } text-white rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+              >
                <p>{requestMessage.message}</p>
              </div>
-            }
+            )}

            <div className="mt-10 md:mt-32 md:flex md:justify-center">
              <button
@@ -284,4 +298,4 @@ function PendingJobsPopout({ details, onClose, situation }) {
  );
 }

-export default PendingJobsPopout;
+export default PendingJobsPopout;
@@ -10,6 +10,7 @@ import { updateUserDetails } from "../store/UserDetails";
 import { updateJobs } from "../store/jobLists";
 import { updateNotifications } from "../store/notifications";
 import { updateUserJobList } from "../store/userJobList";
+import { updateWalletDetails } from "../store/walletDetails";

 const AuthRoute = ({ redirectPath = "/login", children }) => {
  const apiCall = useMemo(() => new usersService(), []);
@@ -19,13 +20,13 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
  const [loadProfileDetails, setLoadProfileDetails] = useState([]);
  const navigate = useNavigate();

-  const { jobListTable } = useSelector((state) => state.tableReload);
+  const { jobListTable, walletTable } = useSelector((state) => state.tableReload);

  const {
-    userDetails: { username, uid },
+    userDetails: { username, uid, session },
  } = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active

-  let loggedIn = username && uid ? true : false; // variable to determine if user is logged in
+  let loggedIn = username && session && uid ? true : false; // variable to determine if user is logged in

  useEffect(() => {
    //Removing Data stored at localStorage after session expires
@@ -149,7 +150,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
              //   sort: _sorted,
              //   header: _header,
              // },
-              data: _sorted
+              data: _sorted,
            })
          );
        })
@@ -177,6 +178,21 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
    getMyJobList();
  }, [jobListTable]);

+  useEffect(() => {
+    const getMyWalletList = async () => {
+      dispatch(updateWalletDetails({ loading: true, data:[] }));
+      try {
+        const res = await apiCall.getUserWallets();
+        console.log("wallet - >", res.data);
+        dispatch(updateWalletDetails({ loading: false, data:res.data?.result_list }));
+      } catch (error) {
+        dispatch(updateWalletDetails({ loading: false, data:[] }));
+        console.log("Error getting mode");
+      }
+    };
+    getMyWalletList();
+  }, [walletTable]);
+
  useEffect(() => {
    // Getting market data
    const getMarketActiveJobList = async () => {
@@ -211,7 +227,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
      .getRecentActivitiedData()
      .then((res) => {
        //   debugger;
-        if (res.data?.internal_return < 0) {
+        if (res?.data?.internal_return < 0) {
          return;
        }
        dispatch(recentActivitiesData(res.data));
@@ -30,6 +30,16 @@ class usersService {
    return this.postAuxEnd("/dashdata", postData);
  }

+  getRecentActivities(){
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: 11202
+    };
+    return this.postAuxEnd("/recentactivities", postData);
+  }
+
  logInUser(reqData) {
    localStorage.setItem("session_token", ``);
    return this.postAuxEnd("/userlogin", reqData);
@@ -86,6 +96,18 @@ class usersService {
    return this.postAuxEnd("/loadprofile", null);
  }

+  getUploadedList() {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      page: 1,
+      limit: 20,
+      action: 11309,
+    };
+    return this.postAuxEnd("/myfiles", postData);
+  }
+
  getOffersList() {
    var postData = {
      uuid: localStorage.getItem("uid"),
@@ -226,7 +248,7 @@ class usersService {
    return this.postAuxEnd("/sendmoneyfee", postData);
  }

-  // Start Credit for Cards 
+  // Start Credit for Cards
  getStartCredit(value) {
    var postData = {
      uid: localStorage.getItem("uid"),
@@ -346,6 +368,7 @@ class usersService {
      page: 0,
      offset: 0,
      limit: 100,
+      allstatus: 0
    };
    return this.postAuxEnd("/activetaskslist", postData);
  }
@@ -577,7 +600,7 @@ class usersService {
    return this.postAuxEnd("/familymanage", postData);
  }

- // END POINT CALL FOR ACCOUNT TOP
+  // END POINT CALL FOR ACCOUNT TOP
  startTopUp(post) {
    alert("WHY ARE WE CALLING THIS ?");
    // var postData = {
@@ -591,7 +614,6 @@ class usersService {
    // return this.postAuxEnd("/starttopup", postData);
  }

-
  resultTopUp(post) {
    var postData = {
      uid: localStorage.getItem("uid"),
@@ -600,7 +622,7 @@ class usersService {
      action: 11061,
      ...post,
    };
-    console.log("topupresult",postData);
+    console.log("topupresult", postData);
    return this.postAuxEnd("/topupresult", postData);
  }

@@ -972,64 +994,75 @@ class usersService {
    return this.postAuxEnd("/familysuggestlist", postData);
  }

-    // FUNCTION TO CHANGE PROFILE PASSWORD
-    profilePassChange(reqData) {
-      var postData = {
-        uid: localStorage.getItem("uid"),
-        member_id: localStorage.getItem("member_id"),
-        sessionid: localStorage.getItem("session_token"),
-        action: 11005,
-        ...reqData,
-      };
-      return this.postAuxEnd("/profilepasschange", postData);
-    }
+  // FUNCTION TO CHANGE PROFILE PASSWORD
+  profilePassChange(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: 11005,
+      ...reqData,
+    };
+    return this.postAuxEnd("/profilepasschange", postData);
+  }

-    // FUNCTION TO GET ACCOUNT SETTINGS
-    getAccSettings() {
-      var postData = {
-        uid: localStorage.getItem("uid"),
-        member_id: localStorage.getItem("member_id"),
-        sessionid: localStorage.getItem("session_token"),
-        action: 11059,
-      };
-      return this.postAuxEnd("/getaccsettings", postData);
-    }
+  // FUNCTION TO GET ACCOUNT SETTINGS
+  getAccSettings() {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: 11059,
+    };
+    return this.postAuxEnd("/getaccsettings", postData);
+  }

-    // FUNCTION TO SET ACCOUNT SETTINGS
-    setAccSettings(reqdata) {
-      var postData = {
-        uid: localStorage.getItem("uid"),
-        member_id: localStorage.getItem("member_id"),
-        sessionid: localStorage.getItem("session_token"),
-        action: 11058,
-        ...reqdata,
-      };
-      return this.postAuxEnd("/setaccsettings", postData);
-    }
+  // FUNCTION TO SET ACCOUNT SETTINGS
+  setAccSettings(reqdata) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: 11058,
+      ...reqdata,
+    };
+    return this.postAuxEnd("/setaccsettings", postData);
+  }

-    // FUNCTION TO DELETE PAY CARD
-    payRemCard(reqData) {
-      var postData = {
-        uid: localStorage.getItem("uid"),
-        member_id: localStorage.getItem("member_id"),
-        sessionid: localStorage.getItem("session_token"),
-        action: 11057,
-        ...reqData,
-      };
-      return this.postAuxEnd("/payremcard", postData);
-    }
+  // FUNCTION TO DELETE PAY CARD
+  payRemCard(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: 11057,
+      ...reqData,
+    };
+    return this.postAuxEnd("/payremcard", postData);
+  }

-    // FUNCTION TO GET SINGLE BLOG ITEM
-    getSingleBlogData(reqData) {
-      var postData = {
-        uid: localStorage.getItem("uid"),
-        member_id: localStorage.getItem("member_id"),
-        sessionid: localStorage.getItem("session_token"),
-        limit: 4,
-        ...reqData,
-      };
-      return this.postAuxEnd("/blogdata", postData);
-    }
+  getHomeRecent() {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      limit: 30,
+      offset: 0,
+      action: 11202,
+    };
+    return this.postAuxEnd("/recentactivities", postData);
+  }
+  // FUNCTION TO GET SINGLE BLOG ITEM
+  getSingleBlogData(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      limit: 4,
+      ...reqData,
+    };
+    return this.postAuxEnd("/blogdata", postData);
+  }

  /*
    - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(username)
@@ -7,6 +7,7 @@ const initialState = {
  othersInterestedTable: false,
  couponTable: false,
  walletTable: false,
+  uploadsTable: false,
 };

 export const tableReloadSlice = createSlice({
@@ -33,6 +34,9 @@ export const tableReloadSlice = createSlice({
        case "WALLETTABLE":
          state.walletTable = !state.walletTable;
          return;
+        case "UPLOADSTABLE":
+          state.uploadsTable = !state.uploadsTable;
+          return;
        default:
          return state;
      }
@@ -1,15 +1,15 @@
 import { createSlice } from "@reduxjs/toolkit";

 const initialState = {
-  userDetails: {}
+  userDetails: {},
 };

 export const userSlice = createSlice({
  name: "userDetails",
  initialState,
  reducers: {
-    updateUserDetails: (state,action) => {
-      state.userDetails = {...action.payload}
+    updateUserDetails: (state, action) => {
+      state.userDetails = { ...action.payload };
    },
  },
 });
@@ -17,4 +17,4 @@ export const userSlice = createSlice({
 // Action creators are generated for each case reducer function
 export const { updateUserDetails } = userSlice.actions;

-export default userSlice.reducer;
+export default userSlice.reducer;
@@ -7,6 +7,7 @@ import userDetailReducer from "./UserDetails";
 import jobReducer from "./jobLists";
 import notificationsReducer from "./notifications";
 import userJobListReducer from "./userJobList";
+import walletDetails from "./walletDetails";

 export default configureStore({
  reducer: {
@@ -17,5 +18,6 @@ export default configureStore({
    userJobList: userJobListReducer,
    commonHeadBanner: commonHeadBannerReducer,
    notifications: notificationsReducer,
+    walletDetails: walletDetails
  },
 });
@@ -0,0 +1,21 @@
+import { createSlice } from "@reduxjs/toolkit";
+
+const initialState = {
+  walletDetails: {
+    loading: true,
+    data: []
+  },
+};
+
+export const walletSlice = createSlice({
+  name: "walletDetails",
+  initialState,
+  reducers: {
+    updateWalletDetails: (state, action) => {
+      state.walletDetails = { ...action.payload };
+    },
+  },
+});
+
+export const { updateWalletDetails } = walletSlice.actions;
+export default walletSlice.reducer;
@@ -1,5 +1,4 @@
 import MarketPlace from "../components/MarketPlace";
-
 import { useSelector } from "react-redux";

 export default function MarketPlacePage() {
@@ -1,7 +1,9 @@
 import React, { useState, useEffect } from "react";
 import Resources from "../components/Resources";
 import usersService from "../services/UsersService";
+import { useLocation } from "react-router-dom";
 export default function ResourcePage() {
+  const {state, pathname} = useLocation() // CHECKS IF THERE IS AN ACTIVE TAB WITH LINK BACK TO RESOURCES
  const [MyResourceData, setMyResourceData] = useState([]);
  const api = new usersService();

@@ -17,5 +19,5 @@ export default function ResourcePage() {
    getMyResourceData();
  }, []);

-  return <Resources MyResourceData={MyResourceData} />;
+  return <Resources MyResourceData={MyResourceData} activeTab={state ? state.tab : ''} />;
 }
@@ -1,6 +1,22 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
 import UploadProduct from "../components/UploadProduct";
+import usersService from "../services/UsersService";

 export default function UploadProductPage() {
-  return <UploadProduct />;
+  const [uploadTypes, setUploadTypes] = useState({loading: true, data: []});
+  const api = new usersService();
+
+  const getUploadTypes = async () => {
+    try {
+      const res = await api.getResourceList();
+      setUploadTypes({loading: false, data: res?.data?.upload_types.data});
+    } catch (error) {
+      setUploadTypes({loading: false, data: []});
+      throw new Error("Error getting mode");
+    }
+  };
+  useEffect(() => {
+    getUploadTypes();
+  }, []);
+  return <UploadProduct uploadTypes={uploadTypes} />;
 }
Author	SHA1	Message	Date
victorAnumudu	7f2448efff	family QR scan value changed	2023-09-09 21:29:24 +01:00
ameye	82ec224d66	Merge branch 'Recent-Activities' of WrenchBoard/Users-Wrench into master	2023-09-09 06:07:32 +00:00
Ebube	35ea200de5	change btn type to submit	2023-09-09 07:00:18 +01:00
ameye	7cdd387045	Merge branch 'resource_upload' of WrenchBoard/Users-Wrench into master	2023-09-08 19:54:33 +00:00
ameye	6b568ff56c	Merge branch 'Recent-Activities' of WrenchBoard/Users-Wrench into master	2023-09-08 19:54:23 +00:00
ameye	8808a2f81c	Merge branch 'twitter-logos-added' of WrenchBoard/Users-Wrench into master	2023-09-08 19:54:17 +00:00
Ebube	1991bab675	added active animations for job list popup	2023-09-07 16:53:16 +01:00
victorAnumudu	f650097db2	implemented resource video and pdf upload	2023-09-07 12:21:05 +01:00
Ebube	c427521ac3	dark mode styles added	2023-09-05 09:51:54 +01:00
victorAnumudu	2412059fd0	added new twitter logo in image folder	2023-09-05 06:36:43 +01:00
ameye	34dc467e8b	Merge branch 'Recent-Activities' of WrenchBoard/Users-Wrench into master	2023-09-04 14:37:01 +00:00
Ebube	9fa16278ab	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into Recent-Activities	2023-09-04 14:31:54 +01:00
Ebube	cae02d1dc6	.	2023-09-04 14:31:28 +01:00
ameye	abbd7b3993	Merge branch 'add-job-bug' of WrenchBoard/Users-Wrench into master	2023-09-04 12:44:22 +00:00
victorAnumudu	5523511524	Add Job Bug fixed	2023-09-04 10:49:04 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	35db8ca7ec	activities	2023-09-03 17:57:14 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	51e0482a16	Hoe activities	2023-09-03 16:34:19 -04:00
ameye	a615e25fcb	Merge branch 'resources-tab-visibility' of WrenchBoard/Users-Wrench into master	2023-09-03 13:01:03 +00:00
victorAnumudu	addede388e	made resources tab visible if enabled	2023-09-03 06:26:19 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	76474bb3b5	invite	2023-09-02 16:37:29 -04:00
tokslaw	6337c82374	Merge branch 'coupon-wallet-reload' of WrenchBoard/Users-Wrench into master	2023-08-29 16:57:03 +00:00
victorAnumudu	a970411719	made wallet to reload on coupon redeem	2023-08-29 09:47:35 +01:00
ameye	10967acf9e	Merge branch 'my-uploads-page' of WrenchBoard/Users-Wrench into master	2023-08-22 10:58:13 +00:00
Ebube	fb6831d44f	An Optimized version	2023-08-21 23:28:32 +01:00
Ebube	7dcae39320	BUG - Assign Job with less than amount	2023-08-21 22:41:21 +01:00
ameye	a0ba60a2bc	Merge branch 'flutter_key_removal' of WrenchBoard/Users-Wrench into master	2023-08-21 13:12:38 +00:00
victorAnumudu	f377326b48	removed flutter api key from env variables	2023-08-21 11:38:51 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	feb8bd718d	all status	2023-08-20 17:07:25 -04:00
ameye	a2a2dbfc24	Merge branch 'my-uploads-page' of WrenchBoard/Users-Wrench into master	2023-08-18 10:46:24 +00:00
Ebube	1c0cb6c97f	added the session parameter	2023-08-15 21:02:51 +01:00
ameye	41c9c60fd1	Merge branch 'terms-of-use-update' of WrenchBoard/Users-Wrench into master	2023-08-15 11:45:12 +00:00
victorAnumudu	ba5646fe2c	Merge master into terms-of-use-update	2023-08-13 07:59:40 +01:00
victorAnumudu	1f9ab45206	updated terms of use	2023-08-13 07:58:37 +01:00
tolik	0ffa1123d2	Hide Apple button	2023-08-13 10:56:42 +08:00
ameye	9420a201e4	Merge branch 'image-anchor-added' of WrenchBoard/Users-Wrench into master	2023-08-11 18:59:57 +00:00
ameye	1b7ea7321e	Merge branch 'my-uploads-page' of WrenchBoard/Users-Wrench into master	2023-08-11 18:59:50 +00:00
victorAnumudu	b3e273d712	file messages wrapped with anthor	2023-08-11 19:37:01 +01:00
Ebube	7fa74d6fd3	added img	2023-08-11 18:13:34 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	02c195500a	myfiles	2023-08-11 12:11:31 -04:00
ameye	ca8e56c6dd	Merge branch 'cancel-popout-removed' of WrenchBoard/Users-Wrench into master	2023-08-10 22:42:31 +00:00
victorAnumudu	c265e9db33	popout removed	2023-08-10 22:06:30 +01:00
ameye	2861473ea3	Merge branch 'cancel-upload' of WrenchBoard/Users-Wrench into master	2023-08-10 19:41:46 +00:00
victorAnumudu	a598aa3898	on cancel, takes user back to my item	2023-08-10 12:51:54 +01:00
ameye	9d190916a8	Merge branch 'wallet-styles' of WrenchBoard/Users-Wrench into master	2023-08-09 21:14:17 +00:00
Ebube	eca9455f0f	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into wallet-styles	2023-08-09 22:00:11 +01:00
Ebube	a1bf0bad0f	added uploaded files	2023-08-09 21:59:46 +01:00
ameye	e236ad20f7	Merge branch 'upload-payload-fix' of WrenchBoard/Users-Wrench into master	2023-08-09 20:36:46 +00:00
victorAnumudu	330f47baa7	updated upload payloads	2023-08-09 21:23:51 +01:00
ameye	5088aa3ead	Merge branch 'bug-fix' of WrenchBoard/Users-Wrench into master	2023-08-09 19:52:37 +00:00
victorAnumudu	07a443d082	file upload size validation initiated	2023-08-09 20:28:19 +01:00
victorAnumudu	59a370d763	enforces user upload supported file before proceeding to upload	2023-08-09 19:34:35 +01:00
victorAnumudu	68e709f34b	list of supported uploads add	2023-08-09 18:19:34 +01:00
victorAnumudu	b1bb730c7d	made file name in upload not to have spaces	2023-08-09 17:01:38 +01:00
ameye	20a86f4802	Merge branch 'upload-action' of WrenchBoard/Users-Wrench into master	2023-08-09 14:28:05 +00:00
				`@@ -0,0 +1 @@`
				`{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}`
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" id="files"><circle cx="64" cy="64" r="64" fill="#EF4C45"></circle><path fill="#CD2E30" d="M128 64v-2L92.4 26.5l-63.1 74 27.2 27c2.4.3 4.9.4 7.4.4C99.3 128 128 99.3 128 64z"></path><path fill="#E5E8EC" d="M93.5 78.4V29c0-1.9-1.5-3.4-3.4-3.4H41.8c-1.9 0-3.4 1.5-3.4 3.4v49.4h55.1z"></path><path fill="#FFF" d="M89.5 78.4V44.6H78.1c-1.9 0-3.4-1.5-3.4-3.4V29.9H37.8c-1.9 0-3.4 1.5-3.4 3.4v45.1h55.1z"></path><path fill="#FFCC04" d="m79.3 65.9-1.5 4c-.5 1.2-1.6 2-2.9 2H53.1c-1.3 0-2.4-.8-2.9-2l-1.5-4c-.5-1.3-1.7-2.2-3.1-2.2H30.9c-1.9 0-3.4 1.5-3.4 3.4v28.8c0 3.5 2.9 6.4 6.4 6.4H94c3.5 0 6.4-2.9 6.4-6.4V67.1c0-1.9-1.5-3.4-3.4-3.4H82.5c-1.4 0-2.7.9-3.2 2.2z"></path><path fill="#CED4DF" d="m74.9 45.8-.1-.1.1.1z"></path><path fill="#22D2FC" d="M74.7 29.9v11.4c0 1.9 1.5 3.4 3.4 3.4h11.4L74.7 29.9z"></path><path fill="#FFF" d="M74.1 81.6H53.9c-2 0-3.7 1.6-3.7 3.7 0 2 1.6 3.7 3.7 3.7h20.2c2 0 3.7-1.6 3.7-3.7 0-2-1.7-3.7-3.7-3.7z"></path></svg>