diff --git a/src/components/Layout/LayoutHeader/LayoutHeader.js b/src/components/Layout/LayoutHeader/LayoutHeader.js
index 107f7192..80f2fd05 100644
--- a/src/components/Layout/LayoutHeader/LayoutHeader.js
+++ b/src/components/Layout/LayoutHeader/LayoutHeader.js
@@ -53,7 +53,6 @@ const LayoutHeader = () => {
});*/
}
-
const logOutHandler = async () => {
logout().then(() => {
toast.success(t("header.logOutSuccess"))
@@ -63,7 +62,6 @@ const LayoutHeader = () => {
})
}
-
const menu = (
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/History.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/History.js
index 5aceaec6..4006d9f5 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/History.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/History.js
@@ -12,7 +12,6 @@ const History = () => {
const [activeTx, setActiveTx] = useState("transactions")
-
const content = () => {
if (activeTx === "transactions") return
if (activeTx === "deposit") return
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/Transactions/Transactions.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/Transactions/Transactions.js
index b1e18b3c..933d0064 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/Transactions/Transactions.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/Transactions/Transactions.js
@@ -17,7 +17,6 @@ import {useGetTransactionsHistory} from "../../../../../../../../../../queries";
const Transactions = () => {
const {t} = useTranslation();
- const user_id = useSelector((state) => state.auth.id)
const coins = useSelector((state) => state.exchange.assets)
const [query, setQuery] = useState({
@@ -32,8 +31,6 @@ const Transactions = () => {
const {data, isLoading, error, refetch} = useGetTransactionsHistory(query);
- console.log("data: ", data)
-
const pagination = {
page: (query.offset / query.limit) + 1,
isLastPage: data?.length < query.limit
@@ -59,10 +56,8 @@ const Transactions = () => {
currenciesOptions.push({value: o, label: t('currency.' + o)})
})
-
const scrollRef = useRef(null);
-
const pageSizeHandler = (e) => {
setQuery({
...query,
@@ -100,7 +95,6 @@ const Transactions = () => {
})
}
-
const content = () => {
if (isLoading) return
if (error) return
@@ -128,7 +122,6 @@ const Transactions = () => {
return (
-
{
onchange={pageSizeHandler}
customClass={`width-20 ${classes.thisInput}`}
/>
-
{
position={`${i18n.language === "fa" ? "bottom-left" : "bottom-right" }`}
customClass={`width-20 ${classes.thisInput} ${classes.datePicker} `}
/>
-
{t("history.ascendingByTime")}
{
...prevState,
ascendingByTime: !prevState.ascendingByTime
}}) }
-
- /*onchange={()=> setQuery({
- ...query,
- ascendingByTime: (prevState => !prevState)}
- )}*/
checked={!query?.ascendingByTime}/>
-
@@ -227,9 +212,6 @@ const Transactions = () => {
}
-
-
-
-
{content()}
@@ -281,9 +262,7 @@ const Transactions = () => {
onClick={nextPage}
/>
-
-
);
};
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/TransactionsTable/TransactionsTable.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/TransactionsTable/TransactionsTable.js
index 5cc9dd74..d434f2c9 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/TransactionsTable/TransactionsTable.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/TransactionsTable/TransactionsTable.js
@@ -1,47 +1,30 @@
import React from 'react';
import classes from './TransactionsTable.module.css';
import {useTranslation} from "react-i18next";
-import {useSelector} from "react-redux";
import Date from "../../../../../../../../../../components/Date/Date";
import moment from "moment-jalaali";
import {BN} from "../../../../../../../../../../utils/utils";
-const TransactionsTable = ({txs, offset}) => {
+const TransactionsTable = ({txs}) => {
const {t} = useTranslation();
- const id = useSelector(state => state.auth.id);
-
let head = (
- {/*{t("row")}*/}
{t("date")}
{t("time")}
{t("history.category")}
{t("history.currency")}
{t("history.balanceChange")}
{t("history.balance")}
- {/*{t("details")}*/}
-
);
let body = (
<>
{txs.map((tr, index) => {
-
- const isMaker = tr?.additionalData?.makerUuid === id
- const isTaker = tr?.additionalData?.takerUuid === id
-
- const isSelfTrade = (((tr?.additionalData?.takerDirection === "ASK") || ( tr?.additionalData?.makerDirection === "BID")) && isTaker && isMaker)
-
return (
-
-
- {/*
- {index + offset + 1}
- */}
@@ -51,32 +34,17 @@ const TransactionsTable = ({txs, offset}) => {
{t("TransactionCategory." + tr.category )}
-
{t("currency." + tr.currency )}
-
{new BN(tr?.balanceChange).toFormat()}
-
{new BN(tr?.balance).toFormat()}
-
-
-
-
-
-
-
-
-
-
-
-
)
})}
>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/MainMenu/MainMenu.js b/src/main/Browser/Pages/UserPanel/Sections/MainMenu/MainMenu.js
index b5653996..fcfc5a02 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/MainMenu/MainMenu.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/MainMenu/MainMenu.js
@@ -101,7 +101,7 @@ const MainMenu = () => {
- {/*
isActive ? classes.selected : undefined
@@ -115,9 +115,9 @@ const MainMenu = () => {
"txHistory.title",
)}`}>
- */}
+
-
isActive ? classes.selected : undefined
@@ -131,7 +131,7 @@ const MainMenu = () => {
"history.title",
)}`}>
-
+ */}
diff --git a/src/main/Browser/Pages/UserPanel/UserPanel.js b/src/main/Browser/Pages/UserPanel/UserPanel.js
index 9d655bd8..eb5c1020 100644
--- a/src/main/Browser/Pages/UserPanel/UserPanel.js
+++ b/src/main/Browser/Pages/UserPanel/UserPanel.js
@@ -13,7 +13,7 @@ import {Transactions} from "../../Routes/routes";
const UserPanel = () => {
const isLogin = useSelector((state) => state.auth.isLogin)
- const isTxHistoryPage = useMatch(RoutesName.History || RoutesName.History)
+ const isTxHistoryPage = useMatch(RoutesName.Transactions || RoutesName.History)
const isTechnicalPage = useMatch(RoutesName.Technical)
const hasSubMenu = !(isTxHistoryPage || isTechnicalPage);