added history table to history page

.env

@@ -23,8 +23,13 @@ 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
 
+#NUMBER OF ITEMS PER PAGE
+REACT_APP_ITEM_PER_PAGE=5
+
 #apigate.lotus.g1.wrenchboard.com:76.209.103.227
 #apigate.orion.g1.wrenchboard.com:76.209.103.227

.env.development

@@ -23,8 +23,13 @@ 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
 
+#NUMBER OF ITEMS PER PAGE
+REACT_APP_ITEM_PER_PAGE=5
+
 #apigate.lotus.g1.wrenchboard.com:76.209.103.227
 #apigate.orion.g1.wrenchboard.com:76.209.103.227

.env.poduction

@@ -23,8 +23,13 @@ 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
 
+#NUMBER OF ITEMS PER PAGE
+REACT_APP_ITEM_PER_PAGE=5
+
 #apigate.orion.g1.wrenchboard.com:76.209.103.227
 #apigate.orion.g1.wrenchboard.com:76.209.103.227

.gitattributes

@@ -0,0 +1,15 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.jsx text
+*.js text
+*.css text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.md text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.sh binary
+

package.json

@@ -14,16 +14,16 @@
     "cors": "^2.8.5",
     "faker": "^6.6.6",
     "formik": "^2.2.9",
-    "react": "^18.0.0",
     "react-chartjs-2": "^4.1.0",
     "react-countup": "^6.2.0",
-    "react-dom": "^18.0.0",
-    "react-lottie": "^1.2.3",
-    "react-redux": "^8.0.2",
     "react-router-dom": "^6.0.2",
-    "react-scripts": "5.0.0",
     "react-slick": "^0.29.0",
     "react-toastify": "^9.0.1",
+    "flutterwave-react-v3": "^1.3.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-redux": "^8.0.5",
+    "react-scripts": "5.0.1",
     "redux": "^4.2.0",
     "slick-carousel": "^1.8.1",
     "web-vitals": "^1.0.1",
@@ -53,4 +53,4 @@
       "last 1 safari version"
     ]
   }
-}
+}

run.sh

@@ -6,12 +6,15 @@ export NODE_ENV="${NODE_ENV:-development}"
 
 if [ $NODE_ENV == "development" ]; then
   # this runs webpack-dev-server with hot reloading
+  echo "Development build"
   npm install --legacy-peer-deps
   npm start
 else
   # build the app and serve it via nginx
+  echo "Production build"
   npm install --legacy-peer-deps
   npm run build
   nginx -g 'daemon off;' -c /usr/src/app/nginx.conf
   nginx -c /usr/src/app/nginx.conf
-fi
+fi
+

src/Routers.jsx

@@ -22,7 +22,7 @@ import UpdatePasswordPages from "./views/UpdatePasswordPages";
 import UploadProductPage from "./views/UploadProductPage";
 import UserProfilePage from "./views/UserProfilePage";
 import VerifyYouPages from "./views/VerifyYouPages";
-
+import VerifyPasswordPages from "./views/VerifyPasswordPages";
 import RemindersPage from './views/RemindersPage';
 import TrackingPage from "./views/TrackingPage";
 import CalendarPage from "./views/CalendarPage";
@@ -31,6 +31,9 @@ import MyTaskPage from "./views/MyTaskPage";
 import MyJobsPage from "./views/MyJobsPage";
 import ReferralPage from "./views/ReferralPage";
 import VerifyLinkPages from "./views/VerifyLinkPages";
+import MyActiveJobsPage from "./views/MyActiveJobsPage";
+import FamilyAccPage from "./views/FamilyAccPage";
+import StartJob from "./components/MyJobs/StartJob";
 
 export default function Routers() {
   return (
@@ -50,7 +53,8 @@ export default function Routers() {
           element={<UpdatePasswordPages />}
         />
         <Route path="/vemail" element={<VerifyLinkPages />} />
-        <Route exact path="/verify-you" element={<VerifyYouPages />} />
+        <Route path="/complereset" element={<VerifyPasswordPages />} />
+        <Route exact path="/outmessage" element={<VerifyYouPages />} />
 
         {/* private route */}
         <Route element={<AuthRoute />}>
@@ -72,6 +76,9 @@ export default function Routers() {
           <Route exact path="/notification" element={<Notification />} />
           <Route exact path="/mytask" element={<MyTaskPage />} />
           <Route exact path="/myjobs" element={<MyJobsPage />} />
+          <Route exact path="/my-active-jobs"  element={<MyActiveJobsPage />} />
+          <Route exact path="/acc-family"  element={<FamilyAccPage />} />
+          <Route exact path="/start-job"  element={<StartJob />} />
           <Route
             exact
             path="/my-collection/collection-item"

src/components/AuthPages/AuthLayout.jsx

@@ -1,24 +1,35 @@
 import React from "react";
-import loginThumb from "../../assets/images/auth-thumb.svg";
-import logo from "../../assets/images/wrenchboard.png"; //logo-1.svg";
+import { Link } from "react-router-dom";
 
 export default function LoginLayout({ slogan, children }) {
-  const checkScreenHeight = window.screen.height;
-  let screen = "";
-  if (checkScreenHeight <= 950) {
-    screen = "h-screen";
-    // screen = "h-[950px]";
-  } else {
-    screen = "h-screen";
-  }
   return (
-    <div className="layout-wrapper login">
-      <div className={`main-wrapper login-wrapper w-full ${screen}`}>
-        <div className="flex w-full h-full">
-
+    <div className={`layout-wrapper login`}>
+      <div className={`main-wrapper login-wrapper w-full h-screen overflow-y-auto sm:p-20 p-10`}>
+        <div className="w-full h-full">
           <div className="flex-1 flex justify-center items-center">
             {children && children}
           </div>
+          <div className="flex-1 flex justify-center items-center p-10">
+            <div className="flex items-center">
+              <Link to="#" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]">
+                About
+              </Link>
+              <Link to="#" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]">
+                Services
+              </Link>
+              <Link to="#" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]">
+                Contact Us
+              </Link>
+            </div>
+          </div>
+          <div className="flex-1 flex justify-center items-center p-10">
+            <p className="text-black text-[15px] px-2 font-medium flex items-center">
+             <span className="text-3xl mt-2 mr-1">©</span>  2023 - {" "}
+              <Link to="/" className="text-[#009ef7] ml-1">
+                WrenchBoard
+              </Link>{" "}
+            </p>
+          </div>
         </div>
       </div>
     </div>

src/components/AuthPages/ForgotPassword/index.jsx

@@ -11,6 +11,7 @@ export default function ForgotPassword() {
   // email
   const [email, setMail] = useState("");
   const [msgError, setMsgError] = useState('');
+  const [msgSuccess, setMsgSuccess] = useState(false)
 
   const navigate = useNavigate();
   const userApi = new usersService();
@@ -20,8 +21,8 @@ export default function ForgotPassword() {
   };
 
   const humanChecker = () => {
-    setValue(!checked);
-  };
+    setValue(!checked)
+  }
 
   const resetHandler = async () => {
     if (email == '') {
@@ -30,24 +31,16 @@ export default function ForgotPassword() {
       setMsgError('Check if you are human')
     }
 
-    if (email != '' && checked) {
+    if (email !== '' && checked) {
       const reqData = { email }
       setResetLoading(true)
       try {
         const res = await userApi.StartResetPassword(reqData)
         if (res.status === 200) {
-          const { data } = res
-          if (data.status == -1) {
-            setMsgError('This is an incorrect or duplicate email')
-            setResetLoading(false)
-          } else if (data.status > 0) {
-            setResetLoading(false)
-            navigate("/verify-you", { replace: true })
-          } else{
-            setMsgError("reset was not successful")
-            setResetLoading(false)
-          }
+          setMsgSuccess(true)
           setMail("")
+          setValue(false)
+          setResetLoading(false)
         }
       } catch (error) {
         setResetLoading(false)
@@ -79,12 +72,10 @@ export default function ForgotPassword() {
           <div className="content-wrapper login shadow-md w-full lg:max-w-[500px] mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px]  rounded-[0.475rem] sm:p-7 p-5">
             <div className="flex flex-col justify-center w-full h-full px-5">
               <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
-                <h1 className="text-[#181c32] font-semibold dark:text-white mb-3" style={{
-                  fontSize: 'calc(1rem + .6vw)'
-                }}>
+                <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
                   Forget Password
                 </h1>
-                <span className="text-gray-400 font-medium text-xl">Enter your email to reset your password.</span>
+                <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">Enter your email to reset your password.</span>
               </div>
               <div className="input-area">
                 <div className="input-item mb-10">
@@ -98,7 +89,6 @@ export default function ForgotPassword() {
                     iconName="message"
                   />
                 </div>
-                {msgError && <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px]">{msgError}</div>}
                 {/* hCaptha clone for the time being */}
                 <div className="mb-10">
                   <div className="w-[303px] h-[78px] mx-auto overflow-hidden">
@@ -108,7 +98,7 @@ export default function ForgotPassword() {
                         <div className="relative table top-0 h-full">
                           <div className="table-cell align-middle">
                             <div className="relative w-[30px] h-[30px] mx-[15px]">
-                              <input type="checkbox" name="human-checkbox" id="human-checkbox" className="w-[28px] h-[28px] border-[1px] rounded border-gray-400 checked:bg-white" onClick={humanChecker} />
+                              <input type="checkbox" name="human-checkbox" id="human-checkbox" className="w-[28px] h-[28px] border-[1px] rounded border-gray-400 checked:bg-white" checked={checked} onChange={humanChecker} />
                             </div>
                           </div>
                         </div>
@@ -126,12 +116,15 @@ export default function ForgotPassword() {
                     </div>
                   </div>
                 </div>
+                {msgError && <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">{msgError}</div>}
+                {msgSuccess && <div className="relative p-4 text-[#44228c] bg-[#e3d7fb] border-[#d5c4f9] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">If we find your email, you will receive a link to reset your password. Please use or <Link to='/contact' className="text-[#4687ba] hover:text-[#009ef7]">contact form</Link> if you did not get our message after few minutes.</div>}
+
                 <div className="signin-area mb-3.5">
                   <div className="flex justify-center items-center gap-2">
                     <button
                       type="button"
                       onClick={resetHandler}
-                      className={`rounded-[0.475rem] mb-6 text-[1.15rem] font-semibold text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
+                      className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
                     >
                       {resetLoading ? (
                         <div className="signup btn-loader"></div>
@@ -142,7 +135,7 @@ export default function ForgotPassword() {
                     <button
                       type="button"
                       onClick={() => navigate("/login")}
-                      className={`rounded-[0.475rem] mb-6 text-[1.15rem] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.8125rem] `}
+                      className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.8125rem] `}
                     >
                       Cancel
                     </button>

src/components/AuthPages/Login/index.jsx

@@ -4,19 +4,24 @@ import { toast } from "react-toastify";
 import googleLogo from "../../../assets/images/google-logo.svg";
 import appleLogo from "../../../assets/images/apple-black.svg";
 import facebookLogo from "../../../assets/images/facebook-4.svg";
-import WrenchBoard from "../../../assets/images/wrenchboard.png"
+import WrenchBoard from "../../../assets/images/wrenchboard.png";
 import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
 
+import { useDispatch, useSelector } from "react-redux";
+import { updateUserDetails } from "../../../store/UserDetails";
+
 export default function Login() {
+  const dispatch = useDispatch();
+
   const [checked, setValue] = useState(false);
   const [loginLoading, setLoginLoading] = useState(false);
 
   //login error state
   const [loginError, setLoginError] = useState(false);
   // for the catch error
-  const [msgError, setMsgError] = useState('');
+  const [msgError, setMsgError] = useState("");
 
   const rememberMe = () => {
     setValue(!checked);
@@ -35,76 +40,79 @@ export default function Login() {
   const navigate = useNavigate();
   const userApi = new usersService();
 
-
   const doLogin = async () => {
-    if (email == '' && password == '') {
-      setMsgError('Please fill in fields')
-    }
     try {
       if (email !== "" && password !== "") {
         var postData = {
           username: email,
           password: password,
-          sessionid: 'STARTING'
+          sessionid: "STARTING",
         };
-        const loginResult = await userApi.logInUser(postData);  // just for a test
+        const loginResult = await userApi.logInUser(postData); // just for a test
         //debugger;
         // if (email === "support@mermsemr.com") {
-        if (loginResult.data.status > 0 && loginResult.data.internal_return == 100 && loginResult.data.session != '') { // just for a start
-          localStorage.setItem("email", `${loginResult.data.email}`);
+        if (
+          loginResult.data.status > 0 &&
+          loginResult.data.internal_return == 100 &&
+          loginResult.data.session != ""
+        ) {
+          // just for a start
           localStorage.setItem("member_id", `${loginResult.data.member_id}`);
           localStorage.setItem("uid", `${loginResult.data.uid}`);
           localStorage.setItem("session_token", `${loginResult.data.session}`);
-          localStorage.setItem("added", `${loginResult.data.added}`);
-          localStorage.setItem("city", `${loginResult.data.city}`);
-          localStorage.setItem("country", `${loginResult.data.country}`);
-          localStorage.setItem("firstname", `${loginResult.data.firstname}`);
-          localStorage.setItem("last_login", `${loginResult.data.last_login}`);
-          localStorage.setItem("lastname", `${loginResult.data.lastname}`);
-          localStorage.setItem("state", `${loginResult.data.state}`);
-          localStorage.setItem("zip_code", `${loginResult.data.zip_code}`);
           localStorage.setItem("session", `${loginResult.data.session}`);
           setLoginLoading(true);
           // userApi.getUserReminders(); //testing
+          dispatch(updateUserDetails(loginResult.data));
           setTimeout(() => {
             navigate("/", { replace: true });
             setLoginLoading(false);
           }, 2000);
         } else {
           // toast.error("Invalid Credential");
-          setLoginError(true)
+          setLoginError(true);
         }
+      } else {
+        setMsgError("Please fill in fields");
       }
     } catch (error) {
-      setMsgError('An error occurred')
+      setMsgError("An error occurred");
     } finally {
       setTimeout(() => {
-        setLoginError(false)
-        setMsgError(null)
-      }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT))
+        setLoginError(false);
+        setMsgError(null);
+      }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT));
     }
   };
 
   return (
     <>
-      <AuthLayout
-        slogan="Welcome to WrenchBoard"
-      >
+      <AuthLayout slogan="Welcome to WrenchBoard">
         <div className="w-full">
-          <div className='mb-12'>
-            <Link to='#'>
-              <img src={WrenchBoard} alt="wrenchboard" className="h-10 mx-auto" />
+          <div className="mb-12">
+            <Link to="#">
+              <img
+                src={WrenchBoard}
+                alt="wrenchboard"
+                className="h-10 mx-auto"
+              />
             </Link>
           </div>
           <div className="content-wrapper login shadow-md w-full lg:max-w-[500px] mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px]  rounded-[0.475rem] sm:p-7 p-5">
             <div className="w-full">
               <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
-                <h1 className="text-[#181c32] font-semibold dark:text-white mb-3" style={{
-                  fontSize: 'calc(1rem + .6vw)'
-                }}>
+                <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
                   Sign In to WrenchBoard
                 </h1>
-                <span className="text-gray-400 font-medium text-xl">New Here? <Link to='/signup' className='font-semibold text-[#4687ba] hover:text-[#009ef7] transition'>Create an Account</Link></span>
+                <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
+                  New Here?{" "}
+                  <Link
+                    to="/signup"
+                    className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition"
+                  >
+                    Create an Account
+                  </Link>
+                </span>
               </div>
               <div className="input-area">
                 <div className="input-item mb-5">
@@ -118,7 +126,6 @@ export default function Login() {
                     iconName="message"
                   />
                 </div>
-    <input type="text" placeholder="boyce" />
 
                 <div className="input-item mb-5">
                   <InputCom
@@ -165,15 +172,29 @@ export default function Login() {
                   Forgot Password
                 </a>
               </div> */}
-                {loginError && <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-thin leading-[19.5px]">Invalid username or password- Please <Link to='/#' className='text-[#009ef7]'>reset your password</Link> or <Link to='/signup' className='text-[#009ef7]'>create a new account</Link></div>}
-                {msgError && <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px]">{msgError}</div>}
+                {loginError && (
+                  <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-thin leading-[19.5px] text-[13px]">
+                    Invalid username or password- Please{" "}
+                    <Link to="/#" className="text-[#009ef7]">
+                      reset your password
+                    </Link>{" "}
+                    or{" "}
+                    <Link to="/signup" className="text-[#009ef7]">
+                      create a new account
+                    </Link>
+                  </div>
+                )}
+                {msgError && (
+                  <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">
+                    {msgError}
+                  </div>
+                )}
                 <div className="signin-area mb-3.5">
                   <div className="flex justify-center">
                     <button
                       onClick={doLogin}
                       type="button"
-                      className={`btn-login  rounded-[0.475rem] mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center ${loginLoading ? "active" : ""
-                        }`}
+                      className={`btn-login  rounded-[0.475rem] mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
                     >
                       {loginLoading ? (
                         <div className="signup btn-loader"></div>
@@ -182,9 +203,9 @@ export default function Login() {
                       )}
                     </button>
                   </div>
-                  <BrandBtn link='#' imgSrc={googleLogo} brand='Google' />
-                  <BrandBtn link='#' imgSrc={facebookLogo} brand='Facebook' />
-                  <BrandBtn link='#' imgSrc={appleLogo} brand='Apple' />
+                  <BrandBtn link="#" imgSrc={googleLogo} brand="Google" />
+                  <BrandBtn link="#" imgSrc={facebookLogo} brand="Facebook" />
+                  <BrandBtn link="#" imgSrc={appleLogo} brand="Apple" />
                 </div>
                 {/* <div className="signup-area flex justify-center">
                 <p className="sm:text-lg text-sm text-thin-light-gray font-normal">
@@ -194,7 +215,10 @@ export default function Login() {
                   </a>
                 </p>
               </div> */}
-                <div className="pt-5 text-[#181c32] text-center font-semibold text-base">This site is protected by hCaptcha and the our Privacy Policy and Terms of Service apply.</div>
+                <div className="pt-5 text-[#181c32] text-center font-semibold text-[13.975px] leading-[20.9625px]">
+                  This site is protected by hCaptcha and the our Privacy Policy
+                  and Terms of Service apply.
+                </div>
               </div>
             </div>
           </div>
@@ -204,11 +228,7 @@ export default function Login() {
   );
 }
 
-const BrandBtn = ({
-  link,
-  imgSrc,
-  brand
-}) => {
+const BrandBtn = ({ link, imgSrc, brand }) => {
   return (
     <div className="flex justify-center bottomMargin">
       <a
@@ -216,10 +236,10 @@ const BrandBtn = ({
         className="w-full border border-light-purple dark:border-[#5356fb29]  rounded-[0.475rem] h-[48px] flex justify-center bg-[#FAFAFA] hover:bg-[#eff2f5] hover:text-[#7e8299] transition duration-300 dark:bg-[#11131F]  items-center font-medium cursor-pointer"
       >
         <img className="mr-3 h-6" src={imgSrc} alt="logo-icon(s)" />
-        <span className="text-lg text-thin-light-gray font-normal">
-          Sign In with {brand}
+        <span className="text-lg text-thin-light-gray font-normal text-[15px]">
+          Continue with {brand}
         </span>
       </a>
     </div>
-  )
-}
+  );
+};

src/components/AuthPages/SignUp/index.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 import { useNavigate, Link } from "react-router-dom";
 import facebookLogo from "../../../assets/images/facebook-4.svg";
 import WrenchBoard from "../../../assets/images/wrenchboard.png";
@@ -6,10 +6,10 @@ import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 
 export default function SignUp() {
-  const [signUpLoading, setSignUpLoading] = useState(false)
+  const [signUpLoading, setSignUpLoading] = useState(false);
   const [checked, setValue] = useState(false);
   // for the catch error
-  const [msgError, setMsgError] = useState('');
+  const [msgError, setMsgError] = useState("");
   const [showPassword, setShowPassword] = useState(false);
   const [countries, setCountries] = useState([]);
 
@@ -18,7 +18,7 @@ export default function SignUp() {
     first_name: "",
     last_name: "",
     email: "",
-    password: ""
+    password: "",
   });
 
   const handleInputChange = (event) => {
@@ -39,31 +39,32 @@ export default function SignUp() {
   const userApi = new usersService();
 
   // Get Country Api
-  const getCountryList = async () => {
-    const res = await userApi.getSignupCountryData()
+  const getCountryList = useCallback(async () => {
+    const res = await userApi.getSignupCountryData();
 
     try {
       if (res.status === 200) {
-        const { signup_country } = await res.data
-        setCountries(signup_country)
+        const { signup_country } = await res.data;
+        setCountries(signup_country);
       } else if (res.data.result !== 100) {
-        setCountries('Nothing see here!')
+        setCountries("Nothing see here!");
       }
     } catch (error) {
-      throw new Error(error)
+      throw new Error(error);
     }
-  }
+  }, []);
 
   const handleSignUp = async () => {
-    let { country, first_name, last_name, email, password } = formData
-
-    if (email === '' && password === '' && first_name === '') {
-      setMsgError('Please fill in fields')
-    }
-
+    let { country, first_name, last_name, email, password } = formData;
     try {
-      if (email !== '' && password !== '' && first_name !== '' && last_name !== '') {
-        setSignUpLoading(true)
+      if (
+        email !== "" &&
+        password !== "" &&
+        first_name !== "" &&
+        last_name !== "" &&
+        country !== ""
+      ) {
+        setSignUpLoading(true);
         const reqData = {
           country: country,
           firstname: first_name,
@@ -72,50 +73,42 @@ export default function SignUp() {
           username: email,
           password: password,
           terms: 1,
-          news: 1
-        }
+          news: 1,
+        };
 
-        const res = await userApi.CreateUser(reqData)
+        const res = await userApi.CreateUser(reqData);
 
         if (res.status === 200) {
-          const { data } = res
-          if (data.status === -1 && data.acc === 'DULPICATE') {
-            setMsgError('This account has been already created')
-            setSignUpLoading(false)
+          const { data } = res;
+          if (data.status === -1 && data.acc === "DULPICATE") {
+            setMsgError("This account has been already created");
+            setSignUpLoading(false);
           }
-          if (data && data.status === '1') {
+          if (data && data.status === "1") {
             setTimeout(() => {
-              navigate("/verify-you", { replace: true });
-              setSignUpLoading(false)
-            }, 2000)
-          } else {
-            setSignUpLoading(false)
-            setMsgError('This account does not exist')
+              navigate("/outmessage", { replace: true });
+              setSignUpLoading(false);
+            }, 2000);
           }
         } else {
-          setSignUpLoading(false)
-          setMsgError('An error occurred')
+          setSignUpLoading(false);
+          setMsgError("An error occurred");
         }
+      } else {
+        setMsgError("Please fill in fields");
       }
     } catch (error) {
-      throw new Error(error)
+      throw new Error(error);
     } finally {
       setTimeout(() => {
-        setMsgError(null)
-      }, process.env.REACT_APP_SIGNUP_ERROR_TIMEOUT)
-      setFormData({
-        first_name: '',
-        last_name: '',
-        email: '',
-        country: '',
-        password: ''
-      })
+        setMsgError(null);
+      }, process.env.REACT_APP_SIGNUP_ERROR_TIMEOUT);
     }
-  }
+  };
 
   useEffect(() => {
-    getCountryList()
-  })
+    getCountryList();
+  });
 
   return (
     <>
@@ -124,36 +117,52 @@ export default function SignUp() {
           <div className=" h-full">
             <div className="flex-1 flex justify-center items-center">
               <div className="w-full">
-                <div className='mb-12'>
-                  <Link to='#'>
-                    <img src={WrenchBoard} alt="wrenchboard" className="h-10 mx-auto" />
+                <div className="mb-12">
+                  <Link to="#">
+                    <img
+                      src={WrenchBoard}
+                      alt="wrenchboard"
+                      className="h-10 mx-auto"
+                    />
                   </Link>
                 </div>
                 <div className="content-wrapper login shadow-md w-full lg:max-w-[600px] mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px]  rounded-[0.475rem] sm:p-7 p-5 mb-7">
                   <div>
                     <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
-                      <h1 className="text-[#181c32] font-semibold dark:text-white mb-3" style={{
-                        fontSize: 'calc(1rem + .6vw)'
-                      }}>
+                      <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
                         Create Account
                       </h1>
-                      <span className="text-gray-400 font-medium text-xl">Already have an account? <Link to='/login' className='font-semibold text-[#4687ba] hover:text-[#009ef7] transition'>Sign in here</Link></span>
+                      <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
+                        Already have an account?{" "}
+                        <Link
+                          to="/login"
+                          className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition"
+                        >
+                          Sign in here
+                        </Link>
+                      </span>
                     </div>
                     <button
                       type="button"
-                      className={`rounded-[0.475rem] w-full mb-6 text-[1.15rem] h-[42px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.8125rem]`}
+                      className={`rounded-[0.475rem] w-full mb-6 text-[15px] h-[42px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.8125rem]`}
                     >
-                      <img className="mr-3 h-6" src={facebookLogo} alt="logo-icon(s)" />
+                      <img
+                        className="mr-3 h-6"
+                        src={facebookLogo}
+                        alt="logo-icon(s)"
+                      />
                       Sign in with Facebook
                     </button>
                     <div className="w-full flex items-center gap-2">
                       <div className="border-b border-[#eff2f5] max-w-[50%] w-full"></div>
-                      <span className="text-[#b5b5c3] font-medium text-[0.7rem] w-[2%]">OR</span>
+                      <span className="text-[#b5b5c3] font-medium text-[0.7rem] w-[2%]">
+                        OR
+                      </span>
                       <div className="border-b border-[#eff2f5] max-w-[50%] w-full"></div>
                     </div>
                     <div className="input-area">
                       <SelectOption
-                        label='Country'
+                        label="Country"
                         data={countries}
                         name="country"
                         value={formData.country}
@@ -196,14 +205,20 @@ export default function SignUp() {
                           placeholder="● ● ● ● ● ●"
                           label="Password"
                           name="password"
-                          type={showPassword ? 'text' : 'password'}
+                          type={showPassword ? "text" : "password"}
                           onClick={togglePasswordVisibility}
-                          passIcon={showPassword ? "show-password" : "hide-password"}
+                          passIcon={
+                            showPassword ? "show-password" : "hide-password"
+                          }
                           value={formData.password}
                           inputHandler={handleInputChange}
                         />
                       </div>
-                      {msgError && <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px]">{msgError}</div>}
+                      {msgError && (
+                        <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px]">
+                          {msgError}
+                        </div>
+                      )}
                       <div className="forgot-password-area flex justify-between items-center mb-6">
                         <div className="remember-checkbox flex items-center space-x-2.5">
                           <button
@@ -228,15 +243,15 @@ export default function SignUp() {
                           </button>
                           <span
                             onClick={rememberMe}
-                            className="text-base cursor-default text-dark-gray dark:text-white"
+                            className="cursor-default text-dark-gray dark:text-white text-[15px]"
                           >
                             I agree with all
-                            <a
+                            <Link
                               href="#"
                               className="text-base text-[#4687ba] hover:text-[#009ef7] mx-1 inline-block"
                             >
                               terms and condition
-                            </a>
+                            </Link>
                           </span>
                         </div>
                       </div>
@@ -245,8 +260,7 @@ export default function SignUp() {
                           <button
                             type="button"
                             onClick={handleSignUp}
-                            className={`rounded-[0.475rem] mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center h-[42px] py-[0.8875rem] px-[1.81rem] ${signUpLoading ? "active" : ""
-                              }`}
+                            className={`rounded-[0.475rem] mb-6 text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center h-[42px] py-[0.8875rem] px-[1.81rem] text-[14.95px] btn-login`}
                           >
                             {signUpLoading ? (
                               <div className="signup btn-loader"></div>
@@ -261,6 +275,42 @@ export default function SignUp() {
                 </div>
               </div>
             </div>
+            <div className="flex-1 flex justify-center items-center p-10">
+              <div className="flex items-center">
+                <a
+                  href="https://www.wrenchboard.com/about-us"
+                  className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  About
+                </a>
+                <a
+                  href="https://www.wrenchboard.com/service"
+                  className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  Services
+                </a>
+                <a
+                  href="https://www.wrenchboard.com/contact"
+                  className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  Contact Us
+                </a>
+              </div>
+            </div>
+            <div className="flex-1 flex justify-center items-center p-10">
+              <p className="text-black text-[15px] px-2 font-medium flex items-center">
+                <span className="text-3xl mt-2 mr-1">©</span> 2023 -{" "}
+                <Link to="/" className="text-[#009ef7] ml-1">
+                  WrenchBoard
+                </Link>{" "}
+              </p>
+            </div>
           </div>
         </div>
       </div>
@@ -273,26 +323,35 @@ const SelectOption = ({
   name,
   inputHandler,
   value,
-  data // passing the data from parent 
+  data, // passing the data from parent
 }) => {
   return (
     <div className="input-com mb-7">
       <div className="flex items-center justify-between">
         <label
-          className="input-label text-[#181c32] dark:text-white text-base font-semibold block mb-2.5"
+          className="input-label text-[#181c32] dark:text-white text-[15px] font-semibold block mb-2.5"
           htmlFor={name}
         >
           {label}
         </label>
       </div>
       <div>
-        <select name={name} id={name} className="input-wrapper border border-[#f5f8fa]] dark:border-[#5e6278] w-full rounded-[0.475rem] h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base focus-visible:border-transparent focus-visible:outline-0 focus-visible:ring-transparent " onChange={inputHandler} value={value}>
+        <select
+          name={name}
+          id={name}
+          className="input-wrapper border border-[#f5f8fa]] dark:border-[#5e6278] w-full rounded-[0.475rem] h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base focus-visible:border-transparent focus-visible:outline-0 focus-visible:ring-transparent "
+          onChange={inputHandler}
+          value={value}
+        >
           <option value={""}>Select your Country</option>
-          {data?.length > 0 && data?.map((item, idx) => (
-            <option value={item[0]} key={idx}>{item[1]}</option>
-          ))}
+          {data?.length > 0 &&
+            data?.map((item, idx) => (
+              <option value={item[0]} key={idx}>
+                {item[1]}
+              </option>
+            ))}
         </select>
       </div>
     </div>
-  )
-}
+  );
+};

src/components/AuthPages/VerifyLink/index.jsx

@@ -1,96 +1,180 @@
-import { useState, useLayoutEffect, useCallback } from "react";
+import { useState, useEffect, useCallback } from "react";
 import { useLocation, Link, useNavigate } from "react-router-dom";
 import AuthLayout from "../AuthLayout";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import usersService from "../../../services/UsersService";
-import WrenchBoard from "../../../assets/images/wrenchboard.png"
+import WrenchBoard from "../../../assets/images/wrenchboard.png";
+import debounce from "../../../hooks/debounce";
 
 export default function VerifyLink() {
-  const [pageLoader, setPageLoader] = useState(true)
-  const [linkSuccess, setLinkSuccess] = useState(false)
-  const [linkError, setLinkError] = useState(false)
-  const navigate = useNavigate()
+  const [email, setEmail] = useState("");
+  const [password, setPassword] = useState("");
+  const [msgError, setMsgError] = useState("");
+  const [linkLoader, setLinkLoader] = useState(false);
+  const [pageLoader, setPageLoader] = useState(true);
+  const [linkSuccess, setLinkSuccess] = useState(true);
+  const navigate = useNavigate();
   const location = useLocation();
-  const queryParams = new URLSearchParams(location?.search)
-  const token = queryParams.get('vlink')
+  const queryParams = new URLSearchParams(location?.search);
+  const token = queryParams.get("vlnk");
+  const userApi = new usersService();
 
-  const verifyEmail = useCallback(
-    async (code) => {
-      const userApi = new usersService()
-  
-      try {
-        const verifyRes = await userApi.verifyEmail(code)
-        if (verifyRes.status === 200) {
-          let { data } = verifyRes
-  
-          if (data && data.internal_return === 0 && data.status_text === 'Link Verfied') {
-            setPageLoader(false)
-            setLinkSuccess(true)
+  // email
+  const handleEmail = (e) => {
+    setEmail(e.target.value);
+  };
+  // password
+  const handlePassword = (e) => {
+    setPassword(e.target.value);
+  };
+
+  // if verification is okay. set a complete signup form
+  const completeSignup = async () => {
+    try {
+      if (email !== "" && password !== "") {
+        setLinkLoader(true);
+        var postData = {
+          username: email,
+          password: password,
+          login_mode: 100,
+          sessionid: "STARTER-NOTREAL",
+          verify_link: token,
+          action: 11012,
+        };
+        const res = await userApi?.CompleteSignUp(postData);
+
+        if (res.status === 200) {
+          const { data } = res;
+          if (
+            data?.status > 0 &&
+            data?.internal_return == 100 &&
+            data?.session != ""
+          ) {
+            localStorage.setItem("email", `${data?.email}`);
+            localStorage.setItem("member_id", `${data?.member_id}`);
+            localStorage.setItem("session_token", `${data?.session}`);
+            localStorage.setItem("session", `${data?.session}`);
+
+            navigate("/", { replace: true });
+            setLinkLoader(false);
           } else {
-            setPageLoader(false)
-            setLinkError(true)
+            setLinkLoader(false);
+            setMsgError("Invalid Link or Password Combination");
           }
-          console.log(data)
+        } else {
+          setLinkLoader(false);
+          setLinkSuccess(false);
+          setMsgError("An error occurred");
         }
-      } catch (error) {
-        setPageLoader(false)
-        setLinkError(true)
-        throw new Error(error)
+      } else {
+        setMsgError("Please fill in fields");
       }
-    }, []
-  )
+    } catch (error) {
+      setLinkLoader(false);
+      setLinkSuccess(false);
+      throw new Error(error);
+    } finally {
+      setTimeout(() => {
+        setMsgError(null);
+      }, process.env.REACT_APP_SIGNUP_ERROR_TIMEOUT);
+    }
+  };
 
-  useLayoutEffect(() => {
-    verifyEmail(token)
-  })
+  // for verifying the incoming verification link and render the correct component
+  const verifyEmail = useCallback(async (code) => {
+    try {
+      const verifyRes = await userApi.verifyEmail(code);
+      if (verifyRes.status === 200) {
+        let { data } = verifyRes;
 
-  console.log(token)
+        if (
+          data &&
+          data.internal_return >= 0 &&
+          data.status_text === "Link Verfied"
+        ) {
+          setPageLoader(false);
+        } else {
+          setPageLoader(false);
+          setLinkSuccess(false);
+        }
+      }
+    } catch (error) {
+      setPageLoader(false);
+      setLinkSuccess(false);
+      throw new Error(error);
+    }
+  }, []);
+
+  // delay verify requests by 10000ms
+  const debouncedEmail = debounce(verifyEmail, 1000);
+
+  useEffect(() => {
+    debouncedEmail(token);
+  }, []);
 
   return (
     <>
-      <AuthLayout
-        slogan="Welcome to WrenchBoard"
-      >
+      <AuthLayout slogan="Welcome to WrenchBoard">
         {pageLoader ? (
           <img src={WrenchBoard} alt="wrenchboard" className="h-10 mx-auto" />
         ) : (
           <div className="w-full">
-            <div className='mb-12'>
-              <Link to='#'>
-                <img src={WrenchBoard} alt="wrenchboard" className="h-10 mx-auto" />
+            <div className="mb-12">
+              <Link to="#">
+                <img
+                  src={WrenchBoard}
+                  alt="wrenchboard"
+                  className="h-10 mx-auto"
+                />
               </Link>
             </div>
             <div className="content-wrapper login shadow-md w-full lg:max-w-[500px] mx-auto flex justify-center items-center dark:bg-dark-white 2xl:w-[828px] rounded-[0.475rem] sm:p-7 p-5">
               <div className="w-full">
                 <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
-                  <h1 className="text-[#181c32] font-semibold dark:text-white mb-3" style={{
-                    fontSize: 'calc(1rem + .6vw)'
-                  }}>
-                    {linkError && 'Invalid verification link'}
-                    {linkSuccess && 'Sign In to WrenchBoard'}
+                  <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
+                    {linkSuccess
+                      ? "Sign In to WrenchBoard"
+                      : "Invalid verification link"}
                   </h1>
                 </div>
                 {/* If the verification was a success */}
-                {linkSuccess && <SuccessfulComponent />}
-
-                {/* If the verification was unsuccessful */}
-                {linkError && <ErrorComponent onClick={() => navigate('/login')} />}
+                {linkSuccess ? (
+                  <SuccessfulComponent
+                    email={email}
+                    password={password}
+                    handleEmail={handleEmail}
+                    handlePassword={handlePassword}
+                    onSubmit={completeSignup}
+                    msgErr={msgError}
+                    loader={linkLoader}
+                  />
+                ) : (
+                  <ErrorComponent onClick={() => navigate("/login")} />
+                )}
               </div>
             </div>
           </div>
         )}
       </AuthLayout>
     </>
-  )
+  );
 }
 
-const SuccessfulComponent = ({ onClick }) => (
+const SuccessfulComponent = ({
+  onSubmit,
+  password,
+  handlePassword,
+  email,
+  handleEmail,
+  msgErr,
+  loader,
+}) => (
   <div className="input-area">
     {/* INPUT */}
     <div className="mb-5">
       <InputCom
-        // value={password}
-        // inputHandler={handlePassword}
+        value={email}
+        inputHandler={handleEmail}
         placeholder="support@mermsemr.com"
         label="Email"
         name="email"
@@ -100,8 +184,8 @@ const SuccessfulComponent = ({ onClick }) => (
     </div>
     <div className="mb-5">
       <InputCom
-        // value={password}
-        // inputHandler={handlePassword}
+        value={password}
+        inputHandler={handlePassword}
         placeholder="● ● ● ● ● ●"
         label="Password"
         name="password"
@@ -109,35 +193,45 @@ const SuccessfulComponent = ({ onClick }) => (
         iconName="password"
       />
     </div>
+    {msgErr && (
+      <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">
+        {msgErr}
+      </div>
+    )}
     <div className="signin-area mb-3.5">
       <button
-        onClick={onClick}
+        onClick={onSubmit}
         type="button"
-        className={`btn-login  rounded-[0.475rem] mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center $`}
+        className={`btn-login  rounded-[0.475rem] mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
       >
-        <span>Continue</span>
+        {loader ? (
+          <div className="signup btn-loader"></div>
+        ) : (
+          <span>Continue</span>
+        )}
       </button>
     </div>
   </div>
-)
+);
 
 const ErrorComponent = ({ onClick }) => (
   <div className="input-area">
     <div className="my-5">
       <p className="text-[14px] leading-[19px] text-center text-[#181c32]">
-        This error occurs because you have already verified this link or the link has expired. Try login or reset password. If none worked, try to create the account from the start.
+        This error occurs because you have already verified this link or the
+        link has expired. Try login or reset password. If none worked, try to
+        create the account from the start.
       </p>
     </div>
 
-
     <div className="signin-area flex justify-center mb-3.5">
       <button
         onClick={onClick}
         type="button"
-        className={`rounded-[0.475rem] mb-6 text-[1.15rem] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
+        className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
       >
         <span>Return Home</span>
       </button>
     </div>
   </div>
-)
+);

src/components/AuthPages/VerifyPassword/index.jsx

@@ -0,0 +1,233 @@
+import { useState, useEffect, useCallback } from "react";
+import { useLocation, Link, useNavigate } from "react-router-dom";
+import AuthLayout from "../AuthLayout";
+import InputCom from "../../Helpers/Inputs/InputCom";
+import usersService from "../../../services/UsersService";
+import WrenchBoard from "../../../assets/images/wrenchboard.png";
+
+const VerifyPassword = () => {
+  const [password, setPassword] = useState("");
+  const [confirmPassword, setConfirmPassword] = useState("");
+  const [msgError, setMsgError] = useState("");
+  const [linkLoader, setLinkLoader] = useState(false);
+  const [linkSuccess, setLinkSuccess] = useState(true);
+  const [showPassword, setShowPassword] = useState(false);
+  const navigate = useNavigate();
+  const location = useLocation();
+  const queryParams = new URLSearchParams(location?.search);
+  const token = queryParams.get("passlink");
+  const userApi = new usersService();
+
+  // To Show and Hide Password
+  const togglePasswordVisibility = () => {
+    setShowPassword(!showPassword);
+  };
+
+  // little checker for the validity of the token
+  if (token?.length != 64) {
+    setLinkSuccess(false);
+  }
+
+  // Password
+  const handlePassword = (e) => {
+    let { name, value } = e?.target;
+    if (name == "password") setPassword(value);
+    if (name == "confirm_password") setConfirmPassword(value);
+  };
+
+  const completeReset = async () => {
+    try {
+      if (password !== "" && confirmPassword !== "") {
+        if (password === confirmPassword) {
+          setLinkLoader(true);
+          var reqData = {
+            sessionid: "DUMMY-CANNOT_BE_EMPTY",
+            reset_link: token,
+            newpass: password,
+            step: 300,
+            action: 730,
+          };
+
+          const res = await userApi?.CompleteResetPassword(reqData);
+
+          if (res.status === 200) {
+            const { data } = res;
+
+            if (data?.status > 0 && data?.email) {
+              setTimeout(() => {
+                navigate("/login", { replace: true });
+                setLinkLoader(false);
+              }, 2000);
+            } else if (data && data?.status == "Invalid Request") {
+              setLinkLoader(false);
+              setLinkSuccess(false);
+            } else {
+              setLinkLoader(false);
+              setMsgError("An error occurred");
+            }
+          } else {
+            setLinkLoader(false);
+            setLinkSuccess(false);
+          }
+        } else {
+          setLinkLoader(false);
+          setMsgError("Passwords does not match");
+        }
+      } else {
+        setMsgError("Please fill in fields");
+      }
+    } catch (error) {
+      setLinkLoader(false);
+      setLinkSuccess(false);
+      throw new Error(error);
+    } finally {
+      setTimeout(() => {
+        setMsgError(null);
+      }, process.env.REACT_APP_SIGNUP_ERROR_TIMEOUT);
+    }
+  };
+
+  return (
+    <>
+      <AuthLayout slogan="Welcome to WrenchBoard">
+        <div className="w-full">
+          <div className="mb-12">
+            <Link to="#">
+              <img
+                src={WrenchBoard}
+                alt="wrenchboard"
+                className="h-10 mx-auto"
+              />
+            </Link>
+          </div>
+          <div className="content-wrapper login shadow-md w-full lg:max-w-[500px] mx-auto flex justify-center items-center dark:bg-dark-white 2xl:w-[828px] rounded-[0.475rem] sm:p-7 p-5">
+            <div className="w-full">
+              <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
+                <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
+                  {linkSuccess ? "Password Reset" : "Invalid verification link"}
+                </h1>
+                {linkSuccess && (
+                  <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
+                    Enter a new password to reset
+                  </span>
+                )}
+                {linkSuccess && (
+                  <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
+                    We'll send an email to confirm reset
+                  </span>
+                )}
+              </div>
+              {/* If the verification was a success */}
+              {linkSuccess ? (
+                <SuccessfulComponent
+                  password={password}
+                  confirmPassword={confirmPassword}
+                  handlePassword={handlePassword}
+                  onSubmit={completeReset}
+                  msgErr={msgError}
+                  loader={linkLoader}
+                  showPassword={showPassword}
+                  onClick={togglePasswordVisibility}
+                  navigateHandler={() => navigate("/login")}
+                />
+              ) : (
+                <ErrorComponent onClick={() => navigate("/login")} />
+              )}
+            </div>
+          </div>
+        </div>
+      </AuthLayout>
+    </>
+  );
+};
+
+export default VerifyPassword;
+
+const SuccessfulComponent = ({
+  onSubmit,
+  navigateHandler,
+  showPassword,
+  onClick,
+  password,
+  confirmPassword,
+  handlePassword,
+  msgErr,
+  loader,
+}) => (
+  <div className="input-area">
+    {/* INPUT */}
+    <div className="mb-5">
+      <InputCom
+        value={password}
+        inputHandler={handlePassword}
+        placeholder="● ● ● ● ● ●"
+        label="Password"
+        name="password"
+        type={showPassword ? "text" : "password"}
+        onClick={onClick}
+        passIcon={
+          showPassword ? "show-password" : "hide-password"
+        }
+      />
+    </div>
+    <div className="mb-5">
+      <InputCom
+        value={confirmPassword}
+        inputHandler={handlePassword}
+        placeholder="● ● ● ● ● ●"
+        label="Confirm Password"
+        name="confirm_password"
+        type="password"
+      />
+    </div>
+    {msgErr && (
+      <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">
+        {msgErr}
+      </div>
+    )}
+    <div className="signin-area mb-3.5">
+      <button
+        onClick={onSubmit}
+        type="button"
+        className={`btn-login  rounded-[0.475rem] mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
+      >
+        {loader ? (
+          <div className="signup btn-loader"></div>
+        ) : (
+          <span>Continue</span>
+        )}
+      </button>
+    </div>
+    <div className="signin-area mb-3.5">
+      <button
+        onClick={navigateHandler}
+        type="button"
+        className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem] btn-login`}
+      >
+        <span>Return Home</span>
+      </button>
+    </div>
+  </div>
+);
+
+const ErrorComponent = ({ onClick }) => (
+  <div className="input-area">
+    <div className="my-5">
+      <p className="text-[14px] leading-[19px] text-center text-[#181c32]">
+        This error occurs because you have already used this link or the link
+        has broken/expired. Start with the reset process again. If it doesn't
+        work, try to create the account from the start.
+      </p>
+    </div>
+
+    <div className="signin-area flex justify-center mb-3.5">
+      <button
+        onClick={onClick}
+        type="button"
+        className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
+      >
+        <span>Return Home</span>
+      </button>
+    </div>
+  </div>
+);

src/components/AuthPages/VerifyYou/index.jsx

@@ -1,30 +1,59 @@
+import { useNavigate, Link } from "react-router-dom";
 import AuthLayout from "../AuthLayout";
+import WrenchBoard from "../../../assets/images/wrenchboard.png";
 
 export default function VerifyYou() {
+  const navigate = useNavigate();
   return (
     <>
-      <AuthLayout
-        slogan="Welcome to WrenchBoard"
-      >
-        <div className="content-wrapper login dark:bg-dark-white w-full lg:max-w-[500px] 2xl:w-[828px] rounded-xl flex flex-col justify-center sm:p-7 p-5">
-          <div className="w-full">
-            <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
-              <h1 className="text-[#181c32] font-semibold dark:text-white mb-3" style={{
-                fontSize: 'calc(1rem + .6vw)'
-              }}>
-                Verification Sent
-              </h1>
-            </div>
-            <div className="input-area">
-              <div className="mb-5">
-                <p className="text-[14px] leading-[19px] text-center text-[#181c32]">
-                  To complete the verification process, you should check your email inbox and look for the verification email. It may take a few minutes for the email to arrive, so be patient. Once you receive the email, open it and click on the verification link provided.
-                </p>
+      <AuthLayout slogan="Welcome to WrenchBoard">
+        <div className="w-full">
+          <div className="mb-12">
+            <Link to="#">
+              <img
+                src={WrenchBoard}
+                alt="wrenchboard"
+                className="h-10 mx-auto"
+              />
+            </Link>
+          </div>
+          <div className="content-wrapper login shadow-md w-full lg:max-w-[500px] mx-auto flex justify-center items-center dark:bg-dark-white 2xl:w-[828px] rounded-[0.475rem] sm:p-7 p-5">
+            <div className="w-full">
+              <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
+                <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
+                  Let's verify your email now
+                </h1>
+                <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
+                  Check your email.
+                </span>
               </div>
-              <div className="mb-5">
-                <p className="text-[14px] leading-[19px] text-center text-[#181c32]">
-                  If you haven't received the verification email after a reasonable amount of time, make sure to check your spam or junk mail folder. It's also possible that the email was sent to the wrong email address, so double-check that you entered your email address correctly.
-                </p>
+              <div className="input-area">
+                <div className="mb-5">
+                  <p className="text-[14px] leading-[19px] text-center text-[#181c32]">
+                    <b>Verify Email.</b> Help us secure your WrenchBoard account
+                    by verifying your email registration address. Verification
+                    will let you access all of WrenchBoard's features.
+                  </p>
+                </div>
+                <div className="mb-5">
+                  <p className="text-[14px] leading-[19px] text-center text-[#181c32]">
+                    If you do not receive the confirmation message within a few
+                    minutes of signing up, please check your Junk E-mail folder
+                    just in case the confirmation email got delivered there
+                    instead of your inbox. If so, select the confirmation
+                    message and click Not Junk, which will allow future messages
+                    to get through.
+                  </p>
+                </div>
+              </div>
+              <div className="signin-area flex justify-center mb-3.5">
+                <button
+                  onClick={() => navigate("/")}
+                  type="button"
+                  className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
+                >
+                  <span>Return Home</span>
+                </button>
               </div>
             </div>
           </div>

src/components/FamilyAcc/FamilyTable.jsx

@@ -0,0 +1,80 @@
+import React, { useState } from "react";
+import dataImage1 from "../../assets/images/data-table-user-1.png";
+import dataImage2 from "../../assets/images/data-table-user-2.png";
+import dataImage3 from "../../assets/images/data-table-user-3.png";
+import dataImage4 from "../../assets/images/data-table-user-4.png";
+import SelectBox from "../Helpers/SelectBox";
+
+export default function FamilyTable({ 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 min-h-[520px] ${
+                className || ""
+            }`}
+        >
+
+            <div className="relative w-full overflow-x-auto sm:rounded-lg">
+                <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+                    <tbody>
+                    <tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">
+                        <td className="py-4">Name</td>
+                        <td className="py-4 text-center">Last Login</td>
+                        <td className="py-4 text-center">No of Tasks</td>
+                        <td className="py-4 text-right">Status</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 whitespace-nowrap">
+                                        Firstname Lastname (age)
+                                    </h1>
+                                    <span className="text-sm text-thin-light-gray">
+                          Added <span className="text-purple">10-10-2029</span>
+                        </span>
+                                </div>
+                            </div>
+                        </td>
+                        <td className="text-center py-4 px-2">
+                            <div className="flex space-x-1 items-center justify-center">
+
+                                <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
+                       10-10-2019
+                      </span>
+                            </div>
+                        </td>
+                        <td className="text-center py-4 px-2">
+                            <div className="flex space-x-1 items-center justify-center">
+
+                                <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
+                        100
+                      </span>
+                            </div>
+                        </td>
+
+                        <td className="text-right py-4 px-2">
+                            <button
+                                type="button"
+                                className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            >
+                                Manage
+                            </button>
+                        </td>
+                    </tr>
+
+
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    );
+}

src/components/FamilyAcc/index.jsx

@@ -0,0 +1,40 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+import FamilyTable from "./FamilyTable";
+
+export default function FamilyAcc() {
+    const [selectTab, setValue] = useState("today");
+    const filterHandler = (value) => {
+        setValue(value);
+    };
+    return (
+        <Layout>
+            {/*<CommonHead />*/}
+            <div className="notification-page w-full mb-10">
+                <div className="notification-wrapper w-full">
+                    {/* heading */}
+                    <div className="sm:flex justify-between items-center mb-6">
+                        <div className="mb-5 sm:mb-0">
+                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                <span
+                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                >
+                  Family Accounts
+                </span>
+
+                            </h1>
+                        </div>
+                        <div className="slider-btns flex space-x-4">
+                            <div onClick={() => filterHandler("today")} className="relative">
+
+                            </div>
+                        </div>
+                    </div>
+                    <FamilyTable />
+                </div>
+            </div>
+        </Layout>
+    );
+}

src/components/FourZeroFour/index.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Lottie from "react-lottie";
+// import Lottie from "react-lottie";
 import { useNavigate } from "react-router-dom";
 import * as animationData from "../../assets/images/Lotties/77618-website-404-error-animation.json";
 
@@ -16,7 +16,7 @@ export default function FourZeroFour() {
   return (
     <div className="flex justify-center items-center w-full h-screen bg-[#232247]">
       <div>
-        <Lottie options={defaultOptions} width={600} height={600} />
+        {/* <Lottie options={defaultOptions} width={600} height={600} /> */}
         <div className="flex justify-center">
           <button
             onClick={() => navigate(-1)}

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

@@ -14,9 +14,7 @@ export default function InputCom({
   forgotPassword,
   onClick,
   disable,
-  blurHandler,
-  onMouseEnter,
-  onMouseLeave
+  blurHandler
 }) {
   const inputRef = useRef(null)
   // Entry Validation
@@ -70,20 +68,20 @@ export default function InputCom({
       <div className="flex items-center justify-between">
       {label && (
         <label
-          className="input-label text-[#181c32] dark:text-white text-base font-semibold block mb-2.5"
+          className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block mb-2.5"
           htmlFor={name}
         >
           {label}
         </label>
       )}
-      {forgotPassword && <Link to="/forgot-password" className="text-base text-[#4687ba] hover:text-[#009ef7]">Forgot Password?</Link>}
+      {forgotPassword && <Link to="/forgot-password" className="text-[13.975px] leading-[20.9625px] text-[#019ef7] hover:text-[#009ef7]">Forgot Password?</Link>}
       </div>
       <div className="input-wrapper border border-[#f5f8fa]] dark:border-[#5e6278] w-full rounded-[0.475rem] h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base ">
         <input
           placeholder={placeholder}
           value={value}
           onChange={inputHandler}
-          className="input-field placeholder:text-base text-bese px-6 text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
+          className="input-field placeholder:text-base px-6 text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
           type={type}
           id={name}
           name={name}
@@ -92,8 +90,6 @@ export default function InputCom({
           ref={inputRef}
           readOnly={disable}
           onBlur={blurHandler}
-          onMouseEnter={onMouseEnter}
-          onMouseLeave={onMouseLeave}
         />
         {iconName && (
           <div className="absolute right-6 bottom-[10px] z-10">

src/components/History/HistoryTable.jsx

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

src/components/History/TopHxBox.jsx

@@ -0,0 +1,137 @@
+import React, { useState } from "react";
+import MarketVisitorAnalytic from "../Charts/MarketVisitorAnalytic";
+import SelectBox from "../Helpers/SelectBox";
+//import SellHistoryWidget from "./SellHistoryWidget";
+import TopHxWidgetBox from "./TopHxWidgetBox";
+
+export default function TopHxBox({ className }) {
+    const [currencyDataLvl, setCurrencyDataLvl] = useState([
+        "Jan 1",
+        "Jan 2",
+        "Jan 3",
+        "Jan 4",
+        "Jan 5",
+        "Jan 6",
+        "Jan 7",
+        "Jan 8",
+        "Jan 9",
+        "Jan 10",
+        "Jan 11",
+        "Jan 12",
+        "Jan 13",
+        "Jan 14",
+        "Jan 15",
+    ]);
+    const filterDatas = ["Last 15 days", "Last 7 days", "Last Month"];
+    const [filterDataSet, setFilterDataSet] = useState([
+        50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100,
+    ]);
+    const dataSetHandler = (value) => {
+        if (value === "Last Month") {
+            setCurrencyDataLvl([
+                "Jan 1",
+                "Jan 2",
+                "Jan 3",
+                "Jan 4",
+                "Jan 5",
+                "Jan 6",
+                "Jan 7",
+                "Jan 8",
+                "Jan 9",
+                "Jan 10",
+                "Jan 11",
+                "Jan 12",
+                "Jan 13",
+                "Jan 14",
+                "Jan 15",
+                "Jan 16",
+                "Jan 17",
+                "Jan 18",
+                "Jan 19",
+                "Jan 20",
+                "Jan 21",
+                "Jan 22",
+                "Jan 23",
+                "Jan 24",
+                "Jan 25",
+                "Jan 26",
+                "Jan 27",
+                "Jan 28",
+                "Jan 29",
+                "Jan 30",
+            ]);
+            setFilterDataSet([
+                50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100, 50, 30,
+                50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100,
+            ]);
+        } else if (value === "Last 7 days") {
+            setCurrencyDataLvl([
+                "Jan 1",
+                "Jan 2",
+                "Jan 3",
+                "Jan 4",
+                "Jan 5",
+                "Jan 6",
+                "Jan 7",
+            ]);
+            setFilterDataSet([50, 30, 100, 20, 50, 30, 100]);
+        } else {
+            setCurrencyDataLvl([
+                "Jan 1",
+                "Jan 2",
+                "Jan 3",
+                "Jan 4",
+                "Jan 5",
+                "Jan 6",
+                "Jan 7",
+                "Jan 8",
+                "Jan 9",
+                "Jan 10",
+                "Jan 11",
+                "Jan 12",
+                "Jan 13",
+                "Jan 14",
+                "Jan 15",
+            ]);
+            setFilterDataSet([
+                50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100, 20, 50, 30, 100,
+            ]);
+        }
+    };
+    return (
+        <div
+            className={`sell-history-market-visitor-analytic w-full ${
+                className || ""
+            }`}
+        >
+            <div className="content-wrapper w-full  lg:flex xl:space-x-8 lg:space-x-4">
+
+                <div className="flex-1 ">
+                    <div className="market-visitor w-full  md:p-8 p-4 h-full bg-white dark:bg-dark-white   overflow-hidden rounded-2xl  section-shadow">
+                        <div className="flex flex-col justify-between h-full">
+                            <div className="content flex justify-between items-center mb-5">
+                                <div>
+                                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
+                                        Purchases
+                                    </h1>
+                                </div>
+                                <SelectBox datas={filterDatas} action={dataSetHandler} />
+                            </div>
+                            <div className="h-[233px]">
+                                <MarketVisitorAnalytic
+                                    datasets={filterDataSet}
+                                    dataLvls={currencyDataLvl}
+                                />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+                    <TopHxWidgetBox />
+                </div>
+
+            </div>
+        </div>
+    );
+}

src/components/History/TopHxWidgetBox.jsx

@@ -0,0 +1,36 @@
+import React from "react";
+import SellHistoryAnalytic from "../Charts/SellHistoryAnalytic";
+
+export default function TopHxWidgetBox() {
+    return (
+        <div className="sell-history w-full h-full md:p-8 p-4 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow">
+            <div className="flex flex-col justify-between h-full">
+                <div className="content lg:flex justify-between items-center mb-5">
+                    <div>
+                        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide mb-1 sm:mb-0">
+                            Activities
+                        </h1>
+                    </div>
+                    <div className="flex space-x-2  mb-4 sm:mb-0">
+                        <div className="flex space-x-2 items-center">
+                            <span className="w-4 h-4 bg-purple block rounded-full"></span>
+                            <p className="text-sm text-thin-light-gray font-medium">
+                                Avg: Sell Price
+                            </p>
+                        </div>
+                        <div className="flex space-x-2 items-center">
+                            <span className="w-4 h-4 bg-pink block rounded-full"></span>
+                            <p className="text-sm text-thin-light-gray font-medium">
+                                Total Sell
+                            </p>
+                        </div>
+                    </div>
+                    <span className="text-sm text-pink">Current Week</span>
+                </div>
+                <div>
+                    <SellHistoryAnalytic />
+                </div>
+            </div>
+        </div>
+    );
+}

src/components/History/index.jsx

@@ -1,11 +1,64 @@
-import React from "react";
+import React, {useState, useEffect} from "react";
 import HistoryAnalyticsCard from "../Cards/HistoryAnalyticsCard";
 import SellHistoryMarketVisitorAnalytic from "../Home/SellHistoryMarketVisitorAnalytic";
 import Layout from "../Partials/Layout";
 import HistoryTable from "./HistoryTable";
 import MarketHistorySection from "./MarketHistorySection";
+import TopHxBox from "./TopHxBox";
+
+import usersService from "../../services/UsersService";
+import PurchasesTable from "../MyWallet/WalletComponent/PurchasesTable";
+import RecentActivityTable from "../MyWallet/WalletComponent/RecentActivityTable";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
 
 export default function History() {
+
+  const apiCall = new usersService()
+
+    let [paymentHistory, setPaymentHistory] = useState({ // FOR PAYMENT HISTORY
+        loading: true,
+        data: [],
+        error: false
+    })
+
+    let [purchaseHistory, setPurchaseHistory] = useState({ // FOR PURCHASE HISTORY
+        loading: true,
+        data: [],
+        error: false
+    })
+
+    //FUNCTION TO GET PAYMENT HISTORY
+    const getPaymentHistory = ()=>{
+      apiCall.getPaymentHx().then((res)=>{
+          if(res.data.internal_return < 0){ // success but no data
+              setPaymentHistory(prev => ({...prev, loading: false}))
+              return
+          }
+          setPaymentHistory(prev => ({...prev, loading: false, data: res.data.result_list}))
+      }).catch((error)=>{
+          setPaymentHistory(prev => ({...prev, loading: false, error: true}))
+      })
+  }
+
+  //FUNCTION TO GET PURCHASE HISTORY
+  const getPurchaseHistory = ()=>{
+      apiCall.getPurchaseHx().then((res)=>{
+          if(res.data.internal_return < 0){ // success but no data
+              setPurchaseHistory(prev => ({...prev, loading: false}))
+              return
+          }
+          // console.log('purchase',res.data)
+          setPurchaseHistory(prev => ({...prev, loading: false, data: res.data.result_list}))
+      }).catch((error)=>{
+          setPurchaseHistory(prev => ({...prev, loading: false, error: true}))
+      })
+  }
+
+  useEffect(()=>{
+    getPaymentHistory()
+    getPurchaseHistory()
+  }, [])
+
   return (
     <>
       <Layout>
@@ -146,8 +199,36 @@ export default function History() {
                 </HistoryAnalyticsCard>
               </div>
             </div>
-            <MarketHistorySection />
-            <SellHistoryMarketVisitorAnalytic className="mb-11" />
+            {/*<MarketHistorySection />*/}
+            {/* <TopHxBox className="mb-11" /> */}
+            <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
+                {/* PURCHASE SECTION */}
+                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+                    <div className="wallet w-full md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+                        <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Purchases</h2>
+                        {purchaseHistory.loading ? 
+                        <LoadingSpinner size='16' color='sky-blue' />
+                        :
+                        <PurchasesTable purchase={purchaseHistory} />
+                        }
+                    </div>
+                </div>
+                {/* END OF PURCHASE SECTION */}
+
+                {/* RECENT ACTIVITY SECTION */}
+                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+                    <div className="wallet w-full md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+                        <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
+                        <p className='text-base text-slate-500 dark:text-white'>Activity Report</p>
+                        {paymentHistory.loading ? 
+                        <LoadingSpinner size='16' color='sky-blue' />
+                        :
+                        <RecentActivityTable payment={paymentHistory} />
+                    }
+                    </div>
+                </div>
+                {/* END OF RECENT ACTIVITY SECTION */}
+            </div>
             <HistoryTable />
           </div>
         </div>

src/components/Home/Hero.jsx

@@ -9,6 +9,7 @@ import slider3 from "../../assets/images/slider-3.jpg";
 import CountDown from "../Helpers/CountDown";
 import SliderCom from "../Helpers/SliderCom";
 import HomeSliders from "./HomeSliders";
+import { useSelector } from "react-redux";
 
 export default function Hero({ className }) {
   const settings = {
@@ -20,6 +21,8 @@ export default function Hero({ className }) {
   };
   const sildeData =null;
   const [addFavorite, setValue] = useState(false);
+
+  const {userDetails} = useSelector((state) => state?.userDetails)
   const favoriteHandler = () => {
     if (!addFavorite) {
       setValue(true);
@@ -29,6 +32,11 @@ export default function Hero({ className }) {
       toast.warn("Remove to Favorite List");
     }
   };
+
+  let loginDate = userDetails?.last_login.split(' ')[0]
+  let {firstname, lastname, email, profile_pic} = userDetails
+  let userEmail = email.split('@')[0]
+
   return (
     <div
       className={`w-full lg:h-[444px] h-full lg:flex lg:p-8 p-4 justify-between items-center lg:space-x-28 rounded-2xl overflow-hidden ${
@@ -47,19 +55,19 @@ export default function Hero({ className }) {
             Welcome
           </h1>
           <span className="text-[18px] font-thin tracking-wide text-white">
-            Last Login :  10-10-2026
+            Last Login :  {loginDate}
           </span>
         </div>
         {/* user */}
         <div className="flex items-center space-x-3">
           <div className="w-14 h-14 flex justify-center items-center rounded-full overflow-hidden">
-            <img src={heroUser} alt="" />
+            <img src={profile_pic != '' ? profile_pic : heroUser} alt="" />
           </div>
           <div>
             <p className="text-xl tracking-wide font-bold antise text-white">
-              Brokln Simons
+              {`${firstname} ${lastname}`}
             </p>
-            <p className="text-sm tracking-wide text-white">@broklinslam_75</p>
+            <p className="text-sm tracking-wide text-white">@{userEmail}</p>
           </div>
         </div>
         {/* countdown */}
@@ -87,7 +95,7 @@ export default function Hero({ className }) {
         {/* action */}
         <div className="flex lg:space-x-3 space-x-1 items-center">
           <Link
-            to="/market-place"
+            to="/mytask"
             className="text-white text-base sm:block hidden"
           >
             <span className=" border-b dark:border-[#5356fb29]  border-white">

src/components/Home/index.jsx

@@ -10,6 +10,8 @@ import UpdateTable from "./UpdateTable";
 import HomeTaskDisplay from "./HomeTaskDisplay";
 import UsersService from "../../services/UsersService";
 import usersService from "../../services/UsersService";
+import { useSelector } from "react-redux";
+
 
 export default function Home() {
     const trending = datas.datas;
@@ -18,10 +20,12 @@ export default function Home() {
     const userApi = new usersService();
     const homeData = userApi.getHomeDate();
 
+    const {userDetails} = useSelector((state) => state?.userDetails)
+
     return (
         <Layout>
             <div className="home-page-wrapper">
-                <Hero className="mb-10" />
+                <Hero className="mb-10" data={userDetails} />
                 {/* <CreateNft />
         <TrendingSection trending={trending} className="mb-10" />*/}
                 <HomeTaskDisplay

src/components/MyActiveJobs/MyActiveJobTable.jsx

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

src/components/MyActiveJobs/index.jsx

@@ -0,0 +1,41 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+import MyActiveJobTable from "./MyActiveJobTable";
+
+export default function MyActiveJobs(props) {
+    const [selectTab, setValue] = useState("today");
+    const filterHandler = (value) => {
+        setValue(value);
+    };
+    console.log("AMEYE LOC1", props.MyJobList);
+    return (
+        <Layout>
+            <CommonHead />
+            <div className="notification-page w-full mb-10">
+                <div className="notification-wrapper w-full">
+                    {/* heading */}
+                    <div className="sm:flex justify-between items-center mb-6">
+                        <div className="mb-5 sm:mb-0">
+                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                <span
+                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                >
+                  Current Job(s)
+                </span>
+
+                            </h1>
+                        </div>
+                        <div className="slider-btns flex space-x-4">
+                            <div onClick={() => filterHandler("today")} className="relative">
+
+                            </div>
+                        </div>
+                    </div>
+                    <MyActiveJobTable MyJobList={props.MyJobList} />
+                </div>
+            </div>
+        </Layout>
+    );
+}

src/components/MyJobs/MyJobTable.jsx

@@ -5,9 +5,22 @@ import dataImage3 from "../../assets/images/data-table-user-3.png";
 import dataImage4 from "../../assets/images/data-table-user-4.png";
 import SelectBox from "../Helpers/SelectBox";
 
+import PaginatedList from "../Pagination/PaginatedList";
+import { handlePagingFunc } from "../Pagination/HandlePagination";
+
 export default function MyJobTable({MyJobList, className }) {
     const filterCategories = ["All Categories", "Explore", "Featured"];
     const [selectedCategory, setCategory] = useState(filterCategories[0]);
+
+    const [currentPage, setCurrentPage] = useState(0);
+    const indexOfFirstItem = Number(currentPage);
+    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    const currentJobList = MyJobList?.result_list?.slice(indexOfFirstItem, indexOfLastItem);
+  
+    const handlePagination = (e) => {
+        handlePagingFunc(e,setCurrentPage)
+    }
+
     return (
         <div
             className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
@@ -17,7 +30,7 @@ export default function MyJobTable({MyJobList, className }) {
             <div className="header w-full flex justify-between items-center mb-5">
                 <div className="flex space-x-2 items-center">
                     <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
-                        Products History
+
                     </h1>
                 </div>
                 <SelectBox
@@ -27,6 +40,7 @@ export default function MyJobTable({MyJobList, className }) {
                     contentBodyClasses="w-auto min-w-max"
                 />
             </div>
+            {MyJobList && MyJobList?.result_list &&
             <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>
@@ -39,41 +53,44 @@ export default function MyJobTable({MyJobList, className }) {
                         <>
                             {MyJobList && MyJobList?.result_list &&
                                 MyJobList.result_list.length > 0 &&
-                                MyJobList.result_list.map((value) => (
-                                   <>
-                                       <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 whitespace-nowrap">
-                                                           {value.title}
-                                                       </h1>
-                                                       <span className="text-sm text-thin-light-gray">
-                          Price <span className="text-purple">{value.price*0.01}</span>
-                        </span>
-                                                   </div>
-                                               </div>
-                                           </td>
+                                currentJobList.map((value, index) => (
+                                    <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
+                                        <td className=" py-4">
+                                            <div className="flex space-x-2 items-center">
+                                                <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                                                    <img
+                                                        src={dataImage2}
+                                                        alt="data"
+                                                        className="w-full h-full"
+                                                    />
+                                                </div>
+                                                <div className="flex flex-col">
+                                                    <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                                                        {value.title}
+                                                    </h1>
+                                                    <div>
+                                                        {value.description}
+                                                    </div>
+                                                    <span className="text-sm text-thin-light-gray">
+                                                    Price: <span className="text-purple">{value.price*0.01}</span>
+                                                    </span>
+                                                    <span className="text-sm text-thin-light-gray">
+                                                    Duration:   <span className="text-purple"> {value.timeline_days} day(s)</span>
+                                                    </span>
+                                                </div>
+                                            </div>
+                                        </td>
 
 
-                                           <td className="text-right py-4 px-2">
-                                               <button
-                                                   type="button"
-                                                   className="text-sm text-white bg-light-green px-2.5 py-1.5 rounded-full"
-                                               >
-                                                   View
-                                               </button>
-                                           </td>
-                                       </tr>
-
-                                   </>
+                                        <td className="text-right py-4 px-2">
+                                            <button
+                                                type="button"
+                                                className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                                            >
+                                                View
+                                            </button>
+                                        </td>
+                                    </tr>
                                 ))}
 
 
@@ -89,7 +106,12 @@ export default function MyJobTable({MyJobList, className }) {
                     )}
                     </tbody>
                 </table>
+
+                {/* PAGINATION BUTTON */}
+                <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= MyJobList?.result_list?.length ? true : false} data={MyJobList?.result_list} start={indexOfFirstItem} stop={indexOfLastItem} />
+                {/* END OF PAGINATION BUTTON */}
             </div>
+            }
         </div>
     );
 }

src/components/MyJobs/StartJob.jsx

@@ -0,0 +1,81 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import MyJobTable from "./MyJobTable";
+import CommonHead from "../UserHeader/CommonHead";
+import SelectBox from "../Helpers/SelectBox";
+import dataImage2 from "../../assets/images/data-table-user-2.png";
+
+export default function StartJob(props) {
+    const [selectTab, setValue] = useState("today");
+    const filterHandler = (value) => {
+        setValue(value);
+    };
+    console.log("AMEYE LOC1", props.MyJobList);
+    return (
+        <Layout>
+            {/*<CommonHead />*/}
+            <div className="notification-page w-full mb-10">
+                <div className="notification-wrapper w-full">
+                    {/* heading */}
+                    <div className="sm:flex justify-between items-center mb-6">
+                        <div className="mb-5 sm:mb-0">
+                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                <span
+                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                >
+                  Additional Terms for Jobs Posting.
+                </span>
+
+                            </h1>
+                        </div>
+                        <div className="slider-btns flex space-x-4">
+                            <div onClick={() => filterHandler("today")} className="relative">
+
+                            </div>
+                        </div>
+                    </div>
+
+                    <div
+                        className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow min-h-[520px]`}
+                    >
+                        <div className="header w-full flex justify-between items-center mb-5">
+                            <div className="flex space-x-2 items-center">
+                                <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
+                                Terms & Agreement
+                                </h1>
+                            </div>
+                            {/*<SelectBox*/}
+                            {/*    action={setCategory}*/}
+                            {/*    datas={filterCategories}*/}
+                            {/*    className="Update-table-dropdown"*/}
+                            {/*    contentBodyClasses="w-auto min-w-max"*/}
+                            {/*/>*/}
+                        </div>
+                        <div className="relative w-full overflow-x-auto sm:rounded-lg">
+                            All terms of sale must follow WrenchBoard policies for buying and selling. Setting and meeting expectations in a listing's terms of sale ensure a smooth transaction and buyer satisfaction while helping WrenchBoard remain a reputable marketplace.
+
+                            What is the policy?
+                            Task or Job owners should provide clear and accurate delivery terms and conditions required to meet the expectations they have set in their listings. These should include:
+                            Delivery mode, timelines, and reviews
+                            The forms of payment available for the task
+                            A returns policy:
+                            Clearly stated criteria under which cancellation will be accepted.
+                            Clearly stated the time period in which the buyer must notify the seller about the delivery delay.
+                            How refunds/returns/cancellations will be issued
+
+
+
+                            Activity that doesn't follow WrenchBoard policy could result in a range of actions, including for example: administratively ending or canceling listings, hiding or demoting all listings from search results, lowering rating, buying or selling restrictions, and account suspension.
+                            All fees paid or payable concerning listings or accounts on which we take any action will not be refunded or otherwise credited to your account.
+
+                            Why does WrencBoard have this policy?
+                            Buyers and sellers enter a contract when they complete transactions, so it's necessary to have precise details on what the transaction entails to guarantee satisfaction. This policy also helps sellers meet our performance standards.
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </Layout>
+    );
+}

src/components/MyTasks/MyJobTable.jsx

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

src/components/MyWallet/AddFund.jsx

@@ -1,24 +1,39 @@
 import React, {useState} from 'react'
 import RecentActivityTable from './WalletComponent/RecentActivityTable'
 import LoadingSpinner from '../Spinners/LoadingSpinner'
+import { useNavigate } from 'react-router-dom'
 
 function AddFund({payment}) {
    
-    //STATE FOR CONTROLLED INPUTS
-    let [inputs, setInputs] = useState('0')
+    const navigate = useNavigate()
+
+    //STATE FOR CONTROLLED INPUT
+    let [input, setInput] = useState('0')
+
+    let [inputError, setInputError] = useState('')
 
     // FUNCTION TO HANDLE INPUT CHANGE
     const handleChange = ({target:{name, value}}) => {
-        setInputs(value)
+        setInput(value)
     }
 
     //FUNCTION TO HANDLE SUBMIT
-    const handleSubmit = (e) => {
-        e.preventDefault();
+    const handleSubmit = () => {
+        setInputError('')
+        if(!input || input == '0'){
+            setInputError('Please Enter Amount')
+            return
+        }
 
-        //valid inputs before submitting. Just for texting remove later
+        if(isNaN(input)){
+            setInputError('Amount must be a Number')
+            return
+        }
+
+        const stateData = {amount: Number(input)}
+        navigate('confirm-add-fund', {state: stateData})
      
-        setInputs('')
+        setInput('')
     }
     return (
         <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
@@ -30,7 +45,7 @@ function AddFund({payment}) {
                         <div className='md:flex items-center'>
                             <label className='w-full md:w-2/4 text-slate-600 text-lg'>Amount(Naira) <span className='text-red-500'>*</span></label>
                             <input className='w-full md:w-2/4 p-3 text-lg text-right bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                                value={inputs} 
+                                value={input} 
                                 name='amount' 
                                 type="text" 
                                 placeholder='Amount' 
@@ -38,6 +53,7 @@ function AddFund({payment}) {
                                 onChange={handleChange}
                                 />
                         </div>
+                        {inputError && <p className='text-base text-red-500'>{inputError}</p>}
                    </form>
                         <hr />
                         <div className='md:p-8 p-4 add-fund-btn flex justify-end items-center py-4'>
@@ -55,7 +71,7 @@ function AddFund({payment}) {
             </div>
     
             <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                <div className="wallet w-full  md:p-8 p-4 h-full max-h-[600px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+                <div className="wallet w-full  md:p-8 p-4 h-full max-h-[590px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
                     <h2 className='text-gray-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
                     <p className='text-base text-gray-600 dark:text-white'>Activity Report</p>
                     {payment.loading ?

src/components/MyWallet/AddRecipient.jsx

@@ -21,7 +21,7 @@ const validationSchema = Yup.object().shape({
       .max(25, 'Maximum 25 characters')
       .required('Lastname is required'),
     country: Yup.string()
-      .min(1, 'Minimum 3 characters')
+      .min(1, 'Minimum 1 characters')
       .max(25, 'Maximum 25 characters')
       .required('Country is required'),
     bank: Yup.string()
@@ -108,7 +108,7 @@ function AddRecipient() {
             }
             // setRequestStatus({message: 'Recipient Added Successfully!', loading: false, status: true})
             toast.success("Recipient Added Successfully!");
-            setTimeout(()=>{navigate('../transfer-fund',{replace:true})},1000)
+            setTimeout(()=>{navigate('/my-wallet/transfer-fund',{replace:true})},1000)
         }).catch((error)=>{
             setRequestStatus({message: 'Opps! an error occured! Try again later', loading: false, status: false})
         })    

src/components/MyWallet/Balance.jsx

@@ -5,7 +5,7 @@ import PurchasesTable from './WalletComponent/PurchasesTable'
 import CouponTable from './WalletComponent/CouponTable'
 import LoadingSpinner from '../Spinners/LoadingSpinner'
 
-function Balance({wallet, payment, coupon, purchase}) {
+function Balance({wallet, coupon}) {
     return (
         <div className="content-wrapper">
             <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
@@ -31,11 +31,11 @@ function Balance({wallet, payment, coupon, purchase}) {
                                 </div>
                                 <div className='balance-info'>
                                     <p className='py-2'>balance</p>
-                                    <span className='text-sm py-1 px-2 bg-green-100 text-green-500 rounded-lg'>{item.symbol}{(item.amount*1).toFixed(2)}</span>
+                                    <span className='text-sm py-1 px-2 bg-green-100 text-green-500 rounded-lg'>{item.symbol}{(item.amount*0.01).toFixed(2)}</span>
                                 </div>
                                 <div className='balance-info'>
                                     <p className='py-2'>Escrow</p>
-                                    <span className='text-sm py-1 px-2 bg-red-100 text-red-500 rounded-lg'>{item.symbol}{(item.escrow*1).toFixed(2)}</span>
+                                    <span className='text-sm py-1 px-2 bg-red-100 text-red-500 rounded-lg'>{item.symbol}{(item.escrow*0.01).toFixed(2)}</span>
                                 </div>
                             </div>
 
@@ -65,39 +65,9 @@ function Balance({wallet, payment, coupon, purchase}) {
                 {/* END OF WALLET SECTION */}
 
 
-                {/* RECENT ACTIVITY SECTION */}
-                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                    <div className="wallet w-full md:p-8 p-4 h-full max-h-[300px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
-                        <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
-                        <p className='text-base text-slate-500 dark:text-white'>Activity Report</p>
-                        {payment.loading ? 
-                        <LoadingSpinner size='16' color='sky-blue' />
-                        :
-                        <RecentActivityTable payment={payment} />
-                    }
-                    </div>
-                </div>
-                {/* END OF RECENT ACTIVITY SECTION */}
-            </div>
-            
-            
-            <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
-                {/* PURCHASE SECTION */}
-                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                    <div className="wallet w-full md:p-8 p-4 h-full max-h-[200px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
-                        <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Purchases</h2>
-                        {purchase.loading ? 
-                        <LoadingSpinner size='16' color='sky-blue' />
-                        :
-                        <PurchasesTable purchase={purchase} />
-                        }
-                    </div>
-                </div>
-                {/* END OF PURCHASE SECTION */}
-
                 {/* COUPON SECTION */}
                 <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                    <div className="wallet w-full  md:p-8 p-4 h-full max-h-[200px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+                    <div className="wallet w-full  md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
                         <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Coupons</h2>
                         {coupon.loading ? 
                         <LoadingSpinner size='16' color='sky-blue' />
@@ -107,8 +77,7 @@ function Balance({wallet, payment, coupon, purchase}) {
                     </div>
                 </div>
                 {/* END OF COUPON SECTION */}
-            </div>
-            
+            </div>            
         </div>
       )
 }

src/components/MyWallet/ConfirmAddFund.jsx

@@ -0,0 +1,132 @@
+import React, {useState, useEffect} from 'react'
+import RecentActivityTable from './WalletComponent/RecentActivityTable'
+import LoadingSpinner from '../Spinners/LoadingSpinner'
+import InputCom from '../Helpers/Inputs/InputCom'
+import {toast} from 'react-toastify'
+import { useLocation, useNavigate } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+
+import usersService from '../../services/UsersService'
+
+import { FlutterWaveButton, closePaymentModal } from 'flutterwave-react-v3'
+
+
+function ConfirmAddFund({payment}) {
+
+    let {userDetails} = useSelector(state => state.userDetails) // TO GET LOGGEDIN USER DETAILS
+    
+    let [pageLoading, setPageLoading] = useState(true)
+
+    let [requestStatus, setRequestStatus] = useState({message: '', loading: false, status: false}) // STATE FOR API REQUEST
+
+    const apiURL = new usersService()
+    const navigate = useNavigate()
+
+    let {state} = useLocation()
+    
+
+    //FUNCTION TO HANDLE SUBMIT
+    const onSuccessPayment = () => {
+        setRequestStatus({message: '', loading: true, status: false})
+        let reqData = {amount: state?.account, currency: 'NGN'}
+        apiURL.startTopUp(reqData).then((res)=>{
+            if(res.data.internal_return < 0){
+                setRequestStatus({message: 'Could not finish transaction', loading: false, status: false})
+                toast.success('Opps! something went wrong')
+            }
+             // do something
+             setRequestStatus({message: 'Topup successful', loading: false, status: true})
+             toast.success('Account Topup was sucessful')
+            setTimeout(()=>{
+                navigate('/my-wallet', {replace: true})
+                window.location.reload(true)
+            }, 1000)
+        }).catch(err => {
+            // do something
+            setRequestStatus({message: 'Opps! An Error Occured', loading: false, status: false})
+            toast.success('Opps! something went wrong')
+        })
+    }
+
+    const config = {
+        public_key: process.env.REACT_APP_FLUTTERWAVE_APIKEY,
+        tx_ref: Date.now(),
+        amount: state?.amount,
+        currency: 'NGN',
+        payment_options: 'card,mobilemoney,ussd',
+        customer: {
+          email: `${userDetails.email}`,
+          phone_number: userDetails.phone,
+          name: `${userDetails.lastname} ${userDetails.firstname}`
+        },
+        customizations: {
+          title: 'WrenchBoard',
+          description: 'Topup Payment',
+          logo: 'https://st2.depositphotos.com/4403291/7418/v/450/depositphotos_74189661-stock-illustration-online-shop-log.jpg',
+        },
+      };
+
+    const fwConfig = {
+        ...config,
+        text: 'Proceed',
+        callback: (response) => {
+          onSuccessPayment()
+          closePaymentModal() // this will close the modal programmatically
+        },
+        onClose: () => {},
+      };
+
+    useEffect(()=>{
+        // what happens if not state redirect user
+        if(!state){
+            navigate('/my-wallet/add-fund',{replace: true})
+        }else{
+            setPageLoading(false)
+        }
+    },[])
+
+    return (
+        <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
+            {pageLoading ?
+            <LoadingSpinner size='8' color='sky-blue' />
+            :
+            <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+                <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl shadow">
+                    <h2 className='md:p-8 p-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Confirm Add Fund To Account</h2>
+                    <hr />
+                   <div className='px-4 md:px-8 py-4 add-fund-info'>
+                        <div className="field w-full mb-3">
+                            <InputCom
+                                label="Amount (Naira):"
+                                type="text"
+                                name="amount"
+                                value={state.amount || ''}
+                                disable={true}
+                            />
+                        </div>
+                    </div>
+
+                    <hr />
+                    <div className='md:p-8 p-4 add-fund-btn flex justify-end items-center py-4'>
+                        <FlutterWaveButton {...fwConfig} className='text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-md' />
+                    </div>
+                </div>
+            </div>
+            }
+    
+            <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+                <div className="wallet w-full  md:p-8 p-4 h-full max-h-[600px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+                    <h2 className='text-gray-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
+                    <p className='text-base text-gray-600 dark:text-white'>Activity Report</p>
+                    {payment.loading ?
+                    <LoadingSpinner size='16' color='sky-blue' />
+                    :
+                    <RecentActivityTable  payment={payment}/>
+                    }
+                </div>
+            </div>
+        </div>
+      )
+}
+
+export default ConfirmAddFund

src/components/MyWallet/ConfirmTransfer.jsx

@@ -0,0 +1,168 @@
+import React, {useState, useEffect} from 'react'
+import {useLocation, useNavigate} from 'react-router-dom'
+import RecentActivityTable from './WalletComponent/RecentActivityTable'
+import LoadingSpinner from '../Spinners/LoadingSpinner'
+import InputCom from '../Helpers/Inputs/InputCom'
+import {toast} from 'react-toastify'
+
+import usersService from '../../services/UsersService'
+
+function ConfirmTransfer({payment, wallet}) {
+    const apiURL = new usersService()
+
+    const navigate = useNavigate()
+    
+    let {state} = useLocation()
+    
+
+    let [requestStatus, setRequestStatus] = useState({message: '', loading: false, status: false})
+    let [pageLoading, setPageLoading] = useState(true)
+
+    //FUNCTION TO HANDLE SUBMIT
+    const handleSubmit = () => {
+        setRequestStatus({message: '', loading: true, status: false})
+        let reqData = {
+            amount: Number(state.amount),
+            Fee: Number(state.fee),
+            recipientid: Number(state.recipientID)
+        }
+        apiURL.sendMoney(reqData).then((res)=>{
+            if(res.data.internal_return < 0){
+                setRequestStatus({message: 'Could not perform transaction', loading: false, status: false})
+                return
+            }
+            setRequestStatus({message: 'transfer successful', loading: false, status: true})
+            toast.success('Transfer sucessful')
+            setTimeout(()=>{
+                navigate('/my-wallet', {replace: true})
+                window.location.reload(true)
+            }, 1000)
+        }).catch(error=>{
+            setRequestStatus({message: 'Opps! something went wrong! Try Again', loading: false, status: false})
+        })
+    }
+
+    useEffect(()=>{
+        // what happens if not state redirect user
+        if(!state){
+            navigate('/my-wallet/transfer-fund',{replace: true})
+        }else{
+            setPageLoading(false)
+        }
+    },[])
+    return (
+        <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
+            {pageLoading ? 
+                <LoadingSpinner size='8' color='sky-blue' />
+            :
+                (
+                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+                    <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl shadow">
+                        <div className='px-4 md:px-8 py-4'>
+                            {wallet.loading ?
+                                <LoadingSpinner size='8' color='sky-blue' />
+                                :
+                                wallet.data.length ? 
+                                <h2 className='my-4 text-slate-500 dark:text-white text-sm xl:text-xl font-medium'>
+                                {wallet.data.map(item => {
+                                    if(item.description == 'Naira'){
+                                        return `Withdraw from Naira Wallet : ${item.symbol}${(item.amount*0.01).toFixed(2)}`
+                                    }
+                                })}
+                                </h2>
+                                :
+                                wallet.error ? 
+                                <h2 className='my-4 text-slate-500 dark:text-white text-sm xl:text-xl font-medium'>Opps! An Error Occured</h2>
+                                :
+                                <h2 className='my-4 text-slate-500 dark:text-white text-sm xl:text-xl font-medium'>No Wallet Information Found!</h2>
+                            }
+                        </div>
+                        <hr />
+                        <div className='px-4 md:px-8 py-4 add-fund-info'>
+                                <h2 className='my-2 text-slate-900 dark:text-white text-sm xl:text-xl font-medium'>Confirm Withdraw to Account</h2>
+                                {/* AMOUNT */}
+                                <div className="field w-full mb-3">
+                                    <InputCom
+                                        label="Amount:"
+                                        type="text"
+                                        name="amount"
+                                        value={state?.amount || ''}
+                                        disable={true}
+                                    />
+                                </div>
+
+                                {/* RECIPIENT ACC: */}
+                                <div className="field w-full mb-3">
+                                    <InputCom
+                                        label="Recipient Acc:"
+                                        type="text"
+                                        name="recipient"
+                                        value={state?.details.recipient || ''}
+                                        disable={true}
+                                    />
+                                </div>
+
+                                {/* PROCESSING FEE: */}
+                                <div className="field w-full mb-3">
+                                    <InputCom
+                                        label="Processing Fee:"
+                                        type="text"
+                                        name="processingFee"
+                                        value={state?.fee || ''}
+                                        disable={true}
+                                    />
+                                </div>
+
+                                {/* TOTAL */}
+                                <div className="field w-full mb-3">
+                                    <InputCom
+                                        label="Total"
+                                        type="text"
+                                        name="total"
+                                        value={state?.total || ''}
+                                        disable={true}
+                                    />
+                                </div>
+
+                                {/* COMMENT/NOTE */}
+                                <div className="field w-full mb-3">
+                                    <InputCom
+                                        label="Comment/Note:"
+                                        type="text"
+                                        name="comment"
+                                        value={state?.comment || ''}
+                                        disable={true}
+                                    />
+                                </div>
+                        </div>
+
+                        <hr />
+                        {requestStatus.message && <p className={`text-base ${requestStatus.status? 'text-green-500' : 'text-red-500'} px-4 md:px-8 py-4`}>{requestStatus.message}</p>}
+                        <div className='px-4 md:px-8 py-4 add-fund-btn flex justify-end items-center'>
+                            {requestStatus.loading ? 
+                            <LoadingSpinner size='8' color='sky-blue' />
+                            :
+                            <button onClick={handleSubmit} className='text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-md'>Transfer</button>
+                            }
+                        </div>
+                    </div>
+                </div>
+                )
+            }
+    
+            <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+                <div className="wallet w-full px-4 md:px-8 py-4 h-full max-h-[600px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+                    <h2 className='text-gray-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
+                    <p className='text-base text-gray-600 dark:text-white'>Activity Report</p>
+                    {payment.loading ?
+                    <LoadingSpinner size='16' color='sky-blue' />
+                    :
+                    <RecentActivityTable  payment={payment}/>
+                    }
+                </div>
+            </div>
+        </div>
+      )
+}
+
+export default ConfirmTransfer

src/components/MyWallet/TransferFund.jsx

@@ -1,30 +1,48 @@
 import React, {useEffect, useState} from 'react'
-import { Link } from 'react-router-dom'
+import { Link, useNavigate } from 'react-router-dom'
 import RecentActivityTable from './WalletComponent/RecentActivityTable'
 import LoadingSpinner from '../Spinners/LoadingSpinner'
 import InputCom from '../Helpers/Inputs/InputCom'
 
 import usersService from '../../services/UsersService'
 
+import {toast} from 'react-toastify'
+
+import {Formik, Form} from 'formik'
+import * as Yup from 'yup'
+
+const validationSchema = Yup.object().shape({
+    amount: Yup.number()
+    .typeError("you must specify a number")
+    .min(1, 'Amount must be greater than 0')
+    .required('Amount is required'),
+    recipientID: Yup.string()
+      .min(1, 'Minimum 1 characters')
+      .max(50, 'Maximum 50 characters')
+      .required('Recipient is required'),
+  })
+  
+  const initialValues = {
+    amount: '',
+    recipientID: '',
+    comment: '',
+  }
+
 function TransferFund({payment, wallet}) {
-    const apiCall = new usersService()
+    const apiCall = new usersService() // API CLASS CALL
 
-    let [newFee, setNewFee] = useState(false)
+    const navigate = useNavigate()
 
-    let [recepients, setRecipients] = useState({ // FOR COUPON HISTORY
+    let [requestStatus, setRequestStatus] = useState(false)
+
+    let [recipients, setRecipients] = useState({ // FOR COUPON HISTORY
         loading: true,
         data: [],
         error: false
     })
 
-    let [sendMoneyFee, setSendMoneyFee] = useState({fee: 0, total: 0}) // HOLD THE VALUE FOR SEND MONEY FEE
+    let [sendMoneyFee, setSendMoneyFee] = useState({loading: false, fee: 0, total: 0}) // HOLD THE VALUE FOR SEND MONEY FEE
 
-    //STATE FOR CONTROLLED INPUTS
-    let [inputs, setInputs] = useState({
-        amount: '0',
-        recipient: '',
-        comment: ''
-    })
 
     //FUNCTION TO GET RECIPIENT LIST
     const getRecipients = ()=>{
@@ -40,154 +58,167 @@ function TransferFund({payment, wallet}) {
     }
 
     //FUNCTION TO GET SEND MONEY FEE
-    const getSendMoneyFee = ()=>{
-        let {amount} = inputs
+    const getSendMoneyFee = ({target:{value}})=>{
+        setSendMoneyFee({loading: true, fee: 0, total: 0})
+        let amount = value
         if(Number(amount) <= 0 || amount=='' || isNaN(amount)){
-            setSendMoneyFee({fee: 0, total: 0})
+            setSendMoneyFee({loading: false, fee: 0, total: 0})
             return
         }
         apiCall.getSendMoneyFee(Number(amount)).then((res)=>{
-            setSendMoneyFee({fee: res.data.processing_fee, total: res.data.total_amount})
+            setSendMoneyFee({loading: false, fee: res.data.processing_fee, total: res.data.total_amount})
         }).catch((error)=>{
-            setSendMoneyFee({fee: 0, total: 0})
+            setSendMoneyFee({loading: false, fee: 0, total: 0})
         })
     }
 
 
-    // FUNCTION TO HANDLE INPUT CHANGE
-    const handleChange = ({target:{name, value}}) => {
-        setInputs(prev => ({...prev, [name]:value}))
-    }
-
     //FUNCTION TO HANDLE SUBMIT
-    const handleSubmit = (e) => {
-        e.preventDefault();
+    const handleSubmit = (values, helpers) => {
+        setRequestStatus(true)
+        let recipientDetails = recipients.data?.filter(item => item.recipient_id == values.recipientID)
+        let stateData = {...values, ...sendMoneyFee, details:{...recipientDetails[0]}}
 
-        //valid inputs before submitting. Just for texting remove later. check amoutn to be number
-    
-        setInputs({
-            amount: '0',
-            recipient: '',
-            comment: ''
-        })
+        setTimeout(()=>{
+            setRequestStatus(false)
+            navigate('confirm-transfer', {state: stateData})
+        }, 1000)
     }
 
     useEffect(()=>{
         getRecipients()
-        getSendMoneyFee()
-    },[newFee])
+    },[])
     return (
         <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
             <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
                 <div className="add-fund w-full md:p-8 p-4 bg-white dark:bg-dark-white rounded-2xl shadow">
-                   <form className='transfer-fund-info' onSubmit={handleSubmit}>
-                        {wallet.loading ?
-                        <LoadingSpinner size='8' color='sky-blue' />
-                        :
-                        wallet.data.length ? 
-                        <h2 className='my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>
-                        {wallet.data.map(item => {
-                            if(item.description == 'Naira'){
-                                return `Withdraw from Naira Wallet : ${item.symbol}${(item.amount*1).toFixed(2)}`
-                            }
-                        })}
-                        </h2>
-                        :
-                        wallet.error ? 
-                        <h2 className='my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Opps! An Error Occured</h2>
-                        :
-                        <h2 className='my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>No Wallet Information Found!</h2>
-                        }
-                        <div className="xl:flex xl:space-x-7 mb-6">
-
-                            <div className="field w-full mb-6 xl:mb-0">
-                                <InputCom
-                                    label="Amount"
-                                    type="text"
-                                    name="amount"
-                                    value={inputs.amount}
-                                    inputHandler={handleChange}
-                                    onMouseEnter={()=>{setNewFee(false)}}
-                                    onMouseLeave={()=>{setNewFee(true)}}
-                                />
-                            </div>
-                            
-                            <div className="field w-full">
-                                <InputCom
-                                    label="Fee"
-                                    type="text"
-                                    name="fee"
-                                    value={sendMoneyFee.fee}
-                                    disable={true}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='md:flex items-center justify-end'>
-                            <div className="field w-full lg:w-1/2 mb-6">
-                                <InputCom
-                                    label="Total"
-                                    type="text"
-                                    name="total"
-                                    value={sendMoneyFee.total}
-                                    disable={true}
-                                />
-                            </div>
-                        </div>
-
-                        <div className='relative my-3 md:flex items-center'>
-                            <div className='transfer-input w-full'>
-                                <div className='flex items-center justify-start py-2'>
-                                    <label className='text-[#181c32] dark:text-white text-base font-semibold block mb-2.5'>Recipient 
-                                        <span className='text-red-500 mx-2'>*</span> 
-                                        <span title='Transfer Recipient' className={`text-white text-sm bg-slate-500 w-1 h-1 rounded-full px-3 py-1 cursor-pointer`}>!</span>
-                                    </label>
-                                    <Link to='add-recipient' className='mx-1 text-base text-white p-2 bg-[orange] rounded-md hover:opacity-80'>Add New</Link>
-                                </div>
-                                <select className='w-full text-base p-2 text-dark-gray dark:text-white rounded-md border border-slate-300 outline-0' value={inputs.recipient} name='recipient' onChange={handleChange}>
-                                    {recepients.loading ?
-                                     <option className='text-slate-500 text-lg' value="">Loading...</option>
-                                     :
-                                     recepients.data.length ?
-                                     <> 
-                                     <option className='text-slate-500 text-lg' value="">Select...</option>
-                                     {recepients.data.map((item, index)=>(
-                                        <option key={index} value={item.account_no} className='text-slate-500 text-lg'>{item.recipient}</option>
-                                     ))}
-                                     </>
-                                     :
-                                     recepients.error ?
-                                     <option className='text-slate-500 text-lg' value="">Could'nt Load, try again!</option>
-                                     :
-                                     <option className='text-slate-500 text-lg' value="">No Recipient Found! Click Add to Add</option>
+                    <Formik initialValues={initialValues} validationSchema={validationSchema} onSubmit={handleSubmit}>
+                        {(props)=>{
+                        return (
+                            <Form className='transfer-fund-info'>
+                                    {wallet.loading ?
+                                    <LoadingSpinner size='8' color='sky-blue' />
+                                    :
+                                    wallet.data.length ? 
+                                    <h2 className='my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>
+                                    {wallet.data.map(item => {
+                                        if(item.description == 'Naira'){
+                                            return `Withdraw from Naira Wallet : ${item.symbol}${(item.amount*0.01).toFixed(2)}`
+                                        }
+                                    })}
+                                    </h2>
+                                    :
+                                    wallet.error ? 
+                                    <h2 className='my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Opps! An Error Occured</h2>
+                                    :
+                                    <h2 className='my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>No Wallet Information Found!</h2>
                                     }
-                                </select>
-                            </div>
-                        </div>
+                                    <div className="xl:flex xl:space-x-7 mb-6">
 
-                        <div className="field w-full mb-6">
-                            {/* <InputCom
-                                label="Comment"
-                                type="text"
-                                name="comment"
-                                value={inputs.comment}
-                                inputHandler={handleChange}
-                            /> */}
-                            <label className='text-[#181c32] dark:text-white text-base font-semibold block mb-2.5'>Comment</label>
-                            <textarea style={{resize: 'none'}}
-                            className='text-base px-6 text-dark-gray dark:text-white w-full bg-slate-100 dark:bg-[#11131F]  focus:ring-0 focus:outline-none' 
-                            name="comment" 
-                            value={inputs.comment}
-                            onChange={handleChange}
-                            cols="30" 
-                            rows="2"
-                            />
-                        </div>
+                                        <div className="field w-full mb-6 xl:mb-0">
+                                            <InputCom
+                                                label="Amount"
+                                                type="text"
+                                                name="amount"
+                                                placeholder='0'
+                                                value={props.values.amount}
+                                                inputHandler={props.handleChange}
+                                                blurHandler={(e)=>{
+                                                    getSendMoneyFee(e)
+                                                }}
+                                                // props.handleBlur
+                                                // onMouseLeave={(e)=>{getSendMoneyFee(e)}}
+                                            />
+                                            {(props.errors.amount && props.touched.amount) && <p className="text-sm text-red-500">{props.errors.amount}</p>}
+                                        </div>
+                                        
+                                        <div className="field w-full">
+                                            <InputCom
+                                                label="Fee"
+                                                type="text"
+                                                name="fee"
+                                                value={sendMoneyFee.loading ? 'loading' : sendMoneyFee.fee}
+                                                disable={true}
+                                            />
+                                        </div>
+                                    </div>
 
-                        <div className='transfer-fund-btn flex justify-end items-center py-4'>
-                            <button className='text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-md'>Continue</button>
-                        </div>
-                   </form>
+                                    <div className='md:flex items-center justify-end'>
+                                        <div className="field w-full lg:w-1/2 mb-6">
+                                            <InputCom
+                                                label="Total"
+                                                type="text"
+                                                name="total"
+                                                value={sendMoneyFee.loading ? 'loading' : sendMoneyFee.total}
+                                                disable={true}
+                                            />
+                                        </div>
+                                    </div>
+                                    
+                                    <div className='w-full'>
+                                        <div className='relative my-3 md:flex items-center'>
+                                            <div className='transfer-input w-full'>
+                                                <div className='flex items-center justify-start py-2'>
+                                                    <label className='text-[#181c32] dark:text-white text-base font-semibold block mb-2.5'>Recipient 
+                                                        <span className='text-red-500 mx-2'>*</span> 
+                                                        <span title='Transfer Recipient' className={`text-white text-sm bg-slate-500 w-1 h-1 rounded-full px-3 py-1 cursor-pointer`}>!</span>
+                                                    </label>
+                                                    <Link to='add-recipient' className='mx-1 text-base text-white p-2 bg-[orange] rounded-md hover:opacity-80'>Add New</Link>
+                                                </div>
+                                                <select className='w-full text-base p-2 text-dark-gray dark:text-white rounded-md border border-slate-300 outline-0' value={props.values.recipientID} name='recipientID' onChange={props.handleChange} onBlur={props.handleBlur}>
+                                                    {recipients.loading ?
+                                                    <option className='text-slate-500 text-lg' value="">Loading...</option>
+                                                    :
+                                                    recipients.data.length ?
+                                                    <> 
+                                                    <option className='text-slate-500 text-lg' value="">Select...</option>
+                                                    {recipients.data.map((item, index)=>(
+                                                        <option key={index} value={item.recipient_id} className='text-slate-500 text-lg'>{item.recipient}</option>
+                                                    ))}
+                                                    </>
+                                                    :
+                                                    recipients.error ?
+                                                    <option className='text-slate-500 text-lg' value="">Could'nt Load, try again!</option>
+                                                    :
+                                                    <option className='text-slate-500 text-lg' value="">No Recipient Found! Click Add to Add</option>
+                                                    }
+                                                </select>
+                                            </div>
+                                        </div>
+                                        {(props.errors.recipientID && props.touched.recipientID) && <p className="text-sm text-red-500">{props.errors.recipientID}</p>}
+                                    </div>
+
+                                    <div className="field w-full mb-6">
+                                        {/* <InputCom
+                                            label="Comment"
+                                            type="text"
+                                            name="comment"
+                                            value={inputs.comment}
+                                            inputHandler={handleChange}
+                                        /> */}
+                                        <label className='text-[#181c32] dark:text-white text-base font-semibold block mb-2.5'>Comment</label>
+                                        <textarea style={{resize: 'none'}}
+                                        className='text-base px-6 text-dark-gray dark:text-white w-full bg-slate-100 dark:bg-[#11131F]  focus:ring-0 focus:outline-none' 
+                                        name="comment" 
+                                        value={props.values.comment}
+                                        onChange={props.handleChange}
+                                        onBlur={props.handleBlur}
+                                        cols="30" 
+                                        rows="2"
+                                        />
+                                    </div>
+
+                                    <div className='transfer-fund-btn flex justify-end items-center py-4'>
+                                        {requestStatus ?
+                                        <LoadingSpinner size='8' color='sky-blue' />
+                                        :
+                                        <button type='submit' className='text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-md'>Continue</button>
+                                        }
+                                    </div>
+                            </Form>
+                        )
+                        }}
+                   </Formik>
                 </div>
             </div>
     

src/components/MyWallet/Wallet.jsx

@@ -8,6 +8,8 @@ import Balance from './Balance'
 import TransferFund from './TransferFund'
 import AddFund from './AddFund'
 import AddRecipient from './AddRecipient'
+import ConfirmTransfer from './ConfirmTransfer'
+import ConfirmAddFund from './ConfirmAddFund'
 
 function Wallet() {
   return (
@@ -111,10 +113,12 @@ const WalletRoutes = () => {
         <Routes>
             <Route element={<Wallet />}>
                 <Route path='add-fund' element={<AddFund payment={paymentHistory} />} />
+                <Route path='add-fund/confirm-add-fund' element={<ConfirmAddFund payment={paymentHistory} />} />
                 <Route path='transfer-fund' element={<TransferFund payment={paymentHistory} wallet={walletList} />} />
-                <Route index element={<Balance payment={paymentHistory} purchase={purchaseHistory} coupon={couponHistory} wallet={walletList} />} />
-                <Route path='*' element={<Navigate to='/' />} />
+                <Route index element={<Balance coupon={couponHistory} wallet={walletList} />} />
                 <Route path='transfer-fund/add-recipient' element={<AddRecipient />} />
+                <Route path='transfer-fund/confirm-transfer' element={<ConfirmTransfer payment={paymentHistory} wallet={walletList} />} />
+                <Route path='*' element={<Navigate to='/' />} />
             </Route>
         </Routes>
     )

src/components/MyWallet/WalletComponent/CouponTable.jsx

@@ -1,7 +1,21 @@
-import React from 'react'
+import React, {useState} from 'react'
+
+import PaginatedList from '../../Pagination/PaginatedList'
+import { handlePagingFunc } from '../../Pagination/HandlePagination';
 
 function CouponTable({coupon}) {
+
+    const [currentPage, setCurrentPage] = useState(0);
+    const indexOfFirstItem = Number(currentPage);
+    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    const currentCoupon = coupon?.data?.slice(indexOfFirstItem, indexOfLastItem);
+  
+    const handlePagination = (e) => {
+      handlePagingFunc(e,setCurrentPage)
+    }
+
   return (
+    <>
     <table className="wallet-activity w-full table-auto border-collapse text-left">
         <thead className='border-b-2'>
             <tr className='text-slate-600'>
@@ -14,7 +28,7 @@ function CouponTable({coupon}) {
         {coupon.data.length ?
         (
         <tbody>
-            {coupon.data.map((item, index) => (
+            {currentCoupon.map((item, index) => (
             <tr key={index} className='text-slate-500'>
                 <td className="p-2">{item.added}</td>
                 <td className="p-2">{item.code}</td>
@@ -41,6 +55,11 @@ function CouponTable({coupon}) {
         </tbody>
         }
     </table>
+
+    {/* PAGINATION BUTTON */}
+    <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= coupon?.data?.length ? true : false} data={coupon?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
+    {/* END OF PAGINATION BUTTON */}
+    </>
   )
 }
 

src/components/MyWallet/WalletComponent/PurchasesTable.jsx

@@ -1,7 +1,21 @@
-import React from 'react'
+import React, {useState} from 'react'
+
+import PaginatedList from '../../Pagination/PaginatedList';
+import { handlePagingFunc } from '../../Pagination/HandlePagination';
 
 function PurchasesTable({purchase}) {
+
+    const [currentPage, setCurrentPage] = useState(0);
+    const indexOfFirstItem = Number(currentPage);
+    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    const currentPurchase = purchase?.data?.slice(indexOfFirstItem, indexOfLastItem);
+  
+    const handlePagination = (e) => {
+      handlePagingFunc(e,setCurrentPage)
+    }
+
   return (
+    <>
     <table className="wallet-activity w-full table-auto border-collapse text-left">
         <thead className='border-b-2'>
             <tr className='text-slate-600'>
@@ -14,7 +28,7 @@ function PurchasesTable({purchase}) {
         {purchase.data.length ?
         (
         <tbody>
-            {purchase.data.map((item, index) => (
+            {currentPurchase.map((item, index) => (
             <tr key={index} className='text-slate-500'>
                 <td className="p-2">{item.added_date}</td>
                 <td className="p-2">{item.confirmation}</td>
@@ -41,6 +55,11 @@ function PurchasesTable({purchase}) {
         </tbody>
         }
     </table>
+
+    {/* PAGINATION BUTTON */}
+    <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= purchase?.data?.length ? true : false} data={purchase?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
+    {/* END OF PAGINATION BUTTON */}
+    </>
   )
 }
 

src/components/MyWallet/WalletComponent/RecentActivityTable.jsx

@@ -1,7 +1,21 @@
-import React from 'react'
+import React, {useState} from 'react'
+
+import PaginatedList from '../../Pagination/PaginatedList';
+import {handlePagingFunc} from '../../Pagination/HandlePagination';
 
 function RecentActivityTable({payment}) {
+
+    const [currentPage, setCurrentPage] = useState(0);
+    const indexOfFirstItem = Number(currentPage);
+    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    const currentActivity = payment?.data?.slice(indexOfFirstItem, indexOfLastItem);
+  
+    const handlePagination = (e) => {
+      handlePagingFunc(e,setCurrentPage)
+    }
+
   return (
+    <>
     <table className="wallet-activity w-full table-auto border-collapse text-left">
         <thead className='border-b-2'>
             <tr className='text-slate-600'>
@@ -14,7 +28,7 @@ function RecentActivityTable({payment}) {
         {payment.data.length ?
         (
         <tbody>
-            {payment.data.map((item, index) => (
+            {currentActivity.map((item, index) => (
             <tr key={index} className='text-slate-500'>
                 <td className="p-2">{item.trx_date}</td>
                 <td className="p-2" dangerouslySetInnerHTML={{__html:item.recipient}}></td>
@@ -41,6 +55,11 @@ function RecentActivityTable({payment}) {
         </tbody>
         }
     </table>
+
+    {/* PAGINATION BUTTON */}
+    <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= payment?.data?.length ? true : false} data={payment?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
+    {/* END OF PAGINATION BUTTON */}
+    </>
   )
 }
 

src/components/MyWallet/WalletComponent/ReferralTable.jsx

@@ -0,0 +1,60 @@
+import React, {useState} from 'react'
+
+import PaginatedList from '../../Pagination/PaginatedList';
+import {handlePagingFunc} from '../../Pagination/HandlePagination';
+
+function ReferralTable({history}) {
+
+    const [currentPage, setCurrentPage] = useState(0);
+    const indexOfFirstItem = Number(currentPage);
+    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    const currentReferral = history?.data?.slice(indexOfFirstItem, indexOfLastItem);
+  
+    const handlePagination = (e) => {
+      handlePagingFunc(e,setCurrentPage)
+    }
+
+  return (
+    <>
+        <table className="referral-list w-full table-auto border-collapse text-left">
+            <thead className='border-b-2'>
+                <tr className='text-slate-600'>
+                <th className="p-3">Added/Name</th>
+                <th className="p-3">Email</th>
+                <th className="p-3">Status</th>
+                </tr>
+            </thead>
+            <tbody>
+                {history.data.length ? 
+                currentReferral.map((item, index) => (
+                    <tr key={index} className='text-slate-500'>
+                        <td className="p-3">{item.added_date} / {item.firstname} {item.lastname}</td>
+                        <td className="p-3">{item.email}</td>
+                        <td className="p-3">{item.status}</td>
+                    </tr>
+                ))
+                :
+                (
+                history.error ?
+                <tr className='text-slate-500'>
+                    <td colSpan={3}>Opps! couldn't get referral history. Try reloading the page</td>
+                </tr>
+                :
+                (
+                <tr className='text-slate-500'>
+                    <td colSpan={3}>No Item Found on referral List</td>
+                </tr>
+                )
+                )
+                }
+            </tbody>
+        </table>
+
+        {/* PAGINATION BUTTON */}
+        <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= history?.data?.length ? true : false} data={history?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
+        {/* END OF PAGINATION BUTTON */}
+    </>
+  )
+}
+
+export default ReferralTable

src/components/MyWallet/WalletHeader.jsx

@@ -58,7 +58,7 @@ export default function WalletHeader(props) {
                                             </div>
                                             <div>
                                                 <p className="eth text-xl font-bold text-purple">
-                                                    {(value.amount*1).toFixed(2)} {value.code}
+                                                    {(value.amount*0.01).toFixed(2)} {value.code}
                                                 </p>
                                                 <p className="usd text-base text-thin-light-gray text-right">
                                                     {/*(773.69 USD)*/}

src/components/Pagination/HandlePagination.jsx

@@ -0,0 +1,17 @@
+
+
+export const handlePagingFunc = ({target:{name, value}},setCurrentPage) => {
+    if(name == 'prev'){
+      setCurrentPage((prev)=>{
+        return prev-Number(process.env.REACT_APP_ITEM_PER_PAGE)
+      })
+    }
+    if(name == 'next'){
+      setCurrentPage((prev)=>{
+        return prev+Number(process.env.REACT_APP_ITEM_PER_PAGE)
+      }) 
+    }
+    if(name == 'page_num'){
+      setCurrentPage(Number(value))
+    }
+  }

src/components/Pagination/PaginatedList.jsx

@@ -0,0 +1,55 @@
+import React from 'react';
+import { createRoutesFromChildren } from 'react-router-dom';
+
+const PaginatedList = ({ onClick, prev, next, data, start, stop }) => {
+
+  if(data.length){
+    return (
+      <div className='p-3 flex justify-center items-center space-x-2'>
+        {/* Render pagination buttons */}
+          {!prev &&
+              <button
+                className={`p-2 ${prev ? 'border' : null}`}
+                name='prev'
+                onClick={onClick}
+              >
+                <>&lt;</>
+              </button>
+            }
+
+            {
+              data.map((item, index)=>{
+                  if(index%process.env.REACT_APP_ITEM_PER_PAGE == 0 && index >= start && index <= stop){
+                  return (
+                    <button
+                      key={index}
+                      value={index}
+                      className={`p-2 ${index==start ? 'border' : null}`}
+                      onClick={onClick}
+                      name='page_num'
+                      disabled={index == start}
+                    >
+                      {index <= 0 ? index+1 : (index/process.env.REACT_APP_ITEM_PER_PAGE)+1}
+                    </button>
+                  )
+                }
+              })
+            }
+            
+            {!next &&
+              <button
+                className={`p-2 ${next ? 'border' : null}`}
+                name='next'
+                onClick={onClick}
+              >
+                <>&gt;</>
+              </button>
+            }
+        </div>
+    )
+  }else{
+    return null
+  }
+};
+
+export default PaginatedList;

src/components/Partials/Header.jsx

@@ -15,6 +15,7 @@ import usersService from "../../services/UsersService";
 
 import siteLogo from '../../assets/images/wrenchboard.png'
 import Flag from '../../assets/images/united-states.svg'
+import { useSelector } from "react-redux";
 
 
 export default function Header({ logoutModalHandler, sidebarHandler }) {
@@ -24,6 +25,8 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
   const [moneyPopup, setPopup] = useToggle(false);
   const [toggleNotification, setToggleNotification] = useToggle(false)
   const darkMode = useContext(DarkModeContext);
+  const {userDetails} = useSelector((state) => state?.userDetails)
+
 
   const [myWalletList, setMyWalletList] = useState([]);
   const api = new usersService();
@@ -87,6 +90,11 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
   const setNotification = ()=> {
     setToggleNotification.toggle()
   }
+
+  // User Profile
+  let {firstname, lastname, email, profile_pic} = userDetails
+  let userEmail = email.split('@')[0]
+
   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">
@@ -463,17 +471,17 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                 {/* profile-image */}
                 <div className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden">
                   <img
-                    src={profileImg}
+                    src={profile_pic != '' ? profile_pic : profileImg}
                     alt="profile"
                     className="w-full h-full"
                   />
                 </div>
                 <div className="lg:block hidden">
                   <h1 className="text-xl font-bold   text-dark-gray dark:text-white">
-                    Brokln Simons
+                  {`${firstname} ${lastname}`}
                   </h1>
                   <p className="text-sm text-thin-light-gray">
-                    @broklinslam_75
+                    @{userEmail}
                   </p>
                 </div>
               </div>

src/components/Partials/Layout.jsx

@@ -22,9 +22,9 @@ export default function Layout({ children }) {
   const logOut = () => {
     localStorage.removeItem("email");
     localStorage.clear();
-    toast.success("Come Back Soon", {
-      icon: `🙂`,
-    });
+    // toast.success("Come Back Soon", {
+    //   icon: `🙂`,
+    // });
 
     navigate("/login", { replace: true });
   };

src/components/Partials/MobileSideBar.jsx

@@ -116,71 +116,71 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-              <li className="item group">
-                <NavLink
-                  to="/notification"
-                  className="nav-item flex items-center justify-start space-x-3.5"
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
-                    <Icons name="notification" />
-                  </span>
-                  <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                    Messages
-                  </span>
-                </NavLink>
-              </li>
-              <li className="item group">
-                <NavLink
-                    to="/my-wallet"
-                    className="nav-item flex items-center justify-start space-x-3.5"
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
-                    <Icons name="wallet-two" />
-                  </span>
-                  <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                     My Wallet
-                  </span>
-                </NavLink>
-              </li>
-              <li className="item group">
-                <NavLink
-                  to="/resources"
-                  className="nav-item flex items-center justify-start space-x-3.5"
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
-                    <Icons name="star" />
-                  </span>
-                  <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                    Resources
-                  </span>
-                </NavLink>
-              </li>
-              <li className="item group">
-                <NavLink
-                  to="/history"
-                  className="nav-item flex items-center justify-start space-x-3.5"
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
-                    <Icons name="history" />
-                  </span>
-                  <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                    History
-                  </span>
-                </NavLink>
-              </li>
-              <li className="item group">
-                <NavLink
-                  to="/referral"
-                  className="nav-item flex items-center justify-start space-x-3.5"
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
-                    <Icons name="history" />
-                  </span>
-                  <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                  Refer a Friend
-                  </span>
-                </NavLink>
-              </li>
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/notification"*/}
+              {/*    className="nav-item flex items-center justify-start space-x-3.5"*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">*/}
+              {/*      <Icons name="notification" />*/}
+              {/*    </span>*/}
+              {/*    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">*/}
+              {/*      Messages*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*      to="/my-wallet"*/}
+              {/*      className="nav-item flex items-center justify-start space-x-3.5"*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">*/}
+              {/*      <Icons name="wallet-two" />*/}
+              {/*    </span>*/}
+              {/*    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">*/}
+              {/*       My Wallet*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/resources"*/}
+              {/*    className="nav-item flex items-center justify-start space-x-3.5"*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">*/}
+              {/*      <Icons name="star" />*/}
+              {/*    </span>*/}
+              {/*    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">*/}
+              {/*      Resources*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/history"*/}
+              {/*    className="nav-item flex items-center justify-start space-x-3.5"*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">*/}
+              {/*      <Icons name="history" />*/}
+              {/*    </span>*/}
+              {/*    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">*/}
+              {/*      History*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/referral"*/}
+              {/*    className="nav-item flex items-center justify-start space-x-3.5"*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">*/}
+              {/*      <Icons name="history" />*/}
+              {/*    </span>*/}
+              {/*    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">*/}
+              {/*    Refer a Friend*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
             </ul>
           </div>
         </div>
@@ -212,7 +212,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                     <Icons name="setting" />
                   </span>
                   <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                    Active Jobs
+                    Active Job(s)
                   </span>
                 </NavLink>
               </li>

src/components/Partials/RightSideBar.jsx

@@ -12,6 +12,7 @@ import EthIco from "../Helpers/Icons/EthIco";
 import LtcIco from "../Helpers/Icons/LtcIco";
 import Usdt from "../Helpers/Icons/Usdt";
 import SelectBox from "../Helpers/SelectBox";
+import { NavLink } from "react-router-dom";
 
 export default function RightSideBar() {
   const filterDatas = ["Last 15 days", "Last Month", "Last 6 month"];
@@ -54,34 +55,34 @@ export default function RightSideBar() {
           </div>
 
           <div className="platform-list">
-            <div className="item flex space-x-3 items-center mb-4">
-              {/* image */}
-              <div className="w-8 h-8 rounded-full">
-                <svg
-                    width="40"
-                    height="41"
-                    viewBox="0 0 40 41"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                      d="M40 20.7556C40.0074 31.7371 31.0431 40.6838 20.0369 40.6912C8.95687 40.6838 0 31.7812 0 20.741C0 9.69341 8.92002 0.80542 20.0295 0.80542C31.08 0.80542 39.9926 9.7081 40 20.7556ZM15.4736 10.3178C15.5326 10.4206 15.5621 10.5088 15.6211 10.5749C16.2772 11.4784 16.808 12.448 17.2282 13.4763C18.6878 17.0242 18.5256 20.3957 16.174 23.5396C16.0855 23.6571 15.9307 23.7673 16.0413 23.9509C16.1445 24.1125 16.314 24.0758 16.4689 24.0758C17.0807 24.0758 17.6926 24.0831 18.3045 24.0758C18.5477 24.0684 18.6804 24.1199 18.6731 24.4063C18.6583 25.016 18.6657 25.6257 18.6731 26.2353C18.6731 26.4557 18.5993 26.5292 18.3708 26.5218C17.7663 26.5145 17.1471 26.4778 16.5426 26.5145C14.8765 26.6173 14.39 26.0591 13.7928 24.59C13.7707 24.5312 13.7486 24.4724 13.7265 24.4137C13.6602 24.1713 13.5127 24.0758 13.2473 24.0684C11.397 24.0244 9.54663 23.973 7.69628 23.8995C7.36454 23.8848 7.26871 23.9803 7.28345 24.3108C7.37191 26.0517 7.96167 27.5722 9.09694 28.9164C9.94471 29.9228 10.962 30.5618 12.2374 30.8263C13.6528 31.1127 15.0903 31.267 16.5352 31.3037C19.2186 31.3698 21.8946 31.1201 24.5853 31.098C25.8459 31.0833 26.878 30.5618 27.711 29.6069C28.3229 28.9091 28.8316 28.1452 29.355 27.3812C30.0479 26.3676 30.7409 25.2804 31.9278 24.8618C32.7313 24.5753 32.7976 24.1272 32.7313 23.4808C32.7313 23.4514 32.7313 23.4147 32.7313 23.3853C32.7682 22.9593 32.5765 22.8785 32.1858 22.9887C30.6082 23.4074 29.0306 23.804 27.453 24.2227C26.8633 24.377 26.2514 24.5532 25.8386 25.038C24.9466 26.1031 23.7892 26.5218 22.4327 26.5365C21.1353 26.5512 21.1353 26.5732 21.1353 25.2731C21.1353 24.1933 21.1353 24.1786 22.2042 24.2007C22.7792 24.2154 23.2805 24.1346 23.7154 23.7159C24.5042 22.9666 25.2046 22.1513 25.6911 21.1743C26.185 20.1754 26.3472 19.1397 26.045 18.0378C25.7059 16.7891 25.0866 15.702 24.2905 14.703C23.4427 13.6453 22.4254 12.7711 21.3859 11.9044C21.1943 11.7501 21.1279 11.5812 21.1353 11.3461C21.15 10.7218 21.1426 10.0974 21.1353 9.47305C21.1279 8.71646 20.5824 8.14352 19.8968 8.15087C19.1891 8.16556 18.6878 8.70912 18.6731 9.48039C18.6657 9.8697 18.6583 10.2664 18.6731 10.6557C18.6878 10.9421 18.5993 11.0082 18.3266 10.9274C17.6926 10.7438 17.0586 10.5675 16.4173 10.4206C16.1297 10.3545 15.8349 10.2296 15.4736 10.3178ZM8.63251 21.7179C8.86841 21.7326 9.00848 21.7473 9.14117 21.7473C10.7409 21.7473 12.3406 21.7326 13.9403 21.7546C14.5522 21.762 14.9871 21.5269 15.3262 21.0348C15.7833 20.3737 16.0781 19.6612 16.0487 18.8458C15.9749 16.936 15.5547 15.107 14.8102 13.3514C14.5964 12.8519 14.4563 12.8593 14.1688 13.2927C13.0188 15.0409 11.8614 16.7891 10.7114 18.5447C10.0405 19.5804 9.36233 20.6087 8.63251 21.7179Z"
-                      fill="#2481E1"
-                  />
-                  <path
-                      d="M15.4729 10.3178C15.8267 10.2223 16.129 10.3472 16.4165 10.4207C17.0578 10.5676 17.6918 10.7439 18.3258 10.9275C18.5986 11.0083 18.687 10.9422 18.6723 10.6557C18.6502 10.2664 18.6649 9.87709 18.6723 9.48044C18.6797 8.70917 19.181 8.15826 19.896 8.15091C20.5816 8.13622 21.1271 8.70916 21.1345 9.47309C21.1419 10.0975 21.1419 10.7218 21.1345 11.3462C21.1271 11.5886 21.2009 11.7502 21.3852 11.9044C22.4246 12.7638 23.4419 13.638 24.2897 14.703C25.0859 15.702 25.7051 16.7892 26.0442 18.0379C26.3465 19.1397 26.1843 20.1754 25.6904 21.1744C25.2038 22.1587 24.5035 22.9667 23.7147 23.7159C23.2797 24.1346 22.7711 24.208 22.2034 24.2007C21.1345 24.1787 21.1345 24.1934 21.1345 25.2731C21.1345 26.5733 21.1345 26.5512 22.432 26.5366C23.7884 26.5219 24.9458 26.1032 25.8378 25.0381C26.2506 24.5459 26.8551 24.377 27.4522 24.2227C29.0298 23.8041 30.6074 23.4074 32.185 22.9887C32.5757 22.8859 32.7674 22.9593 32.7305 23.3854C32.7305 23.4147 32.7305 23.4515 32.7305 23.4809C32.7969 24.1346 32.7305 24.5753 31.927 24.8618C30.7401 25.2878 30.0472 26.3676 29.3542 27.3813C28.8308 28.1452 28.3221 28.9091 27.7103 29.607C26.8772 30.5545 25.8452 31.0834 24.5846 31.0981C21.9012 31.1275 19.2252 31.3699 16.5344 31.3037C15.0895 31.267 13.6594 31.1128 12.2366 30.8263C10.9539 30.5692 9.94395 29.9228 9.09618 28.9165C7.96091 27.5723 7.37115 26.0518 7.28269 24.3109C7.26795 23.973 7.36378 23.8849 7.69552 23.8995C9.54587 23.9657 11.3962 24.0171 13.2466 24.0685C13.512 24.0758 13.6594 24.164 13.7257 24.4137C13.7405 24.4725 13.7626 24.5312 13.7921 24.59C14.3892 26.0591 14.8758 26.6174 16.5418 26.5145C17.1537 26.4778 17.7655 26.5145 18.3774 26.5366C18.6059 26.5439 18.6797 26.4704 18.6797 26.2501C18.6723 25.6404 18.6649 25.0307 18.6797 24.4211C18.687 24.1346 18.5617 24.0832 18.3111 24.0905C17.6992 24.0979 17.0873 24.0905 16.4755 24.0905C16.3207 24.0905 16.1511 24.1199 16.0479 23.9657C15.9299 23.782 16.0921 23.6792 16.1806 23.5543C18.5249 20.4031 18.6944 17.0389 17.2348 13.491C16.8072 12.4553 16.2838 11.4931 15.6277 10.5896C15.5687 10.5088 15.5319 10.4207 15.4729 10.3178Z"
-                      fill="#FEFEFE"
-                  />
-                </svg>
-              </div>
-              {/* name */}
-              <div>
-                <p className="text-thin-light-gray text-base font-medium">
-                  OpenSea
-                </p>
-              </div>
-              {/* action */}
-            </div>
+            {/*<div className="item flex space-x-3 items-center mb-4">*/}
+            {/*  /!* image *!/*/}
+            {/*  <div className="w-8 h-8 rounded-full">*/}
+            {/*    <svg*/}
+            {/*        width="40"*/}
+            {/*        height="41"*/}
+            {/*        viewBox="0 0 40 41"*/}
+            {/*        fill="none"*/}
+            {/*        xmlns="http://www.w3.org/2000/svg"*/}
+            {/*    >*/}
+            {/*      <path*/}
+            {/*          d="M40 20.7556C40.0074 31.7371 31.0431 40.6838 20.0369 40.6912C8.95687 40.6838 0 31.7812 0 20.741C0 9.69341 8.92002 0.80542 20.0295 0.80542C31.08 0.80542 39.9926 9.7081 40 20.7556ZM15.4736 10.3178C15.5326 10.4206 15.5621 10.5088 15.6211 10.5749C16.2772 11.4784 16.808 12.448 17.2282 13.4763C18.6878 17.0242 18.5256 20.3957 16.174 23.5396C16.0855 23.6571 15.9307 23.7673 16.0413 23.9509C16.1445 24.1125 16.314 24.0758 16.4689 24.0758C17.0807 24.0758 17.6926 24.0831 18.3045 24.0758C18.5477 24.0684 18.6804 24.1199 18.6731 24.4063C18.6583 25.016 18.6657 25.6257 18.6731 26.2353C18.6731 26.4557 18.5993 26.5292 18.3708 26.5218C17.7663 26.5145 17.1471 26.4778 16.5426 26.5145C14.8765 26.6173 14.39 26.0591 13.7928 24.59C13.7707 24.5312 13.7486 24.4724 13.7265 24.4137C13.6602 24.1713 13.5127 24.0758 13.2473 24.0684C11.397 24.0244 9.54663 23.973 7.69628 23.8995C7.36454 23.8848 7.26871 23.9803 7.28345 24.3108C7.37191 26.0517 7.96167 27.5722 9.09694 28.9164C9.94471 29.9228 10.962 30.5618 12.2374 30.8263C13.6528 31.1127 15.0903 31.267 16.5352 31.3037C19.2186 31.3698 21.8946 31.1201 24.5853 31.098C25.8459 31.0833 26.878 30.5618 27.711 29.6069C28.3229 28.9091 28.8316 28.1452 29.355 27.3812C30.0479 26.3676 30.7409 25.2804 31.9278 24.8618C32.7313 24.5753 32.7976 24.1272 32.7313 23.4808C32.7313 23.4514 32.7313 23.4147 32.7313 23.3853C32.7682 22.9593 32.5765 22.8785 32.1858 22.9887C30.6082 23.4074 29.0306 23.804 27.453 24.2227C26.8633 24.377 26.2514 24.5532 25.8386 25.038C24.9466 26.1031 23.7892 26.5218 22.4327 26.5365C21.1353 26.5512 21.1353 26.5732 21.1353 25.2731C21.1353 24.1933 21.1353 24.1786 22.2042 24.2007C22.7792 24.2154 23.2805 24.1346 23.7154 23.7159C24.5042 22.9666 25.2046 22.1513 25.6911 21.1743C26.185 20.1754 26.3472 19.1397 26.045 18.0378C25.7059 16.7891 25.0866 15.702 24.2905 14.703C23.4427 13.6453 22.4254 12.7711 21.3859 11.9044C21.1943 11.7501 21.1279 11.5812 21.1353 11.3461C21.15 10.7218 21.1426 10.0974 21.1353 9.47305C21.1279 8.71646 20.5824 8.14352 19.8968 8.15087C19.1891 8.16556 18.6878 8.70912 18.6731 9.48039C18.6657 9.8697 18.6583 10.2664 18.6731 10.6557C18.6878 10.9421 18.5993 11.0082 18.3266 10.9274C17.6926 10.7438 17.0586 10.5675 16.4173 10.4206C16.1297 10.3545 15.8349 10.2296 15.4736 10.3178ZM8.63251 21.7179C8.86841 21.7326 9.00848 21.7473 9.14117 21.7473C10.7409 21.7473 12.3406 21.7326 13.9403 21.7546C14.5522 21.762 14.9871 21.5269 15.3262 21.0348C15.7833 20.3737 16.0781 19.6612 16.0487 18.8458C15.9749 16.936 15.5547 15.107 14.8102 13.3514C14.5964 12.8519 14.4563 12.8593 14.1688 13.2927C13.0188 15.0409 11.8614 16.7891 10.7114 18.5447C10.0405 19.5804 9.36233 20.6087 8.63251 21.7179Z"*/}
+            {/*          fill="#2481E1"*/}
+            {/*      />*/}
+            {/*      <path*/}
+            {/*          d="M15.4729 10.3178C15.8267 10.2223 16.129 10.3472 16.4165 10.4207C17.0578 10.5676 17.6918 10.7439 18.3258 10.9275C18.5986 11.0083 18.687 10.9422 18.6723 10.6557C18.6502 10.2664 18.6649 9.87709 18.6723 9.48044C18.6797 8.70917 19.181 8.15826 19.896 8.15091C20.5816 8.13622 21.1271 8.70916 21.1345 9.47309C21.1419 10.0975 21.1419 10.7218 21.1345 11.3462C21.1271 11.5886 21.2009 11.7502 21.3852 11.9044C22.4246 12.7638 23.4419 13.638 24.2897 14.703C25.0859 15.702 25.7051 16.7892 26.0442 18.0379C26.3465 19.1397 26.1843 20.1754 25.6904 21.1744C25.2038 22.1587 24.5035 22.9667 23.7147 23.7159C23.2797 24.1346 22.7711 24.208 22.2034 24.2007C21.1345 24.1787 21.1345 24.1934 21.1345 25.2731C21.1345 26.5733 21.1345 26.5512 22.432 26.5366C23.7884 26.5219 24.9458 26.1032 25.8378 25.0381C26.2506 24.5459 26.8551 24.377 27.4522 24.2227C29.0298 23.8041 30.6074 23.4074 32.185 22.9887C32.5757 22.8859 32.7674 22.9593 32.7305 23.3854C32.7305 23.4147 32.7305 23.4515 32.7305 23.4809C32.7969 24.1346 32.7305 24.5753 31.927 24.8618C30.7401 25.2878 30.0472 26.3676 29.3542 27.3813C28.8308 28.1452 28.3221 28.9091 27.7103 29.607C26.8772 30.5545 25.8452 31.0834 24.5846 31.0981C21.9012 31.1275 19.2252 31.3699 16.5344 31.3037C15.0895 31.267 13.6594 31.1128 12.2366 30.8263C10.9539 30.5692 9.94395 29.9228 9.09618 28.9165C7.96091 27.5723 7.37115 26.0518 7.28269 24.3109C7.26795 23.973 7.36378 23.8849 7.69552 23.8995C9.54587 23.9657 11.3962 24.0171 13.2466 24.0685C13.512 24.0758 13.6594 24.164 13.7257 24.4137C13.7405 24.4725 13.7626 24.5312 13.7921 24.59C14.3892 26.0591 14.8758 26.6174 16.5418 26.5145C17.1537 26.4778 17.7655 26.5145 18.3774 26.5366C18.6059 26.5439 18.6797 26.4704 18.6797 26.2501C18.6723 25.6404 18.6649 25.0307 18.6797 24.4211C18.687 24.1346 18.5617 24.0832 18.3111 24.0905C17.6992 24.0979 17.0873 24.0905 16.4755 24.0905C16.3207 24.0905 16.1511 24.1199 16.0479 23.9657C15.9299 23.782 16.0921 23.6792 16.1806 23.5543C18.5249 20.4031 18.6944 17.0389 17.2348 13.491C16.8072 12.4553 16.2838 11.4931 15.6277 10.5896C15.5687 10.5088 15.5319 10.4207 15.4729 10.3178Z"*/}
+            {/*          fill="#FEFEFE"*/}
+            {/*      />*/}
+            {/*    </svg>*/}
+            {/*  </div>*/}
+            {/*  /!* name *!/*/}
+            {/*  <div>*/}
+            {/*    <p className="text-thin-light-gray text-base font-medium">*/}
+            {/*      OpenSea*/}
+            {/*    </p>*/}
+            {/*  </div>*/}
+            {/*  /!* action *!/*/}
+            {/*</div>*/}
             <div className="item flex space-x-3 items-center mb-4">
               {/* image */}
               <div className="w-8 h-8 rounded-full">
@@ -108,7 +109,10 @@ export default function RightSideBar() {
               {/* name */}
               <div>
                 <p className="text-thin-light-gray text-base font-medium">
-                  Rarible
+                  <NavLink
+                      to="/history">
+                    History
+                  </NavLink>
                 </p>
               </div>
               {/* action */}
@@ -152,7 +156,8 @@ export default function RightSideBar() {
               {/* name */}
               <div>
                 <p className="text-thin-light-gray text-base font-medium">
-                  Myth Market
+                  <NavLink
+                      to="/referral">Refer a Friend</NavLink>
                 </p>
               </div>
             </div>
@@ -186,12 +191,16 @@ export default function RightSideBar() {
               {/* name */}
               <div>
                 <p className="text-thin-light-gray text-base font-medium">
-                  KnownOrigin
+                  <NavLink
+                      to="/resources">
+                    Resources
+                  </NavLink>
                 </p>
               </div>
             </div>
           </div>
         </div>
+
         <div className="chart-one bg-white dark:bg-dark-white   rounded-2xl p-8 2xl:w-[268px] w-full 2xl:mb-10 2xl:border-none  border flex flex-col sm:flex-row 2xl:flex-col 2xl:block lg:justify-between sm:items-center space-x-5 2xl:space-x-0 ">
           <div>
             <div className="chart-heading mb-4 xl:flex justify-between items-center">

src/components/Partials/SideStatistics.jsx

@@ -0,0 +1,159 @@
+import React, { useState } from "react";
+import DoughnutChart from "../Charts/DoughnutChart";
+import SelectBox from "../Helpers/SelectBox";
+
+export default function SideStatistics() {
+    const filterDatas = ["Last 15 days", "Last Month", "Last 6 month"];
+    const [filterDataSet, setFilterDataSet] = useState([10, 30, 20, 40]);
+    const dataSetHandler = (value) => {
+        if (value === "Last 15 days") {
+            setFilterDataSet([10, 30, 20, 40]);
+        } else if (value === "Last Month") {
+            setFilterDataSet([15, 35, 10, 20]);
+        } else {
+            setFilterDataSet([8, 15, 40, 30]);
+        }
+    };
+
+    const [selectedRate, setSelectedRate] = useState("ETH");
+    const [rateStaticsDropdown, setRateStaticsDropdown] = useState(false);
+    const [filterRateStatics, setFilterRateStatics] = useState([50, 30, 90, 20]);
+    const rateDataSetHandler = (value) => {
+        setSelectedRate(value);
+        if (value === "USD") {
+            setFilterRateStatics([50, 30, 90, 20]);
+        } else if (value === "BTC") {
+            setFilterRateStatics([15, 35, 10, 20]);
+        } else {
+            setFilterRateStatics([8, 15, 20, 30]);
+        }
+        setRateStaticsDropdown(!filterRateStatics);
+    };
+    return (
+        <>
+                <div className="chart-one bg-white dark:bg-dark-white   rounded-2xl p-8 2xl:w-[268px] w-full 2xl:mb-10 2xl:border-none  border flex flex-col sm:flex-row 2xl:flex-col 2xl:block lg:justify-between sm:items-center space-x-5 2xl:space-x-0 ">
+                    <div>
+                        <div className="chart-heading mb-4 xl:flex justify-between items-center">
+                            <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
+                                Statistics
+                            </h3>
+                            <SelectBox datas={filterDatas} action={dataSetHandler} />
+                        </div>
+                        <div id="chartjs-tooltip" className="chart relative 2xl:mb-6">
+                            <DoughnutChart dataSets={filterDataSet} />
+                            <div className="sm:flex hidden absolute 2xl:top-[19%] 2xl:left-[20%] xl:top-[28%] xl:left-[28%] lg:left-[20%] lg:top-[20%] left-[30%] top-[30%] justify-center">
+                <span>
+                  <svg
+                      width="123"
+                      height="123"
+                      viewBox="0 0 123 123"
+                      fill="none"
+                      xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                        d="M70.7788 45.749C70.7788 46.2809 70.7788 46.5811 70.7788 46.8865C70.7788 59.9678 70.7735 73.0544 70.8052 86.1357C70.8052 87.0204 70.5881 87.2679 69.7035 87.2311C67.8601 87.1573 66.0167 87.1889 64.1733 87.2205C63.5324 87.2311 63.2464 87.1257 63.2517 86.3779C63.2781 74.7396 63.2728 63.1012 63.2728 51.4681C63.2728 51.0784 63.2623 50.7467 63.6807 50.4781C65.9849 48.9667 68.268 47.4237 70.7788 45.749Z"
+                        fill="#ECECEC"
+                    />
+                    <path
+                        d="M81.6339 55.6284C81.6339 56.0918 81.6339 56.3604 81.6339 56.6343C81.6339 66.4663 81.6233 76.2983 81.6604 86.1304C81.6657 87.0098 81.4432 87.2574 80.5586 87.2258C78.6835 87.152 76.803 87.1731 74.9226 87.2205C74.2392 87.2363 74.1068 87.0046 74.1068 86.3832C74.128 78.0309 74.1227 69.6787 74.128 61.3265C74.128 61.021 74.0379 60.6893 74.3717 60.4628C76.75 58.8882 79.1178 57.3083 81.6339 55.6284Z"
+                        fill="#ECECEC"
+                    />
+                    <path
+                        d="M56.158 64.1334C54.3623 64.1228 53.0433 62.8115 53.0698 60.942C53.0751 60.3891 52.9109 60.1258 52.4553 59.894C51.1046 59.2042 49.7591 58.4932 48.4296 57.756C47.9528 57.4926 47.6138 57.4505 47.1106 57.8086C45.8658 58.6933 44.2767 58.5512 43.1908 57.5769C42.1684 56.6606 41.8771 55.007 42.5233 53.7905C43.1855 52.5371 44.6581 51.8736 46.03 52.2106C47.5026 52.5687 48.456 53.7115 48.4243 55.2808C48.4137 55.8864 48.6308 56.1708 49.1129 56.4131C50.0293 56.8765 50.9351 57.3505 51.8356 57.8507C52.8844 58.4353 53.9067 59.2568 55.0827 58.093C55.1038 58.0719 55.1515 58.0561 55.1833 58.0561C57.0955 58.1983 57.4239 56.708 58.0384 55.4178C59.8765 51.5787 61.7781 47.7659 63.6586 43.9427C63.844 43.5635 64.0294 43.1843 64.2201 42.8051C64.665 41.9099 65.11 41.1463 64.2677 40.0825C63.4573 39.0661 63.9022 37.4336 64.861 36.5173C65.8568 35.5746 67.2765 35.3798 68.5001 36.017C69.729 36.6595 70.4229 38.0024 70.0415 39.4032C69.8349 40.1615 70.0574 40.5407 70.5818 40.9988C72.2557 42.4681 73.9031 43.969 75.524 45.4962C75.9424 45.8912 76.2656 45.9596 76.8164 45.749C78.199 45.2171 79.6821 45.7174 80.4661 46.8917C81.2236 48.0187 81.1388 49.6249 80.2754 50.636C79.3431 51.7261 77.8176 52.0474 76.5145 51.426C75.2167 50.8045 74.4646 49.4406 74.8671 48.0029C75.079 47.234 74.8512 46.8654 74.3321 46.4125C72.69 44.9643 71.0639 43.4898 69.4641 41.9889C69.0033 41.5518 68.5901 41.3253 68.0022 41.694C67.9439 41.7308 67.8644 41.7782 67.8062 41.7677C66.2435 41.4939 65.9204 42.7051 65.4278 43.7215C63.5103 47.6817 61.5768 51.6313 59.6699 55.5968C59.2991 56.3657 58.727 57.0187 58.4992 57.8876C58.3562 58.4353 58.3827 58.7513 58.7111 59.1989C59.4633 60.2206 59.5216 61.3686 58.9336 62.4903C58.3509 63.5857 57.3975 64.1176 56.158 64.1334Z"
+                        fill="url(#paint0_linear_197_92226)"
+                    />
+                    <path
+                        d="M49.0697 62.2479C49.0697 68.0039 49.0697 73.5018 49.0697 78.9998C49.0697 81.4696 49.0485 83.9342 49.0856 86.4041C49.0962 87.0676 48.8949 87.2362 48.2434 87.2204C46.2941 87.1782 44.3395 87.1835 42.3901 87.2204C41.7863 87.2309 41.532 87.1203 41.5373 86.4252C41.5691 80.2531 41.5532 74.0811 41.5585 67.9091C41.5585 67.6037 41.4896 67.293 41.8339 67.0613C44.1911 65.513 46.5324 63.9436 49.0697 62.2479Z"
+                        fill="#ECECEC"
+                    />
+                    <path
+                        d="M59.9298 68.0092C59.9298 74.355 59.9245 80.4796 59.9351 86.6042C59.9351 87.0518 59.7973 87.2203 59.3312 87.2151C57.2071 87.194 55.083 87.1993 52.9589 87.2151C52.5457 87.2203 52.408 87.0729 52.408 86.6674C52.4186 82.2648 52.4186 77.8675 52.4133 73.465C52.4133 73.149 52.5298 72.9489 52.7946 72.7751C55.1095 71.2321 57.419 69.6838 59.9298 68.0092Z"
+                        fill="#ECECEC"
+                    />
+                    <path
+                        d="M30.9572 92.2319C14.058 75.3327 14.058 47.8462 30.9572 30.947C47.8564 14.0478 75.3428 14.0478 92.242 30.947C109.141 47.8462 109.141 75.3327 92.242 92.2319C75.3428 109.131 47.8564 109.131 30.9572 92.2319ZM90.691 32.498C74.655 16.462 48.5577 16.4485 32.5082 32.498C16.4722 48.534 16.4722 74.6448 32.5082 90.6809C48.5442 106.717 74.655 106.717 90.691 90.6809C106.727 74.6448 106.727 48.534 90.691 32.498Z"
+                        fill="#EBEDED"
+                    />
+                    <defs>
+                      <linearGradient
+                          id="paint0_linear_197_92226"
+                          x1="42.1803"
+                          y1="35.6461"
+                          x2="71.0724"
+                          y2="74.1629"
+                          gradientUnits="userSpaceOnUse"
+                      >
+                        <stop stopColor="#F539F8" />
+                        <stop offset="0.416763" stopColor="#C342F9" />
+                        <stop offset="1" stopColor="#5356FB" />
+                      </linearGradient>
+                    </defs>
+                  </svg>
+                </span>
+                            </div>
+                        </div>
+                    </div>
+                    <div className="chart-analysis mt-5">
+                        <div className="heading text-center">
+                            <h1 className="text-base font-medium text-dark-gray dark:text-white mb-4">
+                                Your All Artwork Statistics
+                            </h1>
+                        </div>
+                        <div className="analysis-list">
+                            <ul>
+                                <li className="flex items-center mb-3.5">
+                                    <span className="w-4 h-4 bg-light-purple  rounded-full block mr-2"></span>
+                                    <div>
+                    <span className="text-sm text-thin-light-gray mr-2">
+                      Profit :
+                    </span>
+                                        <span className="text-sm text-dark-gray dark:text-white font-bold">
+                      {/* don't change variable only change state */}
+                                            {filterDataSet[0]}%
+                    </span>
+                                    </div>
+                                </li>
+                                <li className="flex items-center mb-3.5">
+                                    <span className="w-4 h-4 bg-purple rounded-full block mr-2"></span>
+                                    <div>
+                    <span className="text-sm text-thin-light-gray mr-2">
+                      Total Sold :
+                    </span>
+                                        <span className="text-sm text-dark-gray dark:text-white font-bold">
+                      {/* don't change variable only change state */}
+                                            {filterDataSet[1]}%
+                    </span>
+                                    </div>
+                                </li>
+                                <li className="flex items-center mb-3.5">
+                                    <span className="w-4 h-4 bg-pink rounded-full block mr-2"></span>
+                                    <div>
+                    <span className="text-sm text-thin-light-gray mr-2">
+                      Total Sold :
+                    </span>
+                                        <span className="text-sm text-dark-gray dark:text-white font-bold">
+                      {/* don't change variable only change state */}
+                                            {filterDataSet[2]}%
+                    </span>
+                                    </div>
+                                </li>
+                                <li className="flex items-center mb-3.5">
+                                    <span className="w-4 h-4 bg-[#FFCD00] rounded-full block mr-2"></span>
+                                    <div>
+                    <span className="text-sm text-thin-light-gray mr-2">
+                      Total Sold :
+                    </span>
+                                        <span className="text-sm text-dark-gray dark:text-white font-bold">
+                      {/* don't change variable only change state */}
+                                            {filterDataSet[3]}%
+                    </span>
+                                    </div>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+
+        </>
+    );
+}

src/components/Partials/Sidebar.jsx

@@ -156,112 +156,129 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-              <li className="item group">
-                <NavLink
-                  to="/notification"
-                  className={`nav-item flex items-center  ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="notification-setting" />
-                  </span>
-                  <span
-                    className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                   Messages
-                  </span>
-                </NavLink>
-              </li>
-              <li className="item group">
-                <NavLink
-                  to="/my-wallet"
-                  className={`nav-item flex items-center  ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="wallet-two" />
-                  </span>
-                  <span
-                    className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                   My Wallet
-                  </span>
-                </NavLink>
-              </li>
-              <li className="item group">
-                <NavLink
-                  to="/resources"
-                  className={`nav-item flex items-center ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="star" />
-                  </span>
-                  <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                    Resources
-                  </span>
-                </NavLink>
-              </li>
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/notification"*/}
+              {/*    className={`nav-item flex items-center  ${*/}
+              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
+              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
+              {/*    }`}*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
+              {/*      <Icons name="notification-setting" />*/}
+              {/*    </span>*/}
+              {/*    <span*/}
+              {/*      className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${*/}
+              {/*        sidebar ? "active flex-1" : "w-0"*/}
+              {/*      }`}*/}
+              {/*    >*/}
+              {/*     Messages*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/my-wallet"*/}
+              {/*    className={`nav-item flex items-center  ${*/}
+              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
+              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
+              {/*    }`}*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
+              {/*      <Icons name="wallet-two" />*/}
+              {/*    </span>*/}
+              {/*    <span*/}
+              {/*      className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${*/}
+              {/*        sidebar ? "active flex-1" : "w-0"*/}
+              {/*      }`}*/}
+              {/*    >*/}
+              {/*     My Wallet*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/resources"*/}
+              {/*    className={`nav-item flex items-center ${*/}
+              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
+              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
+              {/*    }`}*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
+              {/*      <Icons name="star" />*/}
+              {/*    </span>*/}
+              {/*    <span*/}
+              {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
+              {/*        sidebar ? "active flex-1" : "w-0"*/}
+              {/*      }`}*/}
+              {/*    >*/}
+              {/*      Resources*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
           
-              <li className="item group">
-                <NavLink
-                  to="/history"
-                  className={`nav-item flex items-center ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="history" />
-                  </span>
-                  <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                    History
-                  </span>
-                </NavLink>
-              </li>
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/history"*/}
+              {/*    className={`nav-item flex items-center ${*/}
+              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
+              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
+              {/*    }`}*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
+              {/*      <Icons name="history" />*/}
+              {/*    </span>*/}
+              {/*    <span*/}
+              {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
+              {/*        sidebar ? "active flex-1" : "w-0"*/}
+              {/*      }`}*/}
+              {/*    >*/}
+              {/*      History*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
 
-              <li className="item group">
-                <NavLink
-                  to="/referral"
-                  className={`nav-item flex items-center ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="history" />
-                  </span>
-                  <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                    Refer a Friend
-                  </span>
-                </NavLink>
-              </li>
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/referral"*/}
+              {/*    className={`nav-item flex items-center ${*/}
+              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
+              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
+              {/*    }`}*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
+              {/*      <Icons name="history" />*/}
+              {/*    </span>*/}
+              {/*    <span*/}
+              {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
+              {/*        sidebar ? "active flex-1" : "w-0"*/}
+              {/*      }`}*/}
+              {/*    >*/}
+              {/*      Refer a Friend*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
             </ul>
           </div>
         </div>
+        <div className="setting-item">
+          <div  class="top-platform bg-pink dark:bg-dark-white   rounded-2xl p-6 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border ">
+            <NavLink
+                to="/acc-family" >
+              <span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">Family Account</span>
+            </NavLink>
+          </div>
+        </div>
+        <div className="setting-item">
+          <div
+              className="top-platform bg-pink dark:bg-dark-white   rounded-2xl p-16 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border ">
+            <NavLink
+                to="/start-job" >
+              <span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">Enable Job Post</span>
+            </NavLink>
+          </div>
 
+        </div>
         <div className="setting-item">
           <div className="heading mb-5">
             <h1 className="title text-xl font-bold text-purple">My Jobs</h1>
@@ -284,13 +301,13 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                           sidebar ? "active flex-1" : "w-0"
                       }`}
                   >
-                    Job List
+                    List
                   </span>
                 </NavLink>
               </li>
               <li className="item group">
                 <NavLink
-                    to="/market"
+                    to="/my-active-jobs"
                     className={`nav-item flex items-center ${
                         ((navData) => (navData.isActive ? "active" : ""),
                             sidebar ? "justify-start space-x-3.5" : "justify-center")
@@ -304,7 +321,27 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                           sidebar ? "active flex-1" : "w-0"
                       }`}
                   >
-                   Active Jobs
+                   Pending
+                  </span>
+                </NavLink>
+              </li>
+              <li className="item group">
+                <NavLink
+                    to="/my-active-jobs"
+                    className={`nav-item flex items-center ${
+                        ((navData) => (navData.isActive ? "active" : ""),
+                            sidebar ? "justify-start space-x-3.5" : "justify-center")
+                    }`}
+                >
+                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+                    <Icons name="people-two" />
+                  </span>
+                  <span
+                      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                          sidebar ? "active flex-1" : "w-0"
+                      }`}
+                  >
+                   Active
                   </span>
                 </NavLink>
               </li>

src/components/Referral/ReferralDisplay.jsx

@@ -2,6 +2,34 @@ import React, { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { toast } from "react-toastify";
 import usersService from '../../services/UsersService';
+import InputCom from '../Helpers/Inputs/InputCom';
+import LoadingSpinner from '../Spinners/LoadingSpinner';
+
+import {Formik, Form} from 'formik'
+import * as Yup from 'yup'
+import ReferralTable from '../MyWallet/WalletComponent/ReferralTable';
+
+const validationSchema = Yup.object().shape({
+    email: Yup.string()
+      .email('Wrong email format')
+      .min(3, 'Minimum 3 characters')
+      .max(50, 'Maximum 50 characters')
+      .required('Email is required'),
+    firstname: Yup.string()
+      .min(3, 'Minimum 3 characters')
+      .max(25, 'Maximum 25 characters')
+      .required('Firstname is required'),
+    lastname: Yup.string()
+      .min(3, 'Minimum 3 characters')
+      .max(25, 'Maximum 25 characters')
+      .required('Lastname is required'),
+  })
+  
+  const initialValues = {
+    firstname: '',
+    lastname: '',
+    email: ''
+  }
 
 function ReferralDisplay() {
     const apiCall = new usersService() // GET API CALL
@@ -16,7 +44,7 @@ function ReferralDisplay() {
         data: []
     }) 
 
-    let [error, setError] = useState({message: '', loading: false}) // for displaying error message on the page
+    let [error, setError] = useState({message: '', loading: false, status: false}) // for displaying error message on the page
 
     //function to call referral history API
     const allReferrals = () => {
@@ -38,49 +66,28 @@ function ReferralDisplay() {
     const sendReferralMsg = (postData) => {
         apiCall.sendReferralMsg(postData).then((res)=>{
             if(res.data.internal_return < 0){
-                setError({message:'Email already referred', loading: false})
+                setError({message:'Email already referred', loading: false, status: false})
                 return
             }else{
-                setInputs({ firstname: '', lastname: '', email: '',})
                 toast.success("Message Sent");
-                setError({message:'', loading: false})
+                setError({message:'', loading: false, status: true})
                 setRefHistoryReload(prev => !prev)
             }
         }).catch((error)=>{
-            setError({message:'Opps! an error occured, try again later', loading: false})
+            setError({message:'Opps! an error occured, try again later', loading: false, status: false})
         })
     }
 
-    //STATE FOR CONTROLLED INPUTS
-    let [inputs, setInputs] = useState({
-        firstname: '',
-        lastname: '',
-        email: ''
-    })
-
-    // FUNCTION TO HANDLE INPUT CHANGE
-    const handleChange = ({target:{name, value}}) => {
-        setInputs(prev => ({...prev, [name]:value}))
-    }
-
     //FUNCTION TO HANDLE SUBMIT
-    const handleSubmit = (e) => {
-        e.preventDefault();
-        setError({message: '', loading: true})
-        let {firstname, lastname, email} = inputs
-        if(!firstname || !lastname || !email){
-            setError({message: 'Please fill all fields', loading: false})
-            return
-        }
+    const handleSubmit = (values, helpers) => {
+        setError({message: '', loading: true, status: false})
 
         var postData = {
             uid: localStorage.getItem("uid"),
             member_id: localStorage.getItem("member_id"),
             sessionid: localStorage.getItem("session_token"),
             action: 11032,
-            ref_firstname: firstname,
-            ref_lastname: lastname,
-            ref_email: email
+            ...values
             };
 
         sendReferralMsg(postData) // FUNCTION TO SEND REFERRAL MESSAGE
@@ -95,56 +102,62 @@ function ReferralDisplay() {
         <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
             <div className="referral w-full  md:p-8 p-4 h-full bg-white dark:bg-dark-white rounded-2xl shadow">
                 <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Send Referral</h2>
-               <form className='referral-info' onSubmit={handleSubmit}>
-                    <div className='md:flex items-center my-4'>
-                        <label className='w-full md:w-1/4 text-slate-900 text-lg'>Firstname <span className='text-red-500'>*</span></label>
-                        <input className='w-full md:w-3/4 p-3 text-lg bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                            value={inputs.firstname} 
-                            name='firstname' 
-                            type="text" 
-                            placeholder='Firstname' 
-                            onChange={handleChange}
+                <Formik initialValues={initialValues} validationSchema={validationSchema} onSubmit={handleSubmit}>
+                    {(props)=>(
+                        <Form className='referral-info'>
+                            {/* Firstname */}
+                            <div className="field w-full mb-6">
+                            <InputCom
+                                label="Firstname"
+                                type="text"
+                                name="firstname"
+                                placeholder="Firstname"
+                                value={props.values.firstname}
+                                inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
                             />
-                    </div>
-
-                    <div className='md:flex items-center my-4'>
-                        <label className='w-full md:w-1/4 text-slate-900 text-lg'>Lastname <span className='text-red-500'>*</span></label>
-                        <input className='w-full md:w-3/4 p-3 text-lg bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                            value={inputs.lastname} 
-                            name='lastname' 
-                            type="text" 
-                            placeholder='Lastname' 
-                            onChange={handleChange}
-                            />
-                    </div>
-
-                    <div className='md:flex items-center my-4'>
-                        <label className='w-full md:w-1/4 text-slate-900 text-lg'>Email <span className='text-red-500'>*</span></label>
-                        <input className='w-full md:w-3/4 p-3 text-lg bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                            value={inputs.email} 
-                            name='email' 
-                            type="email" 
-                            placeholder='Email' 
-                            onChange={handleChange}
-                            />
-                    </div>
-                    <hr />
-                    {error.message != '' && <p className='text-base text-red-500 py-2'>{error.message}</p>}
-                    <div className='referral-btn flex justify-end items-center py-4 border-b-4'>
-                        {error.loading ?
-                        <div className='flex items-center justify-center'>
-                            <div role="status">
-                                <svg aria-hidden="true" class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-sky-blue" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-                                    <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
-                                    <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
-                                </svg>
+                            {(props.errors.firstname && props.touched.firstname) && <p className="text-sm text-red-500">{props.errors.firstname}</p>}
                             </div>
-                        </div>
-                        :
-                        <button type='submit' className='text-lg text-white bg-sky-blue p-2 hover:opacity-90 rounded-md'>Send Message</button>
-                        }
-                    </div>
-               </form>
+
+                            {/* Lastname */}
+                            <div className="field w-full mb-6">
+                            <InputCom
+                                label="Lastname"
+                                type="text"
+                                name="lastname"
+                                placeholder="Lastname"
+                                value={props.values.lastname}
+                                inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
+                            />
+                            {(props.errors.lastname && props.touched.lastname) && <p className="text-sm text-red-500">{props.errors.lastname}</p>}
+                            </div>
+
+                            <div className="field w-full mb-6">
+                            <InputCom
+                                label="Email"
+                                type="text"
+                                name="email"
+                                placeholder="Email"
+                                value={props.values.email}
+                                inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
+                            />
+                            {(props.errors.email && props.touched.email) && <p className="text-sm text-red-500">{props.errors.email}</p>}
+                            </div>
+
+                            <hr />
+                            {error.message != '' && <p className='text-base text-red-500 py-2'>{error.message}</p>}
+                            <div className='referral-btn flex justify-end items-center py-4 border-b-4'>
+                                {error.loading ?
+                                <LoadingSpinner size='6' color='sky-blue' />
+                                :
+                                <button type='submit' className='text-lg text-white bg-sky-blue p-2 hover:opacity-90 rounded-md'>Send Message</button>
+                                }
+                            </div>
+                        </Form>
+                    )}
+               </Formik>
             </div>
         </div>
 
@@ -153,50 +166,11 @@ function ReferralDisplay() {
                 <h2 className='mb-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Referral List</h2>
                 {referralList.loading ? 
                 (
-                <div className='flex items-center justify-center'>
-                    <div role="status">
-                        <svg aria-hidden="true" class="w-32 h-32 text-gray-200 animate-spin dark:text-gray-600 fill-sky-blue" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-                            <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
-                            <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
-                        </svg>
-                    </div>
-                </div>
+                <LoadingSpinner size='32' color='sky-blue' />
                 )
                 :
                 (
-                <table className="referral-list w-full table-auto border-collapse text-left">
-                    <thead className='border-b-2'>
-                        <tr className='text-slate-600'>
-                        <th className="p-3">Added/Name</th>
-                        <th className="p-3">Email</th>
-                        <th className="p-3">Status</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {referralList.data.length ? 
-                        referralList.data.map((item, index) => (
-                            <tr key={index} className='text-slate-500'>
-                                <td className="p-3">{item.added_date} / {item.firstname} {item.lastname}</td>
-                                <td className="p-3">{item.email}</td>
-                                <td className="p-3">{item.status}</td>
-                            </tr>
-                        ))
-                        :
-                        (
-                        referralList.error ?
-                        <tr className='text-slate-500'>
-                            <td colSpan={3}>Opps! couldn't get referral history. Try reloading the page</td>
-                        </tr>
-                        :
-                        (
-                        <tr className='text-slate-500'>
-                            <td colSpan={3}>No Item Found on referral List</td>
-                        </tr>
-                        )
-                        )
-                        }
-                    </tbody>
-                </table>
+                <ReferralTable history={referralList} />
                 )
                 }
             </div>

src/components/Settings/Tabs/PersonalInfoTab.jsx

@@ -4,6 +4,7 @@ import InputCom from "../../Helpers/Inputs/InputCom";
 import {Link, useNavigate} from 'react-router-dom'
 import usersService from "../../../services/UsersService";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import { useSelector } from "react-redux";
 
 import {toast} from 'react-toastify'
 
@@ -34,14 +35,6 @@ const validationSchema = Yup.object().shape({
     .required('State is required'),
 })
 
-const initialValues = {
-  firstname: '',
-  lastname: '',
-  state: '',
-  city: '',
-  email: ''
-}
-
 export default function PersonalInfoTab({
   datas,
   frstNmeHndlr,
@@ -57,13 +50,23 @@ export default function PersonalInfoTab({
   coverImgChangHandler,
 }) {
 
+  let {userDetails} = useSelector((state) => state.userDetails)
+  
   const apiCall = new usersService()
+
   let navigate = useNavigate()
 
   let [togglePromotion, setTogglePromotion] = useState(false)
 
+  const initialValues = {
+    firstname: userDetails?.firstname,
+    lastname: userDetails?.lastname,
+    state: userDetails?.state,
+    city: userDetails?.city,
+    email: userDetails?.email
+  }
+
   let [profile, setProfile] = useState({ // state for requesting from load profile API
-    data: [],
     loading: true,
     status: false
   })
@@ -74,55 +77,27 @@ export default function PersonalInfoTab({
     status: false
   })
 
-  let [inputs, setInputs] = useState({ // State for input fields
-    firstname: '',
-    lastname: '',
-    state: '',
-    city: '',
-    email: ''
-  })
-
-  // const handleChange = ({target:{name, value}}) => {
-  //   setInputs(prev => ({...prev, [name]:value}))
-  // }
-
   const handleUpdateUser = (values, helpers)=> {
     setRequestState({message: '', loading: true, status: false})
     
-    apiCall.updateProfile(values).then((res)=>{
+    apiCall.updateProfile(values).then((res)=>{ // API CALL TO UPDATE USER DETAILS
       if(res.data.internal_return < 0){
         setRequestState({message: 'Profile Was unable to update', loading: false, status: false})
         return
       }
       // setRequestState({message: 'Profile update successfully', loading: false, status: true})
       toast.success("Update Successful");
-      setTimeout(()=>{navigate('/',{replace:true})},1000)
+      setTimeout(()=>{
+        navigate('/',{replace:true})
+        window.location.reload(true)
+      },1000)
     }).catch(error => {
       setRequestState({message: 'Opps! an error occurred. Try Agian', loading: false, status: false})
     })
   }
 
-  const loadProfile = ()=>{ // function to load user profile
-    apiCall.loadProfile().then((res)=>{
-      if(res.data.internal_return < 0){
-        setProfile(prev => ({...prev, loading: false, status: true}))
-        return
-      }
-      setProfile(prev => ({...prev, data: [res.data], loading: false, status: true}))
-      setInputs({
-        firstname: res.data.firstname,
-        lastname: res.data.lastname,
-        state: res.data.state,
-        city: res.data.city,
-        email: res.data.email
-      })
-    }).catch(error =>{
-      setProfile(prev => ({...prev, loading: false, status: false}))
-    })
-  }
-
   useEffect(()=>{
-    loadProfile() // loads user profile unto the page
+    setProfile({loading: false, status: true})
   },[])
 
   return (
@@ -135,14 +110,12 @@ export default function PersonalInfoTab({
       </div>
     :
       <div className="personal-info-tab w-full flex flex-col justify-between">
-        <Formik initialValues={inputs} validationSchema={validationSchema} onSubmit={handleUpdateUser}>
+        <Formik initialValues={initialValues} validationSchema={validationSchema} onSubmit={handleUpdateUser}>
           {(props => {
             return (
             <Form>
-            {
-            profile.data.length ? 
-            profile.data.map((item, index) => (
-              <div key={index} className="flex flex-col-reverse sm:flex-row">
+
+              <div className="flex flex-col-reverse sm:flex-row">
                 <div className="flex-1 sm:mr-10">
                   <div className="fields w-full">
                     {/* inputs starts here */}
@@ -153,7 +126,7 @@ export default function PersonalInfoTab({
                         type="text"
                         name="username"
                         placeholder=""
-                        value={item.username}
+                        value={userDetails.username}
                         disable={true}
                       />
                     </div>
@@ -205,7 +178,7 @@ export default function PersonalInfoTab({
                         label="Country"
                         type="text"
                         name="country"
-                        value={item.country}
+                        value={userDetails.country}
                         disable={true}
                       />
                     </div>
@@ -324,41 +297,35 @@ export default function PersonalInfoTab({
                     </div>
                   </div>
                 </div>
-            </div>
-            ))
-            :
-            profile.status ?
-            <div className="py-3 text-slate-500">No User Information Found!</div>
-            :
-            <div className="py-3 text-slate-500">Opps! something went wrong. Try Again Later!</div>
-            }
-            <div className="content-footer w-full">
-              {requestStatus.message != '' && <p className={`text-center text-base ${requestStatus.status ? 'text-green-800' : 'text-red-600'}`}>{requestStatus.message}</p>}
-              <div className="w-full h-[120px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
-                <div className="flex items-center space-x-4 mr-9">
-                  <Link
-                    to='/'
-                    className="text-18 text-light-red tracking-wide "
-                  >
-                    <span className="border-b dark:border-[#5356fb29]  border-light-red">
-                      {" "}
-                      Cancel
-                    </span>
-                  </Link>
+              </div>
 
-                  {requestStatus.loading ? 
-                  <LoadingSpinner size='8' color='sky-blue' />
-                  :
-                  <button
-                  type="submit"
-                  className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                  >
-                    Update Profile
-                  </button>
-                  }
+              <div className="content-footer w-full">
+                {requestStatus.message != '' && <p className={`text-center text-base ${requestStatus.status ? 'text-green-800' : 'text-red-600'}`}>{requestStatus.message}</p>}
+                <div className="w-full h-[120px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
+                  <div className="flex items-center space-x-4 mr-9">
+                    <Link
+                      to='/'
+                      className="text-18 text-light-red tracking-wide "
+                    >
+                      <span className="border-b dark:border-[#5356fb29]  border-light-red">
+                        {" "}
+                        Cancel
+                      </span>
+                    </Link>
+
+                    {requestStatus.loading ? 
+                    <LoadingSpinner size='8' color='sky-blue' />
+                    :
+                    <button
+                    type="submit"
+                    className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                    >
+                      Update Profile
+                    </button>
+                    }
+                  </div>
                 </div>
               </div>
-            </div>
             </Form>
           )
         })}

src/components/Settings/index.jsx

@@ -40,6 +40,10 @@ export default function Settings() {
     },
     {
       id: 7,
+      name: "privacy",
+    },
+    {
+      id: 8,
       name: "terms",
     },
   ];
@@ -191,6 +195,23 @@ export default function Settings() {
                         <p className="text-18 tracking-wide">FAQ</p>
                       </div>
                     </li>
+                    <li
+                        onClick={() => tabHandler("terms")}
+                        className={`flex lg:space-x-4 space-x-2 hover:text-purple transition-all duration-300 ease-in-out items-center cursor-pointer lg:mb-11 mb-2 mr-6 lg:mr-0 float-left lg:float-none overflow-hidden ${
+                            tab === "privacy"
+                                ? "text-purple"
+                                : " text-thin-light-gray"
+                        }`}
+                    >
+                      <div>
+                        <Icons name="page-right" />
+                      </div>
+                      <div>
+                        <p className="text-18 tracking-wide">
+                          Privacy Policy
+                        </p>
+                      </div>
+                    </li>
                     <li
                       onClick={() => tabHandler("terms")}
                       className={`flex lg:space-x-4 space-x-2 hover:text-purple transition-all duration-300 ease-in-out items-center cursor-pointer lg:mb-11 mb-2 mr-6 lg:mr-0 float-left lg:float-none overflow-hidden ${

src/components/Spinners/LoadingSpinner.jsx

@@ -1,8 +1,8 @@
 import React from 'react'
 
-function LoadingSpinner({size, color}) {
+function LoadingSpinner({size, color, height}) {
   return (
-    <div className='flex items-center justify-center'>
+    <div className={`flex items-center justify-center ${height ? height : ''}`}>
         <div role="status">
             <svg aria-hidden="true" className={`w-${size} h-${size} text-gray-200 animate-spin dark:text-gray-600 fill-${color}`} viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
                 <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>

src/hooks/debounce.js

@@ -0,0 +1,21 @@
+/**
+
+Returns a debounced version of a given function, which means that it delays the execution of the function until a certain amount of time has passed without the function being called again. This can be useful for performance optimization, especially when dealing with expensive or resource-intensive functions that are called frequently.
+@param {Function} func - The function to debounce.
+@param {number} delay - The number of milliseconds to wait before executing the debounced function.
+@returns {Function} - The debounced version of the original function.
+*/
+
+export default function debounce(func, delay) {
+  let timeoutId;
+
+  return function (...args) {
+    const context = this;
+
+    clearTimeout(timeoutId);
+
+    timeoutId = setTimeout(() => {
+      func.apply(context, args);
+    }, delay);
+  };
+}

src/middleware/AuthRoute.jsx

@@ -1,38 +1,31 @@
-import { useEffect, useState } from "react";
+import { useEffect, useState, useCallback } from "react";
 import { Navigate, Outlet, useLocation, useNavigate } from "react-router-dom";
+import usersService from '../services/UsersService'
+import LoadingSpinner from '../components/Spinners/LoadingSpinner'
+import WrenchBoard from "../assets/images/wrenchboard.png"
+import { useDispatch, useSelector } from "react-redux";
+import {updateUserDetails} from '../store/UserDetails'
+
 
 const AuthRoute = ({ redirectPath = "/login", children }) => {
+  const apiCall = new usersService()
+
+  const dispatch = useDispatch()
+
   const [lastActivityTime, setLastActivityTime] = useState(Date.now());
-  const isLogin = localStorage.getItem("email");
+  let [isLogin, setIsLogin] = useState({loading: true, status: false})
 
   const navigate = useNavigate();
-  const { pathname } = useLocation();
 
   //Removing Data stored at localStorage after session expires
   const expireSession = () => {
-    localStorage.removeItem("email");
     localStorage.removeItem('session_token');
-    localStorage.removeItem('firstname');
     localStorage.removeItem('member_id');
-    localStorage.removeItem('lastname');
-    localStorage.removeItem('state');
-    localStorage.removeItem('last_login');
     localStorage.removeItem('uid');
     localStorage.removeItem('session');
-    localStorage.removeItem('city');
-    localStorage.removeItem('country');
-    localStorage.removeItem('loglevel');
-    localStorage.removeItem('zip_code');
-    localStorage.removeItem('added');
     navigate("/login", { replace: true }); // redirects user to login page after session expires
   };
 
-  const checkInactivity = setInterval(() => {
-    if (Date.now() - lastActivityTime > process.env.REACT_APP_SESSION_EXPIRE_MINUTES) {
-      expireSession()
-    }
-  }, process.env.REACT_APP_SESSION_EXPIRE_CHECKER) // Checks for inactivity every minute
-
   // Reset last activity time on user input
   const resetTime = () => {
     setLastActivityTime(Date.now());
@@ -40,19 +33,52 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   window.addEventListener('mousemove', resetTime)
   window.addEventListener('keydown', resetTime)
 
+  const loadProfile = ()=>{ // function to load user profile
+    setIsLogin({loading: true, status: false})
+    apiCall.loadProfile().then((res)=>{
+      if(res.data.internal_return < 0){
+        setIsLogin({loading: false, status: false})
+        return
+      }
+      dispatch(updateUserDetails(res.data))
+      setIsLogin({loading: false, status: true})
+    }).catch(error =>{
+      setIsLogin({loading: false, status: false})
+    })
+  }
+  
   useEffect(() => {
+    if(!isLogin.status){
+      loadProfile() // LOADS USER PROFILE DETAILS AND CALLS DISPATCH UPDATEUSERDETAILS TO UPDATE USERDETAILS SLICE IN STORE
+    }
+
+    const checkInactivity = setInterval(() => {
+      if (Date.now() - lastActivityTime > process.env.REACT_APP_SESSION_EXPIRE_MINUTES) {
+        expireSession()
+      }
+    }, process.env.REACT_APP_SESSION_EXPIRE_CHECKER) // Checks for inactivity every minute
+
     // cleaning up listeners
     return () => {
       clearInterval(checkInactivity)
       window.removeEventListener('mousemove', resetTime)
       window.removeEventListener('keydown', resetTime)
     }
-  }, [pathname, lastActivityTime])
+  }, [lastActivityTime])
 
-  if (!isLogin) {
-    return <Navigate to={redirectPath} replace />;
-  }
-  return children || <Outlet />;
+  return (
+    isLogin.loading ?
+      <LoadingSpinner size='32' color='sky-blue' height='h-screen' />
+      // Stills needs fixing
+      // <div className="h-screen m-auto">
+      //   <img src={WrenchBoard} alt="wrenchboard" className="h-10" />
+      // </div>
+      :
+      !isLogin.status ?
+      <Navigate to={redirectPath} replace />
+      :
+      (children || <Outlet />)
+  )
 };
 
-export default AuthRoute;
+export default AuthRoute;

src/services/UsersService.js

@@ -11,6 +11,11 @@ class usersService {
         return this.postAuxEnd("/createuser", reqData);
     }
 
+    CompleteSignUp(reqData){
+        localStorage.setItem("session_token", ``);
+        return this.postAuxEnd("/completesignuplink", reqData);
+    }
+
     getHomeDate(){
         var postData = {
             uuid: localStorage.getItem("uuid"),
@@ -85,6 +90,9 @@ class usersService {
         return this.postAuxEnd("/pendingjob", postData);
     }
 
+    /*
+    getActiveJobList -  All available Jobs
+     */
     getActiveJobList(){
         var postData = {
             uuid: localStorage.getItem("uid"),
@@ -96,6 +104,20 @@ class usersService {
         return this.postAuxEnd("/getjobsdata", postData);
     }
 
+    /*
+    getMyActiveJobList  - List of jobs active under this user
+     */
+    getMyActiveJobList(){
+        var postData = {
+            uuid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:0,
+            offset:0,
+            limit :100
+        };
+        return this.postAuxEnd("/getjobsdata", postData);
+    }
     getHeroJBanners(){
         var postData = {
             uuid: localStorage.getItem("uid"),
@@ -107,18 +129,6 @@ class usersService {
         return this.postAuxEnd("/homebanners", postData);
     }
 
-    getMyJobList(){
-        var postData = {
-            uuid: localStorage.getItem("uid"),
-            member_id: localStorage.getItem("member_id"),
-            sessionid: localStorage.getItem("session_token"),
-            page:0,
-            offset:0,
-            limit :100
-        };
-        return this.postAuxEnd("/jobmanagerlist", postData);
-    }
-
     getGetPendingJobs(){
         var postData = {
             uuid: localStorage.getItem("uid"),
@@ -188,6 +198,29 @@ class usersService {
         return this.postAuxEnd("/sendmoneyfee", postData);
     }
 
+    getMyActiveJobList(){
+        var postData = {
+            uuid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:0,
+            offset:0,
+            limit :100
+        };
+        return this.postAuxEnd("/jobmanageroffers", postData);
+    }
+
+    getMyJobList(){
+        var postData = {
+            uuid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:0,
+            offset:0,
+            limit :100
+        };
+        return this.postAuxEnd("/jobmanagerlist", postData);
+    }
     // API FUNCTION TO GET COUPON HISTORY
     getCouponHx(){
         var postData = {
@@ -225,6 +258,19 @@ class usersService {
         };
         return this.postAuxEnd("/paymenthx", postData);
     }
+
+    // API FUNCTION TO GET PAYMENT HISTORY
+    sendMoney(reqData){
+        var postData = {
+            uid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            senderid: localStorage.getItem("member_id"),
+            action: 33020,
+            ...reqData
+        };
+        return this.postAuxEnd("/sendmoney", postData);
+    }
     
     //END POINT CALL FOR REFERRAL HISTORY
     getReferralHx(){
@@ -261,6 +307,18 @@ class usersService {
         return this.postAuxEnd("/loadprofile", postData);
     }
 
+     //END POINT CALL FOR ACCOUNT TOP
+     startTopUp(post){
+        var postData = {
+        uid: localStorage.getItem("uid"),
+        member_id: localStorage.getItem("member_id"),
+        sessionid: localStorage.getItem("session_token"),
+        action: 11062,
+        ...post
+        };
+        return this.postAuxEnd("/starttopup", postData);
+    }
+
     //END POINT CALL FOR SENDING REFERRAL MESSAGE
     sendReferralMsg(postData){
         return this.postAuxEnd("/sendreferral", postData);
@@ -270,6 +328,10 @@ class usersService {
         return this.postAuxEnd("/startresetpasword", reqData)
     }
 
+    CompleteResetPassword(reqData){
+        return this.postAuxEnd("/stepresetpass", reqData)
+    }
+
     getCouponRedeem(){
     var postData = {
         uuid: localStorage.getItem("uid"),

src/store/UserDetails.js

@@ -0,0 +1,20 @@
+import { createSlice } from "@reduxjs/toolkit";
+
+const initialState = {
+  userDetails: {}
+};
+
+export const userSlice = createSlice({
+  name: "userDetails",
+  initialState,
+  reducers: {
+    updateUserDetails: (state,payload) => {
+      state.userDetails = {...payload.payload}
+    },
+  },
+});
+
+// Action creators are generated for each case reducer function
+export const { updateUserDetails } = userSlice.actions;
+
+export default userSlice.reducer;

src/store/store.js

@@ -1,8 +1,11 @@
 import { configureStore } from "@reduxjs/toolkit";
 import drawerReducer from "./drawer";
 
+import userDetailReducer from "./UserDetails";
+
 export default configureStore({
   reducer: {
     drawer: drawerReducer,
+    userDetails: userDetailReducer,
   },
-});
+});

src/views/FamilyAccPage.jsx

@@ -0,0 +1,28 @@
+import React, { useContext,useState, useEffect } from "react";
+import usersService from "../services/UsersService";
+import FamilyAcc from "../components/FamilyAcc";
+
+export default function FamilyAccPage() {
+
+    const [MyActiveJobList, setMyActiveJobList] = useState([]);
+    const api = new usersService();
+
+    const getMyActiveJobList = async () => {
+        try {
+            const res = await api.getMyActiveJobList();
+            setMyActiveJobList(res.data);
+        } catch (error) {
+            console.log("Error getting mode");
+        }
+    };
+    useEffect(() => {
+        getMyActiveJobList();
+    }, []);
+
+    //debugger;
+    return (
+        <>
+            <FamilyAcc ActiveJobList={MyActiveJobList}/>
+        </>
+    );
+}

src/views/MyActiveJobsPage.jsx

@@ -0,0 +1,29 @@
+import React, { useContext,useState, useEffect } from "react";
+import usersService from "../services/UsersService";
+//import MyJobs from "../components/MyJobs";
+import MyActiveJobs from "../components/MyActiveJobs";
+
+export default function MyActiveJobsPage() {
+
+    const [MyJobList, setMyJobList] = useState([]);
+    const api = new usersService();
+
+    const getMyJobList = async () => {
+        try {
+            const res = await api.getMyActiveJobList();
+            setMyJobList(res.data);
+        } catch (error) {
+            console.log("Error getting mode");
+        }
+    };
+    useEffect(() => {
+        getMyJobList();
+    }, []);
+
+    // debugger;
+    return (
+        <>
+            <MyActiveJobs MyJobList={MyJobList} />
+        </>
+    );
+}

src/views/MyTaskPage.jsx

@@ -1,16 +1,29 @@
-import React from "react";
+import React, { useContext,useState, useEffect } from "react";
 import MyTasks from "../components/MyTasks";
 import UsersService from "../services/UsersService";
 import usersService from "../services/UsersService";
 
 export default function MyTaskPage() {
 
-    const userApi = new usersService();
-    const activeJobList  = userApi.getActiveJobList();
+    const [MyActiveJobList, setMyActiveJobList] = useState([]);
+    const api = new usersService();
+
+    const getMyActiveJobList = async () => {
+        try {
+            const res = await api.getMyActiveJobList();
+            setMyActiveJobList(res.data);
+        } catch (error) {
+            console.log("Error getting mode");
+        }
+    };
+    useEffect(() => {
+        getMyActiveJobList();
+    }, []);
+
     //debugger;
     return (
         <>
-            <MyTasks />
+            <MyTasks ActiveJobList={MyActiveJobList}/>
         </>
     );
 }

src/views/StartJobPage.jsx

@@ -0,0 +1,30 @@
+import React, { useContext,useState, useEffect } from "react";
+import usersService from "../services/UsersService";
+import StartJob from "../components/MyJobs/StartJob";
+
+export default function StartJobPage() {
+
+    // const userApi = new usersService();
+    // const activeJobList  = userApi.getMyJobList();
+    const [MyJobList, setMyJobList] = useState([]);
+    const api = new usersService();
+
+    const getMyJobList = async () => {
+        try {
+            const res = await api.getMyJobList();
+            setMyJobList(res.data);
+        } catch (error) {
+            console.log("Error getting mode");
+        }
+    };
+    useEffect(() => {
+        getMyJobList();
+    }, []);
+
+    // debugger;
+    return (
+        <>
+            <StartJob MyJobList={MyJobList} />
+        </>
+    );
+}

src/views/VerifyPasswordPages.jsx

@@ -0,0 +1,6 @@
+import React from "react";
+import VerifyPassword from "../components/AuthPages/VerifyPassword";
+
+export default function VerifyPasswordPages() {
+  return <VerifyPassword />;
+}