removed props.handleBlur from amount input box in transfer page

.gitattributes

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

run.sh

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

src/Routers.jsx

@@ -72,6 +72,7 @@ export default function Routers() {
           <Route exact path="/notification" element={<Notification />} />
           <Route exact path="/mytask" element={<MyTaskPage />} />
           <Route exact path="/myjobs" element={<MyJobsPage />} />
+          <Route exact path="/my-active-jobs"  element={<MyJobsPage />} />
           <Route
             exact
             path="/my-collection/collection-item"

src/components/AuthPages/AuthLayout.jsx

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

src/components/AuthPages/SignUp/index.jsx

@@ -106,7 +106,7 @@ export default function SignUp() {
         setMsgError(null);
       }, process.env.REACT_APP_SIGNUP_ERROR_TIMEOUT);
     }
-  };
+  };  
 
   useEffect(() => {
     getCountryList();
@@ -277,6 +277,27 @@ export default function SignUp() {
                 </div>
               </div>
             </div>
+            <div className="flex-1 flex justify-center items-center p-10">
+            <div className="flex items-center">
+              <Link to="#" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]">
+                About
+              </Link>
+              <Link to="#" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]">
+                Services
+              </Link>
+              <Link to="#" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]">
+                Contact Us
+              </Link>
+            </div>
+          </div>
+          <div className="flex-1 flex justify-center items-center p-10">
+            <p className="text-black text-[15px] px-2 font-medium flex items-center">
+             <span className="text-3xl mt-2 mr-1">©</span>  2023 - {" "}
+              <Link to="/" className="text-[#009ef7] ml-1">
+                WrenchBoard
+              </Link>{" "}
+            </p>
+          </div>
           </div>
         </div>
       </div>

src/components/MyJobs/MyJobTable.jsx

@@ -57,6 +57,7 @@ export default function MyJobTable({MyJobList, className }) {
                                                        </h1>
                                                        <span className="text-sm text-thin-light-gray">
                           Price <span className="text-purple">{value.price*0.01}</span>
+                                                           {value.timeline_days} day(s)
                         </span>
                                                    </div>
                                                </div>

src/components/MyWallet/Balance.jsx

@@ -31,11 +31,11 @@ function Balance({wallet, payment, coupon, purchase}) {
                                 </div>
                                 <div className='balance-info'>
                                     <p className='py-2'>balance</p>
-                                    <span className='text-sm py-1 px-2 bg-green-100 text-green-500 rounded-lg'>{item.symbol}{(item.amount*1).toFixed(2)}</span>
+                                    <span className='text-sm py-1 px-2 bg-green-100 text-green-500 rounded-lg'>{item.symbol}{(item.amount*0.01).toFixed(2)}</span>
                                 </div>
                                 <div className='balance-info'>
                                     <p className='py-2'>Escrow</p>
-                                    <span className='text-sm py-1 px-2 bg-red-100 text-red-500 rounded-lg'>{item.symbol}{(item.escrow*1).toFixed(2)}</span>
+                                    <span className='text-sm py-1 px-2 bg-red-100 text-red-500 rounded-lg'>{item.symbol}{(item.escrow*0.01).toFixed(2)}</span>
                                 </div>
                             </div>
 

src/components/MyWallet/ConfirmTransfer.jsx

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

src/components/MyWallet/TransferFund.jsx

@@ -103,7 +103,7 @@ function TransferFund({payment, wallet}) {
                                     <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)}`
+                                            return `Withdraw from Naira Wallet : ${item.symbol}${(item.amount*0.01).toFixed(2)}`
                                         }
                                     })}
                                     </h2>
@@ -125,8 +125,8 @@ function TransferFund({payment, wallet}) {
                                                 inputHandler={props.handleChange}
                                                 blurHandler={(e)=>{
                                                     getSendMoneyFee(e)
-                                                    props.handleBlur
                                                 }}
+                                                // props.handleBlur
                                                 // onMouseLeave={(e)=>{getSendMoneyFee(e)}}
                                             />
                                             {(props.errors.amount && props.touched.amount) && <p className="text-sm text-red-500">{props.errors.amount}</p>}

src/components/MyWallet/WalletHeader.jsx

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

src/components/Partials/RightSideBar.jsx

@@ -12,6 +12,7 @@ import EthIco from "../Helpers/Icons/EthIco";
 import LtcIco from "../Helpers/Icons/LtcIco";
 import Usdt from "../Helpers/Icons/Usdt";
 import SelectBox from "../Helpers/SelectBox";
+import { NavLink } from "react-router-dom";
 
 export default function RightSideBar() {
   const filterDatas = ["Last 15 days", "Last Month", "Last 6 month"];
@@ -108,7 +109,10 @@ export default function RightSideBar() {
               {/* name */}
               <div>
                 <p className="text-thin-light-gray text-base font-medium">
-                  Rarible
+                  <NavLink
+                      to="/history">
+                    History
+                  </NavLink>
                 </p>
               </div>
               {/* action */}
@@ -152,7 +156,8 @@ export default function RightSideBar() {
               {/* name */}
               <div>
                 <p className="text-thin-light-gray text-base font-medium">
-                  Myth Market
+                  <NavLink
+                      to="/referral">Refer a Friend</NavLink>
                 </p>
               </div>
             </div>
@@ -186,7 +191,10 @@ export default function RightSideBar() {
               {/* name */}
               <div>
                 <p className="text-thin-light-gray text-base font-medium">
-                  KnownOrigin
+                  <NavLink
+                      to="/resources">
+                    Resources
+                  </NavLink>
                 </p>
               </div>
             </div>

src/components/Partials/Sidebar.jsx

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

src/components/Settings/index.jsx

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

src/services/UsersService.js

@@ -230,6 +230,19 @@ class usersService {
         };
         return this.postAuxEnd("/paymenthx", postData);
     }
+
+    // API FUNCTION TO GET PAYMENT HISTORY
+    sendMoney(reqData){
+        var postData = {
+            uid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            senderid: localStorage.getItem("member_id"),
+            action: 33020,
+            ...reqData
+        };
+        return this.postAuxEnd("/sendmoney", postData);
+    }
     
     //END POINT CALL FOR REFERRAL HISTORY
     getReferralHx(){