Merge branch 'master' into withdraw_steps

.env

@@ -17,7 +17,8 @@ REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
 
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
-REACT_APP_SESSION_EXPIRE_MINUTES=5
+REACT_APP_SESSION_EXPIRE_MINUTES=300000
+REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
 

src/Routers.jsx

@@ -63,7 +63,7 @@ export default function Routers() {
           <Route exact path="/tracking" element={<TrackingPage />} />
           <Route exact path="/calendar" element={<CalendarPage />} />
           <Route exact path="/resources" element={<ResourcePage />} />
-          <Route exact path="/my-wallet" element={<MyWalletPage />} />
+          <Route exact path="/my-wallet/*" element={<MyWalletPage />} />
           <Route exact path="/notification" element={<Notification />} />
           <Route exact path="/market-place" element={<MarketPlacePage />} />
           <Route exact path="/market" element={<MarketPlacePage />} />

src/components/AuthPages/Login/index.jsx

@@ -81,7 +81,6 @@ export default function Login() {
         }
       }
     } catch (error) {
-      console.log(error)
       setMsgError('An error occurred')
     } finally {
       setTimeout(() => {

src/components/AuthPages/SignUp/index.jsx

@@ -1,144 +1,254 @@
-import React, { useState } from "react";
-import loginThumb from "../../../assets/images/auth-thumb.svg";
-import googleLogo from "../../../assets/images/google-logo.svg";
-import logo from "../../../assets/images/light-logo.png"; //logo-1.svg";
-import titleShape from "../../../assets/images/shape/title-shape-two.svg";
+import React, { 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";
+import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 
 export default function SignUp() {
+  const [signUpLoading, setSignUpLoading] = useState(false)
   const [checked, setValue] = useState(false);
+  // for the catch error
+  const [msgError, setMsgError] = useState('');
+  const [showPassword, setShowPassword] = useState(false);
+  const [countries, setCountries] = useState([]);
+
+  const [formData, setFormData] = useState({
+    country: "",
+    first_name: "",
+    last_name: "",
+    email: "",
+    password: ""
+  });
+
+  const handleInputChange = (event) => {
+    const { name, value } = event?.target;
+    setFormData({ ...formData, [name]: value });
+  };
+
+  // To Show and Hide Password
+  const togglePasswordVisibility = () => {
+    setShowPassword(!showPassword);
+    // return console.log('showPassword')
+  };
   const rememberMe = () => {
     setValue(!checked);
   };
+
+  const navigate = useNavigate();
+  const userApi = new usersService();
+  // Get Country Api
+  const getCountryList = async () => {
+    const res = await userApi.getSignupCountryData()
+
+    try {
+      if (res.status === 200) {
+        const { signup_country } = await res.data
+        setCountries(signup_country)
+      } else if (res.data.result != 100) {
+        setCountries('Nothing see here!')
+      }
+    } catch (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')
+    }
+
+    try {
+      if (email !== '' && password !== '' && first_name !== '' && last_name !== '') {
+        const reqData = {
+          country: country,
+          firstname: first_name,
+          lastname: last_name,
+          email: email,
+          username: email,
+          password: password,
+          terms: 1,
+          news: 1
+        }
+
+        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')
+          }
+          if (data.status > 0 && data.internal_return == 100 && data.session != '') {
+            localStorage.setItem("email", `${data.email}`);
+            localStorage.setItem("country", `${data.country}`);
+            localStorage.setItem("firstname", `${data.firstname}`);
+            localStorage.setItem("lastname", `${data.lastname}`);
+            setSignUpLoading(true)
+
+            setTimeout(() => {
+              navigate("/", { replace: true });
+              setSignUpLoading(false)
+            }, 2000)
+            console.log('Success')
+          } else {
+            setMsgError(data.status)
+          }
+        }
+      }
+    } catch (error) {
+      throw new Error(error)
+      setMsgError('An error occurred')
+    } finally {
+      setTimeout(() => {
+        setMsgError(null)
+      }, 7000)
+    }
+  }
+
+  useEffect(() => {
+    getCountryList()
+  }, [])
+
   return (
     <>
-      <div className="layout-wrapper">
-        <div className="main-wrapper w-full xl:h-screen h-full xl:py-0 py-12">
-          <div className="flex w-full h-full">
+      <div className="layout-wrapper login">
+        <div className="main-wrapper w-full xl:h-screen h-full xl:py-10 py-12 overflow-y-auto">
+          <div className=" h-full">
             <div className="flex-1 flex justify-center items-center">
-              <div className="content-wrapper xl:bg-white dark:bg-dark-white   xl:px-7 px-5 2xl:px-[100px] h-[840px] rounded-xl flex flex-col justify-center">
-                <div>
-                  <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
-                    <h1 className="sm:text-5xl text-4xl font-bold  text-dark-gray dark:text-white leading-2">
-                      Create Account
-                    </h1>
-                    <div className="shape sm:w-[377px] w-[280px] mb-[10px] ml-5">
-                      <img src={titleShape} alt="shape" />
+              <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-[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)'
+                      }}>
+                        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>
                     </div>
-                  </div>
-                  <div className="input-area">
-                    <div className="input-fl-name mb-5 sm:flex w-full sm:space-x-6 ">
-                      <div className="input-item sm:w-1/2 w-full mb-5 sm:mb-0">
+                    <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]`}
+                    >
+                      <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>
+                      <div className="border-b border-[#eff2f5] max-w-[50%] w-full"></div>
+                    </div>
+                    <div className="input-area">
+                      <SelectOption
+                        label='Country'
+                        data={countries}
+                        name="country"
+                        value={formData.country}
+                        inputHandler={handleInputChange}
+                      />
+                      <div className="input-fl-name mb-5 sm:flex w-full sm:space-x-6 ">
+                        <div className="input-item sm:w-1/2 w-full mb-5 sm:mb-0">
+                          <InputCom
+                            placeholder="Firstname"
+                            label="First Name"
+                            name="first_name"
+                            type="text"
+                            value={formData.first_name}
+                            inputHandler={handleInputChange}
+                          />
+                        </div>
+                        <div className="input-item flex-1">
+                          <InputCom
+                            placeholder="Lastname"
+                            label="Last Name"
+                            name="last_name"
+                            type="text"
+                            value={formData.last_name}
+                            inputHandler={handleInputChange}
+                          />
+                        </div>
+                      </div>
+                      <div className="input-item mb-5">
                         <InputCom
-                          placeholder="Adam"
-                          label="First Name"
-                          name="first_name"
-                          type="text"
-                          iconName="people"
+                          placeholder="support@mermsemr.com"
+                          label="Email"
+                          name="email"
+                          type="email"
+                          value={formData.email}
+                          inputHandler={handleInputChange}
                         />
                       </div>
-                      <div className="input-item flex-1">
+                      <div className="input-item mb-5">
                         <InputCom
-                          placeholder="Wathon"
-                          label="Last Name"
-                          name="Last_name"
-                          type="text"
-                          iconName="people"
+                          placeholder="● ● ● ● ● ●"
+                          label="Password"
+                          name="password"
+                          type={showPassword ? 'text' : 'password'}
+                          onClick={togglePasswordVisibility}
+                          passIcon={showPassword ? "show-password" : "hide-password"}
+                          value={formData.password}
+                          inputHandler={handleInputChange}
                         />
                       </div>
-                    </div>
-                    <div className="input-item mb-5">
-                      <InputCom
-                        placeholder="example@quomodosoft.com"
-                        label="Email Address"
-                        name="email"
-                        type="email"
-                        iconName="message"
-                      />
-                    </div>
-                    <div className="input-item mb-5">
-                      <InputCom
-                        placeholder="*********"
-                        label="Password"
-                        name="password"
-                        type="password"
-                        iconName="password"
-                      />
-                    </div>
-                    <div className="input-item mb-5">
-                      <InputCom
-                        placeholder="*********"
-                        label="Re-enter Password"
-                        name="password"
-                        type="password"
-                        iconName="password"
-                      />
-                    </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
-                          onClick={rememberMe}
-                          type="button"
-                          className="w-5 h-5 text-dark-gray dark:text-white flex justify-center items-center border border-light-gray"
-                        >
-                          {checked && (
-                            <svg
-                              xmlns="http://www.w3.org/2000/svg"
-                              className="h-5 w-5"
-                              viewBox="0 0 20 20"
-                              fill="currentColor"
-                            >
-                              <path
-                                fillRule="evenodd"
-                                d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"
-                                clipRule="evenodd"
-                              />
-                            </svg>
-                          )}
-                        </button>
-                        <span
-                          onClick={rememberMe}
-                          className="text-base   text-dark-gray dark:text-white"
-                        >
-                          I agree all
-                          <a
-                            href="#"
-                            className="text-base text-purple mx-1 inline-block"
+                      {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
+                            onClick={rememberMe}
+                            type="button"
+                            className="w-6 h-6 bg-[#4687ba] text-white flex justify-center items-center border border-light-gray rounded-[.45em]"
                           >
-                            terms and condition
-                          </a>
-                          in WrenchBoard.
-                        </span>
+                            {checked && (
+                              <svg
+                                xmlns="http://www.w3.org/2000/svg"
+                                className="h-5 w-5"
+                                viewBox="0 0 20 20"
+                                fill="currentColor"
+                              >
+                                <path
+                                  fillRule="evenodd"
+                                  d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"
+                                  clipRule="evenodd"
+                                />
+                              </svg>
+                            )}
+                          </button>
+                          <span
+                            onClick={rememberMe}
+                            className="text-base cursor-default text-dark-gray dark:text-white"
+                          >
+                            I agree with all
+                            <a
+                              href="#"
+                              className="text-base text-[#4687ba] hover:text-[#009ef7] mx-1 inline-block"
+                            >
+                              terms and condition
+                            </a>
+                          </span>
+                        </div>
+                      </div>
+                      <div className="signin-area mb-1">
+                        <div className="flex justify-center">
+                          <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" : ""
+                              }`}
+                          >
+                            {signUpLoading ? (
+                              <div className="signup btn-loader"></div>
+                            ) : (
+                              <span>Sign Up</span>
+                            )}
+                          </button>
+                        </div>
                       </div>
-                    </div>
-                    <div className="signin-area mb-1">
-                      <a
-                        href="#"
-                        className="w-full rounded-[50px] mb-5 h-[58px] text-xl text-white font-bold flex justify-center bg-purple items-center"
-                      >
-                        Sign Up
-                      </a>
-                      <a
-                        href="#"
-                        className="w-full border border-light-purple dark:border-[#5356fb29]  rounded-[50px] h-[58px] flex justify-center bg-[#FAFAFA] dark:bg-[#11131F]  items-center"
-                      >
-                        <img
-                          className="mr-3"
-                          src={googleLogo}
-                          alt="google logo"
-                        />
-                        <span className="text-lg text-thin-light-gray font-normal">
-                          Sign Up with Google
-                        </span>
-                      </a>
-                    </div>
-                    <div className="signup-area flex justify-center">
-                      <p className="text-lg text-thin-light-gray font-normal">
-                        Already have account?
-                        <a href="/login" className="ml-2   text-dark-gray dark:text-white">
-                          Log In
-                        </a>
-                      </p>
                     </div>
                   </div>
                 </div>
@@ -150,3 +260,32 @@ export default function SignUp() {
     </>
   );
 }
+
+const SelectOption = ({
+  label,
+  name,
+  inputHandler,
+  value,
+  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"
+          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}>
+          <option value={""}>Select your Country</option>
+          {data?.length > 0 && data?.map((item, idx) => (
+            <option value={item[0]} key={idx}>{item[1]}</option>
+          ))}
+        </select>
+      </div>
+    </div>
+  )
+}

src/components/Cards/ActiveJobsCard.jsx

@@ -77,26 +77,27 @@ export default function ActiveJobsCard({
                 </div>
                 <div className="details-area">
                     <div className="product-two-options flex justify-between mb-5 relative">
-                        <div className="status">
-                            {datas.isActive && (
-                                <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">
-                    Active
-                  </span>
-                            )}
-                        </div>
+
+                  {/*      <div className="status">*/}
+                  {/*          {datas.isActive && (*/}
+                  {/*              <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">*/}
+                  {/*  Active*/}
+                  {/*</span>*/}
+                  {/*          )}*/}
+                  {/*      </div>*/}
 
 
-                        <div className=" review flex space-x-2">
-                            <button
-                                onClick={favoriteHandler}
-                                type="button"
-                                className={`w-7 h-7 bg-white    rounded-full flex justify-center items-center  ${
-                                    addFavorite ? "text-red-500" : "text-thin-light-gray"
-                                }`}
-                            >
-                                <Icons name="star" />
-                            </button>
-                        </div>
+                        {/*<div className=" review flex space-x-2">*/}
+                        {/*    <button*/}
+                        {/*        onClick={favoriteHandler}*/}
+                        {/*        type="button"*/}
+                        {/*        className={`w-7 h-7 bg-white    rounded-full flex justify-center items-center  ${*/}
+                        {/*            addFavorite ? "text-red-500" : "text-thin-light-gray"*/}
+                        {/*        }`}*/}
+                        {/*    >*/}
+                        {/*        <Icons name="star" />*/}
+                        {/*    </button>*/}
+                        {/*</div>*/}
                     </div>
 
                     <div className="flex justify-between">

src/components/Cards/AvailableJobsCard.jsx

@@ -0,0 +1,127 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import { toast } from "react-toastify";
+import localImgLoad from "../../lib/localImgLoad";
+import Icons from "../Helpers/Icons";
+
+export default function AvailableJobsCard({
+                                           className,
+                                           datas,
+                                           hidden = false,
+                                       }) {
+    //debugger;
+    const [addFavorite, setValue] = useState(datas.whishlisted);
+    const [options, setOption] = useState(false);
+    const favoriteHandler = () => {
+        if (!addFavorite) {
+            setValue(true);
+            toast.success("Added to Favorite List");
+        } else {
+            setValue(false);
+            toast.warn("Remove to Favorite List");
+        }
+    };
+    return (
+        <div
+            className={`card-style-two w-full h-[426px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
+                className || ""
+            }`}
+        >
+            <div className="flex flex-col justify-between w-full h-full">
+                <Link to="/shop-details" className="mb-2.5">
+                    <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+                        {datas.title}
+                    </h1>
+                </Link>
+
+                <div className="card-two-info flex justify-between items-center">
+                    <div className="owned-by flex space-x-2 items-center">
+                        <div>
+                            <p className="text-thin-light-gray text-sm leading-3">Added</p>
+                            <p className="text-base   text-dark-gray dark:text-white">
+                                {datas.offer_added}
+                            </p>
+                        </div>
+                    </div>
+                    <div className="w-[1px] bg-light-purple dark:bg-dark-light-purple  h-7"></div>
+                    <div className="created-by flex space-x-2 items-center flex-row-reverse">
+                        <div>
+                            <p className="text-thin-light-gray text-sm leading-3 text-right">
+                                Expires
+                            </p>
+                            <p className="text-base text-dark-gray dark:text-white text-right">
+                                {datas.expire}
+                            </p>
+                        </div>
+                    </div>
+                </div>
+                <div className="thumbnail-area w-full">
+                    <div
+                        className="w-full h-[236px] p-6  rounded-xl overflow-hidden"
+                        style={{
+                            background: `url(${localImgLoad(
+                                `images/${datas.thumbnil}`
+                            )}) 0% 0% / cover no-repeat`,
+                        }}
+                    >
+                        <div className="flex justify-center">
+                            {datas.description}
+                        </div>
+
+
+
+
+
+                    </div>
+
+                </div>
+                <div className="details-area">
+                    <div className="product-two-options flex justify-between mb-5 relative">
+
+                        {/*      <div className="status">*/}
+                        {/*          {datas.isActive && (*/}
+                        {/*              <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">*/}
+                        {/*  Active*/}
+                        {/*</span>*/}
+                        {/*          )}*/}
+                        {/*      </div>*/}
+
+
+                        {/*<div className=" review flex space-x-2">*/}
+                        {/*    <button*/}
+                        {/*        onClick={favoriteHandler}*/}
+                        {/*        type="button"*/}
+                        {/*        className={`w-7 h-7 bg-white    rounded-full flex justify-center items-center  ${*/}
+                        {/*            addFavorite ? "text-red-500" : "text-thin-light-gray"*/}
+                        {/*        }`}*/}
+                        {/*    >*/}
+                        {/*        <Icons name="star" />*/}
+                        {/*    </button>*/}
+                        {/*</div>*/}
+                    </div>
+
+                    <div className="flex justify-between">
+                        <div className="flex items-center space-x-2">
+                            <div>
+                                <p className="font-bold text-xl tracking-wide line-clamp-1   text-dark-gray dark:text-white">
+                                    {datas.price*0.01}{datas.currency} | {datas.timeline_days} day(s)
+                                </p>
+                                <p className="text-sm text-lighter-gray">
+                                    ( {datas.offer_code})
+                                </p>
+                            </div>
+                        </div>
+                        <div>
+                            <button
+                                type="button"
+                                className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
+                            >
+                                View
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    );
+}

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

@@ -8,9 +8,11 @@ export default function InputCom({
   name,
   placeholder,
   iconName,
+  passIcon,
   inputHandler,
   value,
-  forgotPassword
+  forgotPassword,
+  onClick
 }) {
   return (
     <div className="input-com">
@@ -25,7 +27,7 @@ export default function InputCom({
       )}
       {forgotPassword && <Link href="/forgot-password" className="text-base text-[#4687ba] hover:text-[#009ef7]">Forgot Password?</Link>}
       </div>
-      <div className="input-wrapper border border-[#f5f8fa]] dark:border-[#5e6278] w-full rounded-[0.475rem] h-[58px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base ">
+      <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}
@@ -33,13 +35,19 @@ export default function InputCom({
           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"
           type={type}
           id={name}
+          name={name}
           required
         />
         {iconName && (
-          <div className="absolute right-6 bottom-[19px] z-10">
+          <div className="absolute right-6 bottom-[10px] z-10">
             <Icons name={iconName} />
           </div>
         )}
+        {passIcon && (
+          <div className="absolute right-6 bottom-[10px] z-10" onClick={onClick}>
+            <Icons name={passIcon} />
+          </div>
+        )}
       </div>
     </div>
   );

src/components/Home/Hero.jsx

@@ -43,10 +43,10 @@ export default function Hero({ className }) {
         {/* heading */}
         <div>
           <h1 className="lg:text-2xl text-xl font-medium text-white tracking-wide">
-            Lock and Lob x Fiesta Spurs
+            Welcome
           </h1>
           <span className="text-[18px] font-thin tracking-wide text-white">
-            ID : 2320382
+            Last Login :  10-10-2026
           </span>
         </div>
         {/* user */}
@@ -64,9 +64,9 @@ export default function Hero({ className }) {
         {/* countdown */}
         <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border border-white-opacity">
           <div className="flex flex-col justify-between">
-            <p className="text-base text-white tracking-wide">Current Bid</p>
+            <p className="text-base text-white tracking-wide">Current Task</p>
             <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-              75,320 ETH
+              ABCDEFGH01
             </p>
             <p className="text-base text-white tracking-wide">773.69 USD</p>
           </div>
@@ -74,7 +74,7 @@ export default function Hero({ className }) {
           <div className="flex flex-col justify-between">
             <p className="text-base text-white tracking-wide">Next due in</p>
             <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-              <CountDown lastDate="2023-03-04 4:00:00" />
+              <CountDown lastDate="2023-04-26 4:00:00" />
             </p>
             <div className="text-base text-white tracking-wide flex gap-[23px]">
               <span>Hrs</span>
@@ -85,19 +85,13 @@ export default function Hero({ className }) {
         </div>
         {/* action */}
         <div className="flex lg:space-x-3 space-x-1 items-center">
-          <Link
-            to="/active-bids"
-            className=" btn-shine  w-[116px] h-[46px] text-white rounded-full text-base bg-pink flex justify-center items-center"
-          >
-            Place a Bid
-          </Link>
           <Link
             to="/market-place"
             className="text-white text-base sm:block hidden"
           >
             <span className=" border-b dark:border-[#5356fb29]  border-white">
               {" "}
-              View Art Work
+              View All Task(s)
             </span>
           </Link>
         </div>

src/components/MarketPlace/MainSection.jsx

@@ -1,8 +1,9 @@
 import React, { useEffect, useState } from "react";
 //import ProductCardStyleTwo from "../Cards/ProductCardStyleTwo";
 import DataIteration from "../Helpers/DataIteration";
-import SearchCom from "../Helpers/SearchCom";
-import ActiveJobsCard from "../Cards/ActiveJobsCard";
+// import SearchCom from "../Helpers/SearchCom";
+// import ActiveJobsCard from "../Cards/ActiveJobsCard";
+import AvailableJobsCard from "../Cards/AvailableJobsCard";
 
 export default function MainSection({ className, marketPlaceProduct }) {
   const [tab, setTab] = useState("explore");
@@ -98,7 +99,7 @@ export default function MainSection({ className, marketPlaceProduct }) {
               endLength={products?.length}
             >
               {({ datas }) => (
-                <ActiveJobsCard key={datas.id} datas={datas} />
+                <AvailableJobsCard key={datas.id} datas={datas} />
               )}
             </DataIteration>
           </div>

src/components/MyWallet/AddFund.jsx

@@ -0,0 +1,72 @@
+import React, {useState} from 'react'
+import RecentActivityTable from './WalletComponent/RecentActivityTable'
+import LoadingSpinner from '../Spinners/LoadingSpinner'
+
+function AddFund({payment}) {
+   
+    //STATE FOR CONTROLLED INPUTS
+    let [inputs, setInputs] = useState('0')
+
+    // FUNCTION TO HANDLE INPUT CHANGE
+    const handleChange = ({target:{name, value}}) => {
+        setInputs(value)
+    }
+
+    //FUNCTION TO HANDLE SUBMIT
+    const handleSubmit = (e) => {
+        e.preventDefault();
+
+        //valid inputs before submitting. Just for texting remove later
+     
+        setInputs('')
+    }
+    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 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'>Add Credit with Account Deposit</h2>
+                    <hr />
+                   <form className='md:p-8 p-4 add-fund-info'>
+                        <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} 
+                                name='amount' 
+                                type="text" 
+                                placeholder='Amount' 
+                                required
+                                onChange={handleChange}
+                                />
+                        </div>
+                   </form>
+                        <hr />
+                        <div className='md:p-8 p-4 add-fund-btn flex justify-end items-center py-4'>
+                            <button onClick={handleSubmit} className='text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-md'>Continue</button>
+                        </div>
+                </div>
+                <div className="add-fund py-4 my-2 w-full bg-white dark:bg-dark-white rounded-2xl shadow">
+                    <h2 className='md:px-8 px-4 py-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Add Credit with Account Deposit</h2>
+                    <hr />
+                    <p className='md:px-8 px-4 py-2 text-slate-600 dark:text-white text-base lg:text-xl font-medium'>Transfer fund to WrenchBoard GTB Account 0250869867</p>
+                    <p className='md:px-8 px-4 py-2 text-slate-500 dark:text-white text-sm lg:text-base font-medium'>
+                    Make sure you add your account username in the notes part of the transfer for prompt processing. When the transfer is complete notify here <a className='text-sky-blue' href='#'>Contact us</a>
+                    </p>
+                </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 AddFund

src/components/MyWallet/AddRecipient.jsx

@@ -0,0 +1,166 @@
+import React, {useState} from 'react'
+import { Link } from 'react-router-dom'
+import Icons from '../Helpers/Icons'
+
+function AddRecipient() {
+   
+    //STATE FOR CONTROLLED INPUTS
+    let [inputs, setInputs] = useState({
+        firstname: '',
+        lastname: '',
+        country: '',
+        'bank-name': '',
+        'account-number': '',
+        'repeat-account-number': '',
+        'account-type': '',
+        state: '',
+        city: ''
+    })
+
+    // FUNCTION TO HANDLE INPUT CHANGE
+    const handleChange = ({target:{name, value}}) => {
+        setInputs(prev => ({...prev, [name]:value}))
+    }
+
+    //FUNCTION TO HANDLE SUBMIT
+    const handleSubmit = (e) => {
+        e.preventDefault();
+
+        //valid inputs before submitting. Just for texting remove later
+    
+        // setInputs((prev)=>{
+        //     for(let input in prev){
+        //         prev[input] = ''
+        //     }
+        // })
+        // RETURN INPUTS TO EMPTY STRING
+        setInputs({
+            firstname: '',
+            lastname: '',
+            country: '',
+            'bank-name': '',
+            'account-number': '',
+            'repeat-account-number': '',
+            'account-type': '',
+            state: '',
+            city: ''
+        })
+    }
+    return (
+        <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
+            <div className="w-full mb-10 lg:mb-0">
+                <div className="w-full md:p-8 p-4 bg-white dark:bg-dark-white rounded-2xl shadow">
+                        <h2 className='my-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-semibold'>ADD BANK ACCOUNT</h2>
+                   <form className='add-recipient-info px-1 md:px-[50px] lg:px-[100px]' onSubmit={handleSubmit}>
+                        
+                        {/* inputs starts here */}
+                        <div className='add-recipient my-3 md:flex items-center justify-between'>
+                            <label className='w-full md:w-1/4 text-slate-600 text-lg'>First Name <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='Account Firstname' 
+                                required
+                                onChange={handleChange}
+                                />
+                        </div>
+
+                        <div className='add-recipient my-3 md:flex items-center justify-between'>
+                            <label className='w-full md:w-1/4 text-slate-600 text-lg'>Last Name <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='Account Lastname' 
+                                required
+                                onChange={handleChange}
+                                />
+                        </div>
+
+                        <div className='add-recipient my-3 md:flex items-center justify-between'>
+                            <label className='w-full md:w-1/4 text-slate-600 text-lg'>Country <span className='text-red-500'>*</span></label>
+                            <select className='mt-2 w-full md:w-3/4 p-3 text-lg bg-white rounded-md border border-slate-300 outline-0' name='country' onChange={handleChange}>
+                                <option className='text-slate-500 text-lg' value="">Select...</option>
+                            </select>
+                        </div>
+
+                        <div className='add-recipient my-3 md:flex items-center justify-between'>
+                            <label className='w-full md:w-1/4 text-slate-600 text-lg'>Bank Name <span className='text-red-500'>*</span></label>
+                            <select className='mt-2 w-full md:w-3/4 p-3 text-lg bg-white rounded-md border border-slate-300 outline-0' name='bank-name' onChange={handleChange}>
+                                <option className='text-slate-500 text-lg' value="">Select...</option>
+                            </select>
+                        </div>
+
+                        <div className='add-recipient my-3 md:flex items-center justify-between'>
+                            <label className='w-full md:w-1/4 text-slate-600 text-lg'>Account Number <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['account-number']} 
+                                name='account-number' 
+                                type="text" 
+                                placeholder='Account No' 
+                                required
+                                onChange={handleChange}
+                                />
+                        </div>
+
+                        <div className='add-recipient my-3 md:flex items-center justify-between'>
+                            <label className='w-full md:w-1/4 text-slate-600 text-lg'>Repeat Account Number <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['repeat-account-number']} 
+                                name='repeat-account-number' 
+                                type="text" 
+                                placeholder='Repeat Account No' 
+                                required
+                                onChange={handleChange}
+                                />
+                        </div>
+
+                        <div className='add-recipient my-3 md:flex items-center justify-between'>
+                            <label className='w-full md:w-1/4 text-slate-600 text-lg'>Account type <span className='text-red-500'>*</span></label>
+                            <select className='mt-2 w-full md:w-3/4 p-3 text-lg bg-white rounded-md border border-slate-300 outline-0' name='account-type' onChange={handleChange}>
+                                <option className='text-slate-500 text-lg' value="">Select...</option>
+                            </select>
+                        </div>
+
+                        <div className='add-recipient my-3 md:flex items-center justify-between'>
+                            <label className='w-full md:w-1/4 text-slate-600 text-lg'>State/Province <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.state} 
+                                name='state' 
+                                type="text" 
+                                placeholder='State' 
+                                required
+                                onChange={handleChange}
+                                />
+                        </div>
+
+                        <div className='add-recipient my-3 md:flex items-center justify-between'>
+                            <label className='w-full md:w-1/4 text-slate-600 text-lg'>City <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.city} 
+                                name='city' 
+                                type="text" 
+                                placeholder='City' 
+                                required
+                                onChange={handleChange}
+                                />
+                        </div>
+
+                        {/* end of inputs starts here */}
+
+                        <div className='add-recipient-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 flex items-center space-x-1'>
+                                <span className='pr-2'>ADD RECIPIENT</span>
+                                <Icons name="arrows" />
+                            </button>
+                        </div>
+                   </form>
+                </div>
+            </div>
+
+        </div>
+      )
+}
+
+export default AddRecipient

src/components/MyWallet/Balance.jsx

@@ -0,0 +1,116 @@
+import React, {useState} from 'react'
+import { Link } from 'react-router-dom'
+import RecentActivityTable from './WalletComponent/RecentActivityTable'
+import PurchasesTable from './WalletComponent/PurchasesTable'
+import CouponTable from './WalletComponent/CouponTable'
+import LoadingSpinner from '../Spinners/LoadingSpinner'
+
+function Balance({wallet, payment, coupon, purchase}) {
+    return (
+        <div className="content-wrapper">
+            <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
+                {/* WALLET 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 bg-white dark:bg-dark-white rounded-2xl shadow">
+                        <div className='flex items-baseline justify-between'>
+                            <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Wallet</h2>
+                            <p className='text-base text-slate-500 dark:text-white'>Add New Wallet</p>
+                        </div>
+                        {/* wallet balance */}
+                        {wallet.loading ?
+                        <LoadingSpinner size='16' color='sky-blue' />
+                        :
+                        wallet.data.length ?
+                        wallet.data.map((item, index)=> (
+                        <div key={index} className="md:flex items-center flex-wrap my-3 border-t-2 border-slate-400">
+                            <div className='text-slate-900 w-full md:w-1/2 flex space-x-3 items-start justify-start'>
+                                <div className='balance-info'>
+                                    <p className='py-2'>Currency</p>
+                                    <span className='text-base'>{item.description}</span>
+                                    <p className='text-base text-slate-500'>{item.symbol}</p>
+                                </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>
+                                </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>
+                                </div>
+                            </div>
+
+                            <div className='w-full my-2 md:my-0 md:w-1/2 flex space-x-2 items-center justify-start md:justify-end'>
+                                <Link to='transfer-fund' className='text-base text-white px-3 py-1 bg-purple rounded-md hover:opacity-80'>Transfer</Link>
+                                <Link to='add-fund' className='text-base text-white px-3 py-1 bg-[orange] rounded-md hover:opacity-80'>Top Up</Link>
+                            </div>
+                        </div>
+                        ))
+                        :
+                        wallet.error ? 
+                        (
+                        <div className="md:flex items-center flex-wrap mt-3">
+                            <p className='text-base'>Opps! An Error occurred, please try again</p>
+                        </div>
+                        )
+                        :
+                        (
+                        <div className="md:flex items-center flex-wrap mt-3">
+                            <p className='text-base'>No Wallets Found!</p>
+                        </div>
+                        )
+                        }
+                        {/* end of wallet balance */}
+                    </div>
+                </div>
+                {/* 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">
+                        <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' />
+                        :
+                        <CouponTable coupon={coupon} />
+                        }
+                    </div>
+                </div>
+                {/* END OF COUPON SECTION */}
+            </div>
+            
+        </div>
+      )
+}
+
+export default Balance

src/components/MyWallet/TransferFund.jsx

@@ -0,0 +1,207 @@
+import React, {useEffect, useState} from 'react'
+import { Link } from 'react-router-dom'
+import RecentActivityTable from './WalletComponent/RecentActivityTable'
+import LoadingSpinner from '../Spinners/LoadingSpinner'
+
+import usersService from '../../services/UsersService'
+
+function TransferFund({payment, wallet}) {
+    const apiCall = new usersService()
+
+    let [newFee, setNewFee] = useState(false)
+
+    let [recepients, 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
+
+    //STATE FOR CONTROLLED INPUTS
+    let [inputs, setInputs] = useState({
+        amount: '0',
+        recipient: '',
+        comment: ''
+    })
+
+    //FUNCTION TO GET RECIPIENT LIST
+    const getRecipients = ()=>{
+        apiCall.getRecipient().then((res)=>{
+            if(res.data.internal_return < 0){ // success but no data
+                setRecipients(prev => ({...prev, loading: false}))
+                return
+            }
+            setRecipients(prev => ({...prev, loading: false, data: res.data.result_list}))
+        }).catch((error)=>{
+            setRecipients(prev => ({...prev, loading: false, error: true}))
+        })
+    }
+
+    //FUNCTION TO GET SEND MONEY FEE
+    const getSendMoneyFee = ()=>{
+        let {amount} = inputs
+        if(Number(amount) <= 0 || amount=='' || isNaN(amount)){
+            setSendMoneyFee({fee: 0, total: 0})
+            return
+        }
+        apiCall.getSendMoneyFee(Number(amount)).then((res)=>{
+            setSendMoneyFee({fee: res.data.processing_fee, total: res.data.total_amount})
+        }).catch((error)=>{
+            setSendMoneyFee({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();
+
+        //valid inputs before submitting. Just for texting remove later. check amoutn to be number
+    
+        setInputs({
+            amount: '0',
+            recipient: '',
+            comment: ''
+        })
+    }
+
+    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='my-3 md:flex items-center justify-between space-x-2'>
+                            <div className='transfer-input w-full md:w-1/2'>
+                                <label className='w-full text-slate-600 text-lg'>Amount <span className='text-red-500'>*</span></label>
+                                <input className='w-full p-3 text-lg text-right bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
+                                    value={inputs.amount} 
+                                    name='amount' 
+                                    type="text" 
+                                    placeholder='Amount' 
+                                    required
+                                    onChange={handleChange}
+                                    onMouseEnter={()=>{setNewFee(false)}}
+                                    onMouseLeave={()=>{setNewFee(true)}}
+                                    />
+                            </div>
+                            <div className='transfer-input w-full md:w-1/2'>
+                                <label className='w-full text-slate-600 text-lg'>Fee <span className='text-red-500'>*</span></label>
+                                <input className='w-full p-3 text-lg text-right bg-slate-100 opacity-50 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
+                                    value={sendMoneyFee.fee} 
+                                    name='fee' 
+                                    type="text" 
+                                    placeholder='Fee' 
+                                    required
+                                    disabled
+                                    />
+                            </div>
+                        </div>
+
+                        <div className='my-3 md:flex items-center justify-end space-x-2'>
+                            <div className='transfer-input w-full md:w-1/2'>
+                                <label className='w-full text-slate-600 text-lg'>Total <span className='text-red-500'>*</span></label>
+                                <input className='w-full p-3 text-lg text-right bg-slate-100 opacity-50 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
+                                    value={sendMoneyFee.total} 
+                                    name='total' 
+                                    type="text" 
+                                    placeholder='Total' 
+                                    required
+                                    disabled
+                                    />
+                            </div>
+                        </div>
+
+                        <div className='relative my-3 md:flex items-center'>
+                            <div className='transfer-input w-full'>
+                                <div className='flex items-center justify-start'>
+                                    <label className='text-slate-600 text-lg'>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-3 bg-[orange] rounded-md hover:opacity-80'>Add New</Link>
+                                </div>
+                                <select className='mt-2 w-full p-3 text-lg bg-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>
+                                    }
+                                </select>
+                            </div>
+                        </div>
+
+                        <div className='my-3 md:flex items-center'>
+                            <div className='transfer-input w-full'>
+                                <label className='w-full text-slate-600 text-lg'>Comment <span className='text-red-500'>*</span></label>
+                                <input className='w-full p-3 text-lg bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
+                                    value={inputs.comment} 
+                                    name='comment' 
+                                    type="text" 
+                                    placeholder='Comment' 
+                                    required
+                                    onChange={handleChange}
+                                    />
+                            </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>
+            </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-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>
+        </div>
+      )
+}
+
+export default TransferFund

src/components/MyWallet/Wallet.jsx

@@ -0,0 +1,123 @@
+import React, { useEffect, useState } from 'react'
+import {Routes, Route, Outlet, Navigate} from 'react-router-dom'
+import usersService from '../../services/UsersService'
+
+import Layout from '../Partials/Layout'
+
+import Balance from './Balance'
+import TransferFund from './TransferFund'
+import AddFund from './AddFund'
+import AddRecipient from './AddRecipient'
+
+function Wallet() {
+  return (
+    <Layout>
+        <Outlet />
+    </Layout>
+  )
+}
+
+
+
+
+
+const WalletRoutes = () => {
+    const apiCall = new usersService()
+
+    let [walletList, setWalletList] = useState({ // FOR WALLET LIST
+        loading: true,
+        data: [],
+        error: false
+    })
+
+    let [paymentHistory, setPaymentHistory] = useState({ // FOR PAYMENT HISTORY
+        loading: true,
+        data: [],
+        error: false
+    })
+
+    let [purchaseHistory, setPurchaseHistory] = useState({ // FOR PURCHASE HISTORY
+        loading: true,
+        data: [],
+        error: false
+    })
+
+    let [couponHistory, setCouponHistory] = useState({ // FOR COUPON HISTORY
+        loading: true,
+        data: [],
+        error: false
+    })
+
+    //FUNCTION TO GET WALLET LIST
+    const getWalletList = ()=>{
+        apiCall.getUserWallets(null).then((res)=>{
+            if(res.data.internal_return < 0){ // success but no data
+                setWalletList(prev => ({...prev, loading: false}))
+                return
+            }
+            setWalletList(prev => ({...prev, loading: false, data: res.data.result_list}))
+        }).catch((error)=>{
+            setWalletList(prev => ({...prev, loading: false, error: true}))
+        })
+    }
+
+    //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}))
+        })
+    }
+
+     //FUNCTION TO GET COUPON HISTORY
+     const getCouponHistory = ()=>{
+        apiCall.getCouponHx().then((res)=>{
+            if(res.data.internal_return < 0){ // success but no data
+                setCouponHistory(prev => ({...prev, loading: false}))
+                return
+            }
+            setCouponHistory(prev => ({...prev, loading: false, data: res.data.result_list}))
+        }).catch((error)=>{
+            setCouponHistory(prev => ({...prev, loading: false, error: true}))
+        })
+    }
+
+    useEffect(()=>{
+        getWalletList()
+        getPaymentHistory()
+        getPurchaseHistory()
+        getCouponHistory()
+    }, [])
+    return (
+        <Routes>
+            <Route element={<Wallet />}>
+                <Route path='add-fund' element={<AddFund 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 path='transfer-fund/add-recipient' element={<AddRecipient />} />
+            </Route>
+        </Routes>
+    )
+}
+
+export default WalletRoutes

src/components/MyWallet/WalletComponent/CouponTable.jsx

@@ -0,0 +1,47 @@
+import React from 'react'
+
+function CouponTable({coupon}) {
+  return (
+    <table className="wallet-activity w-full table-auto border-collapse text-left">
+        <thead className='border-b-2'>
+            <tr className='text-slate-600'>
+            <th className="p-2">Date</th>
+            <th className="p-2">Description</th>
+            <th className="p-2">Amount</th>
+            <th className="p-2">Active</th>
+            </tr>
+        </thead>
+        {coupon.data.length ?
+        (
+        <tbody>
+            {coupon.data.map((item, index) => (
+            <tr key={index} className='text-slate-500'>
+                <td className="p-2">{item.added}</td>
+                <td className="p-2">{item.code}</td>
+                <td className="p-2">{item.amount}</td>
+                <td className="p-2">{item.status}</td>
+            </tr>
+            ))}
+        </tbody>
+        )
+        :
+        coupon.error ? 
+        (
+        <tbody>
+            <tr className='text-slate-500'>
+                <td className="p-2" colSpan={4}>Opps! an error occurred. Please try again!</td>
+            </tr>
+        </tbody>
+        )
+        :
+        <tbody>
+            <tr className='text-slate-500'>
+                <td className="p-2" colSpan={4}>No Purchase History Found!</td>
+            </tr>
+        </tbody>
+        }
+    </table>
+  )
+}
+
+export default CouponTable

src/components/MyWallet/WalletComponent/PurchasesTable.jsx

@@ -0,0 +1,47 @@
+import React from 'react'
+
+function PurchasesTable({purchase}) {
+  return (
+    <table className="wallet-activity w-full table-auto border-collapse text-left">
+        <thead className='border-b-2'>
+            <tr className='text-slate-600'>
+            <th className="p-2">Date</th>
+            <th className="p-2">Description</th>
+            <th className="p-2">Amount</th>
+            <th className="p-2">Fee</th>
+            </tr>
+        </thead>
+        {purchase.data.length ?
+        (
+        <tbody>
+            {purchase.data.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>
+                <td className="p-2">{item.amount}</td>
+                <td className="p-2">{item.fee}</td>
+            </tr>
+            ))}
+        </tbody>
+        )
+        :
+        purchase.error ? 
+        (
+        <tbody>
+            <tr className='text-slate-500'>
+                <td className="p-2" colSpan={4}>Opps! an error occurred. Please try again!</td>
+            </tr>
+        </tbody>
+        )
+        :
+        <tbody>
+            <tr className='text-slate-500'>
+                <td className="p-2" colSpan={4}>No Purchase History Found!</td>
+            </tr>
+        </tbody>
+        }
+    </table>
+  )
+}
+
+export default PurchasesTable

src/components/MyWallet/WalletComponent/RecentActivityTable.jsx

@@ -0,0 +1,47 @@
+import React from 'react'
+
+function RecentActivityTable({payment}) {
+  return (
+    <table className="wallet-activity w-full table-auto border-collapse text-left">
+        <thead className='border-b-2'>
+            <tr className='text-slate-600'>
+            <th className="p-2">Date</th>
+            <th className="p-2">Recipient</th>
+            <th className="p-2">Amount/Fee</th>
+            <th className="p-2">Conf/Status</th>
+            </tr>
+        </thead>
+        {payment.data.length ?
+        (
+        <tbody>
+            {payment.data.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>
+                <td className="p-2">{item.amount}/{item.fee}</td>
+                <td className="p-2">{item.status}</td>
+            </tr>
+            ))}
+        </tbody>
+        )
+        :
+        payment.error ? 
+        (
+        <tbody>
+            <tr className='text-slate-500'>
+                <td className="p-2" colSpan={4}>Opps! an error occurred. Please try again!</td>
+            </tr>
+        </tbody>
+        )
+        :
+        <tbody>
+            <tr className='text-slate-500'>
+                <td className="p-2" colSpan={4}>No Payment History Found!</td>
+            </tr>
+        </tbody>
+        }
+    </table>
+  )
+}
+
+export default RecentActivityTable

src/components/MyWallet/WalletHeader.jsx

@@ -1,3 +1,4 @@
+import {Link} from 'react-router-dom'
 import Icons from "../Helpers/Icons";
 import bank1 from "../../assets/images/bank-1.png";
 import bank2 from "../../assets/images/bank-2.png";
@@ -41,33 +42,30 @@ export default function WalletHeader(props) {
 
                             {props.myWalletList &&
                                 props.myWalletList?.result_list?.length > 0 &&
-                                props.myWalletList.result_list.map((value) => (
-                                    <>
-                                        <li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">
-                                            <div className="sm:flex justify-between items-center">
-                                                <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">
-                                                    <div
-                                                        className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">
-                                                        <img src={bank1} alt=""/>
-                                                    </div>
-                                                    <div className="name">
-                                                        <p className="text-base text-dark-gray dark:text-white font-medium">
-                                                            {value.description}
-                                                        </p>
-                                                    </div>
+                                props.myWalletList.result_list.map((value, index) => (
+                                    <li key={index} className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">
+                                        <div className="sm:flex justify-between items-center">
+                                            <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">
+                                                <div
+                                                    className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">
+                                                    <img src={bank1} alt=""/>
                                                 </div>
-                                                <div>
-                                                    <p className="eth text-xl font-bold text-purple">
-                                                        {value.amount*0.01} {value.code}
-                                                    </p>
-                                                    <p className="usd text-base text-thin-light-gray text-right">
-                                                        {/*(773.69 USD)*/}
+                                                <div className="name">
+                                                    <p className="text-base text-dark-gray dark:text-white font-medium">
+                                                        {value.description}
                                                     </p>
                                                 </div>
                                             </div>
-                                        </li>
-
-                                </>
+                                            <div>
+                                                <p className="eth text-xl font-bold text-purple">
+                                                    {(value.amount*1).toFixed(2)} {value.code}
+                                                </p>
+                                                <p className="usd text-base text-thin-light-gray text-right">
+                                                    {/*(773.69 USD)*/}
+                                                </p>
+                                            </div>
+                                        </div>
+                                    </li>
                                 ))}
 
                             {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
@@ -163,14 +161,15 @@ export default function WalletHeader(props) {
                             {/*    </div>*/}
                             {/*</li>*/}
                         </ul>
-                        <div className="add-money-btn flex justify-center items-center">
-                            <button
+                        <div className="add-money-btn flex justify-center items-center mt-3">
+                            {/* <button
                                 onClick={() => props.addMoneyHandler()}
                                 type="button"
                                 className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                             >
                                 Manage
-                            </button>
+                            </button> */}
+                            <Link to='/my-wallet' className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">Manage</Link>
                         </div>
                     </div>
                 </div>

src/components/Partials/Header.jsx

@@ -641,7 +641,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
 
                     <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
                       <Link
-                        to="/profile"
+                        to="/settings"
                         className="notifications"
                       >
                         <div className="name">
@@ -679,7 +679,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                         <ul className="p-3">
                           <li className="content-item my-1 hover:bg-slate-100 transition duration-500 rounded-lg">
                             <Link
-                              to="#"
+                              to="/referral"
                               className="notifications"
                             >
                               <div className="name">
@@ -794,13 +794,8 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                                 <p className="text-sm">English </p>
                               </div>
                               </div>
-                              {/* <div className="px-1 flex items-center space-x-1 bg-slate-100 rounded-sm text-sm py-1 text-dark-gray dark:text-white hover:text-sky-blue transition font-medium">
-                                <img className="w-[15px] h-[15px]" src={Flag} alt="U.S.A Flag" />
-                                <p className="text-sm">English </p>
-                              </div> */}
                             </Link>
                           </li>
-                         
                         </ul>
                       </div>
                     {/* end Language list items*/}

src/components/Partials/MobileSideBar.jsx

@@ -122,7 +122,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                   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" />
+                    <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

src/components/Partials/Sidebar.jsx

@@ -122,7 +122,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                   }`}
                 >
                   <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="active-bids" />
+                    <Icons name="market" />
                   </span>
                   <span
                     className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
@@ -165,7 +165,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                   }`}
                 >
                   <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="active-bids" />
+                    <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 ${
@@ -185,7 +185,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                   }`}
                 >
                   <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="active-bids" />
+                    <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 ${

src/components/Referral/ReferralDisplay.jsx

@@ -1,14 +1,61 @@
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { toast } from "react-toastify";
+import usersService from '../../services/UsersService';
 
 function ReferralDisplay() {
-    let [referralList, setReferralList] = useState([]) // dummy remove later and call from API
+    const apiCall = new usersService() // GET API CALL
+    const navigate = useNavigate()
+
+    let [refHistoryReload, setRefHistoryReload] = useState(false) // Determines when referral history reloads
+
+    // STATE TO HOLD REFERRAL HISTORY
+    let [referralList, setReferralList] = useState({
+        loading: true,
+        error: false,
+        data: []
+    }) 
+
+    let [error, setError] = useState({message: '', loading: false}) // for displaying error message on the page
+
+    //function to call referral history API
+    const allReferrals = () => {
+        setReferralList({
+            loading: true,
+            error: false,
+            data: []
+        })
+        apiCall.getReferralHx().then((res)=>{
+            setReferralList((prev)=>{
+                return {...prev, loading: false, data:[...res.data.result_list]}
+            })
+        }).catch((error)=>{
+            setReferralList(prev => ({...prev, loading: false, error: true}))
+        })
+    }
+
+    //FUNCTION TO SEND REFERRAL MESSAGE
+    const sendReferralMsg = (postData) => {
+        apiCall.sendReferralMsg(postData).then((res)=>{
+            if(res.data.internal_return < 0){
+                setError({message:'Email already referred', loading: false})
+                return
+            }else{
+                setInputs({ firstname: '', lastname: '', email: '',})
+                toast.success("Message Sent");
+                setError({message:'', loading: false})
+                setRefHistoryReload(prev => !prev)
+            }
+        }).catch((error)=>{
+            setError({message:'Opps! an error occured, try again later', loading: false})
+        })
+    }
 
     //STATE FOR CONTROLLED INPUTS
     let [inputs, setInputs] = useState({
         firstname: '',
         lastname: '',
-        email: '',
-        status: 'pending'
+        email: ''
     })
 
     // FUNCTION TO HANDLE INPUT CHANGE
@@ -19,22 +66,35 @@ function ReferralDisplay() {
     //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
+        }
 
-        //valid inputs before submitting. Just for texting remove later
-        setReferralList(prev => [...prev, inputs])
-        setInputs({
-            firstname: '',
-            lastname: '',
-            email: '',
-            status: 'pending'
-        })
+        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
+            };
+
+        sendReferralMsg(postData) // FUNCTION TO SEND REFERRAL MESSAGE
     }
 
+    useEffect(()=>{
+        allReferrals()
+    }, [refHistoryReload])
+
   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="referral w-full  md:p-8 p-4 h-full bg-white dark:bg-dark-white rounded-2xl shadow">
-                <h2 className='text-gray-900 dark:text-white text-xl lg:text-2xl font-medium'>Send Referral</h2>
+                <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>
@@ -43,7 +103,6 @@ function ReferralDisplay() {
                             name='firstname' 
                             type="text" 
                             placeholder='Firstname' 
-                            required
                             onChange={handleChange}
                             />
                     </div>
@@ -55,7 +114,6 @@ function ReferralDisplay() {
                             name='lastname' 
                             type="text" 
                             placeholder='Lastname' 
-                            required
                             onChange={handleChange}
                             />
                     </div>
@@ -67,46 +125,80 @@ function ReferralDisplay() {
                             name='email' 
                             type="email" 
                             placeholder='Email' 
-                            required
                             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>
+                            </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>
             </div>
         </div>
 
         <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-            <div className="referral w-full  md:p-8 p-4 h-[400px] 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'>Referral List</h2>
+            <div className="referral 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='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>
+                )
+                :
+                (
                 <table className="referral-list w-full table-auto border-collapse text-left">
                     <thead className='border-b-2'>
                         <tr className='text-slate-600'>
-                        <th className="py-3">Added/Name</th>
-                        <th className="py-3">Email</th>
-                        <th className="py-3">Status</th>
+                        <th className="p-3">Added/Name</th>
+                        <th className="p-3">Email</th>
+                        <th className="p-3">Status</th>
                         </tr>
                     </thead>
                     <tbody>
-                        {referralList.length ? 
-                        referralList.map(item => (
-                            <tr className='text-slate-500'>
-                                <td className="py-3">{item.firstname} {item.lastname}</td>
-                                <td className="py-3">{item.email}</td>
-                                <td className="py-3">{item.status}</td>
+                        {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>
                         ))
                         :
-                        (<tr className='text-slate-500'>
+                        (
+                        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>
+                )
+                }
             </div>
         </div>
     </div>

src/components/Settings/index.jsx

@@ -113,7 +113,7 @@ export default function Settings() {
                         <Icons name="people-hover" />
                       </div>
                       <div>
-                        <p className="text-18 tracking-wide">Personal Info</p>
+                        <p className="text-18 tracking-wide">Edit Profile</p>
                       </div>
                     </li>
                     <li

src/components/Spinners/LoadingSpinner.jsx

@@ -0,0 +1,16 @@
+import React from 'react'
+
+function LoadingSpinner({size, color}) {
+  return (
+    <div className='flex items-center justify-center'>
+        <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"/>
+                <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>
+  )
+}
+
+export default LoadingSpinner

src/index.css

@@ -458,6 +458,9 @@ input[type="number"] {
   background-size: cover;
 }
 
+.content{
+  overflow: hidden;
+}
 
 .content-item .inner-list-items {
   top: 0;
@@ -468,7 +471,7 @@ input[type="number"] {
 }
 
 .content-item:hover .inner-list-items {
-  right: -30%;
+  right: 0%;
   opacity: 1;
   z-index: 2;
 }
@@ -709,4 +712,18 @@ TODO: Responsive ===========================
 .content-wrapper.login{
   --bg-color: 255,255,255;
   background: linear-gradient(90deg, rgba(236,237,240,1) 0%, rgba(255,255,255,1) 50%, rgba(236,237,240,1) 100%);
+}
+
+.content-wrapper select {
+  /* for Firefox */
+  -moz-appearance: none;
+  /* for Chrome */
+  -webkit-appearance: none;
+  appearance: none;
+  padding-inline: 1rem;
+}
+
+/* For IE10 */
+.content-wrapper select::-ms-expand {
+  display: none;
 }

src/middleware/AuthRoute.jsx

@@ -1,7 +1,55 @@
-import { Navigate, Outlet } from "react-router-dom";
+import { useEffect, useState } from "react";
+import { Navigate, Outlet, useLocation, useNavigate } from "react-router-dom";
 
 const AuthRoute = ({ redirectPath = "/login", children }) => {
+  const [lastActivityTime, setLastActivityTime] = useState(Date.now());
   const isLogin = localStorage.getItem("email");
+
+  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());
+  }
+  window.addEventListener('mousemove', resetTime)
+  window.addEventListener('keydown', resetTime)
+
+  useEffect(() => {
+    // cleaning up listeners
+    return () => {
+      clearInterval(checkInactivity)
+      window.removeEventListener('mousemove', resetTime)
+      window.removeEventListener('keydown', resetTime)
+    }
+  }, [pathname, lastActivityTime])
+
   if (!isLogin) {
     return <Navigate to={redirectPath} replace />;
   }

src/services/UsersService.js

@@ -48,9 +48,9 @@ class usersService {
         return this.postAuxEnd("/apigate", null);
     }
 
-    CreateUser(){
-        // localStorage.setItem("session_token", ``);
-        return this.postAuxEnd("/createuser", null);
+    CreateUser(reqData){
+        localStorage.setItem("session_token", ``);
+        return this.postAuxEnd("/createuser", reqData);
     }
 
     getLoadProfile(){
@@ -140,15 +140,85 @@ class usersService {
         return this.postAuxEnd("/couponpending", postData);
     }
 
+    // API FUNCTION TO GET COUPON HISTORY
+    getRecipient(){
+        var postData = {
+            uid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:1,
+            limit :20,
+            action: 11175
+        };
+        return this.postAuxEnd("/recipients", postData);
+    }
+
+    // API FUNCTION TO GET SEND MONEY FEE
+    getSendMoneyFee(amount){
+        var postData = {
+            uid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            amount,
+            action: 33025
+        };
+        return this.postAuxEnd("/sendmoneyfee", postData);
+    }
+
+    // API FUNCTION TO GET COUPON HISTORY
     getCouponHx(){
-              var postData = {
-    uuid: localStorage.getItem("uid"),
+        var postData = {
+            uid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:1,
+            limit :20,
+            action: 85025
+        };
+        return this.postAuxEnd("/couponhx", postData);
+    }
+
+    getPurchaseHx(){
+        var postData = {
+            uid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:1,
+            limit :20,
+            action: 15049
+        };
+        return this.postAuxEnd("/purchasehx", postData);
+    }
+
+    // API FUNCTION TO GET PAYMENT HISTORY
+    getPaymentHx(){
+        var postData = {
+            uid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:1,
+            limit :20,
+            action: 15046
+        };
+        return this.postAuxEnd("/paymenthx", postData);
+    }
+    
+    //END POINT CALL FOR REFERRAL HISTORY
+    getReferralHx(){
+        var postData = {
+        uid: localStorage.getItem("uid"),
         member_id: localStorage.getItem("member_id"),
         sessionid: localStorage.getItem("session_token"),
-        page:0,
-        limit :100
-};
-        return this.postAuxEnd("/couponhx", postData);
+        offset: 1,
+        limit :100,
+        action: 11064
+        };
+        return this.postAuxEnd("/refferhx", postData);
+    }
+
+    //END POINT CALL FOR SENDING REFERRAL MESSAGE
+    sendReferralMsg(postData){
+        return this.postAuxEnd("/sendreferral", postData);
     }
 
     getCouponRedeem(){
@@ -162,6 +232,11 @@ class usersService {
         return this.postAuxEnd("/couponredeem", postData);
     }
 
+    // Country Data {GET}
+    getSignupCountryData() {
+        return this.postAuxEnd("/signupcountry", null);
+    }
+
     /*
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(username)
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(password)

src/views/MyWalletPage.jsx

@@ -1,10 +1,11 @@
 import React from "react";
-import MyWallet from "../components/MyWallet";
+// import MyWallet from "../components/MyWallet";
+import WalletRoutes from "../components/MyWallet/Wallet";
 
 export default function MyWalletPage() {
   return (
     <>
-      <MyWallet />
+      <WalletRoutes />
     </>
   );
 }