Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opex",
"version": "v1.0.9-beta.18",
"version": "v1.0.11-beta.19",
"homepage": "",
"private": true,
"dependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import classes from './MarketTitle.module.css'
import {useTranslation} from "react-i18next";
import {Panel} from "../../../../Routes/routes";
import {EasyTrading, Panel} from "../../../../Routes/routes";
import {Link} from "react-router-dom";
import Icon from "../../../../../../components/Icon/Icon";
import Button from "../../../../../../components/Button/Button";
Expand All @@ -10,6 +10,8 @@ const MarketTitle = () => {

const {t} = useTranslation();

const isDevelopment = window.env.REACT_APP_ENV === "development";

const buttonTitle = <Icon iconName="icon-op-02 flex fs-04" customClass={`flex jc-center ai-center py-1`}/>

return (
Expand All @@ -18,37 +20,25 @@ const MarketTitle = () => {
<span className={`text-orange fs-02`}>{t("title")}</span> {t("MarketTitle.content")}
</p>
<div className={`column`}>
{/*<div className={`row jc-start ai-center mb-1`}>
<span className={`${classes.arrow} ml-05`}></span>
<Link to={"#"} className={`mr-05 cursor-pointer hover-text hover-scale-01`}>{t("MarketTitle.easyTrading")}</Link>
</div>*/}
<div className={`row jc-start ai-center mt-1 ${classes.flashit}`}>
<div className={`row jc-start ai-center my-1 ${classes.flashit}`}>
<span className={`${classes.arrow} ml-05`}></span>
<Link to={Panel} className={`mr-05 cursor-pointer hover-text hover-scale-01`}>{t("MarketTitle.advancedTrading")}</Link>
</div>
{/*<Button
buttonClass={`${classes.marketButton} ${classes.easyTradingButton} my-1`}
type="button"
onClick={() => navigate("", { replace: true })}
buttonTitle={t("MarketTitle.easyTrading")}
/>
<Button
buttonClass={`${classes.marketButton} ${classes.advancedTradingButton} my-1`}
type="button"
onClick={() => navigate(Panel, { replace: true })}
buttonTitle={t("MarketTitle.advancedTrading")}
/>*/}
<div className={`row jc-start ai-center my-1`}>
<span className={`${classes.arrow} ml-05`}></span>
<Link to={EasyTrading} className={`mr-05 cursor-pointer hover-text hover-scale-01`}>{t("MarketTitle.easyTrading")}</Link>
</div>
</div>
<div className={`row jc-start ai-center`}>
{ isDevelopment && <div className={`row jc-start ai-center`}>
<Button
buttonClass={`${classes.thisButton} hover-text`}
type="button"
onClick={() => window.open(`https://github.com/opexdev`)}
buttonTitle={buttonTitle}
/>
</div>
</div>}
</div>
);
};

export default MarketTitle;
export default MarketTitle;
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const OpenOrders = () => {
data-tooltip-html={t("myOrders.cancelOrder")}
>
<Icon
iconName="icon-cancel text-red fs-0-7"
iconName="icon-cancel-1 text-red fs-0-8"
customClass={`${classes.iconBG} cursor-pointer`}
/>
</td>
Expand Down