Skip to content

Release v1.0.2 beta.9 #139

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 3 commits into from
Dec 6, 2022
Merged

Release v1.0.2 beta.9 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08f1ce4
Merge pull request #138 from opexdev/release/v1.0.2-beta.8
Hossein-ab99 Nov 22, 2022
fcaff5f
Add sublink, Fix calendar type & available amount in order
Hossein-ab99 Dec 6, 2022
6800655
Add version number
Hossein-ab99 Dec 6, 2022
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opex",
"version": "v1.0.2-beta.8",
"version": "v1.0.2-beta.9",
"homepage": "",
"private": true,
"dependencies": {
Expand Down
3 changes: 2 additions & 1 deletion public/assets/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"unit": "Unit",
"offline": "Check your connection!",
"improperMobileView ": "Not optimized for mobile view.",
"home": "Home",
"country": {
"iran" : "I. R. IRAN",
"germany" : "Germany",
Expand Down Expand Up @@ -557,7 +558,7 @@
"serverError": "Server error, please try again."
},
"Landing": {
"title": "Cryptocurrency Exchange Platform"
"title": "Crypto Exchange Platform"
},
"MarketTitle": {
"content": "Designed specifically to meet your needs.",
Expand Down
1 change: 1 addition & 0 deletions public/assets/locales/fa/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"unit": "واحد",
"offline": "اتصال اینترنت را بررسی کنید!",
"improperMobileView ": "فعلاً برای موبایل بهینه نشده است.",
"home": "صفحه‌اصلی",
"country": {
"iran" : "جمهوری اسلامی ایران",
"germany" : "آلمان",
Expand Down
35 changes: 29 additions & 6 deletions src/components/HeaderBuilder/HeaderBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, {useEffect} from 'react';
import classes from './HeaderBuilder.module.css'
import {Link, useLocation} from "react-router-dom";
import {Link, NavLink, useLocation} from "react-router-dom";
import * as Routes from "../../main/Browser/Routes/routes";
import {Login} from "../../main/Browser/Routes/routes";
import {Login, Panel} from "../../main/Browser/Routes/routes";
import {useDispatch, useSelector} from "react-redux";
import {useTranslation} from "react-i18next";
import ReactTooltip from "react-tooltip";
Expand Down Expand Up @@ -40,15 +40,38 @@ const HeaderBuilder = ({children}) => {
return (
<div className={`${classes.container} container row jc-between ai-center px-2`}>
<div className={`row jc-between ai-center ${classes.content}`}>
<div className={`flex jc-start ai-center width-30`}>
<div className={`flex jc-start ai-center width-35`}>
<Link to={Routes.Landing} className={`flex jc-start ai-center`}>
<img src={toAbsoluteUrl('/assets/logo/logo.svg')} alt={t("title")} title={t("title")} className={`img-lg-plus`}/>
</Link>

<span className={`mr-2`}>{children}</span>

</div>
<div className={`width-40 text-center`}>
{children}
<div className={`width-45 text-center row jc-center ai-center`}>

<NavLink
to={Routes.Landing}
className={({ isActive }) => isActive ? 'text-orange mx-1 cursor-pointer hover-text' : 'mx-1 cursor-pointer hover-text'}
>{t("home")}</NavLink>
<NavLink
to="#"
className={`mx-1 cursor-pointer hover-text`}
>{t("MarketTitle.easyTrading")}</NavLink>
<NavLink
to={Routes.Panel}
className={({ isActive }) => isActive ? 'text-orange mx-1 cursor-pointer hover-text' : 'mx-1 cursor-pointer hover-text'}
>{t("MarketTitle.advancedTrading")}</NavLink>
<NavLink
to={Routes.AllMarket}
className={({ isActive }) => isActive ? 'text-orange mx-1 cursor-pointer hover-text' : 'mx-1 cursor-pointer hover-text'}
>{t("market.title")}</NavLink>




</div>
<div className={`column ai-end width-25`}>
<div className={`column ai-end width-15`}>
{firstName === null ? (
<Link to={Login} state={{from: location}} className="hover-text">
<p>{t("signIn")} | {t("signUp")}</p>
Expand Down
19 changes: 2 additions & 17 deletions ...lMarketContent/components/AllMarketInfo/components/AllMarketInfoCard/AllMarketInfoCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {setActivePairInitiate} from "../../../../../../../../../../store/actions
import {Panel} from "../../../../../../../../Routes/routes";
import {useNavigate} from "react-router-dom";
import {useDispatch, useSelector} from "react-redux";
import i18n from "i18next";

const AllMarketInfoCard = ({data, activeCurrency}) => {

Expand Down Expand Up @@ -44,31 +45,25 @@ const AllMarketInfoCard = ({data, activeCurrency}) => {
}



return (
<div className={`${classes.container} my-1 px-1`}>

{data.map((tr, index) => {
return (
<div key={index} className={`${classes.item} card-border card-bg column cursor-pointer`} style={backgroundBar(tr.priceChange.toString())}
onMouseEnter={()=>MouseEnterEventHandler(index)} onMouseLeave={MouseLeaveEventHandler}>

<div className={`column jc-between ai-center pt-2 pb-3`} style={{height:"80%"}}>

<div className={`row jc-between ai-center width-100 px-1`}>
<div className={`row jc-center ai-center`}>
<img src={images[tr?.base]} alt={tr?.base}
title={tr?.base} className={`img-md-plus ml-05`}/>

<span className={`fs-01`}>{activeCurrency ? t("currency." + tr?.base) : tr?.base + " / " + tr?.quote}</span>
</div>

<div className={`flex jc-end ai-center fs-0-6`}>
<span className={`${tr.priceChange > 0 ? "text-green" : "text-red"} direction-ltr mr-05`}>{new BN(tr.priceChange).toFormat()} %</span>

</div>
</div>

<div className={`column px-1 width-100 fs-0-7`}>
<div className={`row jc-between ai-center`}>
<span className={``}>{t("MarketInfo.lastPrice")}:</span>
Expand All @@ -87,8 +82,6 @@ const AllMarketInfoCard = ({data, activeCurrency}) => {
<span>{new BN(tr.volume).toFormat()}</span>
</div>
</div>


</div>
<div className={`flex jc-center ai-center`} style={{height:"20%"}}>
{ showButton === index ?
Expand All @@ -114,18 +107,10 @@ const AllMarketInfoCard = ({data, activeCurrency}) => {
alt={""}
title={""}
/>
<span className={`fs-0-6 position-absolute`} style={{left:"35%"}}>{t("comingSoon")}</span>
<span className={`fs-0-6 position-absolute`} style={{left:`${i18n.language !== "fa" ? "20%" : "40%"}`}}>{t("comingSoon")}</span>
</div>
}
</div>








</div>
)
})}
Expand Down
2 changes: 1 addition & 1 deletion ...arketContent/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const AllMarketInfTable = ({data, activeCurrency}) => {
alt={""}
title={""}
/>
<span className={`fs-0-6 position-absolute`} style={{left:"45%"}}>{t("comingSoon")}</span>
<span className={`fs-0-6 position-absolute`} style={{left:`${i18n.language !== "fa" ? "20%" : "48%"}`}}>{t("comingSoon")}</span>
</span>

<span className="width-8 flex jc-end ai-center">
Expand Down
2 changes: 1 addition & 1 deletion src/main/Browser/Pages/AllMarket/Sections/AllMarketContent/components/PriceInfo/PriceInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const PriceInfo = () => {
}

return (
<div className={`${classes.container} row jc-between ai-center col-100`}>
<div className={`${classes.container} row jc-between ai-center text-center col-100`}>
<div className={`card-bg card-border height-100 col-48`}>
<div className={`${classes.header} card-header-bg flex jc-center ai-center`}>
<span className={`text-orange`}>{t("MarketView.mostIncreased")}</span>
Expand Down
2 changes: 1 addition & 1 deletion ...ain/Browser/Pages/AllMarket/Sections/AllMarketContent/components/VolumeInfo/VolumeInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const VolumeInfo = () => {


return (
<div className={`${classes.container} row jc-between ai-center col-100`}>
<div className={`${classes.container} row jc-between ai-center text-center col-100`}>
<div className={`card-bg card-border height-100 col-48`}>
<div className={`${classes.header} card-header-bg flex jc-center ai-center`}>
<span className={`text-orange`}>{t("MarketView.mostVolume")}</span>
Expand Down
2 changes: 1 addition & 1 deletion src/main/Browser/Pages/Landing/Sections/LandingContent/components/GeneralInfo/GeneralInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const GeneralInfo = () => {

const content = () => {
if (isLoading) return <Loading/>
if (error) return <Error/>
if (error) return <span className={`width-100`}><Error/></span>
else return <>
<div className={`column jc-center ai-center`}>
<span className={`fs-02`}>{data.activeUsers} </span>
Expand Down
2 changes: 1 addition & 1 deletion ...ctions/LandingContent/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const MarketInfoTable = ({data, activeCurrency}) => {
alt={""}
title={""}
/>
<span className={`fs-0-6 position-absolute`} style={{left:"13%"}}>{t("comingSoon")}</span>
<span className={`fs-0-6 position-absolute`} style={{left:`${i18n.language !== "fa" ? "68%" : "13%"}`}}>{t("comingSoon")}</span>
</span>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion ...er/Pages/UserPanel/Sections/Content/components/Market/components/LastTrades/LastTrades.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const LastTrades = () => {
const {data: lastTrades, isLoading, error} = useLastTrades(activePair.symbol, onSuccess)

const content = () => {
if (error) return <Error/>
if (error) return <span className={`width-100`}><Error/></span>
if (isLoading) return <Loading/>
if (lastTrades.length > 0) return <LastTradesTable data={lastTrades}/>
return <div className="width-100 column ai-center jc-center" style={{height: "100%"}}>
Expand Down
15 changes: 7 additions & 8 deletions ...ections/Content/components/Market/components/MyOrders/components/OpenOrders/OpenOrders.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,26 +104,25 @@ const OpenOrders = () => {
)}
</tr>
<tr style={{display: openOrder === index ? "revert" : "none"}}>
<td colSpan="8" className={`py-1 px-2`}>
<div
className="row jc-around ai-center"
<td colSpan="8" className={`py-1 px-1 fs-0-9`}>
<div className="row jc-between ai-center"
style={{width: "100%"}}>
<p className="col-46 row jc-between">
<p className="width-47 row jc-between">
{t("myOrders.orderId")} : <span>{tr.orderId}</span>
</p>
<p className="col-46 row jc-between">
<p className="width-47 row jc-between">
{t("myOrders.tradedAmount")} :{" "}
<span>{executedQty.decimalPlaces(activePair.baseAssetPrecision).toFormat()}</span>
</p>
</div>
<div
className="row jc-around ai-center"
className="row jc-between ai-center"
style={{width: "100%"}}>
<p className="col-46 row jc-between">
<p className="width-47 row jc-between">
{t("myOrders.avgTradedAmount")} :{" "}
<span>-</span>
</p>
<p className="col-46 row jc-between">
<p className="width-47 row jc-between">
{t("myOrders.tradedPrice")} :{" "}
<span>{executedQty.multipliedBy(pricePerUnit).decimalPlaces(activePair.baseAssetPrecision).toFormat()}</span>
</p>
Expand Down
16 changes: 8 additions & 8 deletions ...s/Content/components/Market/components/MyOrders/components/OrdersHistory/OrdersHistory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ const OrdersHistory = () => {
<tr style={{
display: openOrder === index ? "revert" : "none",
}}>
<td colSpan="8" className={`py-1 px-2`}>
<td colSpan="8" className={`py-1 px-1 fs-0-9`}>
<div
className="row jc-between ai-center"
className="row jc-between ai-center"
style={{width: "100%", textAlign: "start"}}>
<p className="col-46 row jc-between">
<p className="width-47 row jc-between">
{t("myOrders.orderId")} : <span>{tr.orderId}</span>
</p>
<p className="col-46 row jc-between">
<p className="width-47 row jc-between">
{t("orderType")} :{" "}
<span>
{t(tr.side.toLowerCase()) + " " + t("orderTypes." + tr.type)}
Expand All @@ -92,16 +92,16 @@ const OrdersHistory = () => {
</div>
<div className="row jc-between ai-center"
style={{width: "100%", textAlign: "start"}}>
<p className="col-46 row jc-between">
<p className="width-47 row jc-between">
{t("myOrders.stopOrderTime")} :{" "}
<span>
{moment(tr.updateTime).format("jYY/jMM/jDD HH:mm:ss",)}
<Date date={tr.updateTime}/> - {moment(tr.updateTime).format("HH:mm:ss")}
</span>
</p>
<p className="col-46 row jc-between">
<p className="width-47 row jc-between">
{t("myOrders.startOrderTime")} :{" "}
<span>
{moment(tr.time).format("jYY/jMM/jDD HH:mm:ss",)}
<Date date={tr.time}/> - {moment(tr.time).format("HH:mm:ss")}
</span>
</p>
</div>
Expand Down
11 changes: 6 additions & 5 deletions ...rPanel/Sections/Content/components/Market/components/MyOrders/components/Trades/Trades.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Icon from "../../../../../../../../../../../../components/Icon/Icon";
import Error from "../../../../../../../../../../../../components/Error/Error";
import {useMyTrades} from "../../../../../../../../../../../../queries";
import Date from "../../../../../../../../../../../../components/Date/Date";
import {BN} from "../../../../../../../../../../../../utils/utils";

const Trades = () => {

Expand Down Expand Up @@ -78,15 +79,15 @@ const Trades = () => {
</tr>
<tr
style={{display: openOrder === index ? "revert" : "none"}}>
<td colSpan="6" className={`py-1 px-2`}>
<td colSpan="6" className={`py-1 px-1 fs-0-9`}>
<div
className="row jc-around ai-center"
className="row jc-between ai-center"
style={{width: "100%"}}>
<p className="col-46 row jc-between">
<p className="width-47 row jc-between">
{t("myOrders.orderId")} : <span>{tr.orderId}</span>
</p>
<p className="col-46 row jc-between">
{t("commission")} : <span>{tr.commission} <span>{t("currency." + tr.commissionAsset.toUpperCase())}</span></span>
<p className="width-47 row jc-between">
{t("commission")} : <span>{new BN(tr.commission).toFormat()} <span>{t("currency." + tr.commissionAsset.toUpperCase())}</span></span>
</p>
</div>
</td>
Expand Down
4 changes: 2 additions & 2 deletions ...Panel/Sections/Content/components/Market/components/Order/components/BuyOrder/BuyOrder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ const BuyOrder = () => {
}}>
{t("orders.availableAmount")}:{" "}
<span className="cursor-pointer">
{quote.toLocaleString()}{" "}
{new BN(quote).toFormat()}{" "}
{t("currency." + activePair.quoteAsset)}
</span>
</p>
Expand All @@ -287,7 +287,7 @@ const BuyOrder = () => {
}}>
{t("orders.bestOffer")}:{" "}
<span className="cursor-pointer">
{bestBuyPrice.toLocaleString()}{" "}{t("currency." + activePair.quoteAsset)}
{new BN(bestBuyPrice).toFormat()}{" "}{t("currency." + activePair.quoteAsset)}
</span>
</p>
</div>
Expand Down
10 changes: 3 additions & 7 deletions ...nel/Sections/Content/components/Market/components/Order/components/SellOrder/SellOrder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,17 +268,13 @@ const SellOrder = () => {
return (
<div className={`column jc-between ${classes.content}`}>
<div className="column jc-center">
<p onClick={() => fillSellByWallet()}>
{t("orders.availableAmount")}:{" "}
<span className="cursor-pointer">
{base.toLocaleString()}{" "}
{t("currency." + activePair.baseAsset)}
</span>
<p onClick={() => fillSellByWallet()}>{t("orders.availableAmount")}:{" "}
<span className="cursor-pointer">{new BN(base).toFormat()}{" "}{t("currency." + activePair.baseAsset)}</span>
</p>
<p onClick={() => fillSellByBestPrice()}>
{t("orders.bestOffer")}:{" "}
<span className="cursor-pointer">
{bestSellPrice.toLocaleString()}{" "}{t("currency." + activePair.quoteAsset)}
{new BN(bestSellPrice).toFormat()}{" "}{t("currency." + activePair.quoteAsset)}
</span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...wser/Pages/UserPanel/Sections/Content/components/Market/components/OrderBook/OrderBook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const OrderBook = () => {
}, lastTransaction)

const tableRender = () => {
if (error) return <Error/>
if (error) return <span className={`width-100`}><Error/></span>
if (isLoading) return <Loading/>

if (isSafari) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/Browser/Pages/UserPanel/Sections/Footer/Footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ const Footer = () => {
onClick={() => i18n.changeLanguage("en")}>{t("Languages.English")}</span>
</>
}


</div>
</div>
</div>
Expand Down
Loading