diff --git a/package.json b/package.json
index 3b6d0ca..5679b6c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opex-admin-panel",
-  "version": "v1.0.0-beta.5",
+  "version": "v1.0.0-beta.6",
   "private": true,
   "license": "MIT",
   "dependencies": {
diff --git a/src/components/Date/Date.js b/src/components/Date/Date.js
index 3f3ca87..b176fd5 100644
--- a/src/components/Date/Date.js
+++ b/src/components/Date/Date.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import moment from "moment-jalaali";
 
 const Date = ({date}) => {
diff --git a/src/components/SideBar/SideBar.js b/src/components/SideBar/SideBar.js
index 1bd786e..c7ee01d 100644
--- a/src/components/SideBar/SideBar.js
+++ b/src/components/SideBar/SideBar.js
@@ -2,7 +2,6 @@ import {toAbsoluteUrl} from "../utils";
 import {NavLink} from "react-router-dom";
 import * as Routes from "../../routes/routes";
 import Icon from "../Icon/Icon";
-import {Wallet, WhiteList} from "../../routes/routes";
 
 const SideBar = ({closeMenu}) => {
     return <div className={`sidebar text-color ${closeMenu ? "close" : "open"}`}>
diff --git a/src/components/SimplePagination/SimplePagination.js b/src/components/SimplePagination/SimplePagination.js
new file mode 100644
index 0000000..14cf08f
--- /dev/null
+++ b/src/components/SimplePagination/SimplePagination.js
@@ -0,0 +1,30 @@
+import React from "react";
+import {useSearchParams} from "react-router-dom";
+
+const SimplePagination = ({paginate, length}) => {
+    const [searchParams, setSearchParams] = useSearchParams();
+    const params = Object.fromEntries([...searchParams])
+
+    const nextPage = () => {
+        setSearchParams({...params, per_page: paginate.perPage, page: ++paginate.page})
+    }
+    const pervPage = () => {
+        if (paginate.page === 0) return
+        setSearchParams({...params, per_page: paginate.perPage, page: --paginate.page})
+    }
+
+    return (
+        <nav aria-label="Page navigation example">
+            <ul className="pagination justify-content-center">
+                <li className={`page-item ${paginate.page === 1 ? "disabled" : ""}`}>
+                    <button className="page-link" onClick={pervPage}>Previous</button>
+                </li>
+
+                <li className={`page-item ${ paginate.perPage > length ? "disabled" : ""}`}>
+                    <button className="page-link" onClick={nextPage}>Next</button>
+                </li>
+            </ul>
+        </nav>)
+}
+
+export default SimplePagination
diff --git a/src/components/TopBar/Title/Title.js b/src/components/TopBar/Title/Title.js
index a5faa88..fc0a127 100644
--- a/src/components/TopBar/Title/Title.js
+++ b/src/components/TopBar/Title/Title.js
@@ -1,8 +1,6 @@
 import React from "react";
 import {Route, Routes} from "react-router-dom";
 import * as RoutesName from "../../../routes/routes";
-import WhiteList from "../../../pages/WhiteList/WhiteList";
-import {Wallet} from "../../../routes/routes";
 
 const Title = () => {
 
diff --git a/src/pages/ChainAndToken/ChainAndToken.js b/src/pages/ChainAndToken/ChainAndToken.js
index e129ed8..adbcfab 100644
--- a/src/pages/ChainAndToken/ChainAndToken.js
+++ b/src/pages/ChainAndToken/ChainAndToken.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import classes from './ChainAndToken.module.css'
 import Chains from "./Chains/Chains";
 import Tokens from "./Tokens/Tokens";
 
diff --git a/src/pages/ChainAndToken/Chains/ChainBalance.js b/src/pages/ChainAndToken/Chains/ChainBalance.js
index c01394d..85a1e19 100644
--- a/src/pages/ChainAndToken/Chains/ChainBalance.js
+++ b/src/pages/ChainAndToken/Chains/ChainBalance.js
@@ -1,6 +1,5 @@
 import React, {useEffect, useState} from 'react';
 import classes from './Chains.module.css'
-
 import ToggleSwitch from "../../../components/ToggleSwitch/ToggleSwitch";
 import {useGetAllBalanceByChain, useGetTotalBalanceByChain} from "../../../query";
 import {BN} from "../../../utils/utils";
@@ -13,29 +12,35 @@ const ChainBalance = ({chainId}) => {
     });
 
     const {data, isLoading, error, refetch} = useGetAllBalanceByChain(chainId, params);
-    const {data:total, isLoading:totalIsLoading, error:totalError} = useGetTotalBalanceByChain(chainId);
+    const {data: total, isLoading: totalIsLoading} = useGetTotalBalanceByChain(chainId);
 
 
     useEffect(() => {
         refetch()
     }, [params]);
 
-    const content = ()=> {
+    const content = () => {
 
-        if (isLoading) return <div className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-5 ${classes.box}`}>
+        if (isLoading) return <div
+            className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-5 ${classes.box}`}>
             Loading...
         </div>
-        if (error) return <div className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-5 ${classes.box}`}>
+        if (error) return <div
+            className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-5 ${classes.box}`}>
             Error!
         </div>
-        if (data?.length === 0) return <div className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-5 ${classes.box}`}>
+        if (data?.length === 0) return <div
+            className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-5 ${classes.box}`}>
             No Data!
         </div>
-        else return <div className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-3 ${classes.box} ${classes.striped}`}>
+        else return <div
+            className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-3 ${classes.box} ${classes.striped}`}>
             {data?.map((balance, index) => <div className={`d-flex flex-row col-12 py-4 px-2 font-size-sm`} key={index}>
                 <span className={`col-8`}>{index + 1} <span className={`mx-3`}></span> {balance?.address}</span>
-                <span className={`col-2 text-center`} style={{color: '#fff'}}>Balance: <span className={``}>{new BN(balance?.balance).toFormat()}</span></span>
-                <span className={`col-2 text-center`} style={{color: '#fff'}}> $ { new BN(balance?.balanceUsd).isZero() ? "---" : new BN(balance?.balanceUsd).toFormat()} </span>
+                <span className={`col-2 text-center`} style={{color: '#fff'}}>Balance: <span
+                    className={``}>{new BN(balance?.balance).toFormat()}</span></span>
+                <span className={`col-2 text-center`}
+                      style={{color: '#fff'}}> $ {new BN(balance?.balanceUsd).isZero() ? "---" : new BN(balance?.balanceUsd).toFormat()} </span>
             </div>)}
         </div>
     }
@@ -44,43 +49,42 @@ const ChainBalance = ({chainId}) => {
 
         <>
 
-            <div className={`col-12 my-2 d-flex flex-row justify-content-between align-items-center col-12 mt-4 py-4 px-4 ${classes.box} font-size-sm`}>
-               <div className={`d-flex flex-row align-items-center col-5`}>
-                   <span className={``}>Exclude Zero Balance</span>
-                   <span className={`mx-2`}> </span>
-                   <ToggleSwitch
+            <div
+                className={`col-12 my-2 d-flex flex-row justify-content-between align-items-center col-12 mt-4 py-4 px-4 ${classes.box} font-size-sm`}>
+                <div className={`d-flex flex-row align-items-center col-5`}>
+                    <span className={``}>Exclude Zero Balance</span>
+                    <span className={`mx-2`}> </span>
+                    <ToggleSwitch
 
-                       onchange={ () => {
+                        onchange={() => {
 
-                           setParams(prevState => {return {
-                               ...prevState,
-                               excludeZero: !prevState.excludeZero
-                           }})
+                            setParams(prevState => {
+                                return {
+                                    ...prevState,
+                                    excludeZero: !prevState.excludeZero
+                                }
+                            })
 
 
-                       } }
+                        }}
 
-                       /*onchange={()=> setQuery({
-                           ...query,
-                           ascendingByTime: (prevState => !prevState)}
-                       )}*/
-                       checked={params?.excludeZero}/>
-               </div>
+                        /*onchange={()=> setQuery({
+                            ...query,
+                            ascendingByTime: (prevState => !prevState)}
+                        )}*/
+                        checked={params?.excludeZero}/>
+                </div>
 
                 <div className={`d-flex flex-row justify-content-center align-items-center col-7 text-center`}>
                     <span className={``}>{total?.chain?.toUpperCase()}</span>
                     <span className={`mx-1`}> </span>
                     <span className={``}>Total Balance: </span>
                     <span className={`mx-2`}> </span>
-                    <span className={`font-size-md`} style={{color: 'white'}}>{ totalIsLoading ? "Loading..." : new BN(total?.balance).toFormat()}</span>
+                    <span className={`font-size-md`}
+                          style={{color: 'white'}}>{totalIsLoading ? "Loading..." : new BN(total?.balance).toFormat()}</span>
                 </div>
             </div>
-
             {content()}
-
-
-
-
         </>
 
     );
diff --git a/src/pages/ChainAndToken/Chains/Chains.js b/src/pages/ChainAndToken/Chains/Chains.js
index a3f14c6..418502c 100644
--- a/src/pages/ChainAndToken/Chains/Chains.js
+++ b/src/pages/ChainAndToken/Chains/Chains.js
@@ -6,7 +6,7 @@ import {useGetChains} from "../../../query";
 
 const Chains = () => {
 
-    const {data, isLoading, error, refetch} = useGetChains();
+    const {data, isLoading, error} = useGetChains();
 
 
     const [chainId, setChainId] = useState(null);
diff --git a/src/pages/ChainAndToken/Tokens/Tokens.js b/src/pages/ChainAndToken/Tokens/Tokens.js
index a252193..9e374a7 100644
--- a/src/pages/ChainAndToken/Tokens/Tokens.js
+++ b/src/pages/ChainAndToken/Tokens/Tokens.js
@@ -6,7 +6,7 @@ import {useGetTokens} from "../../../query";
 
 const Tokens = () => {
 
-    const {data, isLoading, error, refetch} = useGetTokens();
+    const {data, isLoading, error} = useGetTokens();
 
 
     const [chainId, setChainId] = useState(null);
diff --git a/src/pages/ChainAndToken/Tokens/TokensBalance.js b/src/pages/ChainAndToken/Tokens/TokensBalance.js
index 1c3123b..1f29609 100644
--- a/src/pages/ChainAndToken/Tokens/TokensBalance.js
+++ b/src/pages/ChainAndToken/Tokens/TokensBalance.js
@@ -11,29 +11,35 @@ const TokensBalance = ({chainId}) => {
     });
 
     const {data, isLoading, error, refetch} = useGetTokenAllBalanceById(chainId, params);
-    const {data:total, isLoading:totalIsLoading, error:totalError} = useGetTokenTotalBalanceById(chainId);
+    const {data: total, isLoading: totalIsLoading} = useGetTokenTotalBalanceById(chainId);
 
 
     useEffect(() => {
         refetch()
     }, [params]);
 
-    const content = ()=> {
+    const content = () => {
 
-        if (isLoading) return <div className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-5 ${classes.box}`}>
+        if (isLoading) return <div
+            className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-5 ${classes.box}`}>
             Loading...
         </div>
-        if (error) return <div className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-5 ${classes.box}`}>
+        if (error) return <div
+            className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-5 ${classes.box}`}>
             Error!
         </div>
-        if (data?.length === 0) return <div className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-5 ${classes.box}`}>
+        if (data?.length === 0) return <div
+            className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-5 ${classes.box}`}>
             No Data!
         </div>
-        else return <div className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-3 ${classes.box} ${classes.striped}`}>
+        else return <div
+            className={`d-flex flex-column justify-content-center align-items-center col-12 mt-4 py-3 ${classes.box} ${classes.striped}`}>
             {data?.map((balance, index) => <div className={`d-flex flex-row col-12 py-4 px-2 font-size-sm`} key={index}>
                 <span className={`col-8`}>{index + 1} <span className={`mx-3`}></span> {balance?.address}</span>
-                <span className={`col-2 text-center`} style={{color: '#fff'}}>Balance: <span className={``}>{new BN(balance?.balance).toFormat()}</span></span>
-                <span className={`col-2 text-center`} style={{color: '#fff'}}> $ { new BN(balance?.balanceUsd).isZero() ? "---" : new BN(balance?.balanceUsd).toFormat()} </span>
+                <span className={`col-2 text-center`} style={{color: '#fff'}}>Balance: <span
+                    className={``}>{new BN(balance?.balance).toFormat()}</span></span>
+                <span className={`col-2 text-center`}
+                      style={{color: '#fff'}}> $ {new BN(balance?.balanceUsd).isZero() ? "---" : new BN(balance?.balanceUsd).toFormat()} </span>
 
             </div>)}
         </div>
@@ -44,21 +50,24 @@ const TokensBalance = ({chainId}) => {
     return (
         <>
 
-            <div className={`col-12 my-2 d-flex flex-row justify-content-between align-items-center col-12 mt-4 py-4 px-4 ${classes.box} font-size-sm`}>
+            <div
+                className={`col-12 my-2 d-flex flex-row justify-content-between align-items-center col-12 mt-4 py-4 px-4 ${classes.box} font-size-sm`}>
                 <div className={`d-flex flex-row align-items-center col-5`}>
                     <span className={``}>Exclude Zero Balance</span>
                     <span className={`mx-2`}> </span>
                     <ToggleSwitch
 
-                        onchange={ () => {
+                        onchange={() => {
 
-                            setParams(prevState => {return {
-                                ...prevState,
-                                excludeZero: !prevState.excludeZero
-                            }})
+                            setParams(prevState => {
+                                return {
+                                    ...prevState,
+                                    excludeZero: !prevState.excludeZero
+                                }
+                            })
 
 
-                        } }
+                        }}
 
                         /*onchange={()=> setQuery({
                             ...query,
@@ -72,15 +81,11 @@ const TokensBalance = ({chainId}) => {
                     <span className={`mx-1`}> </span>
                     <span className={``}>Total Balance: </span>
                     <span className={`mx-2`}> </span>
-                    <span className={`font-size-md`} style={{color: 'white'}}>{ totalIsLoading ? "Loading..." : new BN(total?.balance).toFormat()}</span>
+                    <span className={`font-size-md`}
+                          style={{color: 'white'}}>{totalIsLoading ? "Loading..." : new BN(total?.balance).toFormat()}</span>
                 </div>
             </div>
-
             {content()}
-
-
-
-
         </>
     );
 };
diff --git a/src/pages/Dashboard/BriefWallet/BriefWalletCard.js b/src/pages/Dashboard/BriefWallet/BriefWalletCard.js
index 95c9825..4a4f9bb 100644
--- a/src/pages/Dashboard/BriefWallet/BriefWalletCard.js
+++ b/src/pages/Dashboard/BriefWallet/BriefWalletCard.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import classes from './BriefWallet.module.css'
 import {BN} from "../../../utils/utils";
 
 const BriefWalletCard = ({data, index}) => {
diff --git a/src/pages/Dashboard/Chain/ChainCard.js b/src/pages/Dashboard/Chain/ChainCard.js
index f2d8a0c..e6c346c 100644
--- a/src/pages/Dashboard/Chain/ChainCard.js
+++ b/src/pages/Dashboard/Chain/ChainCard.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import classes from './Chain.module.css'
 import {BN} from "../../../utils/utils";
 
 const ChainCard = ({data, index}) => {
diff --git a/src/pages/Dashboard/Dashboard.js b/src/pages/Dashboard/Dashboard.js
index 6e04100..603beea 100644
--- a/src/pages/Dashboard/Dashboard.js
+++ b/src/pages/Dashboard/Dashboard.js
@@ -1,8 +1,7 @@
 import React from "react";
 import Loading from "../../components/Loading";
 import ScrollBar from "../../components/ScrollBar";
-import {useGetUsersByGroup, useGetUsersList, useGetWithdrawsReq} from "../../query";
-import Chains from "../ChainAndToken/Chains/Chains";
+import {useGetUsersByGroup, useGetUsersList} from "../../query";
 import Chain from "./Chain/Chain";
 import Token from "./Token/Token";
 import BriefWallet from "./BriefWallet/BriefWallet";
@@ -10,12 +9,10 @@ import BriefWallet from "./BriefWallet/BriefWallet";
 const Dashboard = () => {
 
     const {data: users} = useGetUsersList(1, 10)
-    const {data: withdraws} = useGetWithdrawsReq(null, 1, 10)
     const {data: kycReq} = useGetUsersByGroup("kyc-requested", 1, 10)
 
     return <ScrollBar>
         <div className="d-flex flex-column justify-content-start align-items-center" style={{minHeight: "100%"}}>
-
             <div className="d-flex flex-row justify-content-between align-items-center my-5" style={{width: "90%"}}>
                 <div className="d-flex justify-content-center align-items-center primary-bg"
                      style={{width: "30%", height: "20vh", borderRadius: "7px"}}>
@@ -27,16 +24,6 @@ const Dashboard = () => {
                         </div> : <Loading/>
                     }
                 </div>
-                <div className="d-flex justify-content-center align-items-center primary-bg"
-                     style={{width: "30%", height: "20vh", borderRadius: "7px"}}>
-                    {withdraws !== null ?
-                        <div className="d-flex flex-column justify-content-center align-items-center"
-                             style={{height: "100%"}}>
-                            <h4 className="mb-2">Withdraws Req</h4>
-                            <span className="mt-2 text-info" style={{fontSize: "2rem"}}>{withdraws?.total || "-"}</span>
-                        </div> : <Loading/>
-                    }
-                </div>
                 <div className="d-flex justify-content-center align-items-center primary-bg"
                      style={{width: "30%", height: "20vh", borderRadius: "7px"}}>
                     {kycReq !== null ?
diff --git a/src/pages/Dashboard/Token/Token.js b/src/pages/Dashboard/Token/Token.js
index 228dee7..525c90c 100644
--- a/src/pages/Dashboard/Token/Token.js
+++ b/src/pages/Dashboard/Token/Token.js
@@ -1,8 +1,6 @@
 import React from 'react';
 import classes from './Token.module.css'
-import {useGetTotalBalance} from "../../../query";
 import {useGetTokenTotalBalance} from "../../../query/hooks/useGetTokenTotalBalance";
-import ChainCard from "../Chain/ChainCard";
 import TokenCard from "./TokenCard";
 
 const Token = () => {
@@ -26,12 +24,9 @@ const Token = () => {
         <div className={`flex-column justify-content-start`} style={{width: "32%"}}>
 
             <p className={`font-size-md-plus mb-4`}>Token List</p>
-
             {
                 content()
             }
-
-
         </div>
     );
 };
diff --git a/src/pages/Dashboard/Token/TokenCard.js b/src/pages/Dashboard/Token/TokenCard.js
index 489dfa3..7be4f22 100644
--- a/src/pages/Dashboard/Token/TokenCard.js
+++ b/src/pages/Dashboard/Token/TokenCard.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import classes from './Token.module.css'
 import {BN} from "../../../utils/utils";
 
 const TokenCard = ({data, index}) => {
diff --git a/src/pages/Wallet/Wallet.js b/src/pages/Wallet/Wallet.js
index 678b625..5bbf06f 100644
--- a/src/pages/Wallet/Wallet.js
+++ b/src/pages/Wallet/Wallet.js
@@ -13,21 +13,7 @@ const Wallet = () => {
         "offset": 0
     });
 
-    const {data, isLoading, error, refetch} = useGetWalletData(params);
-
-
-
-    /*const content = () => {
-        if (isLoading) return <div style={{height: "40vh"}}><Loading/></div>
-        if (error) return <div style={{height: "40vh"}}>Error</div>
-        if (data?.length === 0) return <div style={{height: "40vh"}} className={`flex jc-center ai-center`}>No Data...!</div>
-
-
-        else return <>
-            <WalletList data={data}/>
-        </>
-    }*/
-
+    const {data, isLoading, error} = useGetWalletData(params);
 
     return (
         <ScrollBar>
@@ -46,11 +32,6 @@ const Wallet = () => {
 
 
                     } }
-
-                    /*onchange={()=> setQuery({
-                        ...query,
-                        ascendingByTime: (prevState => !prevState)}
-                    )}*/
                     checked={params?.excludeSystem}/>
             </div>
             <div className="col-12 d-flex flex-column justify-content-between align-items-center px-5">
@@ -96,11 +77,6 @@ const Wallet = () => {
                     </div>
                     : ""
                 }
-             {/*   {(!isLoading && users?.total > paginate.perPage)&&
-                    <div className="mt-2">
-                        <Pagination total={users.total} paginate={paginate}/>
-                    </div>
-                }*/}
             </div>
         </ScrollBar>
     );
diff --git a/src/pages/WhiteList/WhiteList.js b/src/pages/WhiteList/WhiteList.js
index bbe1b3b..09f3638 100644
--- a/src/pages/WhiteList/WhiteList.js
+++ b/src/pages/WhiteList/WhiteList.js
@@ -2,8 +2,6 @@ import React, {useState} from 'react';
 import classes from './WhiteList.module.css'
 import Loading from "../../components/Loading";
 import {copyToClipboard, toAbsoluteUrl} from "../../components/utils";
-import {Link} from "react-router-dom";
-import Pagination from "../../components/Pagination/Pagination";
 import ScrollBar from "../../components/ScrollBar";
 import {useGetWhiteList} from "../../query";
 import {adminDeleteWhiteList, adminUpdateWhiteList} from "js-api-client/admin/whiteList";
@@ -47,7 +45,7 @@ const WhiteList = () => {
 
         setAddLoading(true)
 
-        const whiteListData = {"data":[`${email}`]}
+        const whiteListData = {"data":[`${email.toLowerCase()}`]}
 
         adminUpdateWhiteList(whiteListData)
             .then(() => {
diff --git a/src/pages/Withdraws/WithdrawInfo.js b/src/pages/Withdraws/WithdrawInfo.js
index 8c36657..7b6d280 100644
--- a/src/pages/Withdraws/WithdrawInfo.js
+++ b/src/pages/Withdraws/WithdrawInfo.js
@@ -11,7 +11,6 @@ import Date from "../../components/Date/Date";
 const WithdrawInfo = () => {
     let {id} = useParams();
     const {data: withdraw, isLoading, error, refetch} = useGetWithdrawInfo(id)
-
     return (
         <ScrollBar>
             <div className="col-12" style={{padding: "5vh 3vw"}}>
@@ -23,8 +22,9 @@ const WithdrawInfo = () => {
                     : ""
                 }
                 <div className="col-12 userInfoBox">
-                    <h4 className="py-3 primary-bg rounded d-flex justify-content-center align-items-center">Withdraw
-                        Information</h4>
+                    <h4 className="py-3 primary-bg rounded d-flex justify-content-center align-items-center">
+                        Withdraw Information
+                    </h4>
                     {isLoading ? <div className="col-12 d-flex justify-content-center align-items-center mt-4"
                                       style={{height: "50vh"}}><Loading/></div> : <>
                         <div className="d-flex flex-row">
@@ -46,7 +46,7 @@ const WithdrawInfo = () => {
                                     <span
                                         className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Owner Uuid</span>
                                     <span
-                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.ownerUuid || "-"}</span>
+                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.uuid || "-"}</span>
                                     <span
                                         className="col-1 secondary-bg border-start border-dark border-dark d-flex justify-content-center align-items-center rounded-end"
                                         style={{cursor: "pointer"}} onClick={() => copyToClipboard(withdraw.ownerUuid)}>
@@ -56,68 +56,49 @@ const WithdrawInfo = () => {
                                 </div>
                                 <div className="d-flex flex-row rounded my-3 inputGroup">
                                     <span
-                                        className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Request Date</span>
-                                    <span
-                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.requestDate ? <><Date  date={withdraw.requestDate}/> {moment(withdraw.requestDate).format("hh:mm:ss")}</> : "-"}</span>
-                                    <span
-                                        className="col-1 secondary-bg border-start border-dark border-dark border-dark d-flex justify-content-center align-items-center rounded-end"
-                                        style={{cursor: "pointer"}}
-                                        onClick={() => copyToClipboard(<><Date  date={withdraw.requestDate}/> {moment(withdraw.requestDate).format("hh:mm:ss")}</>)}>
-                                        <img className="col-4" src={toAbsoluteUrl("/media/img/copy-link.svg")}
-                                             alt="copy"/>
-                                    </span>
-                                </div>
-                                <div className="d-flex flex-row rounded my-3 inputGroup">
-                                    <span
-                                        className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Finalized Date</span>
-                                    <span
-                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.finalizedDate ? <><Date  date={withdraw.finalizedDate}/> {moment(withdraw.finalizedDate).format("hh:mm:ss")}</> : "-"}</span>
+                                        className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Status</span>
                                     <span
-                                        className="col-1 secondary-bg border-start border-dark border-dark border-dark d-flex justify-content-center align-items-center rounded-end"
-                                        style={{cursor: "pointer"}}
-                                        onClick={() => copyToClipboard(<><Date  date={withdraw.finalizedDate}/> {moment(withdraw.finalizedDate).format("hh:mm:ss")}</>)}>
-                                        <img className="col-4" src={toAbsoluteUrl("/media/img/copy-link.svg")}
-                                             alt="copy"/>
+                                        className={`col-8 secondary-bg p-3 d-flex justify-content-center align-items-center`}>
+                                        {withdraw?.status === "CREATED" ? "-" :
+                                            <img className="table-img"
+                                                 src={withdraw.status === "DONE" ? toAbsoluteUrl("/media/img/check.svg") : toAbsoluteUrl("/media/img/remove.svg")}
+                                                 alt=""/>}
                                     </span>
-                                </div>
-
-                                <div className="d-flex flex-row rounded my-3 inputGroup">
                                     <span
-                                        className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Request Transaction</span>
-                                    <span
-                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.requestTransaction || "-"}</span>
-                                    <span
-                                        className="col-1 secondary-bg border-start border-dark border-dark border-dark d-flex justify-content-center align-items-center rounded-end"
-                                        style={{cursor: "pointer"}}
-                                        onClick={() => copyToClipboard(withdraw.requestTransaction)}>
+                                        className="col-1 secondary-bg border-start border-dark border-dark border-dark d-flex justify-content-center align-items-center rounded-end hover"
+                                        style={{cursor: "pointer"}} onClick={() => copyToClipboard(withdraw.status)}>
                                         <img className="col-4" src={toAbsoluteUrl("/media/img/copy-link.svg")}
                                              alt="copy"/>
                                     </span>
                                 </div>
-
                                 <div className="d-flex flex-row rounded my-3 inputGroup">
                                     <span
-                                        className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Finalized Transaction</span>
+                                        className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Create Date</span>
                                     <span
-                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.finalizedTransaction || "-"}</span>
+                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.createDate ? <>
+                                        <Date
+                                            date={withdraw.createDate}/> {moment(withdraw.createDate).format("hh:mm:ss")}</> : "-"}</span>
                                     <span
                                         className="col-1 secondary-bg border-start border-dark border-dark border-dark d-flex justify-content-center align-items-center rounded-end hover"
                                         style={{cursor: "pointer"}}
-                                        onClick={() => copyToClipboard(withdraw.finalizedTransaction)}>
+                                        onClick={() => copyToClipboard(<><Date
+                                            date={withdraw.createDate}/> {moment(withdraw.createDate).format("hh:mm:ss")}</>)}>
                                         <img className="col-4" src={toAbsoluteUrl("/media/img/copy-link.svg")}
                                              alt="copy"/>
                                     </span>
                                 </div>
-
                                 <div className="d-flex flex-row rounded my-3 inputGroup">
                                     <span
-                                        className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Accepted Fee</span>
+                                        className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Last Change Date</span>
                                     <span
-                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.acceptedFee || "-"}</span>
+                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.acceptDate ? <>
+                                        <Date
+                                            date={withdraw.acceptDate}/> {moment(withdraw.acceptDate).format("hh:mm:ss")}</> : "-"}</span>
                                     <span
-                                        className="col-1 secondary-bg border-start border-dark border-dark border-dark d-flex justify-content-center align-items-center rounded-end hover"
+                                        className="col-1 secondary-bg border-start border-dark border-dark border-dark d-flex justify-content-center align-items-center rounded-end"
                                         style={{cursor: "pointer"}}
-                                        onClick={() => copyToClipboard(withdraw.acceptedFee)}>
+                                        onClick={() => copyToClipboard(<><Date
+                                            date={withdraw.acceptDate}/> {moment(withdraw.acceptDate).format("hh:mm:ss")}</>)}>
                                         <img className="col-4" src={toAbsoluteUrl("/media/img/copy-link.svg")}
                                              alt="copy"/>
                                     </span>
@@ -136,34 +117,19 @@ const WithdrawInfo = () => {
                                              alt="copy"/>
                                     </span>
                                 </div>
-
-                                <div className="d-flex flex-row rounded my-3 inputGroup">
-                                    <span
-                                        className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Amount</span>
-                                    <span
-                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.amount || "-"}</span>
-                                    <span
-                                        className="col-1 secondary-bg border-start border-dark border-dark border-dark d-flex justify-content-center align-items-center rounded-end hover"
-                                        style={{cursor: "pointer"}} onClick={() => copyToClipboard(withdraw.amount)}>
-                                        <img className="col-4" src={toAbsoluteUrl("/media/img/copy-link.svg")}
-                                             alt="copy"/>
-                                    </span>
-                                </div>
-
-
                             </div>
 
                             <div className="col-6 pe-3">
 
                                 <div className="d-flex flex-row rounded my-3 inputGroup">
                                     <span
-                                        className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Destination Amount</span>
+                                        className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Amount</span>
                                     <span
-                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.destAmount || "-"}</span>
+                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.amount || "-"}</span>
                                     <span
                                         className="col-1 secondary-bg border-start border-dark border-dark border-dark d-flex justify-content-center align-items-center rounded-end hover"
                                         style={{cursor: "pointer"}}
-                                        onClick={() => copyToClipboard(withdraw.destAmount)}>
+                                        onClick={() => copyToClipboard(withdraw.amount)}>
                                         <img className="col-4" src={toAbsoluteUrl("/media/img/copy-link.svg")}
                                              alt="copy"/>
                                     </span>
@@ -171,13 +137,13 @@ const WithdrawInfo = () => {
 
                                 <div className="d-flex flex-row rounded my-3 inputGroup">
                                     <span
-                                        className="col-3 primary-bg d-flex justify-content-center align-items-center rounded-start">Destination Currency</span>
+                                        className="col-3 primary-bg d-flex justify-content-center align-items-center rounded-start">Currency</span>
                                     <span
-                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.destCurrency || "-"}</span>
+                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.currency || "-"}</span>
                                     <span
                                         className="col-1 secondary-bg border-start border-dark border-dark border-dark d-flex justify-content-center align-items-center rounded-end"
                                         style={{cursor: "pointer"}}
-                                        onClick={() => copyToClipboard(withdraw.destCurrency)}>
+                                        onClick={() => copyToClipboard(withdraw.currency)}>
                                             <img className="col-4" src={toAbsoluteUrl("/media/img/copy-link.svg")}
                                                  alt="copy"/>
                                     </span>
@@ -237,48 +203,6 @@ const WithdrawInfo = () => {
                                              alt="copy"/>
                                     </span>
                                 </div>
-
-                                <div className="d-flex flex-row rounded my-3 inputGroup">
-                                    <span
-                                        className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Create Date</span>
-                                    <span
-                                        className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">{withdraw.createDate ? <><Date  date={withdraw.createDate}/> {moment(withdraw.createDate).format("hh:mm:ss")}</> : "-"}</span>
-                                    <span
-                                        className="col-1 secondary-bg border-start border-dark border-dark border-dark d-flex justify-content-center align-items-center rounded-end hover"
-                                        style={{cursor: "pointer"}}
-                                        onClick={() => copyToClipboard(<><Date  date={withdraw.createDate}/> {moment(withdraw.createDate).format("hh:mm:ss")}</>)}>
-                                        <img className="col-4" src={toAbsoluteUrl("/media/img/copy-link.svg")}
-                                             alt="copy"/>
-                                    </span>
-                                </div>
-
-                                <div className="d-flex flex-row rounded my-3 inputGroup">
-                                    <span className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">Status</span>
-                                    <span className={`col-8 secondary-bg p-3 d-flex justify-content-center align-items-center`}>
-                                        {withdraw?.status === "CREATED" ? "-" :
-                                            <img className="table-img" src={withdraw.status === "DONE" ? toAbsoluteUrl("/media/img/check.svg") : toAbsoluteUrl("/media/img/remove.svg")} alt=""/>}
-                                    </span>
-                                    <span
-                                        className="col-1 secondary-bg border-start border-dark border-dark border-dark d-flex justify-content-center align-items-center rounded-end hover"
-                                        style={{cursor: "pointer"}} onClick={() => copyToClipboard(withdraw.status)}>
-                                        <img className="col-4" src={toAbsoluteUrl("/media/img/copy-link.svg")}
-                                             alt="copy"/>
-                                    </span>
-                                </div>
-                                <div className="d-flex flex-row rounded my-3 inputGroup">
-                                    <span className="col-3 primary-bg d-flex justify-content-center align-items-center  rounded-start">
-                                        Accept Date
-                                    </span>
-                                    <span className="col-8 secondary-bg p-3 d-flex justify-content-center align-items-center">
-                                        {withdraw.acceptDate ? (<><Date date={withdraw.acceptDate}/> {moment(withdraw.acceptDate).format("hh:mm:ss")}</>)  : "-"}
-                                    </span>
-                                    <span
-                                        className="col-1 secondary-bg border-start border-dark border-dark border-dark d-flex justify-content-center align-items-center rounded-end hover"
-                                        style={{cursor: "pointer"}}
-                                        onClick={() => copyToClipboard(<><Date  date={withdraw.acceptDate}/> {moment(withdraw.acceptDate).format("hh:mm:ss")}</>)}>
-                                        <img className="col-4" src={toAbsoluteUrl("/media/img/copy-link.svg")} alt="copy"/>
-                                    </span>
-                                </div>
                             </div>
                         </div>
                     </>
diff --git a/src/pages/Withdraws/WithdrawStatus.js b/src/pages/Withdraws/WithdrawStatus.js
index a20de9b..8a51f8f 100644
--- a/src/pages/Withdraws/WithdrawStatus.js
+++ b/src/pages/Withdraws/WithdrawStatus.js
@@ -1,9 +1,9 @@
-import Loading from "../../components/Loading";
 import React, {useState} from "react";
+import Loading from "../../components/Loading";
 import {adminSetWithdrawStatus} from "js-api-client";
 
 const WithdrawStatus = ({id, withdraw, refetch}) => {
-    const [error, setError] = useState();
+    const [error, setError] = useState(false);
     const [isLoading, setIsLoading] = useState(false);
     const [withdrawState, setWithdrawState] = useState();
     const [withdrawExp, setWithdrawExp] = useState();
diff --git a/src/pages/Withdraws/Withdraws.js b/src/pages/Withdraws/Withdraws.js
index d1caa3e..e314898 100644
--- a/src/pages/Withdraws/Withdraws.js
+++ b/src/pages/Withdraws/Withdraws.js
@@ -3,11 +3,11 @@ import {Link} from "react-router-dom";
 import {toAbsoluteUrl} from "../../components/utils";
 import moment from "moment/moment";
 import usePagination from "../../hooks/usePagination";
-import Pagination from "../../components/Pagination/Pagination";
 import Loading from "../../components/Loading";
 import ScrollBar from "../../components/ScrollBar";
 import {useGetWithdrawsReq} from "../../query";
 import Date from "../../components/Date/Date";
+import SimplePagination from "../../components/SimplePagination/SimplePagination";
 
 const Withdraws = () => {
     const [paginate, searchParams, setSearchParams] = usePagination();
@@ -43,11 +43,10 @@ const Withdraws = () => {
                     <thead className="py-2 my-2" style={{paddingBottom: "1vh !important"}}>
                     <tr>
                         <th scope="col"/>
-                        <th scope="col">Destination Network</th>
-                        <th scope="col">Destination Currency</th>
+                        <th scope="col">Currency</th>
+                        <th scope="col">Network</th>
+                        <th scope="col">User ID</th>
                         <th scope="col">Amount</th>
-                        <th scope="col">Accepted Fee</th>
-                        <th scope="col">Applied Fee</th>
                         <th scope="col">Note</th>
                         <th scope="col">Create Date</th>
                         <th scope="col">Status</th>
@@ -62,19 +61,18 @@ const Withdraws = () => {
                                     <Loading/>
                                 </td>
                             </tr>
-                            : withdraws.withdraws?.length === 0 ? <tr>
+                            : withdraws?.length === 0 ? <tr>
                                 <td colSpan="12" className="text-center" style={{height: "50vh"}}>No Withdraw Exist</td>
                             </tr> :
-                            withdraws.withdraws?.map((withdraw, index) => <tr key={withdraw.withdrawId}>
+                            withdraws?.map((withdraw, index) => <tr key={withdraw.withdrawId}>
                                 <th scope="row">{(paginate.page - 1) * paginate.perPage + index + 1}</th>
-                                <td>{withdraw.destNetwork}</td>
                                 <td><img className="table-img"
-                                         src={toAbsoluteUrl("media/img/assets/" + withdraw.destCurrency + ".svg")}
+                                         src={toAbsoluteUrl("media/img/assets/" + withdraw.currency + ".svg")}
                                          alt=""/>
                                 </td>
+                                <td>{withdraw.destNetwork}</td>
+                                <td>{withdraw.uuid}</td>
                                 <td>{withdraw.amount}</td>
-                                <td>{withdraw.acceptedFee}</td>
-                                <td>{withdraw.appliedFee}</td>
                                 <td>{withdraw.destNote}</td>
                                 <td><Date date={withdraw.createDate}/> {moment(withdraw.createDate).format("hh:mm:ss")}</td>
                                 <td>
@@ -99,9 +97,9 @@ const Withdraws = () => {
                     </div>
                     : ""
                 }
-                {(!isLoading && withdraws?.total > paginate.perPage) &&
+                {!isLoading  &&
                 <div className="mt-2">
-                    <Pagination total={withdraws.total} paginate={paginate}/>
+                    <SimplePagination length={withdraws?.length} paginate={paginate}/>
                 </div>
                 }
             </div>
diff --git a/src/query/hooks/useGetAllBalanceByChain.js b/src/query/hooks/useGetAllBalanceByChain.js
index d62e87d..f9a55ab 100644
--- a/src/query/hooks/useGetAllBalanceByChain.js
+++ b/src/query/hooks/useGetAllBalanceByChain.js
@@ -4,15 +4,12 @@ import axios from "axios";
 export const useGetAllBalanceByChain = (chainId, params) => {
     return useQuery(
         ['chain-balance', chainId], async () => {
-            /*if (chainId === null) return;*/
             const {data} = await axios.get(`https://walletstat.exky.io/v1/balance/${chainId}`, {
                 params: params
             })
             return data;
         },
         {
-            retry: 1,
-            /*enabled: false,
-            initialData:[]*/
+            retry: 1
         });
 }
\ No newline at end of file
diff --git a/src/query/hooks/useGetChains.js b/src/query/hooks/useGetChains.js
index 34afc86..252c4d6 100644
--- a/src/query/hooks/useGetChains.js
+++ b/src/query/hooks/useGetChains.js
@@ -1,5 +1,4 @@
 import {useQuery} from "@tanstack/react-query";
-import {adminGetChains} from "js-api-client";
 import axios from "axios";
 
 export const useGetChains = () => {
diff --git a/src/query/hooks/useGetWalletData.js b/src/query/hooks/useGetWalletData.js
index d1b68a2..96e37be 100644
--- a/src/query/hooks/useGetWalletData.js
+++ b/src/query/hooks/useGetWalletData.js
@@ -1,5 +1,5 @@
 import {useQuery} from "@tanstack/react-query";
-import {adminGetUsersList, adminGetWalletData} from "js-api-client";
+import {adminGetWalletData} from "js-api-client";
 
 export const useGetWalletData = (params) => {
     return useQuery(
diff --git a/src/query/hooks/useGetWithdrawInfo.js b/src/query/hooks/useGetWithdrawInfo.js
index adeda11..5a337dd 100644
--- a/src/query/hooks/useGetWithdrawInfo.js
+++ b/src/query/hooks/useGetWithdrawInfo.js
@@ -9,7 +9,6 @@ export const useGetWithdrawInfo = (id) => {
         },
         {
             retry: 1,
-            select:(res) => res.withdraws[0],
             notifyOnChangeProps: ['data', 'isLoading', 'error'],
         });
-}
\ No newline at end of file
+}
diff --git a/src/query/hooks/useGetWithdrawsReq.js b/src/query/hooks/useGetWithdrawsReq.js
index 68998eb..c0de592 100644
--- a/src/query/hooks/useGetWithdrawsReq.js
+++ b/src/query/hooks/useGetWithdrawsReq.js
@@ -11,4 +11,4 @@ export const useGetWithdrawsReq = (status , page, perPage) => {
             retry: 1,
             notifyOnChangeProps: ['data', 'isLoading', 'error'],
         });
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index b97f4d0..3d50dde 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9059,8 +9059,8 @@ __metadata:
 
 "js-api-client@https://github.com/opexdev/js-api-client.git#develop":
   version: 1.0.0-beta2
-  resolution: "js-api-client@https://github.com/opexdev/js-api-client.git#commit=31a0f62c50c74506b5ea9b1de5e0850899e8827a"
-  checksum: 3aaec7b1257c68d7dd890b4df2e084c78c1a2bad143bc44b9d9debae8b9c8263b2f205f0b2ce1c770acab629b0202b051328b2bc30351859bc81618bb5a8a31f
+  resolution: "js-api-client@https://github.com/opexdev/js-api-client.git#commit=bcb951f3220a482b4262d603eef9c688d5b31a37"
+  checksum: 6aa72ad15998b2fe0477f4ad986e9feb5f7387a8b01ba80571ca7b3bd2d226ea99bc3b61ae7093ae9afa6601abff98f296f818147ee64268151e0de3508a374f
   languageName: node
   linkType: hard