flutterwave payment integration

.env

@@ -23,6 +23,8 @@ REACT_APP_SESSION_EXPIRE_CHECKER=60000
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
 REACT_APP_SIGNUP_ERROR_TIMEOUT=7000
 
+REACT_APP_FLUTTERWAVE_APIKEY=FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X
+
 # Had to change the error time to 3sec cause it took too long
 REACT_APP_RESET_START_ERROR_TIMEOUT=3000
 

.env.development

@@ -0,0 +1,32 @@
+SKIP_PREFLIGHT_CHECK=true 
+
+REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
+REACT_APP_TWITTER="https://twitter.com/fluxtra"
+
+REACT_APP_APPSITE="https://myfitapp.mermsemr.com"
+#REACT_APP_APPSITE="http://localhost:7012"
+
+
+# REACT_APP_AUX_ENDPOINT="http://10.20.30.32:9083/svs/user"
+# REACT_APP_USERS_ENDPOINT="http://10.20.30.32:9083/svs/user"
+REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
+REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
+
+#REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+#REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+
+#"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
+
+REACT_APP_SESSION_EXPIRE_MINUTES=300000
+REACT_APP_SESSION_EXPIRE_CHECKER=60000
+
+REACT_APP_LOGIN_ERROR_TIMEOUT=7000
+REACT_APP_SIGNUP_ERROR_TIMEOUT=7000
+
+REACT_APP_FLUTTERWAVE_APIKEY=FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X
+
+# Had to change the error time to 3sec cause it took too long
+REACT_APP_RESET_START_ERROR_TIMEOUT=3000
+
+#apigate.lotus.g1.wrenchboard.com:76.209.103.227
+#apigate.orion.g1.wrenchboard.com:76.209.103.227

.env.poduction

@@ -0,0 +1,32 @@
+SKIP_PREFLIGHT_CHECK=true 
+
+REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
+REACT_APP_TWITTER="https://twitter.com/fluxtra"
+
+REACT_APP_APPSITE="https://myfitapp.mermsemr.com"
+#REACT_APP_APPSITE="http://localhost:7012"
+
+
+# REACT_APP_AUX_ENDPOINT="http://10.20.30.32:9083/svs/user"
+# REACT_APP_USERS_ENDPOINT="http://10.20.30.32:9083/svs/user"
+REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
+REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
+
+#REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
+#REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
+
+#"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
+
+REACT_APP_SESSION_EXPIRE_MINUTES=300000
+REACT_APP_SESSION_EXPIRE_CHECKER=60000
+
+REACT_APP_LOGIN_ERROR_TIMEOUT=7000
+REACT_APP_SIGNUP_ERROR_TIMEOUT=7000
+
+REACT_APP_FLUTTERWAVE_APIKEY=FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X
+
+# Had to change the error time to 3sec cause it took too long
+REACT_APP_RESET_START_ERROR_TIMEOUT=3000
+
+#apigate.orion.g1.wrenchboard.com:76.209.103.227
+#apigate.orion.g1.wrenchboard.com:76.209.103.227

.eslintrc

@@ -1,59 +0,0 @@
-{
-  "extends": [
-    "airbnb",
-    "airbnb/hooks",
-    "eslint:recommended",
-    "prettier",
-    "plugin:jsx-a11y/recommended"
-  ],
-  "parser": "babel-eslint",
-  "parserOptions": {
-    "ecmaVersion": 8
-  },
-  "env": {
-    "browser": true,
-    "node": true,
-    "es6": true,
-    "jest": true
-  },
-  "rules": {
-    "no-plusplus": 0,
-    "import/no-dynamic-require": 0,
-    "global-require": 0,
-    "no-nested-ternary": 0,
-    "react/self-closing-comp": 0,
-    "react/no-unescaped-entities": 0,
-    "jsx-a11y/anchor-is-valid": 0,
-    "react/jsx-props-no-spreading": 0,
-    "jsx-eslint/eslint-plugin-jsx-a11y": 0,
-    "jsx-a11y/no-static-element-interactions": 0,
-    "jsx-a11y/label-has-associated-control": 0,
-    "jsx-a11y/no-noninteractive-element-interactions": 0,
-    "react/react-in-jsx-scope": 0,
-    "react-hooks/rules-of-hooks": "error",
-    "no-console": 0,
-    "react/state-in-constructor": 0,
-    "indent": 0,
-    "linebreak-style": 0,
-    "react/prop-types": 0,
-    "jsx-a11y/click-events-have-key-events": 0,
-    "react/jsx-filename-extension": [
-      1,
-      {
-        "extensions": [".js", ".jsx"]
-      }
-    ]
-    // "prettier/prettier": [
-    //     "error",
-    //     {
-    //         "trailingComma": "es5",
-    //         "singleQuote": true,
-    //         "printWidth": 100,
-    //         "tabWidth": 4,
-    //         "semi": true,
-    //         "endOfLine": "auto"
-    //     }
-    // ]
-  },
-  "plugins": ["prettier", "react", "react-hooks"]
-}

.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
+

Dockerfile

@@ -0,0 +1,36 @@
+# pull the base image
+FROM node:alpine
+
+# Build args
+ARG NODE_ENV
+
+# set the working direction
+#WORKDIR /app
+WORKDIR /usr/src/app
+
+# add `/app/node_modules/.bin` to $PATH
+# ENV PATH /app/node_modules/.bin:$PATH
+ENV PATH /usr/src/app/node_modules/.bin:$PATH
+ENV NODE_ENV=$NODE_ENV
+
+# install nginx
+RUN apk update
+RUN apk add nginx
+
+# install app dependencies
+COPY package.json ./
+
+COPY package-lock.json ./
+
+COPY nginx.conf ./
+
+COPY run.sh ./
+
+RUN npm install --legacy-peer-deps
+
+# add app
+COPY . ./
+
+# start app
+CMD /bin/sh ./run.sh
+

docker-compose.yml

@@ -4,7 +4,9 @@ services:
     image: registry.chiefsoft.net/wrenchboard-users-wrench:latest
     build:
       context: .
-      dockerfile: docker/Dockerfile
+      dockerfile: Dockerfile
+      args:
+        - NODE_ENV=production
     restart: unless-stopped
     ports:
       - 9082:3000
@@ -13,19 +15,20 @@ services:
     working_dir: /usr/src/app
     volumes:
       - ./:/usr/src/app
-      - /usr/src/app/node_modules
       - ./src/:/usr/src/app/src
-      - ./vendors/:/usr/src/app/vendors
+      - ./run.sh:/usr/src/app/run.sh
     extra_hosts:
       - backend.wrenchboard.api.live:10.10.33.15
       - backend.wrenchboard.api.test:10.10.33.15
       - apigate.lotus.g1.wrenchboard.com:10.10.33.15
+      - apigate.orion.g1.wrenchboard.com:10.10.33.15
       # #- backend.wrenchboard.api.live:172.31.4.27
       # #- backend.wrenchboard.api.test:10.20.30.27
       - apigateway.wrenchboard.app.dev.fluxtra.net:10.20.30.19
       - apigateway.wrenchboard.app.lotus.fluxtra.net:172.31.4.19
     environment:
       - CHOKIDAR_USEPOLLING=true
+      - NODE_ENV=${NODE_ENV:-production}
    # volumes:
    #   - ./:/app
    #   - /app/node_modules

docker/Dockerfile

@@ -3,7 +3,15 @@
 
 FROM alpine:3.15
 
+# Build args
+ARG NODE_ENV
+
 ENV NODE_VERSION 14.19.0
+ENV NODE_ENV=$NODE_ENV
+
+# install nginx
+RUN apk update
+RUN apk add nginx
 
 RUN addgroup -g 1000 node \
     && adduser -u 1000 -G node -s /bin/sh -D node \
@@ -103,6 +111,10 @@ WORKDIR /usr/src/app
 # ENV PATH /app/node_modules/.bin:$PATH
 ENV PATH /usr/src/app/node_modules/.bin:$PATH
 
+COPY nginx.conf ./
+
+COPY run.sh ./
+
 # install app dependencies
 COPY package.json ./
 RUN npm install
@@ -114,7 +126,9 @@ RUN npm install
 COPY . ./
 
 # start app
-CMD ["npm","run", "start"]
+# CMD ["npm","run", "start"]
  
 # CMD ["yarn", "start"]
 
+# start app
+CMD /bin/sh ./run.sh

nginx.conf

@@ -0,0 +1,29 @@
+worker_processes 1;
+
+events {
+  worker_connections 1024;
+}
+
+http {
+  access_log /var/log/nginx/access.log;
+  error_log  /var/log/nginx/error.log;
+
+  server {
+    gzip on;
+    listen 3000;
+    server_name localhost;
+    root /usr/src/app/build;
+
+    include /etc/nginx/mime.types;
+
+    location /nginx_status {
+      stub_status on;
+      access_log off;
+    }
+
+    location / {
+      try_files $uri $uri/ /index.html;
+    }
+  }
+}
+

package.json

@@ -13,6 +13,7 @@
     "chartjs": "^0.3.24",
     "cors": "^2.8.5",
     "faker": "^6.6.6",
+    "formik": "^2.2.9",
     "react": "^18.0.0",
     "react-chartjs-2": "^4.1.0",
     "react-countup": "^6.2.0",
@@ -25,14 +26,14 @@
     "react-toastify": "^9.0.1",
     "redux": "^4.2.0",
     "slick-carousel": "^1.8.1",
-    "web-vitals": "^1.0.1"
+    "web-vitals": "^1.0.1",
+    "yup": "^1.1.1"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
+    "start": "react-scripts start -e .env.development",
+    "build": "react-scripts build -e .env.production",
     "test": "react-scripts test",
-    "eject": "react-scripts eject",
-    "lint": "yarn add -D prettier@2.4.1 && yarn add -D eslint@7.11.0 && yarn add -D babel-eslint@10.1.0 && npx install-peerdeps --dev eslint-config-airbnb@18.2.1 && yarn add -D eslint-config-prettier@8.3.0 eslint-plugin-prettier@4.0.0"
+    "eject": "react-scripts eject"
   },
   "eslintConfig": {
     "extends": [
@@ -51,20 +52,5 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  },
-  "devDependencies": {
-    "autoprefixer": "^10.4.5",
-    "babel-eslint": "10.1.0",
-    "eslint": "7.2.0",
-    "eslint-config-airbnb": "18.2.1",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-import": "2.22.1",
-    "eslint-plugin-jsx-a11y": "6.4.1",
-    "eslint-plugin-prettier": "4.0.0",
-    "eslint-plugin-react": "^7.29.4",
-    "eslint-plugin-react-hooks": "1.7.0",
-    "postcss": "^8.4.12",
-    "prettier": "2.4.1",
-    "tailwindcss": "^3.0.24"
   }
 }

run.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env sh
+set -e
+set -x
+
+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
+

src/Routers.jsx

@@ -30,6 +30,7 @@ import ResourcePage from "./views/ResourcePage";
 import MyTaskPage from "./views/MyTaskPage";
 import MyJobsPage from "./views/MyJobsPage";
 import ReferralPage from "./views/ReferralPage";
+import VerifyLinkPages from "./views/VerifyLinkPages";
 
 export default function Routers() {
   return (
@@ -48,7 +49,8 @@ export default function Routers() {
           path="/update-password"
           element={<UpdatePasswordPages />}
         />
-        <Route exact path="/verify-you" element={<VerifyYouPages />} />
+        <Route path="/vemail" element={<VerifyLinkPages />} />
+        <Route exact path="/outmessage" element={<VerifyYouPages />} />
 
         {/* private route */}
         <Route element={<AuthRoute />}>
@@ -70,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 logo from "../../assets/images/wrenchboard.png"; //logo-1.svg";
+import { Link } from "react-router-dom";
 
 export default function LoginLayout({ slogan, children }) {
-  const checkScreenHeight = window.screen.height;
-  let screen = "";
-  if (checkScreenHeight <= 950) {
-    screen = "h-screen";
-    // screen = "h-[950px]";
-  } else {
-    screen = "h-screen";
-  }
   return (
-    <div className="layout-wrapper login">
-      <div className={`main-wrapper login-wrapper w-full ${screen}`}>
-        <div className="flex w-full h-full">
-
+    <div className={`layout-wrapper login`}>
+      <div className={`main-wrapper login-wrapper w-full h-screen overflow-y-auto sm:p-20 p-10`}>
+        <div className="w-full h-full">
           <div className="flex-1 flex justify-center items-center">
             {children && children}
           </div>
+          <div className="flex-1 flex justify-center items-center p-10">
+            <div className="flex items-center">
+              <Link to="#" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]">
+                About
+              </Link>
+              <Link to="#" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]">
+                Services
+              </Link>
+              <Link to="#" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]">
+                Contact Us
+              </Link>
+            </div>
+          </div>
+          <div className="flex-1 flex justify-center items-center p-10">
+            <p className="text-black text-[15px] px-2 font-medium flex items-center">
+             <span className="text-3xl mt-2 mr-1">©</span>  2023 - {" "}
+              <Link to="/" className="text-[#009ef7] ml-1">
+                WrenchBoard
+              </Link>{" "}
+            </p>
+          </div>
         </div>
       </div>
     </div>

src/components/AuthPages/ForgotPassword/index.jsx

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

src/components/AuthPages/Login/index.jsx

@@ -9,7 +9,13 @@ import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
 
+import { useDispatch, useSelector } from "react-redux";
+import {updateUserDetails} from '../../../store/UserDetails'
+
 export default function Login() {
+
+  const dispatch = useDispatch()
+
   const [checked, setValue] = useState(false);
   const [loginLoading, setLoginLoading] = useState(false);
 
@@ -51,23 +57,14 @@ export default function Login() {
         //debugger;
         // if (email === "support@mermsemr.com") {
         if (loginResult.data.status > 0 && loginResult.data.internal_return == 100 && loginResult.data.session != '') { // just for a start
-          localStorage.setItem("email", `${loginResult.data.email}`);
           localStorage.setItem("member_id", `${loginResult.data.member_id}`);
           localStorage.setItem("uid", `${loginResult.data.uid}`);
           localStorage.setItem("session_token", `${loginResult.data.session}`);
-          localStorage.setItem("added", `${loginResult.data.added}`);
-          localStorage.setItem("city", `${loginResult.data.city}`);
-          localStorage.setItem("country", `${loginResult.data.country}`);
-          localStorage.setItem("firstname", `${loginResult.data.firstname}`);
-          localStorage.setItem("last_login", `${loginResult.data.last_login}`);
-          localStorage.setItem("lastname", `${loginResult.data.lastname}`);
-          localStorage.setItem("state", `${loginResult.data.state}`);
-          localStorage.setItem("zip_code", `${loginResult.data.zip_code}`);
           localStorage.setItem("session", `${loginResult.data.session}`);
           setLoginLoading(true);
           // userApi.getUserReminders(); //testing
+          dispatch(updateUserDetails(loginResult.data))
           setTimeout(() => {
-            toast.success("Login Successfully");
             navigate("/", { replace: true });
             setLoginLoading(false);
           }, 2000);
@@ -100,12 +97,10 @@ export default function Login() {
           <div className="content-wrapper login shadow-md w-full lg:max-w-[500px] mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px]  rounded-[0.475rem] sm:p-7 p-5">
             <div className="w-full">
               <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
-                <h1 className="text-[#181c32] font-semibold dark:text-white mb-3" style={{
-                  fontSize: 'calc(1rem + .6vw)'
-                }}>
+                <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
                   Sign In to WrenchBoard
                 </h1>
-                <span className="text-gray-400 font-medium text-xl">New Here? <Link to='/signup' className='font-semibold text-[#4687ba] hover:text-[#009ef7] transition'>Create an Account</Link></span>
+                <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">New Here? <Link to='/signup' className='font-semibold text-[#4687ba] hover:text-[#009ef7] transition'>Create an Account</Link></span>
               </div>
               <div className="input-area">
                 <div className="input-item mb-5">
@@ -119,6 +114,7 @@ export default function Login() {
                     iconName="message"
                   />
                 </div>
+
                 <div className="input-item mb-5">
                   <InputCom
                     value={password}
@@ -164,15 +160,14 @@ export default function Login() {
                   Forgot Password
                 </a>
               </div> */}
-                {loginError && <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-thin leading-[19.5px]">Invalid username or password- Please <Link to='/#' className='text-[#009ef7]'>reset your password</Link> or <Link to='/signup' className='text-[#009ef7]'>create a new account</Link></div>}
-                {msgError && <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px]">{msgError}</div>}
+                {loginError && <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-thin leading-[19.5px] text-[13px]">Invalid username or password- Please <Link to='/#' className='text-[#009ef7]'>reset your password</Link> or <Link to='/signup' className='text-[#009ef7]'>create a new account</Link></div>}
+                {msgError && <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">{msgError}</div>}
                 <div className="signin-area mb-3.5">
                   <div className="flex justify-center">
                     <button
                       onClick={doLogin}
                       type="button"
-                      className={`btn-login  rounded-[0.475rem] mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center ${loginLoading ? "active" : ""
-                        }`}
+                      className={`btn-login  rounded-[0.475rem] mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
                     >
                       {loginLoading ? (
                         <div className="signup btn-loader"></div>
@@ -193,7 +188,7 @@ export default function Login() {
                   </a>
                 </p>
               </div> */}
-                <div className="pt-5 text-[#181c32] text-center font-semibold text-base">This site is protected by hCaptcha and the our Privacy Policy and Terms of Service apply.</div>
+                <div className="pt-5 text-[#181c32] text-center font-semibold text-[13.975px] leading-[20.9625px]">This site is protected by hCaptcha and the our Privacy Policy and Terms of Service apply.</div>
               </div>
             </div>
           </div>
@@ -215,8 +210,8 @@ const BrandBtn = ({
         className="w-full border border-light-purple dark:border-[#5356fb29]  rounded-[0.475rem] h-[48px] flex justify-center bg-[#FAFAFA] hover:bg-[#eff2f5] hover:text-[#7e8299] transition duration-300 dark:bg-[#11131F]  items-center font-medium cursor-pointer"
       >
         <img className="mr-3 h-6" src={imgSrc} alt="logo-icon(s)" />
-        <span className="text-lg text-thin-light-gray font-normal">
-          Sign In with {brand}
+        <span className="text-lg text-thin-light-gray font-normal text-[15px]">
+          Continue with {brand}
         </span>
       </a>
     </div>

src/components/AuthPages/SignUp/index.jsx

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

src/components/AuthPages/VerifyLink/index.jsx

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

src/components/AuthPages/VerifyYou/index.jsx

@@ -1,42 +1,49 @@
-import React from "react";
-import titleShape from "../../../assets/images/shape/text-shape-three.svg";
+import { useNavigate, Link } from "react-router-dom";
 import AuthLayout from "../AuthLayout";
-import Otp from "./Otp";
+import WrenchBoard from "../../../assets/images/wrenchboard.png"
 
 export default function VerifyYou() {
+  const navigate = useNavigate()
   return (
     <>
       <AuthLayout
         slogan="Welcome to WrenchBoard"
       >
-        <div className="content-wrapper xl:bg-white dark:bg-dark-white   w-full sm:w-auto px-5 xl:px-[70px] 2xl:px-[100px] h-[818px] rounded-xl flex flex-col justify-center">
-          <div>
-            <div className="title-area flex flex-col justify-center items-center relative text-center mb-8">
-              <h1 className="sm:text-5xl text-4xl font-bold leading-[74px]   text-dark-gray dark:text-white">
-                Verification Code
-              </h1>
-              <div className="shape sm:w-[377px] w-[270px] -mt-5 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-[500px] mx-auto flex justify-center items-center dark:bg-dark-white 2xl:w-[828px] rounded-[0.475rem] sm:p-7 p-5">
+            <div className="w-full">
+              <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
+                <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
+                  Let's verify your email now
+                </h1>
+                <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">Check your email.</span>
               </div>
+              <div className="input-area">
+                <div className="mb-5">
+                  <p className="text-[14px] leading-[19px] text-center text-[#181c32]">
+                    <b>Verify Email.</b> Help us secure your WrenchBoard account by verifying your email registration address. Verification will let you access all of WrenchBoard's features.
+                  </p>
+                </div>
+                <div className="mb-5">
+                  <p className="text-[14px] leading-[19px] text-center text-[#181c32]">
+                    If you do not receive the confirmation message within a few minutes of signing up, please check your Junk E-mail folder just in case the confirmation email got delivered there instead of your inbox. If so, select the confirmation message and click Not Junk, which will allow future messages to get through.
+                  </p>
+                </div>
+              </div>
+            <div className="signin-area flex justify-center mb-3.5">
+              <button
+                onClick={() => navigate("/")}
+                type="button"
+                className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
+              >
+                <span>Return Home</span>
+              </button>
             </div>
-            <div className="input-area">
-              <Otp />
-              <div className="signin-area mb-3.5">
-                <a
-                  href="/update-password"
-                  className="w-full rounded-[50px] h-[58px] mb-6 text-xl text-white font-bold flex justify-center bg-purple items-center"
-                >
-                  Continue
-                </a>
-              </div>
-              <div className="resend-code flex justify-center">
-                <p className="text-lg text-thin-light-gray font-normal">
-                  Dont’t have an aceount ?
-                  <a href="#" className="ml-2 text-dark-gray dark:text-white font-bold">
-                    Please resend
-                  </a>
-                </p>
-              </div>
             </div>
           </div>
         </div>

src/components/Cards/HomeBannerOffersCard.jsx

@@ -0,0 +1,26 @@
+import React from "react";
+import { Link } from "react-router-dom";
+import localImgLoad from "../../lib/localImgLoad";
+
+export default function HomeBannerOffersCard(props) {
+    return (
+        <Link
+            to="/my-collection/collection-item"
+            className="item w-full block group banner-630-340"
+        >
+            <div className="flex flex-col justify-between h-full">
+                <div className="content flex justify-between items-center mb-5">
+                    <div>
+                        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
+                            <>Ab hshsh jsjsj hshdhhdjjd</>
+                        </h1>
+                    </div>
+                    {/*<SelectBox datas={filterDatas} action={dataSetHandler} />*/}
+                </div>
+                <div className="h-[233px]">
+                    BEST IMAGE IN THE WORLLD
+                </div>
+            </div>
+        </Link>
+    );
+}

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

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useRef } from "react";
 import Icons from "../../Icons";
 import { Link } from "react-router-dom";
 
@@ -12,31 +12,84 @@ export default function InputCom({
   inputHandler,
   value,
   forgotPassword,
-  onClick
+  onClick,
+  disable,
+  blurHandler
 }) {
+  const inputRef = useRef(null)
+  // Entry Validation
+  // for Min Length:
+  const minLengthValidation = () => {
+    if (inputRef && inputRef?.current && inputRef?.current?.name === 'email') {
+      return 7
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'first_name') {
+      return 3
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'last_name') {
+      return 3
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'address') {
+      return 5
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'password') {
+      return 8
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'state') {
+      return 3
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'province') {
+      return 3
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'city') {
+      return 3
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'amount') {
+      return 1
+    }
+  }
+
+  // for MaxLength
+  const maxLengthValidation = () => {
+    if (inputRef && inputRef?.current && inputRef?.current?.name === 'email') {
+      return 35
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'first_name') {
+      return 25
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'last_name') {
+      return 25
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'address') {
+      return 49
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'password') {
+      return 15
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'state') {
+      return 25
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'province') {
+      return 25
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'city') {
+      return 25
+    } else if (inputRef && inputRef?.current && inputRef?.current?.name === 'amount') {
+      return 9  
+    }
+  }
   return (
     <div className="input-com">
       <div className="flex items-center justify-between">
       {label && (
         <label
-          className="input-label text-[#181c32] dark:text-white text-base font-semibold block mb-2.5"
+          className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block mb-2.5"
           htmlFor={name}
         >
           {label}
         </label>
       )}
-      {forgotPassword && <Link to="/forgot-password" className="text-base text-[#4687ba] hover:text-[#009ef7]">Forgot Password?</Link>}
+      {forgotPassword && <Link to="/forgot-password" className="text-[13.975px] leading-[20.9625px] text-[#019ef7] hover:text-[#009ef7]">Forgot Password?</Link>}
       </div>
       <div className="input-wrapper border border-[#f5f8fa]] dark:border-[#5e6278] w-full rounded-[0.475rem] h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base ">
         <input
           placeholder={placeholder}
           value={value}
           onChange={inputHandler}
-          className="input-field placeholder:text-base text-bese px-6 text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
+          className="input-field placeholder:text-base px-6 text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
           type={type}
           id={name}
           name={name}
-          required
+          minLength={minLengthValidation()}
+          maxLength={maxLengthValidation()}
+          ref={inputRef}
+          readOnly={disable}
+          onBlur={blurHandler}
         />
         {iconName && (
           <div className="absolute right-6 bottom-[10px] z-10">

src/components/Home/Hero.jsx

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

src/components/Home/HomeSliders.jsx

@@ -2,6 +2,7 @@ import SliderCom from "../Helpers/SliderCom";
 import slider1 from "../../assets/images/slider-1.jpg";
 import slider2 from "../../assets/images/slider-2.jpg";
 import slider3 from "../../assets/images/slider-3.jpg";
+import HomeBannerOffersCard from "../Cards/HomeBannerOffersCard";
 
 
 export default function HomeSliders(props) {
@@ -20,6 +21,9 @@ export default function HomeSliders(props) {
                         <div className="item w-full h-full bg-white dark:bg-dark-white   rounded-2xl overflow-hidden">
                             <img src={slider3} alt="slider" className="w-full h-full" />
                         </div>
+                        <div className="item w-full h-full bg-white dark:bg-dark-white   rounded-2xl overflow-hidden">
+                           <HomeBannerOffersCard />
+                        </div>
                     </SliderCom>
                 </div>
             </div>

src/components/Home/index.jsx

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

src/components/MyJobs/index.jsx

@@ -4,11 +4,12 @@ import Layout from "../Partials/Layout";
 import MyJobTable from "./MyJobTable";
 import CommonHead from "../UserHeader/CommonHead";
 
-export default function MyJobs() {
+export default function MyJobs(props) {
     const [selectTab, setValue] = useState("today");
     const filterHandler = (value) => {
         setValue(value);
     };
+    console.log("AMEYE LOC1", props.MyJobList);
     return (
         <Layout>
             <CommonHead />
@@ -32,7 +33,7 @@ export default function MyJobs() {
                         </div>
                     </div>
                     </div>
-                    <MyJobTable />
+                    <MyJobTable MyJobList={props.MyJobList} />
                 </div>
             </div>
         </Layout>

src/components/MyWallet/AddFund.jsx

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

src/components/MyWallet/AddRecipient.jsx

@@ -1,161 +1,365 @@
-import React, {useState} from 'react'
-import { Link } from 'react-router-dom'
+import React, {useEffect, useState} from 'react'
+import { Link, useNavigate } from 'react-router-dom'
 import Icons from '../Helpers/Icons'
+import usersService from '../../services/UsersService'
+import InputCom from '../Helpers/Inputs/InputCom'
+
+import LoadingSpinner from '../Spinners/LoadingSpinner'
+import {toast} from 'react-toastify'
+
+import {Formik, Form} from 'formik'
+import * as Yup from 'yup'
+
+
+const validationSchema = Yup.object().shape({
+    firstname: Yup.string()
+      .min(3, 'Minimum 3 characters')
+      .max(25, 'Maximum 25 characters')
+      .required('Firstname is required'),
+    lastname: Yup.string()
+      .min(3, 'Minimum 3 characters')
+      .max(25, 'Maximum 25 characters')
+      .required('Lastname is required'),
+    country: Yup.string()
+      .min(1, 'Minimum 1 characters')
+      .max(25, 'Maximum 25 characters')
+      .required('Country is required'),
+    bank: Yup.string()
+      .min(3, 'Minimum 3 characters')
+      .max(25, 'Maximum 25 characters')
+      .required('Bank name is required'),
+    accountNumber: Yup.string()
+    .matches(/\d/, "must be a number")
+    .min(3, 'Minimum 3 characters')
+    .max(25, 'Maximum 25 characters')
+    .required('Account Number is required'),
+    repeatAccountNumber: Yup.string()
+    .required('Repeat Account Number is required')
+    .oneOf([Yup.ref('accountNumber'), null], 'Must match Account Number'),
+    accountType: Yup.string()
+      .min(1, 'Minimum 3 characters')
+      .max(25, 'Maximum 25 characters')
+      .required('Account Type is required'),
+    city: Yup.string()
+      .min(3, 'Minimum 3 characters')
+      .max(25, 'Maximum 25 characters')
+      .required('City is required'),
+    state: Yup.string()
+      .min(3, 'Minimum 3 characters')
+      .max(25, 'Maximum 25 characters')
+      .required('State is required'),
+  })
+  
+  const initialValues = {
+    firstname: '',
+    lastname: '',
+    country: '',
+    bank: '',
+    accountNumber: '',
+    repeatAccountNumber: '',
+    accountType: '',
+    state: '',
+    city: ''
+  }
 
 function AddRecipient() {
-   
-    //STATE FOR CONTROLLED INPUTS
-    let [inputs, setInputs] = useState({
-        firstname: '',
-        lastname: '',
-        country: '',
-        'bank-name': '',
-        'account-number': '',
-        'repeat-account-number': '',
-        'account-type': '',
-        state: '',
-        city: ''
+
+    const apiURL = new usersService()
+
+    const navigate = useNavigate()
+
+    let [requestStatus, setRequestStatus] = useState({message: '', loading: false, status: false})
+
+    let [allCountries, setAllCountries] = useState({ // STATE TO HOLD LIST OF COUNTRIES
+        loading: true,
+        data: []
     })
 
-    // FUNCTION TO HANDLE INPUT CHANGE
-    const handleChange = ({target:{name, value}}) => {
-        setInputs(prev => ({...prev, [name]:value}))
+    let [bankName, setBankName] = useState({ // STATE TO HOLD LIST OF BANK NAME
+        loading: true,
+        data: []
+    })
+
+    let [accType, setAccType] = useState({ // STATE TO HOLD LIST ACCOUNT TYPE
+        loading: true,
+        data: []
+    })
+
+    //FUNCTION TO HANDLE ADD RECIPIENT SUBMIT
+    const handleSubmit = (values, helpers) => {
+        setRequestStatus({message: '', loading: true, status: false})
+
+        let reqData = { //REQUEST DATA FOR API CALL
+            firstname: values.firstname,
+            lastname: values.lastname,
+            bank_code: values.bank,
+            account_no: values.accountNumber,
+            account_type: values.accountType,
+            country: values.country,
+            state: values.state,
+            city: values.city
+        }
+
+        //CALL TO ADD RECIPIENT API
+        apiURL.addRecipient(reqData).then((res)=>{
+            if(res.data.internal_return < 0){
+                setRequestStatus({message: 'could not add recipient, try again!', loading: false, status: true})
+                return
+            }
+            // setRequestStatus({message: 'Recipient Added Successfully!', loading: false, status: true})
+            toast.success("Recipient Added Successfully!");
+            setTimeout(()=>{navigate('../transfer-fund',{replace:true})},1000)
+        }).catch((error)=>{
+            setRequestStatus({message: 'Opps! an error occured! Try again later', loading: false, status: false})
+        })    
     }
 
-    //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: ''
+    // FUNCTION TO GET COUNTRIES
+    const getCountry = ()=> { 
+        apiURL.getSignupCountryData().then((res)=>{
+            if(res.data.internal_return < 0){
+                setAllCountries(prev => ({loading: false, data: []}))
+                return
+            }
+            setAllCountries(prev => ({loading: false, data:res.data.signup_country}))
+        }).catch((error)=>{
+            setAllCountries(prev => ({loading: false, data: []}))
         })
     }
+    // END OF FUNCTION TO GET COUNTRIES
+
+    // FUNCTION TO GET COUNTRY BANK
+    const getCountryBank = ()=> { 
+        apiURL.getCountryBank().then((res)=>{
+            if(res.data.internal_return < 0){
+                setBankName(prev => ({loading: false, data: []}))
+                return
+            }
+            setBankName(prev => ({loading: false, data:res.data.result_list}))
+        }).catch((error)=>{
+            setBankName(prev => ({loading: false, data: []}))
+        })
+    }
+    // END OF FUNCTION TO GET COUNTRY BANK
+
+    // FUNCTION TO GET ACCOUNT TYPES
+    const getAccountTypes = ()=> { 
+        apiURL.getAccountTypes().then((res)=>{
+            if(res.data.internal_return < 0){
+                setAccType(prev => ({loading: false, data: []}))
+                return
+            }
+            setAccType(prev => ({loading: false, data:res.data.result_list}))
+        }).catch((error)=>{
+            setAccType(prev => ({loading: false, data: []}))
+        })
+    }
+    // END OF FUNCTION TO GET ACCOUNT TYPES
+
+    useEffect(()=>{
+        getCountry() // TO LOAD LIST COUNTRY
+        getCountryBank() // TO LOAD LIST COUNTRY BANK
+        getAccountTypes() // TO LOAD LIST ACCOUNT TYPES
+    },[])
+
     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>
+                    <h2 className='my-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-semibold'>ADD BANK ACCOUNT</h2>
+                    <Formik initialValues={initialValues} validationSchema={validationSchema} onSubmit={handleSubmit}>
+                        {(props)=>(
+                        <Form className='add-recipient-info px-1 md:px-[50px] lg:px-[100px]'>
+                                
+                                {/* inputs starts here */}
+                                {/* firstname */}
+                                <div className="xl:flex xl:space-x-7 mb-6">
+                                    <div className="field w-full mb-6 xl:mb-0">
+                                    <InputCom
+                                        label="Firstname"
+                                        type="text"
+                                        name="firstname"
+                                        placeholder="Account Firstname"
+                                        value={props.values.firstname}
+                                        inputHandler={props.handleChange}
+                                        blurHandler={props.handleBlur}
+                                    />
+                                    {(props.errors.firstname && props.touched.firstname) && <p className="text-sm text-red-500">{props.errors.firstname}</p>}
+                                    </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>
+                                    {/* lastname */}
+                                    <div className="field w-full">
+                                    <InputCom
+                                        label="Lastname"
+                                        type="text"
+                                        name="lastname"
+                                        placeholder="Account Lastname"
+                                        value={props.values.lastname}
+                                        inputHandler={props.handleChange}
+                                        blurHandler={props.handleBlur}
+                                    />
+                                    {(props.errors.lastname && props.touched.lastname) && <p className="text-sm text-red-500">{props.errors.lastname}</p>}
+                                    </div>
+                                </div>
 
-                        <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="xl:flex xl:space-x-7 mb-6">
+                                    {/* country */}
+                                    <div className='add-recipient w-full mb-6 xl:mb-0'>
+                                        <label className='input-label text-[#181c32] dark:text-white text-base font-semibold block mb-2.5'>Country <span className='text-red-500'>*</span></label>
+                                        <select className='w-full text-base p-2 text-dark-gray dark:text-white rounded-md border border-slate-300 outline-0' name='country' 
+                                        value={props.values.country}
+                                        onChange={props.handleChange}
+                                        onBlur={props.handleBlur}
+                                        >
+                                            {allCountries.loading ?
+                                            <option className='text-slate-500 text-lg' value="">Loading...</option>
+                                            :
+                                            allCountries.data.length ?
+                                            <>
+                                                <option className='text-slate-500 text-lg' value="">Select...</option>
+                                                {allCountries.data.map((item, index)=>(
+                                                    <option key={index} className='text-slate-500 text-lg' value={item[0]}>{item[1]}</option>
+                                                ))}
+                                            </>
+                                            :
+                                            <option className='text-slate-500 text-lg' value="">No Options Found! Try Again</option>
+                                            }
+                                        </select>
+                                        {(props.errors.country && props.touched.country) && <p className="text-sm text-red-500">{props.errors.country}</p>}
+                                    </div>
+                                    
+                                    {/* bank name */}
+                                    <div className='add-recipient w-full'>
+                                        <label className='input-label text-[#181c32] dark:text-white text-base font-semibold block mb-2.5'>Bank Name <span className='text-red-500'>*</span></label>
+                                        <select className='w-full text-base p-2 text-dark-gray dark:text-white rounded-md border border-slate-300 outline-0' name='bank' 
+                                        value={props.values.bank}
+                                        onChange={props.handleChange}
+                                        onBlur={props.handleBlur}
+                                        >
+                                        {bankName.loading ?
+                                            <option className='text-slate-500 text-lg' value="">Loading...</option>
+                                            :
+                                            bankName.data.length ?
+                                            <>
+                                                <option className='text-slate-500 text-lg' value="">Select...</option>
+                                                {bankName.data.map((item, index)=>(
+                                                    <option key={index} className='text-slate-500 text-lg' value={item.code}>{item.name}</option>
+                                                ))}
+                                            </>
+                                            :
+                                            <option className='text-slate-500 text-lg' value="">No Options Found! Try Again</option>
+                                            }
+                                        </select>
+                                        {(props.errors.bank && props.touched.bank) && <p className="text-sm text-red-500">{props.errors.bank}</p>}
+                                    </div>
+                                </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>
+                                {/* ACCOUNT NUMBER */}
+                                <div className="xl:flex xl:space-x-7 mb-6">
+                                    <div className="field w-full mb-6 xl:mb-0">
+                                    <InputCom
+                                        label="Account Number"
+                                        type="text"
+                                        name="accountNumber"
+                                        placeholder="Account No"
+                                        value={props.values.accountNumber}
+                                        inputHandler={props.handleChange}
+                                        blurHandler={props.handleBlur}
+                                    />
+                                    {(props.errors.accountNumber && props.touched.accountNumber) && <p className="text-sm text-red-500">{props.errors.accountNumber}</p>}
+                                    </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>
+                                    {/* REPEAT ACCT. NUMBER */}
+                                    <div className="field w-full">
+                                    <InputCom
+                                        label="Repeat Account Number"
+                                        type="text"
+                                        name="repeatAccountNumber"
+                                        placeholder="Repeat Account Number"
+                                        value={props.values.repeatAccountNumber}
+                                        inputHandler={props.handleChange}
+                                        blurHandler={props.handleBlur}
+                                    />
+                                    {(props.errors.repeatAccountNumber && props.touched.repeatAccountNumber) && <p className="text-sm text-red-500">{props.errors.repeatAccountNumber}</p>}
+                                    </div>
+                                </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="xl:flex xl:space-x-7 mb-6">
+                                    {/* Account Type */}
+                                    <div className='add-recipient w-full'>
+                                        <label className='input-label text-[#181c32] dark:text-white text-base font-semibold block mb-2.5'>Account Type <span className='text-red-500'>*</span></label>
+                                        <select className='w-full text-base p-2 text-dark-gray dark:text-white rounded-md border border-slate-300 outline-0' name='accountType' 
+                                        value={props.values.accountType}
+                                        onChange={props.handleChange}
+                                        onBlur={props.handleBlur}
+                                        >
+                                            {accType.loading ?
+                                            <option className='text-slate-500 text-lg' value="">Loading...</option>
+                                            :
+                                            accType.data.length ?
+                                            <>
+                                                <option className='text-slate-500 text-lg' value="">Select...</option>
+                                                {accType.data.map((item, index)=>(
+                                                    <option key={index} className='text-slate-500 text-lg' value={item.value}>{item.name}</option>
+                                                ))}
+                                            </>
+                                            :
+                                            <option className='text-slate-500 text-lg' value="">No Options Found! Try Again</option>
+                                            }
+                                        </select>
+                                        {(props.errors.accountType && props.touched.accountType) && <p className="text-sm text-red-500">{props.errors.accountType}</p>}
+                                    </div>
+                                </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>
+                                {/* state */}
+                                <div className="xl:flex xl:space-x-7 mb-6">
+                                    <div className="field w-full mb-6 xl:mb-0">
+                                    <InputCom
+                                        label="State"
+                                        type="text"
+                                        name="state"
+                                        placeholder="State/Province"
+                                        value={props.values.state}
+                                        inputHandler={props.handleChange}
+                                        blurHandler={props.handleBlur}
+                                    />
+                                    {(props.errors.state && props.touched.state) && <p className="text-sm text-red-500">{props.errors.state}</p>}
+                                    </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>
+                                    {/* city */}
+                                    <div className="field w-full">
+                                    <InputCom
+                                        label="City"
+                                        type="text"
+                                        name="city"
+                                        placeholder="City"
+                                        value={props.values.city}
+                                        inputHandler={props.handleChange}
+                                        blurHandler={props.handleBlur}
+                                    />
+                                    {(props.errors.city && props.touched.city) && <p className="text-sm text-red-500">{props.errors.city}</p>}
+                                    </div>
+                                </div>
+                                {/* end of 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'>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>
+                                {/* REQUEST ERROR DISPLAY */}
+                                {requestStatus.message && <p className='text-sm text-red-500'>{requestStatus.message}</p>}
 
-                        {/* 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 className='add-recipient-btn flex justify-end items-center py-4'>
+                                    {requestStatus.loading ? 
+                                    <LoadingSpinner size={6} color='sky-blue' />
+                                    :
+                                    <button type='submit' 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>
+                        )}
+                   </Formik>
                 </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/ConfirmAddFund.jsx

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

src/components/MyWallet/ConfirmTransfer.jsx

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

src/components/MyWallet/TransferFund.jsx

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

src/components/MyWallet/Wallet.jsx

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

src/components/MyWallet/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/Header.jsx

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

src/components/Partials/Layout.jsx

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

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

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

src/components/Settings/Tabs/PersonalInfoTab.jsx

@@ -1,6 +1,46 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
 import Icons from "../../Helpers/Icons";
 import InputCom from "../../Helpers/Inputs/InputCom";
+import {Link, useNavigate} from 'react-router-dom'
+import usersService from "../../../services/UsersService";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+
+import {toast} from 'react-toastify'
+
+import {Formik, Form} from 'formik'
+import * as Yup from 'yup'
+
+const validationSchema = Yup.object().shape({
+  email: Yup.string()
+    .email('Wrong email format')
+    .min(3, 'Minimum 3 characters')
+    .max(50, 'Maximum 50 characters')
+    .required('Email is required'),
+  firstname: Yup.string()
+    .min(3, 'Minimum 3 characters')
+    .max(25, 'Maximum 25 characters')
+    .required('Firstname is required'),
+  lastname: Yup.string()
+    .min(3, 'Minimum 3 characters')
+    .max(25, 'Maximum 25 characters')
+    .required('Lastname is required'),
+  city: Yup.string()
+    .min(3, 'Minimum 3 characters')
+    .max(25, 'Maximum 25 characters')
+    .required('City is required'),
+  state: Yup.string()
+    .min(3, 'Minimum 3 characters')
+    .max(25, 'Maximum 25 characters')
+    .required('State is required'),
+})
+
+const initialValues = {
+  firstname: '',
+  lastname: '',
+  state: '',
+  city: '',
+  email: ''
+}
 
 export default function PersonalInfoTab({
   datas,
@@ -16,283 +56,313 @@ export default function PersonalInfoTab({
   browseCoverImg,
   coverImgChangHandler,
 }) {
-  return (
-    <div className="personal-info-tab w-full flex flex-col justify-between">
-      <div className="flex flex-col-reverse sm:flex-row">
-        <div className="flex-1 sm:mr-10">
-          <div className="fields w-full">
-            {/* first name and last name */}
-            <div className="xl:flex xl:space-x-7 mb-6">
-              <div className="field w-full mb-6 xl:mb-0">
-                <InputCom
-                  label="First Name"
-                  type="text"
-                  name="firstName"
-                  placeholder="First Name Here"
-                  value={datas}
-                  inputHandler={frstNmeHndlr}
-                />
-              </div>
-              <div className="field w-full">
-                <InputCom
-                  label="Last Name"
-                  type="text"
-                  name="lastName"
-                  placeholder="Last Name Here"
-                  value={datas}
-                  inputHandler={lstNmeHndlr}
-                />
-              </div>
-            </div>
-            {/* User Name */}
-            <div className="field w-full mb-6">
-              <InputCom
-                label="User Name"
-                type="text"
-                name="userName"
-                placeholder="@example"
-                value={datas}
-                inputHandler={lstNmeHndlr}
-              />
-            </div>
-            {/* External Links */}
-            <div className="field w-full mb-6">
-              <InputCom
-                label="External Links"
-                type="text"
-                name="link"
-                placeholder="https:yoursite.lo/imte/item_name123"
-                value={datas}
-                inputHandler={lstNmeHndlr}
-              />
-            </div>
-            {/* bio */}
-            <div className="field w-full mb-6">
-              <h1 className="field-title">Bio </h1>
-              <div className="input-field mt-2">
-                <div className="input-wrapper w-full ">
-                  <textarea
-                    value={datas}
-                    onChange={(e) => dscrphn(e)}
-                    placeholder="provide a detailed description of your item."
-                    rows="7"
-                    className="w-full h-full px-7 py-4  border border-light-purple dark:border-[#5356fb29]  rounded-[20px] text-dark-gray dark:text-white bg-[#FAFAFA] dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
-                  />
-                </div>
-              </div>
-            </div>
-            {/* email */}
-            <div className="field w-full mb-6">
-              <InputCom
-                label="Email"
-                type="email"
-                name="email"
-                placeholder="https:yoursite.lo/imte/item_name123"
-                value={datas}
-                inputHandler={lstNmeHndlr}
-              />
-              <p className="text-thin-light-gray text-sm tracking-wide mt-3">
-                Your email for marketplace notifications
-              </p>
-            </div>
-          </div>
-          {/* border line */}
-          <div className="w-full h-[1px] bg-[#E3E4FE] dark:bg-[#a7a9b533]  mb-6"></div>
-          <div className="social-connetion w-full">
-            <div className="mb-6">
-              {/* headings */}
-              <div className="mb-4">
-                <h1 className="text-xl text-dark-gray dark:text-white tracking-wide font-bold mb-1.5">
-                  Social Connections
-                </h1>
-                <p className="text-sm tracking-wide text-thin-light-gray">
-                  Help collectors verify your account by connecting Twitter
-                </p>
-              </div>
-              <div className="flex justify-between items-center ">
-                <div className="flex space-x-2.5 items-center">
-                  <div className="w-[44px] h-[44px] rounded-full bg-[#E0F2FD] flex justify-center items-center">
-                    <span>
-                      <svg
-                        width="23"
-                        height="19"
-                        viewBox="0 0 23 19"
-                        fill="none"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          d="M0 17.0066C2.46188 17.0803 4.69827 16.4768 6.78777 14.9218C4.65896 14.6476 3.19321 13.6316 2.38327 11.5697C3.08253 11.5697 3.68869 11.5697 4.29588 11.5697C2.09881 10.6971 0.869935 9.1764 0.703396 6.7914C1.37576 6.9763 1.99951 7.14666 2.62222 7.31805C0.666157 5.02758 0.227569 2.9085 1.41507 0.9307C4.01246 3.90364 7.22015 5.64253 11.155 5.89391C11.155 5.44101 11.1405 5.04628 11.1571 4.65259C11.2409 2.67998 12.208 1.25376 13.9686 0.46118C15.6847 -0.31166 17.3821 -0.119489 18.8665 1.08548C19.3403 1.47086 19.7509 1.5311 20.2702 1.3192C20.9519 1.04081 21.6367 0.77177 22.3866 0.471567C22.0546 1.52383 21.3605 2.23746 20.6519 3.0103C21.3998 2.80774 22.1476 2.60622 22.8955 2.40367C22.9307 2.43483 22.9659 2.46599 23.001 2.49715C22.4218 3.10587 21.8818 3.76029 21.2498 4.30564C20.8691 4.63389 20.7191 4.95798 20.7067 5.44101C20.6074 9.13796 19.3444 12.3727 16.7698 15.0361C14.2769 17.6143 11.2109 18.8836 7.62874 18.9917C4.97239 19.0716 2.5105 18.4775 0.217225 17.1458C0.141714 17.1032 0.071374 17.0533 0 17.0066Z"
-                          fill="#33AAF2"
-                        />
-                      </svg>
-                    </span>
-                  </div>
-                  <p className="text-18 dark:text-white tracking-wide">
-                    Twitter
-                  </p>
-                </div>
-                <div>
-                  <p className="text-18 tracking-wide text-[#33AAF2] border-b dark:border-[#5356fb29]  border-[#33AAF2]">
-                    Cannect
-                  </p>
-                </div>
-              </div>
-            </div>
-            <div className="mb-10">
-              {/* headings */}
-              <div className="sm:flex justify-between items-center mb-4">
-                <div className="mr-16 mb-5 sm:mb-0">
-                  <h1 className="text-xl text-dark-gray dark:text-white tracking-wide font-bold mb-1.5">
-                    Verification
-                  </h1>
-                  <p className="text-sm tracking-wide text-thin-light-gray leading-7">
-                    Proceed with verification process to get more visibility and
-                    gain trust on NFTMAX Marketplace.
-                  </p>
-                </div>
-                <div>
-                  <a
-                    href="#"
-                    className="w-[136px] h-[46px] flex justify-center items-center text-18 tracking-wide rounded-full text-white bg-light-green hover:bg-green-600 transition duration-300 ease-in-out"
-                  >
-                    Get Verified
-                  </a>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div className="w-[232px] mb-10">
-          <div className="update-profile w-full mb-9">
-            <h1 className="text-xl tracking-wide font-bold text-dark-gray dark:text-white flex items-center mb-2">
-              Update Profile
-              <span className="ml-1">
-                <Icons name="block-question" />
-              </span>
-            </h1>
-            <p className="text-base text-thin-light-gray mb-5">
-              Profile of at least Size
-              <span className="ml-1   text-dark-gray dark:text-white">
-                300x300
-              </span>
-              . Gifs work too.
-              <span className="ml-1   text-dark-gray dark:text-white">
-                Max 5mb
-              </span>
-              .
-            </p>
-            <div className="flex justify-center">
-              <div className="w-full relative">
-                <img
-                  src={profileImg}
-                  alt=""
-                  className="sm:w-[198px] sm:h-[198px] w-[120px] h-[120px] rounded-full overflow-hidden object-cover"
-                />
-                <input
-                  ref={profileImgInput}
-                  onChange={(e) => profileImgChangHandler(e)}
-                  type="file"
-                  className="hidden"
-                />
-                <div
-                  onClick={browseProfileImg}
-                  className="w-[32px] h-[32px] absolute bottom-7 sm:right-10 right-[105px]  hover:bg-pink bg-dark-gray rounded-full cursor-pointer"
-                >
-                  <svg
-                    width="32"
-                    height="32"
-                    viewBox="0 0 32 32"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M16.5147 11.5C17.7284 12.7137 18.9234 13.9087 20.1296 15.115C19.9798 15.2611 19.8187 15.4109 19.6651 15.5683C17.4699 17.7635 15.271 19.9587 13.0758 22.1539C12.9334 22.2962 12.7948 22.4386 12.6524 22.5735C12.6187 22.6034 12.5663 22.6296 12.5213 22.6296C11.3788 22.6334 10.2362 22.6297 9.09365 22.6334C9.01498 22.6334 9 22.6034 9 22.536C9 21.4009 9 20.2621 9.00375 19.1271C9.00375 19.0746 9.02997 19.0109 9.06368 18.9772C10.4123 17.6249 11.7609 16.2763 13.1095 14.9277C14.2295 13.8076 15.3459 12.6913 16.466 11.5712C16.4884 11.5487 16.4997 11.5187 16.5147 11.5Z"
-                      fill="white"
-                    />
-                    <path
-                      d="M20.9499 14.2904C19.7436 13.0842 18.5449 11.8854 17.3499 10.6904C17.5634 10.4694 17.7844 10.2446 18.0054 10.0199C18.2639 9.76139 18.5261 9.50291 18.7884 9.24443C19.118 8.91852 19.5713 8.91852 19.8972 9.24443C20.7251 10.0611 21.5492 10.8815 22.3771 11.6981C22.6993 12.0165 22.7105 12.4698 22.3996 12.792C21.9238 13.2865 21.4443 13.7772 20.9686 14.2717C20.9648 14.2792 20.9536 14.2867 20.9499 14.2904Z"
-                      fill="white"
-                    />
-                  </svg>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div className="update-profile w-full">
-            <h1 className="text-xl tracking-wide font-bold text-dark-gray dark:text-white flex items-center mb-2">
-              Update Cover
-              <span className="ml-1">
-                <Icons name="block-question" />
-              </span>
-            </h1>
-            <p className="text-base text-thin-light-gray mb-5">
-              Cover of at least Size
-              <span className="ml-1   text-dark-gray dark:text-white">
-                1170x920
-              </span>
-              .
-            </p>
-            <div className="flex justify-center">
-              <div className="w-full relative">
-                <img
-                  src={coverImg}
-                  alt=""
-                  className="w-full h-[120px] rounded-lg overflow-hidden object-cover"
-                />
-                <input
-                  ref={coverImgInput}
-                  onChange={(e) => coverImgChangHandler(e)}
-                  type="file"
-                  className="hidden"
-                />
-                <div
-                  onClick={browseCoverImg}
-                  className="w-[32px] h-[32px] absolute -bottom-4 right-4 bg-dark-gray hover:bg-pink rounded-full cursor-pointer"
-                >
-                  <svg
-                    width="32"
-                    height="32"
-                    viewBox="0 0 32 32"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M16.5147 11.5C17.7284 12.7137 18.9234 13.9087 20.1296 15.115C19.9798 15.2611 19.8187 15.4109 19.6651 15.5683C17.4699 17.7635 15.271 19.9587 13.0758 22.1539C12.9334 22.2962 12.7948 22.4386 12.6524 22.5735C12.6187 22.6034 12.5663 22.6296 12.5213 22.6296C11.3788 22.6334 10.2362 22.6297 9.09365 22.6334C9.01498 22.6334 9 22.6034 9 22.536C9 21.4009 9 20.2621 9.00375 19.1271C9.00375 19.0746 9.02997 19.0109 9.06368 18.9772C10.4123 17.6249 11.7609 16.2763 13.1095 14.9277C14.2295 13.8076 15.3459 12.6913 16.466 11.5712C16.4884 11.5487 16.4997 11.5187 16.5147 11.5Z"
-                      fill="white"
-                    />
-                    <path
-                      d="M20.9499 14.2904C19.7436 13.0842 18.5449 11.8854 17.3499 10.6904C17.5634 10.4694 17.7844 10.2446 18.0054 10.0199C18.2639 9.76139 18.5261 9.50291 18.7884 9.24443C19.118 8.91852 19.5713 8.91852 19.8972 9.24443C20.7251 10.0611 21.5492 10.8815 22.3771 11.6981C22.6993 12.0165 22.7105 12.4698 22.3996 12.792C21.9238 13.2865 21.4443 13.7772 20.9686 14.2717C20.9648 14.2792 20.9536 14.2867 20.9499 14.2904Z"
-                      fill="white"
-                    />
-                  </svg>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div className="content-footer w-full">
-        <div className="w-full h-[120px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
-          <div className="flex space-x-4 mr-9">
-            <button
-              type="button"
-              className="text-18 text-light-red tracking-wide "
-            >
-              <span className="border-b dark:border-[#5356fb29]  border-light-red">
-                {" "}
-                Cancel
-              </span>
-            </button>
 
-            <button
-              type="button"
-              className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
-            >
-              Upadate Profile
-            </button>
-          </div>
+  const apiCall = new usersService()
+  let navigate = useNavigate()
+
+  let [togglePromotion, setTogglePromotion] = useState(false)
+
+  let [profile, setProfile] = useState({ // state for requesting from load profile API
+    data: [],
+    loading: true,
+    status: false
+  })
+
+  let [requestStatus, setRequestState] = useState({ // state for requesting from update api
+    message: '',
+    loading: false,
+    status: false
+  })
+
+  let [inputs, setInputs] = useState({ // State for input fields
+    firstname: '',
+    lastname: '',
+    state: '',
+    city: '',
+    email: ''
+  })
+
+  // const handleChange = ({target:{name, value}}) => {
+  //   setInputs(prev => ({...prev, [name]:value}))
+  // }
+
+  const handleUpdateUser = (values, helpers)=> {
+    setRequestState({message: '', loading: true, status: false})
+    
+    apiCall.updateProfile(values).then((res)=>{
+      if(res.data.internal_return < 0){
+        setRequestState({message: 'Profile Was unable to update', loading: false, status: false})
+        return
+      }
+      // setRequestState({message: 'Profile update successfully', loading: false, status: true})
+      toast.success("Update Successful");
+      setTimeout(()=>{navigate('/',{replace:true})},1000)
+    }).catch(error => {
+      setRequestState({message: 'Opps! an error occurred. Try Agian', loading: false, status: false})
+    })
+  }
+
+  const loadProfile = ()=>{ // function to load user profile
+    apiCall.loadProfile().then((res)=>{
+      if(res.data.internal_return < 0){
+        setProfile(prev => ({...prev, loading: false, status: true}))
+        return
+      }
+      setProfile(prev => ({...prev, data: [res.data], loading: false, status: true}))
+      setInputs({
+        firstname: res.data.firstname,
+        lastname: res.data.lastname,
+        state: res.data.state,
+        city: res.data.city,
+        email: res.data.email
+      })
+    }).catch(error =>{
+      setProfile(prev => ({...prev, loading: false, status: false}))
+    })
+  }
+
+  useEffect(()=>{
+    loadProfile() // loads user profile unto the page
+  },[])
+
+  return (
+
+    profile.loading ?
+      <div className="personal-info-tab w-full flex flex-col justify-between">
+        <div className="p-3">
+          <LoadingSpinner size='32' color='sky-blue' />
         </div>
       </div>
-    </div>
+    :
+      <div className="personal-info-tab w-full flex flex-col justify-between">
+        <Formik initialValues={inputs} validationSchema={validationSchema} onSubmit={handleUpdateUser}>
+          {(props => {
+            return (
+            <Form>
+            {
+            profile.data.length ? 
+            profile.data.map((item, index) => (
+              <div key={index} className="flex flex-col-reverse sm:flex-row">
+                <div className="flex-1 sm:mr-10">
+                  <div className="fields w-full">
+                    {/* inputs starts here */}
+                    {/* username */}
+                    <div className="field w-full mb-6">
+                      <InputCom
+                        label="User Name"
+                        type="text"
+                        name="username"
+                        placeholder=""
+                        value={item.username}
+                        disable={true}
+                      />
+                    </div>
+
+                    {/* Email */}
+                    <div className="field w-full mb-6">
+                      <InputCom
+                        label="Email"
+                        type="text"
+                        name="email"
+                        placeholder="Email"
+                        value={props.values.email}
+                        inputHandler={props.handleChange}
+                        blurHandler={props.handleBlur}
+                      />
+                      {(props.errors.email && props.touched.email) && <p className="text-sm text-red-500">{props.errors.email}</p>}
+                    </div>
+                    {/* first name and last name */}
+                    <div className="xl:flex xl:space-x-7 mb-6">
+                      <div className="field w-full mb-6 xl:mb-0">
+                        <InputCom
+                          label="First Name"
+                          type="text"
+                          name="firstname"
+                          placeholder="First Name"
+                          value={props.values.firstname}
+                          inputHandler={props.handleChange}
+                          blurHandler={props.handleBlur}
+                        />
+                        {(props.errors.firstname && props.touched.firstname) && <p className="text-sm text-red-500">{props.errors.firstname}</p>}
+                      </div>
+                      <div className="field w-full">
+                        <InputCom
+                          label="Last Name"
+                          type="text"
+                          name="lastname"
+                          placeholder="Last Name"
+                          value={props.values.lastname}
+                          inputHandler={props.handleChange}
+                          blurHandler={props.handleBlur}
+                        />
+                        {(props.errors.lastname && props.touched.lastname) && <p className="text-sm text-red-500">{props.errors.lastname}</p>}
+                      </div>
+                    </div>
+
+                    {/* Country */}
+                    <div className="field w-full mb-6">
+                      <InputCom
+                        label="Country"
+                        type="text"
+                        name="country"
+                        value={item.country}
+                        disable={true}
+                      />
+                    </div>
+
+                    {/* State/Province */}
+                    <div className="field w-full mb-6">
+                      <InputCom
+                        label="State/Province"
+                        type="text"
+                        name="state"
+                        placeholder="State"
+                        value={props.values.state}
+                        inputHandler={props.handleChange}
+                        blurHandler={props.handleBlur}
+                      />
+                      {(props.errors.state && props.touched.state) && <p className="text-sm text-red-500">{props.errors.state}</p>}
+                    </div>
+
+                    {/* City */}
+                    <div className="field w-full mb-6">
+                      <InputCom
+                        label="City"
+                        type="text"
+                        name="city"
+                        placeholder="City"
+                        value={props.values.city}
+                        inputHandler={props.handleChange}
+                        blurHandler={props.handleBlur}
+                      />
+                      {(props.errors.city && props.touched.city) && <p className="text-sm text-red-500">{props.errors.city}</p>}
+                    </div>
+
+                    {/* Preferred Communication*/}
+                    <div className='field w-full mb-6 md:flex items-center space-x-4'>
+                        <label className='input-label text-[#181c32] dark:text-white text-base font-semibold'>Pref. Communication</label>
+                        <div className="check-box">
+                          <div className="flex items-center justify-start">
+                            <div className="check-input flex items-center mr-1">
+                              <input className="w-4 h-4 cursor-pointer" type="checkbox" name="prefcomm1" id="" />
+                              <span className="mx-2 text-base text-dark-gray dark:text-white">Email</span>
+                            </div>
+                            <div className="check-input flex items-center">
+                              <input className="w-4 h-4 cursor-pointer" type="checkbox" name="prefcomm2" id="" />
+                              <span className="mx-2 text-base text-dark-gray dark:text-white">Phone</span>
+                            </div>
+                          </div>
+                        </div>
+                    </div>
+
+                    {/* Allow Promotions */}
+                    <div className='field w-full mb-6 flex items-center space-x-4'>
+                        <label className='input-label text-[#181c32] dark:text-white text-base font-semibold'>Allow Promotions</label>
+                        <div className="cursor-pointer flex items-center" onClick={()=>setTogglePromotion(prev => !prev)}>
+                          <div className={`h-6 w-8 mr-1 p-1 ${togglePromotion ? 'bg-sky-blue flex justify-end items-center': 'bg-slate-200'} rounded-full transition`}>
+                            <div className="w-4 h-full bg-white rounded-full"></div>  
+                          </div>
+                        </div>
+                    </div>
+                    {/* inputs ends here */}
+                  </div>
+                </div>
+                <div className="w-[232px] mb-10">
+                  <div className="update-profile w-full mb-9">
+                    <h1 className="text-xl tracking-wide font-bold text-dark-gray dark:text-white flex items-center mb-2">
+                      Update Profile
+                      <span className="ml-1">
+                        <Icons name="block-question" />
+                      </span>
+                    </h1>
+                    <p className="text-base text-thin-light-gray mb-5">
+                      Profile of at least Size
+                      <span className="ml-1   text-dark-gray dark:text-white">
+                        300x300
+                      </span>
+                      . Gifs work too.
+                      <span className="ml-1   text-dark-gray dark:text-white">
+                        Max 5mb
+                      </span>
+                      .
+                    </p>
+                    <div className="flex justify-center">
+                      <div className="w-full relative">
+                        <img
+                          src={profileImg}
+                          alt=""
+                          className="sm:w-[198px] sm:h-[198px] w-[120px] h-[120px] rounded-full overflow-hidden object-cover"
+                        />
+                        <input
+                          ref={profileImgInput}
+                          onChange={(e) => profileImgChangHandler(e)}
+                          type="file"
+                          className="hidden"
+                        />
+                        <div
+                          onClick={browseProfileImg}
+                          className="w-[32px] h-[32px] absolute bottom-7 sm:right-10 right-[105px]  hover:bg-pink bg-dark-gray rounded-full cursor-pointer"
+                        >
+                          <svg
+                            width="32"
+                            height="32"
+                            viewBox="0 0 32 32"
+                            fill="none"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M16.5147 11.5C17.7284 12.7137 18.9234 13.9087 20.1296 15.115C19.9798 15.2611 19.8187 15.4109 19.6651 15.5683C17.4699 17.7635 15.271 19.9587 13.0758 22.1539C12.9334 22.2962 12.7948 22.4386 12.6524 22.5735C12.6187 22.6034 12.5663 22.6296 12.5213 22.6296C11.3788 22.6334 10.2362 22.6297 9.09365 22.6334C9.01498 22.6334 9 22.6034 9 22.536C9 21.4009 9 20.2621 9.00375 19.1271C9.00375 19.0746 9.02997 19.0109 9.06368 18.9772C10.4123 17.6249 11.7609 16.2763 13.1095 14.9277C14.2295 13.8076 15.3459 12.6913 16.466 11.5712C16.4884 11.5487 16.4997 11.5187 16.5147 11.5Z"
+                              fill="white"
+                            />
+                            <path
+                              d="M20.9499 14.2904C19.7436 13.0842 18.5449 11.8854 17.3499 10.6904C17.5634 10.4694 17.7844 10.2446 18.0054 10.0199C18.2639 9.76139 18.5261 9.50291 18.7884 9.24443C19.118 8.91852 19.5713 8.91852 19.8972 9.24443C20.7251 10.0611 21.5492 10.8815 22.3771 11.6981C22.6993 12.0165 22.7105 12.4698 22.3996 12.792C21.9238 13.2865 21.4443 13.7772 20.9686 14.2717C20.9648 14.2792 20.9536 14.2867 20.9499 14.2904Z"
+                              fill="white"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+            </div>
+            ))
+            :
+            profile.status ?
+            <div className="py-3 text-slate-500">No User Information Found!</div>
+            :
+            <div className="py-3 text-slate-500">Opps! something went wrong. Try Again Later!</div>
+            }
+            <div className="content-footer w-full">
+              {requestStatus.message != '' && <p className={`text-center text-base ${requestStatus.status ? 'text-green-800' : 'text-red-600'}`}>{requestStatus.message}</p>}
+              <div className="w-full h-[120px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
+                <div className="flex items-center space-x-4 mr-9">
+                  <Link
+                    to='/'
+                    className="text-18 text-light-red tracking-wide "
+                  >
+                    <span className="border-b dark:border-[#5356fb29]  border-light-red">
+                      {" "}
+                      Cancel
+                    </span>
+                  </Link>
+
+                  {requestStatus.loading ? 
+                  <LoadingSpinner size='8' color='sky-blue' />
+                  :
+                  <button
+                  type="submit"
+                  className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                  >
+                    Update Profile
+                  </button>
+                  }
+                </div>
+              </div>
+            </div>
+            </Form>
+          )
+        })}
+        </Formik>
+      </div>
   );
 }

src/components/Settings/index.jsx

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

src/components/Spinners/LoadingSpinner.jsx

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

src/hooks/debounce.js

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

src/index.css

@@ -10,6 +10,12 @@
   src: url("./assets/fonts/Product Sans Bold.ttf");
 }
 
+.banner-630-340{
+  width: 630px;
+  height: 340px;
+  background-color: aliceblue;
+}
+
 /* Bold italic Weight */
 @font-face {
   font-family: "Product Sans";

src/middleware/AuthRoute.jsx

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

src/services/UsersService.js

@@ -11,6 +11,11 @@ class usersService {
         return this.postAuxEnd("/createuser", reqData);
     }
 
+    CompleteSignUp(reqData){
+        localStorage.setItem("session_token", ``);
+        return this.postAuxEnd("/completesignuplink", reqData);
+    }
+
     getHomeDate(){
         var postData = {
             uuid: localStorage.getItem("uuid"),
@@ -96,7 +101,7 @@ class usersService {
         return this.postAuxEnd("/getjobsdata", postData);
     }
 
-    getMyJobList(){
+    getHeroJBanners(){
         var postData = {
             uuid: localStorage.getItem("uid"),
             member_id: localStorage.getItem("member_id"),
@@ -104,7 +109,19 @@ class usersService {
             page:0,
             limit :100
         };
-        return this.postAuxEnd("/myjobs", postData);
+        return this.postAuxEnd("/homebanners", postData);
+    }
+
+    getMyJobList(){
+        var postData = {
+            uuid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:0,
+            offset:0,
+            limit :100
+        };
+        return this.postAuxEnd("/jobmanagerlist", postData);
     }
 
     getGetPendingJobs(){
@@ -153,6 +170,17 @@ class usersService {
         return this.postAuxEnd("/recipients", postData);
     }
 
+    //END POINT CALL FOR UPDATE PROFILE
+    addRecipient(data){
+        var postData = {
+        uid: localStorage.getItem("uid"),
+        member_id: localStorage.getItem("member_id"),
+        sessionid: localStorage.getItem("session_token"),
+        ...data
+        };
+        return this.postAuxEnd("/addrecipient", postData);
+    }
+
     // API FUNCTION TO GET SEND MONEY FEE
     getSendMoneyFee(amount){
         var postData = {
@@ -202,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(){
@@ -216,6 +257,40 @@ class usersService {
         return this.postAuxEnd("/refferhx", postData);
     }
 
+    //END POINT CALL FOR UPDATE PROFILE
+    updateProfile(post){
+        var postData = {
+        uid: localStorage.getItem("uid"),
+        member_id: localStorage.getItem("member_id"),
+        sessionid: localStorage.getItem("session_token"),
+        action: 5031,
+        ...post
+        };
+        return this.postAuxEnd("/updateprofile", postData);
+    }
+
+    //END POINT CALL FOR GETTING USER PROFILE
+    loadProfile(post){
+        var postData = {
+        uid: localStorage.getItem("uid"),
+        member_id: localStorage.getItem("member_id"),
+        sessionid: localStorage.getItem("session_token"),
+        };
+        return this.postAuxEnd("/loadprofile", postData);
+    }
+
+     //END POINT CALL FOR ACCOUNT TOP
+     startTopUp(post){
+        var postData = {
+        uid: localStorage.getItem("uid"),
+        member_id: localStorage.getItem("member_id"),
+        sessionid: localStorage.getItem("session_token"),
+        action: 11062,
+        ...post
+        };
+        return this.postAuxEnd("/starttopup", postData);
+    }
+
     //END POINT CALL FOR SENDING REFERRAL MESSAGE
     sendReferralMsg(postData){
         return this.postAuxEnd("/sendreferral", postData);
@@ -241,6 +316,37 @@ class usersService {
         return this.postAuxEnd("/signupcountry", null);
     }
 
+     // END POINT TO GET BANK NAME
+     getCountryBank() {
+        var postData = {
+            uid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            action: 11183,
+            country: 'NG'
+        };
+        return this.postAuxEnd("/countrybanks", postData);
+    }
+
+    // END POINT TO GET ACCOUNT TYPE
+    getAccountTypes() {
+        var postData = {
+            uid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            action: 11177
+        };
+        return this.postAuxEnd("/accounttypes", postData);
+    }
+
+    verifyEmail(code) {
+        const reqData = {
+            verify_link: code,
+            action: 11015
+        }
+        return this.postAuxEnd("/verifysignuplink", reqData);
+    }
+
     /*
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(username)
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(password)

src/store/UserDetails.js

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

src/store/store.js

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

src/views/HomePages.jsx

@@ -1,7 +1,23 @@
-import React from "react";
+import React, {useState, useEffect} from 'react'
 import Home from "../components/Home";
-
+import usersService from "../services/UsersService";
 export default function HomePages() {
+
+    const [marketActiveJobList, setMarketActiveJobList] = useState([]);
+    const api = new usersService();
+
+    const getMarketActiveJobList = async () => {
+        try {
+            const res = await api.getHeroJBanners();
+            setMarketActiveJobList(res.data);
+        } catch (error) {
+            console.log("Error getting mode");
+        }
+    };
+    useEffect(() => {
+        getMarketActiveJobList();
+    }, []);
+
   return (
     <>
       <Home />

src/views/MyJobsPage.jsx

@@ -24,10 +24,10 @@ export default function MyJobsPage() {
         getMyJobList();
     }, []);
 
-    debugger;
+   // debugger;
     return (
         <>
-            <MyJobs />
+            <MyJobs MyJobList={MyJobList} />
         </>
     );
 }

src/views/VerifyLinkPages.jsx

@@ -0,0 +1,5 @@
+import VerifyLink from "../components/AuthPages/VerifyLink";
+
+export default function VerifyLinkPages() {
+  return <VerifyLink />;
+}