Skip to content

Revert buy and sell comp #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hossein-ab99 merged 1 commit into from
Sep 8, 2024
Merged

Revert buy and sell comp #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Layout/LayoutHeader/LayoutHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,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>
Expand Down
8 changes: 4 additions & 4 deletions src/main/Browser/Pages/UserPanel/Sections/MainMenu/MainMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const MainMenu = () => {
<Icon iconName="icon-account fs-21"/>
</NavLink>

{/* <NavLink
<NavLink
to={Routes.Transactions}
className={({ isActive }) =>
isActive ? classes.selected : undefined
Expand All @@ -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
Expand All @@ -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}`}>
Expand Down
2 changes: 1 addition & 1 deletion src/main/Browser/Pages/UserPanel/UserPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down