From d0026242f31eecd17a16b92a0cf82e0fb2c8cdc6 Mon Sep 17 00:00:00 2001 From: Hossein Date: Sun, 8 Sep 2024 15:36:08 +0330 Subject: [PATCH 1/2] #216: Remove logs --- .../components/History/components/Transactions/Transactions.js | 2 -- 1 file changed, 2 deletions(-) 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..8e228a87 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 @@ -32,8 +32,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 From 50b9ea38b9268fe2a6e8345a3baf690a997a661c Mon Sep 17 00:00:00 2001 From: Hossein Date: Mon, 9 Sep 2024 15:23:19 +0330 Subject: [PATCH 2/2] #216: Revert tansactions tab --- src/components/Layout/LayoutHeader/LayoutHeader.js | 2 +- .../Browser/Pages/UserPanel/Sections/MainMenu/MainMenu.js | 8 ++++---- src/main/Browser/Pages/UserPanel/UserPanel.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/Layout/LayoutHeader/LayoutHeader.js b/src/components/Layout/LayoutHeader/LayoutHeader.js index 80f2fd05..40f5d0f5 100644 --- a/src/components/Layout/LayoutHeader/LayoutHeader.js +++ b/src/components/Layout/LayoutHeader/LayoutHeader.js @@ -84,7 +84,7 @@ const LayoutHeader = () => {
navigate(RoutesName.Wallet)}>{t("wallet.title")}
-
navigate(RoutesName.Transactions)}>{t("txHistory.title")}
+
navigate(RoutesName.History)}>{t("history.title")}
navigate(RoutesName.Settings)}>{t("settings.title")}
{t("signOut")}
diff --git a/src/main/Browser/Pages/UserPanel/Sections/MainMenu/MainMenu.js b/src/main/Browser/Pages/UserPanel/Sections/MainMenu/MainMenu.js index fcfc5a02..b5653996 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 eb5c1020..a0230016 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.Transactions || RoutesName.History) + const isTxHistoryPage = useMatch(RoutesName.History) const isTechnicalPage = useMatch(RoutesName.Technical) const hasSubMenu = !(isTxHistoryPage || isTechnicalPage);