Revert buy and sell comp

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 = (
         <Menu
             style={{
@@ -86,7 +84,7 @@ const LayoutHeader = () => {
             </div>
 
             <div className={`my-3 px-1 menuItem cursor-pointer hover-text fs-0-8`} onClick={()=>navigate(RoutesName.Wallet)}>{t("wallet.title")}</div>
-            <div className={`my-3 px-1 menuItem cursor-pointer hover-text fs-0-8`} onClick={()=>navigate(RoutesName.History)}>{t("history.title")}</div>
+            <div className={`my-3 px-1 menuItem cursor-pointer hover-text fs-0-8`} onClick={()=>navigate(RoutesName.Transactions)}>{t("txHistory.title")}</div>
             <div className={`my-3 px-1 menuItem cursor-pointer hover-text fs-0-8`} onClick={()=>navigate(RoutesName.Settings)}>{t("settings.title")}</div>
             <div className={`my-3 px-1 menuItem cursor-pointer hover-text fs-0-8 text-red`} onClick={logOutHandler}>{t("signOut")}</div>
         </Menu>

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 <Transactions/>
         if (activeTx === "deposit") return <DepositHistory/>

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 <div style={{height: "40vh"}}><Loading/></div>
         if (error) return <div style={{height: "40vh"}}><Error/></div>
@@ -128,7 +122,6 @@ const Transactions = () => {
 
     return (
         <div className={`width-100 column my-3`} ref={scrollRef}>
-
             <div className={`width-100 row jc-between ai-center wrap fs-0-9`}>
                 <TextInput
                     select={true}
@@ -171,7 +164,6 @@ const Transactions = () => {
                     onchange={pageSizeHandler}
                     customClass={`width-20 ${classes.thisInput}`}
                 />
-
                 <TextInput
                     datePicker={true}
                     //placeholder={t('history.size')}
@@ -191,7 +183,6 @@ const Transactions = () => {
                     position={`${i18n.language === "fa" ? "bottom-left" : "bottom-right" }`}
                     customClass={`width-20 ${classes.thisInput} ${classes.datePicker} `}
                 />
-
                 <div className={`width-15 row jc-end ai-center fs-0-8`}>
                     <span className={`fs-0-8 ml-1`}>{t("history.ascendingByTime")}</span>
                     <ToggleSwitch
@@ -200,14 +191,8 @@ const Transactions = () => {
                             ...prevState,
                             ascendingByTime: !prevState.ascendingByTime
                         }}) }
-
-                        /*onchange={()=> setQuery({
-                            ...query,
-                            ascendingByTime: (prevState => !prevState)}
-                        )}*/
                         checked={!query?.ascendingByTime}/>
                 </div>
-
             </div>
 
             <div className={`card-bg card-border width-100 my-4`} >
@@ -227,9 +212,6 @@ const Transactions = () => {
                         </span>}
                     </div>
 
-
-
-
                     <div className={`row jc-start ai-center `}>
                         <Button
                             buttonClass={`${classes.thisButton} px-2`}
@@ -253,7 +235,6 @@ const Transactions = () => {
                             onClick={nextPage}
                         />
                     </div>
-
                 </div>
                 <div>
                     {content()}
@@ -281,9 +262,7 @@ const Transactions = () => {
                         onClick={nextPage}
                     />
                 </div>
-
             </div>
-
         </div>
     );
 };

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 = (
         <div className="row text-gray px-2 py-2" style={{backgroundColor:"var(--tableHeader)"}}>
-            {/*<span className="width-9 flex jc-start ai-center">{t("row")}</span>*/}
             <span className="width-12 flex jc-start ai-center">{t("date")}</span>
             <span className="width-12 flex  jc-start ai-center">{t("time")}</span>
             <span className="width-17 flex jc-start ai-center">{t("history.category")}</span>
             <span className="width-17 flex jc-start ai-center">{t("history.currency")}</span>
             <span className="width-18 flex jc-start ai-center">{t("history.balanceChange")}</span>
             <span className="width-24 flex jc-end ai-center">{t("history.balance")}</span>
-            {/*<span className="width-12 flex jc-end ai-center">{t("details")}</span>*/}
-
         </div>
     );
 
     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 (
-
                     <div className={`column ${classes.striped}`} key={index}>
-
                         <div className={`${classes.row} row rounded-5 border-bottom px-2 py-2`} key={index}>
-                            {/*<span className="width-9 row jc-start ai-center">
-                                {index + offset + 1}
-                            </span>*/}
                             <span className="width-12 row jc-start ai-center">
                                 <Date date={tr.date}/>
                             </span>
@@ -51,32 +34,17 @@ const TransactionsTable = ({txs, offset}) => {
                             <span className="width-17 row jc-start ai-center">
                                 {t("TransactionCategory." + tr.category )}
                             </span>
-
                             <span className="width-17 row jc-start ai-center">
                                 {t("currency." + tr.currency )}
                             </span>
-
                             <span className="width-18 row jc-start ai-center">
                                 <span className={`direction-ltr ${new BN(tr?.balanceChange).isLessThan(0) ? "text-red" : "text-green"}`}>{new BN(tr?.balanceChange).toFormat()}</span>
                             </span>
-
                             <span className="width-24 row jc-end ai-center">
                                 <span className={`direction-ltr`}>{new BN(tr?.balance).toFormat()}</span>
-
                             </span>
-
-
-
-
-
-
-
                         </div>
-
                     </div>
-
-
-
                 )
             })}
         </>

src/main/Browser/Pages/UserPanel/Sections/MainMenu/MainMenu.js

@@ -101,7 +101,7 @@ const MainMenu = () => {
                             <Icon iconName="icon-account fs-21"/>
                         </NavLink>
 
-                       {/* <NavLink
+                        <NavLink
                             to={Routes.Transactions}
                             className={({ isActive }) =>
                                 isActive ? classes.selected : undefined
@@ -115,9 +115,9 @@ const MainMenu = () => {
                                 "txHistory.title",
                             )}</span>`}>
                             <Icon iconName="icon-clock fs-21"/>
-                        </NavLink>*/}
+                        </NavLink>
 
-                        <NavLink
+                        {/*<NavLink
                             to={Routes.History}
                             className={({ isActive }) =>
                                 isActive ? classes.selected : undefined
@@ -131,7 +131,7 @@ const MainMenu = () => {
                                 "history.title",
                             )}</span>`}>
                             <Icon iconName="icon-clock fs-21"/>
-                        </NavLink>
+                        </NavLink>*/}
 
                     </div>
                     <div className={`column jc-end ai-center ${classes.bottomSection}`}>

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);