Release v1.0.9-beta.18

package.json

@@ -1,6 +1,6 @@
 {
   "name": "opex",
-  "version": "v1.0.7-beta.17",
+  "version": "v1.0.9-beta.18",
   "homepage": "",
   "private": true,
   "dependencies": {

public/assets/locales/en/translation.json

@@ -246,6 +246,12 @@
     "estimateAlert": "The equivalent amount is calculated based on the highest buy offer"
   },
   "TransactionHistory": {
+    "buyAndSell" : "Buy And Sell",
+    "buyAndSellTx" : "Buy And Sell History",
+    "withdrawTx" : "Withdraw History",
+    "depositTx" : "Deposit History",
+    "destAddress" : "Dest Address",
+    "txType" : "Transaction Type",
     "coin": "Coins",
     "category": "Categories",
     "size": "Number",
@@ -768,6 +774,10 @@
   "contactUs": {
     "title": "Contact Us",
     "subTitle1": "Contact Us content",
-    "text1": ""
+    "text1": "",
+    "businessEmailsValue": "",
+    "businessEmails": "Business Email",
+    "supportRelated": "Support Related",
+    "supportRelatedValue": ""
   }
 }

public/assets/locales/fa/translation.json

@@ -246,6 +246,12 @@
     "estimateAlert": "مبلغ دارایی معادل براساس بالاترین پیشنهاد خرید محاسبه شده"
   },
   "TransactionHistory": {
+    "buyAndSell" : "خرید و فروش",
+    "buyAndSellTx" : "تاریخچه خرید و فروش",
+    "withdrawTx" : "تاریخچه برداشت",
+    "depositTx" : "تاریخچه واریز",
+    "destAddress" : "آدرس مقصد",
+    "txType" : "نوع تراکنش",
     "coin" : "ارز",
     "category" : "نوع تراکنش",
     "size" : "تعداد",
@@ -768,6 +774,10 @@
   "contactUs": {
     "title": "تماس با ما",
     "subTitle1": "متن تماس با ما",
-    "text1": ""
+    "text1": "",
+    "businessEmailsValue": "",
+    "businessEmails": "ایمیل کسب و کار",
+    "supportRelated": "ایمیل پشتیبانی",
+    "supportRelatedValue": ""
   }
 }

src/components/HeaderBuilder/HeaderBuilder.js

@@ -61,12 +61,6 @@ const HeaderBuilder = ({children}) => {
                         to={Routes.AllMarket}
                         className={({ isActive }) => isActive ? 'text-orange mx-1 cursor-pointer hover-text' : 'mx-1 cursor-pointer hover-text'}
                     >{t("market.title")}</NavLink>
-                    <NavLink
-                        to={Routes.Info}
-                        className={({ isActive }) => isActive ? 'text-orange mx-1 cursor-pointer hover-text' : 'mx-1 cursor-pointer hover-text'}
-                    >{t("info.title")}
-                    </NavLink>
-
                 </div>
                 <div className={`column ai-end width-15`}>
                     {firstName === null ? (

src/components/Layout/LayoutHeader/LayoutHeader.js

@@ -85,7 +85,7 @@ const LayoutHeader = () => {
                 </p>
             </div>
 
-            <div className={`my-3 px-1 menuItem cursor-pointer hover-text fs-0-8`} onClick={()=>navigate(RoutesName.TxHistory)}>{t("txHistory.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/AllMarket/components/VolumeInfo/components/MostVolume/MostVolume.js

@@ -19,9 +19,12 @@ const MostVolume = ({mostVolume}) => {
                 <span className={`${i18n.language !== "fa" ? 'mr-025' : 'ml-025'} fs-0-6`}>{mostVolume?.pairInfo?.baseAsset}</span>
                 <span className={`${i18n.language !== "fa" ? 'mL-025' : 'mr-025'} fs-01`}>{new BN(mostVolume?.volume).toFormat()} </span>
             </div>
-            <div className={`row jc-center ai-center width-100`}>
+
+            {/*++ to do ++*/}
+
+            {/*<div className={`row jc-center ai-center width-100`}>
                 <span  className={`${mostVolume?.change > 0 ? "text-green" : "text-red"} direction-ltr`}>{new BN(mostVolume?.change).toFormat(2)} %</span>
-            </div>
+            </div>*/}
         </>
     );
 };

src/main/Browser/Pages/Info/ContactUs/ContactUs.js

@@ -10,6 +10,17 @@ const ContactUs = () => {
             <div className={`card-bg card-border column px-2 py-3 `}>
                 <span className={`fs-02 mb-1`}>{t("contactUs.subTitle1")}</span>
                 <span className={`my-1`}>{t("contactUs.text1")}</span>
+
+                <div className={`row mt-2`}>
+                    <span className={` ml-1`}>{t("contactUs.businessEmails")}: </span>
+                    <span className={`fs-01 mr-1`}>{t("contactUs.businessEmailsValue")}</span>
+                </div>
+                <div className={`row mt-2`}>
+
+                    <span className={` ml-1`}>{t("contactUs.supportRelated")}: </span>
+                    <span className={`fs-01 mr-1`}>{t("contactUs.supportRelatedValue")}</span>
+                </div>
+
             </div>
         </div>
     );

src/main/Browser/Pages/Landing/components/GeneralInfo/GeneralInfo.js

@@ -4,6 +4,7 @@ import {useGetExchangeInfo} from "../../../../../../queries";
 import Loading from "../../../../../../components/Loading/Loading";
 import Error from "../../../../../../components/Error/Error";
 import {useTranslation} from "react-i18next";
+import i18n from "i18next";
 
 const GeneralInfo = () => {
 
@@ -17,15 +18,24 @@ const GeneralInfo = () => {
         if (error) return <span className={`width-100`}><Error/></span>
         else return <>
             <div className={`column jc-center ai-center width-33`}>
-                <span className={`fs-02`}>{data.activeUsers.toLocaleString()} </span>
+                <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'}`}>
+                    <span className={`fs-02`}>{data.activeUsers.toLocaleString()} </span>
+                    <span className={`fs-0-9 ${i18n.language !== "fa" ? 'ml-025' : 'mr-025'}`}> + </span>
+                </div>
                 <span className={`fs-0-7`}>{t("GeneralInfo.activeUsers")}</span>
             </div>
             <div className={`column jc-center ai-center width-33`}>
-                <span className={`fs-02`}>{data.totalOrders.toLocaleString()} </span>
+                <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'}`}>
+                    <span className={`fs-02`}>{data.totalOrders.toLocaleString()} </span>
+                    <span className={`fs-0-9 ${i18n.language !== "fa" ? 'ml-025' : 'mr-025'}`}> + </span>
+                </div>
                 <span className={`fs-0-7`}>{t("GeneralInfo.totalOrders")}</span>
             </div>
             <div className={`column jc-center ai-center width-33`}>
-                <span className={`fs-02`}>{data.totalTrades.toLocaleString()} </span>
+                <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'}`}>
+                    <span className={`fs-02`}>{data.totalTrades.toLocaleString()} </span>
+                    <span className={`fs-0-9 ${i18n.language !== "fa" ? 'ml-025' : 'mr-025'}`}> + </span>
+                </div>
                 <span className={`fs-0-7`}>{t("GeneralInfo.totalTrades")}</span>
             </div>
         </>

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

@@ -9,7 +9,7 @@ import Footer from "../Footer/Footer";
 import Settings from "./components/Settings/Settings";
 import {useSelector} from "react-redux";
 import TechnicalChart from "./components/TechnicalChart/TechnicalChart";
-import TransactionHistory from "./components/TransactionHistory/TransactionHistory";
+import Transactions from "./components/Transactions/Transactions";
 
 const Content = () => {
 
@@ -24,7 +24,7 @@ const Content = () => {
                     <Route path={RoutesName.WalletRelative+"/:id"} element={<Wallet/>}/>
                     <Route path={RoutesName.SettingsRelative+"/*"} element={<Settings/>}/>
                     <Route path={RoutesName.TechnicalRelative} element={<TechnicalChart/>}/>
-                    <Route path={RoutesName.TxHistoryRelative} element={<TransactionHistory/>}/>
+                    <Route path={RoutesName.TransactionsRelative} element={<Transactions/>}/>
                 </Route>
                 <Route
                     path={RoutesName.WalletRelative}

src/main/Browser/Pages/UserPanel/Sections/Content/components/Transactions/Transactions.js

@@ -0,0 +1,60 @@
+import React, {useState} from 'react';
+import classes from './Transactions.module.css';
+import Icon from "../../../../../../../../components/Icon/Icon";
+import {Link} from "react-router-dom";
+import * as Routes from "../../../../../../Routes/routes";
+import i18n from "i18next";
+import {useTranslation} from "react-i18next";
+import TextInput from "../../../../../../../../components/TextInput/TextInput";
+import DatePanel from "react-multi-date-picker/plugins/date_panel";
+import BuyAndSell from "./components/BuyAndSell/BuyAndSell";
+import WithdrawHistory from "./components/WithdrawHistory/WithdrawHistory";
+import DepositHistory from "./components/DepositHistory/DepositHistory";
+
+const Transactions = () => {
+
+    const {t} = useTranslation();
+
+    const [activeTx, setActiveTx] = useState("buyAndSell")
+
+
+    const content = () => {
+      if (activeTx === "buyAndSell") return <BuyAndSell/>
+        if (activeTx === "deposit") return <DepositHistory/>
+        if (activeTx === "withdraw") return <WithdrawHistory/>
+    }
+
+    return (<>
+
+
+        <div className={`column px-1 pt-1`}>
+
+            <div className={`width-100 border card-bg px-2 py-2 rounded-8 column jc-start ai-center`}>
+
+                <div className={`row jc-start ai-center width-100 ${classes.header}`}>
+                    <span className={`ml-1 px-2 py-1 rounded-5 cursor-pointer hover-text ${classes.title} ${activeTx === "buyAndSell" && classes.active}`} onClick={()=>setActiveTx("buyAndSell")}>{t("TransactionHistory.buyAndSell")}</span>
+                    <span className={`ml-1 px-2 py-1 rounded-5 cursor-pointer hover-text ${classes.title} ${activeTx === "deposit" && classes.active}`} onClick={()=>setActiveTx("deposit")}>{t("TransactionCategory.DEPOSIT")}</span>
+                    <span className={`ml-1 px-2 py-1 rounded-5 cursor-pointer hover-text ${classes.title} ${activeTx === "withdraw" && classes.active}`} onClick={()=>setActiveTx("withdraw")}>{t("TransactionCategory.WITHDRAW")}</span>
+                </div>
+                <div className={`${classes.content} width-100`}>
+
+                    {content()}
+
+                </div>
+
+
+
+            </div>
+
+
+        </div>
+
+
+
+
+    </>
+
+    );
+};
+
+export default Transactions;

src/main/Browser/Pages/UserPanel/Sections/Content/components/Transactions/Transactions.module.css

@@ -0,0 +1,46 @@
+.thisInput :global(.lead) {
+    width: 30%;
+}
+.thisInput :global(.selectExternalClass) {
+    width: 70% !important;
+}
+
+.thisInput :global(.rmdp-container ) {
+    width: 70%;
+    height: 100%;
+}
+
+
+
+.thisButton {
+    background-color: var(--orange);
+    color: #000;
+}
+.disable:disabled,.button[disabled] {
+    border: 0.3vh solid var(--cardHeader);
+    background: var(--cardHeader);
+    color: var(--textColor);
+    cursor: not-allowed;
+}
+
+.thisButton:disabled,.button[disabled] {
+    border: 0.3vh solid var(--cardHeader);
+    background: var(--cardHeader);
+    color: var(--textColor);
+    cursor: not-allowed;
+}
+
+
+
+.header {
+    height: 10vh;
+}
+
+/*.title {
+    background-color: var(--cardBodyAlpha);
+}*/
+
+.active {
+    background-color: var(--activeTitle);
+    color: var(--activeTab);
+}