diff --git a/src/components/FamilyAcc/FamilyTable.jsx b/src/components/FamilyAcc/FamilyTable.jsx
index 1a27a76..2eb2650 100644
--- a/src/components/FamilyAcc/FamilyTable.jsx
+++ b/src/components/FamilyAcc/FamilyTable.jsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import dataImage1 from "../../assets/images/data-table-user-1.png";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
-import { useNavigate, useLocation, Link } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { handlePagingFunc } from "../Pagination/HandlePagination";
 import PaginatedList from "../Pagination/PaginatedList";
 
diff --git a/src/components/Helpers/PriceFormatter.jsx b/src/components/Helpers/PriceFormatter.jsx
index 9a1802e..49b5bb5 100644
--- a/src/components/Helpers/PriceFormatter.jsx
+++ b/src/components/Helpers/PriceFormatter.jsx
@@ -20,7 +20,8 @@ import React from "react";
 export const PriceFormatter = (
   price = "00",
   currency = "",
-  currencyName = ""
+  currencyName = "",
+  priceClass
 ) => {
   // Convert the number to a string
   let numStr = String(price);
@@ -44,7 +45,7 @@ export const PriceFormatter = (
   return (
     <span className="text-sm flex items-center">
       <sup>{currency || currencyName || ""}</sup>
-      <span className="px-1 font-bold text-lg">{formattedInteger || ""}</span>
+      <span className={`px-1 font-bold ${priceClass ? priceClass : "text-lg"}`}>{formattedInteger || ""}</span>
       <sup>{formattedDecimal || ""}</sup>
     </span>
   );
diff --git a/src/components/Home/FullAccountDash.jsx b/src/components/Home/FullAccountDash.jsx
index feff276..0e996b9 100644
--- a/src/components/Home/FullAccountDash.jsx
+++ b/src/components/Home/FullAccountDash.jsx
@@ -11,12 +11,6 @@ import HomeActivities from "./HomeActivities";
 
 export default function FullAccountDash(props) {
   console.log("PROPS IN HOME->", props);
-
-  const trending = datas.datas;
-  const jobData = datas.datas; // api calls or cache
-
-  const userApi = new usersService();
-
   const { userDetails } = useSelector((state) => state?.userDetails);
 
   return (
diff --git a/src/components/MyWallet/AddFund.jsx b/src/components/MyWallet/AddFund.jsx
index 92e4e31..6aa4cf9 100644
--- a/src/components/MyWallet/AddFund.jsx
+++ b/src/components/MyWallet/AddFund.jsx
@@ -1,48 +1,53 @@
-import React, {useState} from 'react'
-import RecentActivityTable from './WalletComponent/RecentActivityTable'
-import LoadingSpinner from '../Spinners/LoadingSpinner'
-import { useNavigate, useLocation } from 'react-router-dom'
-import InputCom from '../Helpers/Inputs/InputCom'
+import React, { useState } from "react";
+import RecentActivityTable from "./WalletComponent/RecentActivityTable";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import { useNavigate } from "react-router-dom";
+import InputCom from "../Helpers/Inputs/InputCom";
 
-import AddFundDollars from './AddFundDollars'
+import AddFundDollars from "./AddFundDollars";
 
-function AddFund({payment}) {
-   
-    const navigate = useNavigate()
-    const {currency} = useLocation()?.state //GETS THE USER CURRENCY FOR ADD FUND
+function AddFund({ paymentHistory, currency }) {
+  const navigate = useNavigate();
+  //   const { currency } = useLocation()?.state; //GETS THE USER CURRENCY FOR ADD FUND
 
-    //STATE FOR CONTROLLED INPUT
-    let [input, setInput] = useState('')
+  //STATE FOR CONTROLLED INPUT
+  let [input, setInput] = useState("");
 
-    let [inputError, setInputError] = useState('')
+  let [inputError, setInputError] = useState("");
 
-    // FUNCTION TO HANDLE INPUT CHANGE
-    const handleChange = ({target:{name, value}}) => {
-        setInput(value)
+  // FUNCTION TO HANDLE INPUT CHANGE
+  const handleChange = ({ target: { name, value } }) => {
+    setInput(value);
+  };
+
+  //FUNCTION TO HANDLE SUBMIT
+  const handleSubmit = () => {
+    setInputError("");
+    if (!input || input == "0") {
+      setInputError("Please Enter Amount");
+      return setTimeout(() => {
+        setInputError("");
+      }, 5000);
     }
 
-    //FUNCTION TO HANDLE SUBMIT
-    const handleSubmit = () => {
-        setInputError('')
-        if(!input || input == '0'){
-            setInputError('Please Enter Amount')
-            return setTimeout(()=>{setInputError('')}, 5000)
-        }
-
-        if(isNaN(input)){
-            setInputError('Amount must be a Number')
-            return setTimeout(()=>{setInputError('')}, 5000)
-        }
-
-        const stateData = {amount: Number(input), currency: 'naira'}
-        navigate('confirm-add-fund', {state: stateData})
-     
-        setInput('')
+    if (isNaN(input)) {
+      setInputError("Amount must be a Number");
+      return setTimeout(() => {
+        setInputError("");
+      }, 5000);
     }
-    return (
-        <div>
-            {/* heading */}
-            <div className="sm:flex justify-between items-center mb-6">
+
+    const stateData = { amount: Number(input), currency: "naira" };
+    navigate("confirm-add-fund", { state: stateData });
+
+    setInput("");
+  };
+  console.log("walletItem >>", paymentHistory);
+
+  return (
+    <div>
+      {/* heading */}
+      {/* <div className="sm:flex justify-between items-center mb-6">
                 <div className="w-full flex justify-start space-x-3 items-center">
                     <button
                     type="button"
@@ -71,70 +76,82 @@ function AddFund({payment}) {
                         className="relative"
                     ></div>
                 </div>
-            </div>
+            </div> */}
 
-            <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
-                <div className="lg:w-2/2 w-full mb-10 lg:mb-0">
-                    <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl shadow">
-                        {/*<h2 className='md:p-8 p-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Add Credit with Account Deposit</h2>*/}
-                        {/*<hr />*/}
-                        <form className='md:p-8 p-4 add-fund-info'>
-                            <div className="field w-full mb-6">
-                                <InputCom
-                                    fieldClass="px-6"
-                                    label={currency == 'US Dollars' ? "Amount (USD)" : "Amount (Naira)"}
-                                    type="text"
-                                    name="amount"
-                                    placeholder="0"
-                                    value={input}
-                                    inputHandler={handleChange}
-                                />
-                                {inputError && <p className='text-base text-red-500'>{inputError}</p>}
-                            </div>
-                        </form>
-                        <hr />
+      <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
+        <div className="lg:w-2/2 w-full mb-10 lg:mb-0">
+          <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl shadow">
+            {/*<h2 className='md:p-8 p-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Add Credit with Account Deposit</h2>*/}
+            {/*<hr />*/}
+            <form className="md:p-8 p-4 add-fund-info">
+              <div className="field w-full mb-6">
+                <InputCom
+                  fieldClass="px-6"
+                  label={
+                    currency == "US Dollars" ? "Amount (USD)" : "Amount (Naira)"
+                  }
+                  type="text"
+                  name="amount"
+                  placeholder="0"
+                  value={input}
+                  inputHandler={handleChange}
+                />
+                {inputError && (
+                  <p className="text-base text-red-500">{inputError}</p>
+                )}
+              </div>
+            </form>
+            <hr />
 
-                        {/* SHOWS THIS IF USER CURRENCY IS DOLLARS */}
-                        {currency == 'US Dollars' &&
-                        <div className='w-full md:p-8 p-4 bg-white dark:bg-dark-white rounded-2xl shadow'>
-                            <AddFundDollars setInputError={setInputError} input={input} setInput={setInput} />
-                        </div>
-                        }
+            {/* SHOWS THIS IF USER CURRENCY IS DOLLARS */}
+            {currency == "US Dollars" && (
+              <div className="w-full md:p-8 p-4 bg-white dark:bg-dark-white rounded-2xl shadow">
+                <AddFundDollars
+                  setInputError={setInputError}
+                  input={input}
+                  setInput={setInput}
+                />
+              </div>
+            )}
 
-                        {/* HIDES THIS BUTTON IF CURENCY IS NAIRA */}
-                        {currency != 'US Dollars' &&
-                        <div className='md:p-8 p-4 add-fund-btn flex justify-end items-center py-4'>
-                            <button
-                                onClick={handleSubmit}
-                                type="button"
-                                className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                            >
-                                <span className="text-white">Continue</span>
-                            </button>
-                        </div>
-                        }
-                    </div>
-                </div>
-            </div>
-
-            {/* HIDES THIS SECTION IF CURENCY IS NAIRA */}
-            {currency != 'US Dollars' &&
-            <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
-                <div className="lg:w-2/2 w-full mb-10 lg:mb-0">
-                    <div className="wallet w-full md:p-8 p-4 h-full min-h-[590px] bg-white dark:bg-dark-white 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>
-            }          
+            {/* HIDES THIS BUTTON IF CURENCY IS NAIRA */}
+            {currency != "US Dollars" && (
+              <div className="md:p-8 p-4 add-fund-btn flex justify-end items-center py-4">
+                <button
+                  onClick={handleSubmit}
+                  type="button"
+                  className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                >
+                  <span className="text-white">Continue</span>
+                </button>
+              </div>
+            )}
+          </div>
         </div>
-      )
+      </div>
+
+      {/* HIDES THIS SECTION IF CURENCY IS NAIRA */}
+      {currency != "US Dollars" && (
+        <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
+          <div className="lg:w-2/2 w-full mb-10 lg:mb-0">
+            <div className="wallet w-full md:p-8 p-4 h-full min-h-[590px] bg-white dark:bg-dark-white rounded-2xl shadow">
+              <h2 className="text-gray-900 dark:text-white text-xl lg:text-2xl font-medium">
+                {/* Recent Activity */}Working in Progress
+              </h2>
+              <p>This popup has taking time because of the prop drilling. I have got it right now</p>
+              {/* <p className='text-base text-gray-600 dark:text-white'>Activity Report</p> */}
+              {paymentHistory?.loading ? (
+                <LoadingSpinner size="16" color="sky-blue" />
+              ) : (
+                // <RecentActivityTable payment={paymentHistory} />
+                ""
+              )}
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  );
 }
 
-export default AddFund
\ No newline at end of file
+export default AddFund;
diff --git a/src/components/MyWallet/Popup/CreditPopup.jsx b/src/components/MyWallet/Popup/CreditPopup.jsx
new file mode 100644
index 0000000..fdd2e46
--- /dev/null
+++ b/src/components/MyWallet/Popup/CreditPopup.jsx
@@ -0,0 +1,76 @@
+import { useState } from "react";
+import { useLocation } from "react-router-dom";
+// import ModalCom from "../Helpers/ModalCom";
+import { Form, Formik } from "formik";
+import InputCom from "../../Helpers/Inputs/InputCom";
+import usersService from "../../../services/UsersService";
+import Icons from "../../Helpers/Icons";
+import AddFund from "../AddFund";
+import ModalCom from "../../Helpers/ModalCom";
+
+const CreditPopup = ({ details, onClose, situation}) => {
+  const { pathname, state } = useLocation();
+  const [submitTask, setSubmitTask] = useState({
+    loading: false,
+    msg: "",
+    state: "",
+  });
+  const [suggestedNextStep, setSuggestedNextStep] = useState("Send Task");
+
+  const switchNextStep = ({ target: value }) => {
+    setSuggestedNextStep(value);
+  };
+
+  const apiCall = new usersService();
+
+  const handleParentSuggestion = (values) => {
+    if (suggestedNextStep == "Send Task") {
+      let firstName = state?.firstname;
+      let family_uid = state?.family_uid;
+      //   continuePopupData({ ...details, firstName, family_uid });
+    }
+    onClose();
+  };
+
+  return (
+    <ModalCom action={onClose} situation={situation}>
+      <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+        <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
+          <h1 className="text-base md:text-lg font-bold text-dark-gray dark:text-white tracking-wide">
+            Add Credit
+          </h1>
+          <button
+            type="button"
+            className="text-[#374557] dark:text-red-500"
+            onClick={onClose}
+          >
+            <svg
+              width="36"
+              height="36"
+              viewBox="0 0 36 36"
+              fill="none"
+              className="fill-current"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                fill=""
+                fillOpacity="0.6"
+              />
+              <path
+                d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                fill="#"
+                fillOpacity="0.6"
+              />
+            </svg>
+          </button>
+        </div>
+        <div className="logout-modal-body w-full flex flex-col items-center px-10 py-8">
+          <AddFund payment={details} />
+        </div>
+      </div>
+    </ModalCom>
+  );
+};
+
+export default CreditPopup;
diff --git a/src/components/MyWallet/Wallet.jsx b/src/components/MyWallet/Wallet.jsx
index b2bee7c..12446f8 100644
--- a/src/components/MyWallet/Wallet.jsx
+++ b/src/components/MyWallet/Wallet.jsx
@@ -1,85 +1,177 @@
-import React, { useEffect, useState } from 'react'
-import {Routes, Route, Outlet, Navigate} from 'react-router-dom'
-import usersService from '../../services/UsersService'
+import React, {
+  Suspense,
+  lazy,
+  useCallback,
+  useEffect,
+  useMemo,
+  useReducer,
+} from "react";
+import { Routes, Route, Outlet, Navigate } from "react-router-dom";
+import usersService from "../../services/UsersService";
+import Layout from "../Partials/Layout";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
 
-import Layout from '../Partials/Layout'
-
-import Balance from './Balance'
-import TransferFund from './TransferFund'
-import AddFund from './AddFund'
-import AddRecipient from './AddRecipient'
-import ConfirmTransfer from './ConfirmTransfer'
-import ConfirmAddFund from './ConfirmAddFund'
-import WalletBox from "./WalletBox";
+const AddFund = lazy(() => import("./AddFund"));
+const ConfirmAddFund = lazy(() => import("./ConfirmAddFund"));
+const TransferFund = lazy(() => import("./TransferFund"));
+const WalletBox = lazy(() => import("./WalletBox"));
+const AddRecipient = lazy(() => import("./AddRecipient"));
+const ConfirmTransfer = lazy(() => import("./ConfirmTransfer"));
 
 function Wallet() {
   return (
     <Layout>
-        <Outlet />
+      <Outlet />
     </Layout>
-  )
+  );
 }
 
+const initialState = {
+  loading: true,
+  data: [],
+  error: false,
+};
+
+// Currently learning better about useReducer, so I converted this since it seemed like something complex
+const reducer = (state, action) => {
+  switch (action.type) {
+    case "FETCH_SUCCESS":
+      return {
+        ...state,
+        loading: false,
+        data: action.payload,
+      };
+    case "FETCH_ERROR":
+      return {
+        ...state,
+        loading: false,
+        error: true,
+      };
+    default:
+      return state;
+  }
+};
 
 const WalletRoutes = () => {
-    const apiCall = new usersService()
+  const apiCall = useMemo(() => new usersService(), []);
 
-    let [walletList, setWalletList] = useState({ // FOR WALLET LIST
-        loading: true,
-        data: [],
-        error: false
-    })
+  const [walletList, dispatchWalletList] = useReducer(reducer, initialState);
+  const [paymentHistory, dispatchPaymentHistory] = useReducer(
+    reducer,
+    initialState
+  );
 
-    let [paymentHistory, setPaymentHistory] = useState({ // FOR PAYMENT HISTORY
-        loading: true,
-        data: [],
-        error: false
-    })
+  const getWalletList = useCallback(() => {
+    apiCall
+      .getUserWallets(null)
+      .then((res) => {
+        if (res.data.internal_return < 0) {
+          dispatchWalletList({ type: "FETCH_SUCCESS", payload: [] });
+        } else {
+          dispatchWalletList({
+            type: "FETCH_SUCCESS",
+            payload: res.data.result_list,
+          });
+        }
+      })
+      .catch(() => {
+        dispatchWalletList({ type: "FETCH_ERROR" });
+      });
+  }, [apiCall]);
 
-    //FUNCTION TO GET WALLET LIST
-    const getWalletList = ()=>{
-        apiCall.getUserWallets(null).then((res)=>{
-            if(res.data.internal_return < 0){ // success but no data
-                setWalletList(prev => ({...prev, loading: false}))
-                return
-            }
-            setWalletList(prev => ({...prev, loading: false, data: res.data.result_list}))
-        }).catch((error)=>{
-            setWalletList(prev => ({...prev, loading: false, error: true}))
-        })
+  const getPaymentHistory = useCallback(() => {
+    apiCall
+      .getPaymentHx()
+      .then((res) => {
+        if (res.data.internal_return < 0) {
+          dispatchPaymentHistory({ type: "FETCH_SUCCESS", payload: [] });
+        } else {
+          dispatchPaymentHistory({
+            type: "FETCH_SUCCESS",
+            payload: res.data.result_list,
+          });
+        }
+      })
+      .catch(() => {
+        dispatchPaymentHistory({ type: "FETCH_ERROR" });
+      });
+  }, [apiCall]);
+
+  useEffect(() => {
+    let isMounted = true;
+
+    if (isMounted) {
+      getWalletList();
+      getPaymentHistory();
     }
 
-    //FUNCTION TO GET PAYMENT HISTORY
-    const getPaymentHistory = ()=>{
-        apiCall.getPaymentHx().then((res)=>{
-            if(res.data.internal_return < 0){ // success but no data
-                setPaymentHistory(prev => ({...prev, loading: false}))
-                return
-            }
-            setPaymentHistory(prev => ({...prev, loading: false, data: res.data.result_list}))
-        }).catch((error)=>{
-            setPaymentHistory(prev => ({...prev, loading: false, error: true}))
-        })
-    }
+    return () => {
+      isMounted = false;
+    };
+  }, [getWalletList, getPaymentHistory]);
 
-    useEffect(()=>{
-        getWalletList()
-        getPaymentHistory()
-    }, [])
-    return (
-        <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 wallet={walletList} />} />*/}
-                <Route index element={<WalletBox wallet={walletList} />} />
-                <Route path='transfer-fund/add-recipient' element={<AddRecipient />} />
-                <Route path='transfer-fund/confirm-transfer' element={<ConfirmTransfer payment={paymentHistory} wallet={walletList} />} />
-                <Route path='*' element={<Navigate to='/' />} />
-            </Route>
-        </Routes>
-    )
-}
+  return (
+    <Routes>
+      <Route
+        element={
+          <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>
+            <Wallet />
+          </Suspense>
+        }
+      >
+        {/* <Route
+          path="add-fund"
+          element={
+            <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>
+              <AddFund payment={paymentHistory} />
+            </Suspense>
+          }
+        /> */}
+        <Route
+          path="add-fund/confirm-add-fund"
+          element={
+            <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>
+              <ConfirmAddFund payment={paymentHistory} />
+            </Suspense>
+          }
+        />
+        <Route
+          path="transfer-fund"
+          element={
+            <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>
+              <TransferFund payment={paymentHistory} wallet={walletList} />
+            </Suspense>
+          }
+        />
+        {/*<Route index element={<Balance wallet={walletList} />} />*/}
+        <Route
+          index
+          element={
+            <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>
+              <WalletBox wallet={walletList} payment={paymentHistory} />
+            </Suspense>
+          }
+        />
+        <Route
+          path="transfer-fund/add-recipient"
+          element={
+            <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>
+              <AddRecipient />
+            </Suspense>
+          }
+        />
+        <Route
+          path="transfer-fund/confirm-transfer"
+          element={
+            <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>
+              <ConfirmTransfer payment={paymentHistory} wallet={walletList} />
+            </Suspense>
+          }
+        />
+        <Route path="*" element={<Navigate to="/" />} />
+      </Route>
+    </Routes>
+  );
+};
 
-export default WalletRoutes
\ No newline at end of file
+export default WalletRoutes;
diff --git a/src/components/MyWallet/WalletBox.jsx b/src/components/MyWallet/WalletBox.jsx
index 4e8969c..2c5d159 100644
--- a/src/components/MyWallet/WalletBox.jsx
+++ b/src/components/MyWallet/WalletBox.jsx
@@ -1,9 +1,3 @@
-import React from "react";
-import bank1 from "../../assets/images/bank-1.png";
-import bank2 from "../../assets/images/bank-2.png";
-import bank3 from "../../assets/images/bank-3.png";
-import bank4 from "../../assets/images/bank-4.png";
-import Layout from "../Partials/Layout";
 import CurrencyStaticsSection from "./CurrencyStaticsSection";
 import CurrentBalanceWidget from "./CurrentBalanceWidget";
 import InvestmentSection from "./InvestmentSection";
@@ -11,263 +5,262 @@ import RecentTransactionWidget from "./RecentTransactionWidget";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import WalletItemCard from "./WalletItemCard";
 
-export default function WalletBox({wallet, coupon}) {
-    return (
-        <>
-
-                <div className="my-wallet-wrapper w-full mb-10">
-                    <div className="main-wrapper w-full">
-                        <div className="balance-inquery w-full lg:h-[436px] lg:flex lg:space-x-11 mb-11">
-                            {wallet.loading ?
-                                <LoadingSpinner size='16' color='sky-blue' />
-                                :
-                                wallet.data.length ?
-                                    wallet.data.map((item, index)=> (
-                                        <div className="lg:w-1/2 h-full mb-10 lg:mb-0">
-                                            <WalletItemCard walletItem={item} />
-                                        </div>
-                                )) : ''
-                            }
-
-                            {/*<div className="flex-1">*/}
-                            {/*    <CurrentBalanceWidget />*/}
-                            {/*</div>*/}
-                          {/*  <div className="flex-1">*/}
-                          {/*      <div className="my-wallets w-full h-full bg-white dark:bg-dark-white   rounded-lg p-6">*/}
-                          {/*          <div className="mb-4">*/}
-                          {/*              <h1 className="text-xl font-bold tracking-wide   text-dark-gray dark:text-white">*/}
-                          {/*                  My Wallet*/}
-                          {/*              </h1>*/}
-                          {/*          </div>*/}
-                          {/*          <div className="content-area">*/}
-                          {/*              <div className="flex justify-between items-center mb-6">*/}
-                          {/*                  <div className="flex space-x-5 items-center">*/}
-                          {/*                      <div className="account-name flex space-x-4 items-center">*/}
-                          {/*                          <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
-                          {/*                              <img src={bank1} alt="" />*/}
-                          {/*                          </div>*/}
-                          {/*                          <div className="name">*/}
-                          {/*                              <p className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
-                          {/*                                  MetaMask*/}
-                          {/*                              </p>*/}
-                          {/*                          </div>*/}
-                          {/*                      </div>*/}
-                          {/*                  </div>*/}
-                          {/*                  <div className="flex space-x-5 items-center">*/}
-                          {/*                      <div>*/}
-                          {/*                          <p className="text-xl font-bold text-dark-gray dark:text-white text-right mb-3">*/}
-                          {/*                              $734.79*/}
-                          {/*                          </p>*/}
-                          {/*                          <p className="text-sm text-thin-light-gray">*/}
-                          {/*                              New Add*/}
-                          {/*                              <span className="text-light-green ml-1">*/}
-                          {/*    +324.75*/}
-                          {/*  </span>*/}
-                          {/*                          </p>*/}
-                          {/*                      </div>*/}
-                          {/*                      <div>*/}
-                          {/*<span className="dark:text-thin-light-gray text-[#374557]">*/}
-                          {/*  <svg*/}
-                          {/*      width="6"*/}
-                          {/*      height="26"*/}
-                          {/*      viewBox="0 0 6 26"*/}
-                          {/*      fill="none"*/}
-                          {/*      className="fill-current"*/}
-                          {/*      xmlns="http://www.w3.org/2000/svg"*/}
-                          {/*  >*/}
-                          {/*    <circle cx="3" cy="3" r="3" fillOpacity="0.6" />*/}
-                          {/*    <circle*/}
-                          {/*        cx="3"*/}
-                          {/*        cy="12.75"*/}
-                          {/*        r="3"*/}
-                          {/*        fillOpacity="0.6"*/}
-                          {/*    />*/}
-                          {/*    <circle*/}
-                          {/*        cx="3"*/}
-                          {/*        cy="22.5"*/}
-                          {/*        r="3"*/}
-                          {/*        fillOpacity="0.6"*/}
-                          {/*    />*/}
-                          {/*  </svg>*/}
-                          {/*</span>*/}
-                          {/*                      </div>*/}
-                          {/*                  </div>*/}
-                          {/*              </div>*/}
-                          {/*              <div className="flex justify-between items-center mb-6">*/}
-                          {/*                  <div className="flex space-x-5 items-center">*/}
-                          {/*                      <div className="account-name flex space-x-4 items-center">*/}
-                          {/*                          <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
-                          {/*                              <img src={bank2} alt="" />*/}
-                          {/*                          </div>*/}
-                          {/*                          <div className="name">*/}
-                          {/*                              <p className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
-                          {/*                                  Coinbase Wallet*/}
-                          {/*                              </p>*/}
-                          {/*                          </div>*/}
-                          {/*                      </div>*/}
-                          {/*                  </div>*/}
-                          {/*                  <div className="flex space-x-5 items-center">*/}
-                          {/*                      <div>*/}
-                          {/*                          <p className="text-xl font-bold text-dark-gray dark:text-white text-right mb-3">*/}
-                          {/*                              $734.79*/}
-                          {/*                          </p>*/}
-                          {/*                          <p className="text-sm text-thin-light-gray">*/}
-                          {/*                              New Add*/}
-                          {/*                              <span className="text-light-green ml-1">*/}
-                          {/*    +324.75*/}
-                          {/*  </span>*/}
-                          {/*                          </p>*/}
-                          {/*                      </div>*/}
-                          {/*                      <div>*/}
-                          {/*<span className="dark:text-thin-light-gray text-[#374557]">*/}
-                          {/*  <svg*/}
-                          {/*      width="6"*/}
-                          {/*      height="26"*/}
-                          {/*      viewBox="0 0 6 26"*/}
-                          {/*      fill="none"*/}
-                          {/*      className="fill-current"*/}
-                          {/*      xmlns="http://www.w3.org/2000/svg"*/}
-                          {/*  >*/}
-                          {/*    <circle cx="3" cy="3" r="3" fillOpacity="0.6" />*/}
-                          {/*    <circle*/}
-                          {/*        cx="3"*/}
-                          {/*        cy="12.75"*/}
-                          {/*        r="3"*/}
-                          {/*        fillOpacity="0.6"*/}
-                          {/*    />*/}
-                          {/*    <circle*/}
-                          {/*        cx="3"*/}
-                          {/*        cy="22.5"*/}
-                          {/*        r="3"*/}
-                          {/*        fillOpacity="0.6"*/}
-                          {/*    />*/}
-                          {/*  </svg>*/}
-                          {/*</span>*/}
-                          {/*                      </div>*/}
-                          {/*                  </div>*/}
-                          {/*              </div>*/}
-                          {/*              <div className="flex justify-between items-center mb-6">*/}
-                          {/*                  <div className="flex space-x-5 items-center">*/}
-                          {/*                      <div className="account-name flex space-x-4 items-center">*/}
-                          {/*                          <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
-                          {/*                              <img src={bank3} alt="" />*/}
-                          {/*                          </div>*/}
-                          {/*                          <div className="name">*/}
-                          {/*                              <p className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
-                          {/*                                  Bitski*/}
-                          {/*                              </p>*/}
-                          {/*                          </div>*/}
-                          {/*                      </div>*/}
-                          {/*                  </div>*/}
-                          {/*                  <div className="flex space-x-5 items-center">*/}
-                          {/*                      <div>*/}
-                          {/*                          <p className="text-xl font-bold text-dark-gray dark:text-white text-right mb-3">*/}
-                          {/*                              $734.79*/}
-                          {/*                          </p>*/}
-                          {/*                          <p className="text-sm text-thin-light-gray">*/}
-                          {/*                              New Add*/}
-                          {/*                              <span className="text-light-green ml-1">*/}
-                          {/*    +324.75*/}
-                          {/*  </span>*/}
-                          {/*                          </p>*/}
-                          {/*                      </div>*/}
-                          {/*                      <div>*/}
-                          {/*<span className="dark:text-thin-light-gray text-[#374557]">*/}
-                          {/*  <svg*/}
-                          {/*      width="6"*/}
-                          {/*      height="26"*/}
-                          {/*      viewBox="0 0 6 26"*/}
-                          {/*      fill="none"*/}
-                          {/*      className="fill-current"*/}
-                          {/*      xmlns="http://www.w3.org/2000/svg"*/}
-                          {/*  >*/}
-                          {/*    <circle cx="3" cy="3" r="3" fillOpacity="0.6" />*/}
-                          {/*    <circle*/}
-                          {/*        cx="3"*/}
-                          {/*        cy="12.75"*/}
-                          {/*        r="3"*/}
-                          {/*        fillOpacity="0.6"*/}
-                          {/*    />*/}
-                          {/*    <circle*/}
-                          {/*        cx="3"*/}
-                          {/*        cy="22.5"*/}
-                          {/*        r="3"*/}
-                          {/*        fillOpacity="0.6"*/}
-                          {/*    />*/}
-                          {/*  </svg>*/}
-                          {/*</span>*/}
-                          {/*                      </div>*/}
-                          {/*                  </div>*/}
-                          {/*              </div>*/}
-                          {/*              <div className="flex justify-between items-center mb-6">*/}
-                          {/*                  <div className="flex space-x-5 items-center">*/}
-                          {/*                      <div className="account-name flex space-x-4 items-center">*/}
-                          {/*                          <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
-                          {/*                              <img src={bank4} alt="" />*/}
-                          {/*                          </div>*/}
-                          {/*                          <div className="name">*/}
-                          {/*                              <p className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
-                          {/*                                  WalletConnect*/}
-                          {/*                              </p>*/}
-                          {/*                          </div>*/}
-                          {/*                      </div>*/}
-                          {/*                  </div>*/}
-                          {/*                  <div className="flex space-x-5 items-center">*/}
-                          {/*                      <div>*/}
-                          {/*                          <p className="text-xl font-bold text-dark-gray dark:text-white text-right mb-3">*/}
-                          {/*                              $734.79*/}
-                          {/*                          </p>*/}
-                          {/*                          <p className="text-sm text-thin-light-gray">*/}
-                          {/*                              New Add*/}
-                          {/*                              <span className="text-light-green ml-1">*/}
-                          {/*    +324.75*/}
-                          {/*  </span>*/}
-                          {/*                          </p>*/}
-                          {/*                      </div>*/}
-                          {/*                      <div>*/}
-                          {/*<span className="dark:text-thin-light-gray text-[#374557]">*/}
-                          {/*  <svg*/}
-                          {/*      width="6"*/}
-                          {/*      height="26"*/}
-                          {/*      viewBox="0 0 6 26"*/}
-                          {/*      fill="none"*/}
-                          {/*      className="fill-current"*/}
-                          {/*      xmlns="http://www.w3.org/2000/svg"*/}
-                          {/*  >*/}
-                          {/*    <circle cx="3" cy="3" r="3" fillOpacity="0.6" />*/}
-                          {/*    <circle*/}
-                          {/*        cx="3"*/}
-                          {/*        cy="12.75"*/}
-                          {/*        r="3"*/}
-                          {/*        fillOpacity="0.6"*/}
-                          {/*    />*/}
-                          {/*    <circle*/}
-                          {/*        cx="3"*/}
-                          {/*        cy="22.5"*/}
-                          {/*        r="3"*/}
-                          {/*        fillOpacity="0.6"*/}
-                          {/*    />*/}
-                          {/*  </svg>*/}
-                          {/*</span>*/}
-                          {/*                      </div>*/}
-                          {/*                  </div>*/}
-                          {/*              </div>*/}
-                          {/*          </div>*/}
-                          {/*      </div>*/}
-                          {/*  </div>*/}
-                        </div>
-                        {/* flex space-x-11 */}
-                        {/*<div className="recent-and-investment grid lg:grid-cols-2 grid-cols-1 2xl:gap-[40px] xl:gap-7 gap-4 lg:h-[416px] w-full  justify-between">*/}
-                        {/*    <div className=" h-full">*/}
-                        {/*        <RecentTransactionWidget />*/}
-                        {/*    </div>*/}
-                        {/*    <div className=" h-full">*/}
-                        {/*        <InvestmentSection />*/}
-                        {/*    </div>*/}
-                        {/*</div>*/}
-                    </div>
+export default function WalletBox({ wallet, coupon, payment }) {
+  return (
+    <>
+      <div className="my-wallet-wrapper w-full mb-10">
+        <div className="main-wrapper w-full">
+          <div className="balance-inquery w-full lg:h-[436px] lg:flex lg:space-x-11 mb-11">
+            {wallet.loading ? (
+              <div className="w-full h-full flex items-center justify-center">
+                <LoadingSpinner size="16" color="sky-blue" />
+              </div>
+            ) : wallet.data.length ? (
+              wallet.data.map((item, index) => (
+                <div className="lg:w-1/2 h-full mb-10 lg:mb-0">
+                  <WalletItemCard walletItem={item} paymentHistory={payment} />
                 </div>
+              ))
+            ) : null}
 
-        </>
-    );
+            {/*<div className="flex-1">*/}
+            {/*    <CurrentBalanceWidget />*/}
+            {/*</div>*/}
+            {/*  <div className="flex-1">*/}
+            {/*      <div className="my-wallets w-full h-full bg-white dark:bg-dark-white   rounded-lg p-6">*/}
+            {/*          <div className="mb-4">*/}
+            {/*              <h1 className="text-xl font-bold tracking-wide   text-dark-gray dark:text-white">*/}
+            {/*                  My Wallet*/}
+            {/*              </h1>*/}
+            {/*          </div>*/}
+            {/*          <div className="content-area">*/}
+            {/*              <div className="flex justify-between items-center mb-6">*/}
+            {/*                  <div className="flex space-x-5 items-center">*/}
+            {/*                      <div className="account-name flex space-x-4 items-center">*/}
+            {/*                          <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+            {/*                              <img src={bank1} alt="" />*/}
+            {/*                          </div>*/}
+            {/*                          <div className="name">*/}
+            {/*                              <p className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
+            {/*                                  MetaMask*/}
+            {/*                              </p>*/}
+            {/*                          </div>*/}
+            {/*                      </div>*/}
+            {/*                  </div>*/}
+            {/*                  <div className="flex space-x-5 items-center">*/}
+            {/*                      <div>*/}
+            {/*                          <p className="text-xl font-bold text-dark-gray dark:text-white text-right mb-3">*/}
+            {/*                              $734.79*/}
+            {/*                          </p>*/}
+            {/*                          <p className="text-sm text-thin-light-gray">*/}
+            {/*                              New Add*/}
+            {/*                              <span className="text-light-green ml-1">*/}
+            {/*    +324.75*/}
+            {/*  </span>*/}
+            {/*                          </p>*/}
+            {/*                      </div>*/}
+            {/*                      <div>*/}
+            {/*<span className="dark:text-thin-light-gray text-[#374557]">*/}
+            {/*  <svg*/}
+            {/*      width="6"*/}
+            {/*      height="26"*/}
+            {/*      viewBox="0 0 6 26"*/}
+            {/*      fill="none"*/}
+            {/*      className="fill-current"*/}
+            {/*      xmlns="http://www.w3.org/2000/svg"*/}
+            {/*  >*/}
+            {/*    <circle cx="3" cy="3" r="3" fillOpacity="0.6" />*/}
+            {/*    <circle*/}
+            {/*        cx="3"*/}
+            {/*        cy="12.75"*/}
+            {/*        r="3"*/}
+            {/*        fillOpacity="0.6"*/}
+            {/*    />*/}
+            {/*    <circle*/}
+            {/*        cx="3"*/}
+            {/*        cy="22.5"*/}
+            {/*        r="3"*/}
+            {/*        fillOpacity="0.6"*/}
+            {/*    />*/}
+            {/*  </svg>*/}
+            {/*</span>*/}
+            {/*                      </div>*/}
+            {/*                  </div>*/}
+            {/*              </div>*/}
+            {/*              <div className="flex justify-between items-center mb-6">*/}
+            {/*                  <div className="flex space-x-5 items-center">*/}
+            {/*                      <div className="account-name flex space-x-4 items-center">*/}
+            {/*                          <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+            {/*                              <img src={bank2} alt="" />*/}
+            {/*                          </div>*/}
+            {/*                          <div className="name">*/}
+            {/*                              <p className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
+            {/*                                  Coinbase Wallet*/}
+            {/*                              </p>*/}
+            {/*                          </div>*/}
+            {/*                      </div>*/}
+            {/*                  </div>*/}
+            {/*                  <div className="flex space-x-5 items-center">*/}
+            {/*                      <div>*/}
+            {/*                          <p className="text-xl font-bold text-dark-gray dark:text-white text-right mb-3">*/}
+            {/*                              $734.79*/}
+            {/*                          </p>*/}
+            {/*                          <p className="text-sm text-thin-light-gray">*/}
+            {/*                              New Add*/}
+            {/*                              <span className="text-light-green ml-1">*/}
+            {/*    +324.75*/}
+            {/*  </span>*/}
+            {/*                          </p>*/}
+            {/*                      </div>*/}
+            {/*                      <div>*/}
+            {/*<span className="dark:text-thin-light-gray text-[#374557]">*/}
+            {/*  <svg*/}
+            {/*      width="6"*/}
+            {/*      height="26"*/}
+            {/*      viewBox="0 0 6 26"*/}
+            {/*      fill="none"*/}
+            {/*      className="fill-current"*/}
+            {/*      xmlns="http://www.w3.org/2000/svg"*/}
+            {/*  >*/}
+            {/*    <circle cx="3" cy="3" r="3" fillOpacity="0.6" />*/}
+            {/*    <circle*/}
+            {/*        cx="3"*/}
+            {/*        cy="12.75"*/}
+            {/*        r="3"*/}
+            {/*        fillOpacity="0.6"*/}
+            {/*    />*/}
+            {/*    <circle*/}
+            {/*        cx="3"*/}
+            {/*        cy="22.5"*/}
+            {/*        r="3"*/}
+            {/*        fillOpacity="0.6"*/}
+            {/*    />*/}
+            {/*  </svg>*/}
+            {/*</span>*/}
+            {/*                      </div>*/}
+            {/*                  </div>*/}
+            {/*              </div>*/}
+            {/*              <div className="flex justify-between items-center mb-6">*/}
+            {/*                  <div className="flex space-x-5 items-center">*/}
+            {/*                      <div className="account-name flex space-x-4 items-center">*/}
+            {/*                          <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+            {/*                              <img src={bank3} alt="" />*/}
+            {/*                          </div>*/}
+            {/*                          <div className="name">*/}
+            {/*                              <p className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
+            {/*                                  Bitski*/}
+            {/*                              </p>*/}
+            {/*                          </div>*/}
+            {/*                      </div>*/}
+            {/*                  </div>*/}
+            {/*                  <div className="flex space-x-5 items-center">*/}
+            {/*                      <div>*/}
+            {/*                          <p className="text-xl font-bold text-dark-gray dark:text-white text-right mb-3">*/}
+            {/*                              $734.79*/}
+            {/*                          </p>*/}
+            {/*                          <p className="text-sm text-thin-light-gray">*/}
+            {/*                              New Add*/}
+            {/*                              <span className="text-light-green ml-1">*/}
+            {/*    +324.75*/}
+            {/*  </span>*/}
+            {/*                          </p>*/}
+            {/*                      </div>*/}
+            {/*                      <div>*/}
+            {/*<span className="dark:text-thin-light-gray text-[#374557]">*/}
+            {/*  <svg*/}
+            {/*      width="6"*/}
+            {/*      height="26"*/}
+            {/*      viewBox="0 0 6 26"*/}
+            {/*      fill="none"*/}
+            {/*      className="fill-current"*/}
+            {/*      xmlns="http://www.w3.org/2000/svg"*/}
+            {/*  >*/}
+            {/*    <circle cx="3" cy="3" r="3" fillOpacity="0.6" />*/}
+            {/*    <circle*/}
+            {/*        cx="3"*/}
+            {/*        cy="12.75"*/}
+            {/*        r="3"*/}
+            {/*        fillOpacity="0.6"*/}
+            {/*    />*/}
+            {/*    <circle*/}
+            {/*        cx="3"*/}
+            {/*        cy="22.5"*/}
+            {/*        r="3"*/}
+            {/*        fillOpacity="0.6"*/}
+            {/*    />*/}
+            {/*  </svg>*/}
+            {/*</span>*/}
+            {/*                      </div>*/}
+            {/*                  </div>*/}
+            {/*              </div>*/}
+            {/*              <div className="flex justify-between items-center mb-6">*/}
+            {/*                  <div className="flex space-x-5 items-center">*/}
+            {/*                      <div className="account-name flex space-x-4 items-center">*/}
+            {/*                          <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+            {/*                              <img src={bank4} alt="" />*/}
+            {/*                          </div>*/}
+            {/*                          <div className="name">*/}
+            {/*                              <p className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
+            {/*                                  WalletConnect*/}
+            {/*                              </p>*/}
+            {/*                          </div>*/}
+            {/*                      </div>*/}
+            {/*                  </div>*/}
+            {/*                  <div className="flex space-x-5 items-center">*/}
+            {/*                      <div>*/}
+            {/*                          <p className="text-xl font-bold text-dark-gray dark:text-white text-right mb-3">*/}
+            {/*                              $734.79*/}
+            {/*                          </p>*/}
+            {/*                          <p className="text-sm text-thin-light-gray">*/}
+            {/*                              New Add*/}
+            {/*                              <span className="text-light-green ml-1">*/}
+            {/*    +324.75*/}
+            {/*  </span>*/}
+            {/*                          </p>*/}
+            {/*                      </div>*/}
+            {/*                      <div>*/}
+            {/*<span className="dark:text-thin-light-gray text-[#374557]">*/}
+            {/*  <svg*/}
+            {/*      width="6"*/}
+            {/*      height="26"*/}
+            {/*      viewBox="0 0 6 26"*/}
+            {/*      fill="none"*/}
+            {/*      className="fill-current"*/}
+            {/*      xmlns="http://www.w3.org/2000/svg"*/}
+            {/*  >*/}
+            {/*    <circle cx="3" cy="3" r="3" fillOpacity="0.6" />*/}
+            {/*    <circle*/}
+            {/*        cx="3"*/}
+            {/*        cy="12.75"*/}
+            {/*        r="3"*/}
+            {/*        fillOpacity="0.6"*/}
+            {/*    />*/}
+            {/*    <circle*/}
+            {/*        cx="3"*/}
+            {/*        cy="22.5"*/}
+            {/*        r="3"*/}
+            {/*        fillOpacity="0.6"*/}
+            {/*    />*/}
+            {/*  </svg>*/}
+            {/*</span>*/}
+            {/*                      </div>*/}
+            {/*                  </div>*/}
+            {/*              </div>*/}
+            {/*          </div>*/}
+            {/*      </div>*/}
+            {/*  </div>*/}
+          </div>
+          {/* flex space-x-11 */}
+          {/*<div className="recent-and-investment grid lg:grid-cols-2 grid-cols-1 2xl:gap-[40px] xl:gap-7 gap-4 lg:h-[416px] w-full  justify-between">*/}
+          {/*    <div className=" h-full">*/}
+          {/*        <RecentTransactionWidget />*/}
+          {/*    </div>*/}
+          {/*    <div className=" h-full">*/}
+          {/*        <InvestmentSection />*/}
+          {/*    </div>*/}
+          {/*</div>*/}
+        </div>
+      </div>
+    </>
+  );
 }
diff --git a/src/components/MyWallet/WalletItemCard.jsx b/src/components/MyWallet/WalletItemCard.jsx
index ff5b1ff..5d287cd 100644
--- a/src/components/MyWallet/WalletItemCard.jsx
+++ b/src/components/MyWallet/WalletItemCard.jsx
@@ -1,72 +1,131 @@
 import React, { useState } from "react";
-import background from "../../assets/images/bg-sky-blue.jpg" //shape/balance-bg.svg";
-import {PriceFormatter} from "../Helpers/PriceFormatter";
-import {Link} from "react-router-dom";
+import background from "../../assets/images/bg-sky-blue.jpg"; //shape/balance-bg.svg";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+import { Link } from "react-router-dom";
+import { useSelector } from "react-redux";
+import CreditPopup from "./Popup/CreditPopup";
 
-export default function WalletItemCard({walletItem}) {
-    const [eth] = useState(90);
-    const [btc] = useState(85);
-    const [ltc] = useState(20);
-    return (
-        <div
-            className="current-balance-widget w-full h-full rounded-2xl overflow-hidden flex flex-col justify-between  px-8 py-9"
-            style={{
-                background: `url(${background}) 0% 0% / cover no-repeat`,
-            }}
-        >
-            <div className="wallet flex justify-between">
-                <div className="w-[100px] h-[100px] rounded-full bg-[#485199] flex justify-center items-center">
-                    <div>
-                        <p className="text-26 font-bold text-white tracking-wide text-center">
-                            .
-                        </p>
-                        <p className="text-lg text-white tracking-wide text-center">
-                            {walletItem.code}
-                        </p>
-                    </div>
-                </div>
-                <div>
-                    {/*<p className="text-26 font-bold tracking-wide text-white text-right">*/}
-                    {/*    6,572.00*/}
-                    {/*</p>*/}
-                    {/*<p className="tracking-wide text-white text-lg opacity-[70%]">*/}
-                    {/*    Total Transactions*/}
-                    {/*</p>*/}
-                </div>
-            </div>
-            <div className="balance">
-                <p className="text-lg text-white opacity-[70%] tracking-wide mb-6">
-                    Current Balance
-                </p>
-                <p className="text-[44px] font-bold text-white tracking-wide leading-10 mb-2">
-                   {walletItem.amount * 0.01} {walletItem.code}
-                </p>
-                <p className="text-lg text-white tracking-wide">
-                   HOLDINGS : {PriceFormatter(walletItem.escrow * 0.01, walletItem.code)}
-                    {/*<span className="text-light-green">(11.5%)</span>*/}
-                </p>
-            </div>
-            <div className="counters flex space-x-16">
-                <div>
-                    {
-                        walletItem.action_type != 'AC_AD_FD_ONLY' ?
-                            <Link to='transfer-fund' className='px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[40px] rounded-full relative  bg-purple lg:text-xl text-lg font-bold text-white'>Transfer</Link>:''
-                    }
-                </div>
-                <div>
-                    <Link to='add-fund' state={{currency:walletItem.description}} className='px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[40px] rounded-full relative  bg-white lg:text-xl text-lg font-bold'>
-                                        <span className="">
-                                            <svg xmlns="http://www.w3.org/2000/svg" width="38"
-                                                 height="38" viewBox="0 0 42 42" fill="none"><path
-                                                d="M21 0C16.8466 0 12.7865 1.23163 9.33303 3.53914C5.8796 5.84665 3.18798 9.1264 1.59854 12.9636C0.00909901 16.8009 -0.406771 21.0233 0.403518 25.0969C1.21381 29.1705 3.21386 32.9123 6.15077 35.8492C9.08767 38.7861 12.8295 40.7862 16.9031 41.5965C20.9767 42.4068 25.1991 41.9909 29.0364 40.4015C32.8736 38.812 36.1534 36.1204 38.4609 32.667C40.7684 29.2135 42 25.1534 42 21C41.994 15.4323 39.7796 10.0944 35.8426 6.15741C31.9056 2.22045 26.5677 0.00602189 21 0ZM28 22.75H22.75V28C22.75 28.4641 22.5656 28.9092 22.2374 29.2374C21.9093 29.5656 21.4641 29.75 21 29.75C20.5359 29.75 20.0908 29.5656 19.7626 29.2374C19.4344 28.9092 19.25 28.4641 19.25 28V22.75H14C13.5359 22.75 13.0908 22.5656 12.7626 22.2374C12.4344 21.9092 12.25 21.4641 12.25 21C12.25 20.5359 12.4344 20.0907 12.7626 19.7626C13.0908 19.4344 13.5359 19.25 14 19.25H19.25V14C19.25 13.5359 19.4344 13.0908 19.7626 12.7626C20.0908 12.4344 20.5359 12.25 21 12.25C21.4641 12.25 21.9093 12.4344 22.2374 12.7626C22.5656 13.0908 22.75 13.5359 22.75 14V19.25H28C28.4641 19.25 28.9093 19.4344 29.2374 19.7626C29.5656 20.0907 29.75 20.5359 29.75 21C29.75 21.4641 29.5656 21.9092 29.2374 22.2374C28.9093 22.5656 28.4641 22.75 28 22.75Z"
-                                                fill="white"></path>
-                                            </svg>
-                                        </span>
-                        <span className='text-black'>Add Credit</span>
-                    </Link>
-                </div>
+export default function WalletItemCard({ walletItem, paymentHistory }) {
+  //   const [eth] = useState(90);
+  //   const [btc] = useState(85);
+  //   const [ltc] = useState(20);
 
+  const { userDetails } = useSelector((state) => state?.userDetails);
+  let accountType = userDetails?.account_type == "FAMILY";
+
+  //   Credit popup
+  const [creditPopup, setCreditPopup] = useState({ show: false, data: {} });
+
+  const openPopUp = (value) => {
+    setCreditPopup({
+      show: true,
+      data: { ...value },
+    });
+  };
+
+  const closePopUp = () => {
+    setCreditPopup({ show: false, data: {} });
+  };
+  return (
+    <>
+      <div
+        className={`current-balance-widget w-full h-full rounded-2xl overflow-hidden flex flex-col ${
+          accountType ? "justify-start" : "justify-between"
+        } px-8 py-9`}
+        style={{
+          background: `url(${background}) 0% 0% / cover no-repeat`,
+        }}
+      >
+        <div className="wallet flex justify-between">
+          <div className="w-[100px] h-[100px] rounded-full bg-[#485199] flex justify-center items-center">
+            <div>
+              <p className="text-26 font-bold text-white tracking-wide text-center">
+                .
+              </p>
+              <p className="text-lg text-white tracking-wide text-center">
+                {walletItem.code}
+              </p>
             </div>
+          </div>
+          <div></div>
         </div>
-    );
+        <div className="balance">
+          <p className="text-lg text-white opacity-[70%] tracking-wide mb-6">
+            Current Balance
+          </p>
+          <p className="text-[44px] font-bold text-white tracking-wide leading-10 mb-2">
+            {PriceFormatter(
+              walletItem.amount * 0.01,
+              walletItem.code,
+              undefined,
+              "text-[2rem]"
+            )}
+          </p>
+          <p className="text-lg text-white tracking-wide">
+            HOLDINGS :{" "}
+            <span className="mt-1">
+              {PriceFormatter(
+                walletItem.escrow * 0.01,
+                walletItem.code,
+                undefined,
+                "text-[2rem]"
+              )}
+            </span>
+            {/*<span className="text-light-green">(11.5%)</span>*/}
+          </p>
+        </div>
+        {!accountType && (
+          <div className="counters flex space-x-16">
+            <div>
+              <Link
+                to="transfer-fund"
+                className={`${
+                  walletItem.action_type != "AC_AD_FD_ONLY" && "invisible"
+                } px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[40px] rounded-full relative  bg-purple lg:text-xl text-lg font-bold text-white`}
+              >
+                Transfer
+              </Link>
+            </div>
+            <div>
+              <button
+                // state={{ currency: walletItem.description }}
+                className="px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[40px] rounded-full bg-white lg:text-xl text-lg font-bold text-black group relative transition duration-300 stroke-black fill-white"
+                onClick={() => {
+                  openPopUp({
+                    paymentHistory: paymentHistory,
+                    currency: walletItem?.description,
+                  });
+                }}
+              >
+                <span className="">
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="38"
+                    height="38"
+                    viewBox="0 0 42 42"
+                    fill="none"
+                  >
+                    <path
+                      d="M21 0C16.8466 0 12.7865 1.23163 9.33303 3.53914C5.8796 5.84665 3.18798 9.1264 1.59854 12.9636C0.00909901 16.8009 -0.406771 21.0233 0.403518 25.0969C1.21381 29.1705 3.21386 32.9123 6.15077 35.8492C9.08767 38.7861 12.8295 40.7862 16.9031 41.5965C20.9767 42.4068 25.1991 41.9909 29.0364 40.4015C32.8736 38.812 36.1534 36.1204 38.4609 32.667C40.7684 29.2135 42 25.1534 42 21C41.994 15.4323 39.7796 10.0944 35.8426 6.15741C31.9056 2.22045 26.5677 0.00602189 21 0ZM28 22.75H22.75V28C22.75 28.4641 22.5656 28.9092 22.2374 29.2374C21.9093 29.5656 21.4641 29.75 21 29.75C20.5359 29.75 20.0908 29.5656 19.7626 29.2374C19.4344 28.9092 19.25 28.4641 19.25 28V22.75H14C13.5359 22.75 13.0908 22.5656 12.7626 22.2374C12.4344 21.9092 12.25 21.4641 12.25 21C12.25 20.5359 12.4344 20.0907 12.7626 19.7626C13.0908 19.4344 13.5359 19.25 14 19.25H19.25V14C19.25 13.5359 19.4344 13.0908 19.7626 12.7626C20.0908 12.4344 20.5359 12.25 21 12.25C21.4641 12.25 21.9093 12.4344 22.2374 12.7626C22.5656 13.0908 22.75 13.5359 22.75 14V19.25H28C28.4641 19.25 28.9093 19.4344 29.2374 19.7626C29.5656 20.0907 29.75 20.5359 29.75 21C29.75 21.4641 29.5656 21.9092 29.2374 22.2374C28.9093 22.5656 28.4641 22.75 28 22.75Z"
+                      //   fill="white"
+                      className="stroke-black fill-white"
+                    ></path>
+                  </svg>
+                </span>
+                <span className="">Add Credit</span>
+                <span className="absolute inset-0 w-full h-full transition-all duration-300 ease-out bg-gray-300 group-hover:bg-gray-400 opacity-0"></span>
+              </button>
+            </div>
+          </div>
+        )}
+      </div>
+      {creditPopup.show && (
+        <CreditPopup
+          details={creditPopup.data}
+          onClose={closePopUp}
+          situation={openPopUp}
+        />
+      )}
+    </>
+  );
 }
diff --git a/src/views/MyWalletPage.jsx b/src/views/MyWalletPage.jsx
index 284e93d..de0f993 100644
--- a/src/views/MyWalletPage.jsx
+++ b/src/views/MyWalletPage.jsx
@@ -1,5 +1,3 @@
-import React from "react";
-// import MyWallet from "../components/MyWallet";
 import WalletRoutes from "../components/MyWallet/Wallet";
 
 export default function MyWalletPage() {