Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into transfer-fund-page

src/components/MyWallet/WalletHeader.jsx

@@ -1,4 +1,4 @@
-import {Link} from 'react-router-dom'
+import { Link, useLocation, useNavigate } from "react-router-dom";
 import Icons from "../Helpers/Icons";
 import bank1 from "../../assets/images/bank-1.png";
 import bank2 from "../../assets/images/bank-2.png";
@@ -9,10 +9,11 @@ import Accordion from "../Helpers/Accordion";
 export default function WalletHeader(props) {
   //  debugger;
   //props.myWalletList.result_list
+  let { pathname } = useLocation();
+  let navigate = useNavigate();
   return (
     <>
-            <div
+      <div className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]  items-center rounded-full relative  bg-purple pr-1.5 pl-4">
-                className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]  items-center rounded-full relative  bg-purple pr-1.5 pl-4">
         <div
           onClick={() => props.handlerBalance()}
           className="flex items-center lg:justify-between justify-center w-full h-full"
@@ -20,9 +21,7 @@ export default function WalletHeader(props) {
           <span className="lg:block hidden">
             <Icons name="wallet" />
           </span>
-                    <p className="lg:text-xl text-lg font-bold text-white">
+          <p className="lg:text-xl text-lg font-bold text-white">Wallet</p>
-                        Wallet
-                    </p>
           <span className="lg:block hidden">
             <Icons name="deep-plus" />
           </span>
@@ -39,15 +38,16 @@ export default function WalletHeader(props) {
           </div>
           <div className="content px-7 pb-7">
             <ul>
-
               {props.myWalletList &&
                 props.myWalletList?.result_list?.length > 0 &&
                 props.myWalletList.result_list.map((value, index) => (
-                                    <li key={index} className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">
+                  <li
+                    key={index}
+                    className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple"
+                  >
                     <div className="sm:flex justify-between items-center">
                       <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">
-                                                <div
+                        <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 ">
-                                                    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">
@@ -163,13 +163,26 @@ export default function WalletHeader(props) {
             </ul>
             <div className="add-money-btn flex justify-center items-center mt-3">
               {/* <button
-                                onClick={() => props.addMoneyHandler()}
+                                onClick={() => {
+                                if(pathname == '/my-wallet') props.setBalanceDropdown.toggle()
+                                else navigate('/my-wallet', {replace: true})
+                                }}
                                 type="button"
                                 className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                             >
                                 Manage
                             </button> */}
-                            <Link to='/my-wallet' className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">Manage</Link>
+              <Link
+                to="/my-wallet"
+                onClick={() => {
+                  if (pathname == "/my-wallet")
+                    props.setBalanceDropdown.toggle();
+                  else navigate("/my-wallet", { replace: true });
+                }}
+                className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+              >
+                Manage
+              </Link>
             </div>
           </div>
         </div>
@@ -183,5 +196,6 @@ export default function WalletHeader(props) {
       {/*    </div>*/}
       {/*</div>*/}
       <div className="lg:hidden block"></div>
-        </>);
+    </>
+  );
 }

src/components/Partials/Header.jsx

@@ -1,5 +1,5 @@
 import React, { useContext,useState, useEffect } from "react";
-import { Link } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
 import bank1 from "../../assets/images/bank-1.png";
 import bank2 from "../../assets/images/bank-2.png";
 import bank3 from "../../assets/images/bank-3.png";
@@ -91,6 +91,15 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
     setToggleNotification.toggle()
   }
 
+  // getting the location of head
+  let {pathname} = useLocation()
+  
+  const handleWalletBtn = () => {
+    if (pathname === "/my-wallet"){
+      setbalanceValue.set(false)
+    } else return balanceDropdown
+  }
+
   // User Profile
   let {firstname, lastname, email, profile_pic} = userDetails
   let userEmail = email.split('@')[0]
@@ -234,7 +243,8 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                 myWalletList={myWalletList}
                 handlerBalance={handlerBalance}
                 balanceDropdown={balanceDropdown}
-                addMoneyHandler={addMoneyHandler} />
+                addMoneyHandler={addMoneyHandler}
+                setBalanceDropdown = {setbalanceValue} />
             {/* notification */}
             <div className="user-notification lg:block hidden relative">
               <div