diff --git a/package.json b/package.json index 298f1393..4afc5437 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opex", - "version": "v1.0.5-beta.15", + "version": "v1.0.5-beta.16", "homepage": "", "private": true, "dependencies": { diff --git a/public/assets/locales/en/translation.json b/public/assets/locales/en/translation.json index 943886a2..330a4035 100644 --- a/public/assets/locales/en/translation.json +++ b/public/assets/locales/en/translation.json @@ -249,7 +249,8 @@ "coin": "Coins", "category": "Categories", "size": "Number", - "period" : "Period" + "period" : "Period", + "ascendingByTime" : "Ascending By Time" }, "TransactionCategory": { "DEPOSIT": "Deposit", @@ -258,7 +259,8 @@ "WITHDRAW": "Withdraw", "ORDER_CANCEL": "Cancel Order", "ORDER_CREATE": "Create Order", - "ORDER_FINALIZED": "Finalized Order" + "ORDER_FINALIZED": "Finalized Order", + "ETC" : "Unknown" }, "DepositWithdraw": { "title": "Deposit / Withdraw", diff --git a/public/assets/locales/fa/translation.json b/public/assets/locales/fa/translation.json index d28b3197..964d449e 100644 --- a/public/assets/locales/fa/translation.json +++ b/public/assets/locales/fa/translation.json @@ -249,7 +249,8 @@ "coin" : "ارز", "category" : "نوع تراکنش", "size" : "تعداد", - "period" : "بازه زمانی" + "period" : "بازه زمانی", + "ascendingByTime" : "نمایش براساس جدیدترین" }, "TransactionCategory": { "DEPOSIT" : "واریز", @@ -258,7 +259,8 @@ "WITHDRAW" : "برداشت", "ORDER_CANCEL" : "لغو سفارش", "ORDER_CREATE" : "ثبت سفارش", - "ORDER_FINALIZED" : "اتمام سفارش" + "ORDER_FINALIZED" : "اتمام سفارش", + "ETC" : "نامشخص" }, "DepositWithdraw": { "title": "واریز/برداشت", diff --git a/public/assets/locales/uzb/translation.json b/public/assets/locales/uzb/translation.json index c5013e8b..eac1c1a8 100644 --- a/public/assets/locales/uzb/translation.json +++ b/public/assets/locales/uzb/translation.json @@ -249,7 +249,8 @@ "coin": "Koins", "category": "Toifalar", "size": "Raqam", - "period" : "Davr" + "period" : "Davr", + "ascendingByTime" : "Eng so'nggisiga asoslangan ko'rsatish" }, "TransactionCategory": { "DEPOSIT": "Depozit", @@ -258,7 +259,8 @@ "WITHDRAW": "Olib chiqish", "ORDER_CANCEL": "Buyurtmani bekor qilish", "ORDER_CREATE": "Buyurtma yaratish", - "ORDER_FINALIZED": "Buyurtma yakunlandi" + "ORDER_FINALIZED": "Buyurtma yakunlandi", + "ETC" : "Noma'lum" }, "DepositWithdraw": { "title": "Depozit / Pul olish", diff --git a/src/components/AdvanceTradingView/AdvanceTradingView.jsx b/src/components/AdvanceTradingView/AdvanceTradingView.jsx index db209605..d60d723d 100644 --- a/src/components/AdvanceTradingView/AdvanceTradingView.jsx +++ b/src/components/AdvanceTradingView/AdvanceTradingView.jsx @@ -12,7 +12,7 @@ const removeTestCoin = (pair) => { } const AdvanceTradingView = () => { - const isDark = useSelector((state) => state.global.isDark) + const theme = useSelector((state) => state.global.theme) const activePair = useSelector((state) => state.exchange.activePair) const widgetOptions = { symbol: removeTestCoin(activePair.baseAsset+"/"+activePair.quoteAsset), @@ -32,13 +32,13 @@ const AdvanceTradingView = () => { useLayoutEffect(() => { const widget = (window.tvWidget = new window.TradingView.widget( - {...widgetOptions, theme: isDark ? "dark" : "light"}, + {...widgetOptions, theme: theme.toLowerCase()}, )); widget.onChartReady(() => { console.log("Chart has loaded!"); }); - }, [isDark]); + }, [theme]); return (
{ - + const type = useSelector((state) => state.exchange.dateType) const calendar = () => { - const type = window.env.REACT_APP_CALENDAR_TYPE + switch (type) { case "Jalali": return moment(date).format("jYY/jMM/jDD"); @@ -17,7 +18,7 @@ const Date = ({date}) => { } }; - return calendar(); + return (<>{calendar()}); }; export default Date; diff --git a/src/components/Loading/Loading.js b/src/components/Loading/Loading.js index 884c6bc1..340064ee 100644 --- a/src/components/Loading/Loading.js +++ b/src/components/Loading/Loading.js @@ -1,25 +1,17 @@ import React from "react"; import {useTranslation} from "react-i18next"; import {images} from "../../assets/images"; -import {connect} from "react-redux"; +import {useSelector} from "react-redux"; import {isMobile} from 'react-device-detect'; - -const Loading = ({isDark}) => { +const Loading = () => { + const theme = useSelector((state) => state.global.theme) const {t} = useTranslation(); return (
- loading... + loading... {t('loading')}
); }; - - -const mapStateToProps = (state) => { - return { - isDark: state.global.isDark, - }; -}; - -export default connect(mapStateToProps, null)(Loading); \ No newline at end of file +export default Loading; \ No newline at end of file diff --git a/src/components/TextInput/TextInput.js b/src/components/TextInput/TextInput.js index bafe4bab..4059e4c4 100644 --- a/src/components/TextInput/TextInput.js +++ b/src/components/TextInput/TextInput.js @@ -2,12 +2,12 @@ import React from "react"; import Icon from "../Icon/Icon"; import Select from "react-select"; import classes from "./TextInput.module.css"; -import i18n from "../../i18n/i18n"; import persian_fa from "react-date-object/locales/persian_fa"; import persian from "react-date-object/calendars/persian"; import DatePicker from "react-multi-date-picker"; import "react-multi-date-picker/styles/backgrounds/bg-dark.css" import {useSelector} from "react-redux"; +import i18n from "i18next"; const TextInput = (props) => { const { @@ -27,17 +27,18 @@ const TextInput = (props) => { ...other } = props - const isDark = useSelector((state) => state.global.isDark) - + const theme = useSelector((state) => state.global.theme) const optionClassHandler = (state) => { let className = classes.selectOptions - if (state.isFocused) { - className = className + " " + classes.isFocused - } - if (state.isSelected) { - className = className + " " + classes.isSelected - } + + if (state.isFocused) { + className = className + " " + classes.isFocused + } + if (state.isSelected) { + className = className + " " + classes.isSelected + } + return className; } @@ -55,12 +56,11 @@ const TextInput = (props) => { {...other} /> - if(lead){ + if (lead) { leadSection = {lead} } - - if ( select ){ + if (select) { inputSection =