diff --git a/public/assets/locales/fa/translation.json b/public/assets/locales/fa/translation.json
index 0adb2e0c..034d07df 100644
--- a/public/assets/locales/fa/translation.json
+++ b/public/assets/locales/fa/translation.json
@@ -337,8 +337,6 @@
     "cancel": "لغو",
     "seconds": "ثانیه",
     "submitPaymentReq": "ثبت درخواست واریز",
-    "noInventory": "موجودی کافی نیست !",
-    "allowableWithdraw": "حداقل مقدار مجاز برداشت رعایت نشده است.",
     "fillAddress": "وارد کردن آدرس الزامیست.",
     "important": "مهم",
     "DepositTETHContentBefore": "فقط ETH تستی شبکه Ropsten مورد قبول قرار می گیرد! برای دریافت رایگان به ",
@@ -354,7 +352,11 @@
     "network": "شبکه",
     "selectNetwork": " شبکه را انتخاب کنید",
     "gettingAddress": "درحال گرفتن آدرس...",
-    "errorGettingAddress": "خطا در گرفتن آدرس"
+    "errorGettingAddress": "خطا در گرفتن آدرس",
+
+    "noInventory": "موجودی کافی نیست !",
+    "noInventorywithdrawFee": "با احتساب کارمزد، موجودی کافی نیست !",
+    "allowableWithdraw": "حداقل مقدار مجاز برداشت رعایت نشده است."
   },
   "CallbackPage": {
     "ok": "واریز وجه با موفقیت انجام شد.",
@@ -380,6 +382,7 @@
     "inventory": "موجودی بعد  از تراکنش",
     "freeWallet": "موجودی قابل برداشت",
     "minWithdraw": "حداقل مقدار برداشت",
+    "maxWithdrawal": "حداکثر مقدار برداشت",
     "minDeposit": "حداقل مقدار واریز",
     "maxWithdraw": "سقف برداشت روزانه شما",
     "maxMonthWithdraw": "سقف برداشت ماهانه شما",
diff --git a/src/components/NumberInput/NumberInput.js b/src/components/NumberInput/NumberInput.js
index 54de1716..ee5904b9 100644
--- a/src/components/NumberInput/NumberInput.js
+++ b/src/components/NumberInput/NumberInput.js
@@ -62,7 +62,7 @@ const NumberInput = (props) => {
                 customClass="hint-icon"
             />
             <div className="column pt-05">
-                { alerts.map((alert , index) => <span key={index} className={`${classes.alert} pr-05 `}>{alert}</span>) }
+                { alerts?.map((alert , index) => <span key={index} className={`${classes.alert} pr-05 `}>{alert}</span>) }
             </div>
         </div>
     }
diff --git a/src/components/Popup/Popup.js b/src/components/Popup/Popup.js
index 16038f1b..b844d591 100644
--- a/src/components/Popup/Popup.js
+++ b/src/components/Popup/Popup.js
@@ -11,6 +11,8 @@ import {useGetCurrencyInfo} from "../../queries";
 import Loading from "../Loading/Loading";
 import Error from "../Error/Error";
 import PopupAddress from "./PopupAddress/PopupAddress";
+import i18n from "i18next";
+import {getCurrencyNameOrAlias} from "../../utils/utils";
 
 const Popup = ({currency, closePopup}) => {
 
@@ -18,6 +20,8 @@ const Popup = ({currency, closePopup}) => {
 
     const isLogin = useSelector((state) => state.auth.isLogin)
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     const [networkName, setNetworkName] = useState({value: 0, error: []});
 
@@ -75,7 +79,7 @@ const Popup = ({currency, closePopup}) => {
     return (
         <div className={`width-100 column jc-between ai-center px-1 py-1 appear-animation card-border ${classes.container}`}>
             <div className={`${classes.header} width-100`}>
-                <h3>{t("deposit")} <span>{t("currency." + currency)}</span></h3>
+                <h3>{t("deposit")} <span>{getCurrencyNameOrAlias(currencies[currency], language)}</span></h3>
             </div>
             <div className={`${classes.content} width-100 column jc-center ai-center`}>
                 {content()}
diff --git a/src/components/TextInput/TextInput.js b/src/components/TextInput/TextInput.js
index 5cca9b97..4aeccb93 100644
--- a/src/components/TextInput/TextInput.js
+++ b/src/components/TextInput/TextInput.js
@@ -35,17 +35,21 @@ const TextInput = (props) => {
     const type = useSelector((state) => state.exchange.dateType)
 
     const optionClassHandler = (state) => {
-        let className = classes.selectOptions
+        let className = classes.selectOptions;
 
         if (state.isFocused) {
-            className = className + " " + classes.isFocused
+            className += " " + classes.isFocused;
         }
         if (state.isSelected) {
-            className = className + " " + classes.isSelected
+            className += " " + classes.isSelected;
+        }
+        if (state.isDisabled) {
+            className += " " + classes.disabledOption; // اضافه کردن کلاس برای گزینه‌های غیرفعال
         }
 
         return className;
-    }
+    };
+
 
     const calenderTypeHandler = () => {
         if (type === "Hijri" && i18n.language === "en") {
diff --git a/src/components/TextInput/TextInput.module.css b/src/components/TextInput/TextInput.module.css
index ed9c9756..0891552f 100644
--- a/src/components/TextInput/TextInput.module.css
+++ b/src/components/TextInput/TextInput.module.css
@@ -209,4 +209,10 @@
     /*width: 1px !important;*/
 }
 
+.disabledOption {
+    color: var(--gray) !important;
+    background-color: var(--deActive) !important;
+    cursor: not-allowed !important;
+}
+
 
diff --git a/src/index.js b/src/index.js
index 2758ac78..e2b29805 100644
--- a/src/index.js
+++ b/src/index.js
@@ -76,6 +76,7 @@ i18n
     });
 
 
+
 const Toast = () => {
     return <Toaster position="top-right" toastOptions={
         {
diff --git a/src/main/Browser/Browser.js b/src/main/Browser/Browser.js
index 289d9b94..045da396 100644
--- a/src/main/Browser/Browser.js
+++ b/src/main/Browser/Browser.js
@@ -23,6 +23,7 @@ import Guide from "./Pages/Info/Guide/Guide";
 import Rules from "./Pages/Info/Rules/Rules";
 import ContactUs from "./Pages/Info/ContactUs/ContactUs";
 import EasyTrading from "./Pages/EasyTrading/EasyTrading";
+import axios from "axios";
 
 const Browser = () => {
     const query = useQuery();
@@ -34,6 +35,8 @@ const Browser = () => {
     const title = useSelector((state) => state.exchange.title)
     const description = useSelector((state) => state.exchange.description)
 
+    const currencies = useSelector((state) => state.exchange.currencies)
+    const fees = useSelector((state) => state.exchange.fees)
 
     theme === "DARK" ? document.body.classList.add('dark') : document.body.classList.remove('dark');
 
diff --git a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js
index 049e5d9f..e4797e16 100644
--- a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js
+++ b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js
@@ -1,4 +1,4 @@
-import React, {useState} from 'react';
+import React, {useEffect, useState} from 'react';
 import classes from './AllMarketInfo.module.css'
 import Icon from "../../../../../../components/Icon/Icon";
 import AllMarketInfoCard from "./components/AllMarketInfoCard/AllMarketInfoCard";
@@ -9,6 +9,8 @@ import Loading from "../../../../../../components/Loading/Loading";
 import Error from "../../../../../../components/Error/Error";
 import {setMarketInterval} from "../../../../../../store/actions";
 import {useTranslation} from "react-i18next";
+import i18n from "i18next";
+import {getCurrencyNameOrAlias} from "../../../../../../utils/utils";
 
 const AllMarketInfo = () => {
 
@@ -21,13 +23,22 @@ const AllMarketInfo = () => {
     const interval = useSelector((state) => state.global.marketInterval)
     const quote = activeCurrency === "" ? null : activeCurrency
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const {data: overview, isLoading, error} = useOverview(null, interval, quote)
-    const {data: currencies} = useGetQuoteCurrencies()
+    const {data: quoteCurrencies, isLoading:quoteCurrenciesIsLoading, error:quoteCurrenciesError} = useGetQuoteCurrencies()
+
+    useEffect(() => {
+        if (quoteCurrencies?.length > 0) {
+            setActiveCurrency(quoteCurrencies[0]);
+        }
+    }, [quoteCurrencies]);
 
 
     const content = () => {
-        if (isLoading) return <div style={{height: "40vh"}}><Loading/></div>
-        if (error) return <div style={{height: "40vh"}}><Error/></div>
+        if (isLoading || quoteCurrenciesIsLoading) return <div style={{height: "40vh"}}><Loading/></div>
+        if (error || quoteCurrenciesError) return <div style={{height: "40vh"}}><Error/></div>
         else return <>
             {card ?
                 <AllMarketInfoCard data={overview} activeCurrency={activeCurrency}/>
@@ -44,8 +55,8 @@ const AllMarketInfo = () => {
                     <Icon iconName={`${card ? 'icon-row' : 'icon-grid'} fs-02 flex cursor-pointer hover-text`} customClass={`ml-05`} onClick={()=>setCard(prevState => !prevState)}/>
                     <h1 className={`mr-05 ml-025 cursor-pointer hover-text`}  onClick={()=>setActiveCurrency("")}>{t("market.title")}</h1>
                     <div className={`row jc-center ai-center fs-0-8 mr-1`}>
-                        {currencies?.map((currency) =>
-                            <span className={`px-2 py-1 rounded-5 cursor-pointer hover-text ${classes.title} ${activeCurrency === currency && classes.active}`} onClick={() => setActiveCurrency(currency)} key={currency}>{t("currency." + currency)}</span>
+                        {quoteCurrencies?.map((currency) =>
+                            <span className={`px-2 py-1 rounded-5 cursor-pointer hover-text ${classes.title} ${activeCurrency === currency && classes.active}`} onClick={() => setActiveCurrency(currency)} key={currency}>{getCurrencyNameOrAlias(currencies[currency], language)}</span>
                         )}
                     </div>
                 </div>
diff --git a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoCard/AllMarketInfoCard.js b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoCard/AllMarketInfoCard.js
index a3741bbd..ac5d2983 100644
--- a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoCard/AllMarketInfoCard.js
+++ b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoCard/AllMarketInfoCard.js
@@ -3,7 +3,7 @@ import classes from './AllMarketInfoCard.module.css'
 import {useTranslation} from "react-i18next";
 import {images} from "../../../../../../../../assets/images";
 import Button from "../../../../../../../../components/Button/Button";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import {setActivePairInitiate} from "../../../../../../../../store/actions";
 import {Panel} from "../../../../../../Routes/routes";
 import {useNavigate} from "react-router-dom";
@@ -16,6 +16,8 @@ const AllMarketInfoCard = ({data, activeCurrency}) => {
     const {t} = useTranslation();
     const navigate = useNavigate();
     const dispatch = useDispatch();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
     const allExchangeSymbols = useSelector((state) => state.exchange.symbols)
 
     const [showButton, setShowButton] = useState(null)
@@ -53,33 +55,38 @@ const AllMarketInfoCard = ({data, activeCurrency}) => {
                     <div key={index} className={`${classes.item} card-border card-bg column cursor-pointer`} style={backgroundBar(tr.priceChangePercent.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={`column jc-start ai-start width-100 px-1`}>
                                 <div className={`row jc-center ai-center`}>
-                                    <img  src={images[tr?.base]} alt={tr?.base}
+                                    <img src={currencies[tr?.base]?.icon} 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>
+                                    <span className={`fs-01`}>{activeCurrency ?
+                                        <>
+                                            {getCurrencyNameOrAlias(currencies[tr?.base], language)}
+                                            <span className={`text-gray fs-0-8 mr-05`}>{tr?.base}</span>
+                                        </>
+                                        : tr?.base + " / " + tr?.quote}</span>
                                 </div>
                                 <div className={`flex jc-end ai-center fs-0-6`}>
-                                        <span className={`${tr.priceChangePercent > 0 ? "text-green" : "text-red"} direction-ltr mr-05`}>{new BN(tr.priceChangePercent).toFormat(2)} %</span>
+                                    <span className={`flex ${i18n.language !== "fa" ? 'jc-start' : 'jc-end'} ai-center ${tr.priceChangePercent > 0 ? "text-green" : tr.priceChangePercent < 0 ? "text-red" : ""} direction-ltr`}>{tr.priceChangePercent === 0 ? "0 %" : `${new BN(tr.priceChangePercent).toFormat(2)} %`}</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>
-                                    <span className={`${tr.priceChangePercent > 0 ? "text-green" : "text-red"} fs-01`}>{new BN(tr.lastPrice).toFormat()} <span className={`fs-0-7 mr-025`}>{t("currency." + tr?.quote)}</span></span>
+                                    <span className={`${tr.priceChangePercent > 0 ? "text-green" : "text-red"} fs-01`}>{new BN(tr.lastPrice).toFormat()} <span className={`fs-0-7 mr-025`}>{tr?.quote}</span></span>
                                 </div>
                                 <div className={`row jc-between ai-center`}>
                                     <span className={`text-gray`}>{t("MarketInfo.lowPrice")}:</span>
-                                    <span>{new BN(tr.lowPrice).toFormat()}</span>
+                                    <span>{new BN(tr.lowPrice).decimalPlaces(currencies[tr?.quote]?.precision ?? 0).toFormat()} <span className={`fs-0-7 mr-05`}>{tr?.quote}</span></span>
                                 </div>
                                 <div className={`row jc-between ai-center`}>
                                     <span className={`text-gray`}>{t("MarketInfo.highPrice")}:</span>
-                                    <span>{new BN(tr.highPrice).toFormat()}</span>
+                                    <span>{new BN(tr.highPrice).decimalPlaces(currencies[tr?.quote]?.precision ?? 0).toFormat()} <span className={`fs-0-7 mr-05`}>{tr?.quote}</span></span>
                                 </div>
                                 <div className={`row jc-between ai-center`}>
                                     <span className={`text-gray`}>{t("MarketInfo.volume")}:</span>
-                                    <span>{new BN(tr.volume).toFormat()}</span>
+                                    <span>{new BN(tr.volume).decimalPlaces(currencies[tr?.base]?.precision ?? 0).toFormat()} <span className={`fs-0-7 mr-05`}>{tr?.base}</span></span>
                                 </div>
                             </div>
                         </div>
diff --git a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js
index ca325345..10369eb9 100644
--- a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js
+++ b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js
@@ -3,7 +3,7 @@ import classes from './AllMarketInfoTable.module.css'
 import {useTranslation} from "react-i18next";
 import {images} from "../../../../../../../../assets/images";
 import Button from "../../../../../../../../components/Button/Button";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import i18n from "i18next";
 import {setActivePairInitiate} from "../../../../../../../../store/actions";
 import {Panel} from "../../../../../../Routes/routes";
@@ -17,6 +17,9 @@ const AllMarketInfTable = ({data, activeCurrency}) => {
     const dispatch = useDispatch();
     const allExchangeSymbols = useSelector((state) => state.exchange.symbols)
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const navigateToPanel = (symbol) => {
         const selectedPair = allExchangeSymbols.find( s => s.symbol === symbol)
         dispatch(setActivePairInitiate(selectedPair, 0))
@@ -25,17 +28,17 @@ const AllMarketInfTable = ({data, activeCurrency}) => {
 
     let head = (
         <div className="row text-gray px-2 py-2" style={{backgroundColor:"var(--tableHeader)"}}>
-            <span className="width-15 flex jc-start ai-center">{t("MarketInfo.name")}</span>
+            <span className="width-20 flex jc-start ai-center">{t("MarketInfo.name")}</span>
             <span className="width-11 flex  jc-start ai-center">{t("MarketInfo.lastPrice")}</span>
-            <span className="width-9 flex jc-start ai-center">{t("MarketInfo.priceChange")}</span>
+            <span className="width-11 flex jc-start ai-center">{t("MarketInfo.priceChange")}</span>
             <span className="width-12 flex jc-start ai-center">{t("MarketInfo.lowPrice")}</span>
             <span className="width-12 flex jc-start ai-center">{t("MarketInfo.highPrice")}</span>
-            <span className="width-15 flex jc-start ai-center">{t("MarketInfo.volume")}</span>
+            <span className="width-14 flex jc-start ai-center">{t("MarketInfo.volume")}</span>
             {/*<span className="width-10 flex jc-start ai-center">{t("MarketInfo.lowPrice")}</span>
             <span className="width-10 flex jc-start ai-center">{t("MarketInfo.highPrice")}</span>*/}
-            <span className="width-10 flex jc-start ai-center">{t("MarketInfo.chart")}</span>{/*
-            <span className="width-8 flex jc-center ai-center">{t("MarketInfo.details")}</span>
-            <span className="width-8 flex jc-center ai-center">{t("MarketInfo.trade")}</span>*/}
+            <span className="width-9 flex jc-start ai-center">{t("MarketInfo.chart")}</span>
+            <span className="width-8 flex jc-center ai-center"></span>
+            <span className="width-8 flex jc-center ai-center"></span>
         </div>
     );
 
@@ -44,25 +47,36 @@ const AllMarketInfTable = ({data, activeCurrency}) => {
             {data.map((tr, index) => {
                 return (
                     <div className={`${classes.row} row rounded-5 border-bottom px-2 py-2`} key={index}>
-                         <span className="width-15 row jc-start ai-center">
-                             <img src={images[tr?.base]} alt={tr?.base}
+                        <span className="width-20 row jc-start ai-center">
+                             <img src={currencies[tr?.base]?.icon} alt={tr?.base}
                                   title={tr?.base} className={`img-md-plus ml-05`}/>
-                                 <span className={`fs-01 mr-05`}>{activeCurrency ? t("currency." + tr?.base) : tr?.base + " / " + tr?.quote}</span>
+                                 <span className={`fs-01 mr-05`}>{activeCurrency ?
+                                     <>
+                                         {getCurrencyNameOrAlias(currencies[tr?.base], language)}
+                                         <span className={`text-gray fs-0-8 mr-05`}>{tr?.base}</span>
+                                     </>
+
+                                     : tr?.base + " / " + tr?.quote}</span>
                          </span>
-                        <span className={`width-11 flex jc-start ai-center ${tr?.priceChangePercent > 0 ? "text-green" : "text-red"}`}>{new BN(tr.lastPrice).toFormat()} <span className={`fs-0-7 mr-05`}>{t("currency." + tr?.quote)}</span></span>
+                        <span className={`width-11 flex jc-start ai-center ${tr?.priceChangePercent > 0 ? "text-green" : "text-red"}`}>{new BN(tr.lastPrice).decimalPlaces(currencies[tr?.quote]?.precision  ?? 0).toFormat()} <span className={`fs-0-7 mr-05`}>{tr?.quote}</span></span>
+
+
+
+
+                        <span className={`width-11 flex ${i18n.language !== "fa" ? 'jc-start' : 'jc-end'} ai-center ${tr.priceChangePercent > 0 ? "text-green" : tr.priceChangePercent < 0 ? "text-red" : ""} direction-ltr`}>{tr.priceChangePercent === 0 ? "0 %" : `${new BN(tr.priceChangePercent).toFormat(2)} %`}</span>
+
 
 
-                        <span className={`width-9 flex ${i18n.language !== "fa" ? 'jc-start' : 'jc-end'} ai-center ${tr?.priceChangePercent > 0 ? "text-green" : "text-red"} direction-ltr`}>{new BN(tr?.priceChangePercent).toFormat(2)} %</span>
-                        <span className="width-12 flex jc-start ai-center">{new BN(tr?.lowPrice).toFormat()}</span>
+                        <span className="width-12 flex jc-start ai-center">{new BN(tr?.lowPrice).decimalPlaces(currencies[tr?.quote]?.precision ?? 0).toFormat()} <span className={`fs-0-7 mr-05`}>{tr?.quote}</span></span>
 
-                        <span className={`width-12 flex jc-start ai-center`}>{new BN(tr?.highPrice).toFormat()}</span>
+                        <span className={`width-12 flex jc-start ai-center`}>{new BN(tr?.highPrice).decimalPlaces(currencies[tr?.quote]?.precision ?? 0).toFormat()} <span className={`fs-0-7 mr-05`}>{tr?.quote}</span></span>
 
 
-                        <span className="width-15 flex jc-start ai-center">{new BN(tr?.volume).toFormat()}</span>
+                        <span className="width-14 flex jc-start ai-center">{new BN(tr?.volume).decimalPlaces(currencies[tr?.base]?.precision ?? 0).toFormat()} <span className={`fs-0-7 mr-05`}>{tr?.base}</span></span>
                         {/*<span className="width-10 flex jc-start ai-center">{tr.lowPrice}</span>
                         <span className="width-10 flex jc-start ai-center">{tr.highPrice}</span>*/}
 
-                        <span className="width-10 flex jc-start ai-center position-relative">
+                        <span className="width-9 flex jc-start ai-center position-relative">
                             <img
                                 className={`img-lg-2 ${classes.filter}`}
                                 src={images.chart}
diff --git a/src/main/Browser/Pages/AllMarket/components/PriceInfo/components/MostDecreasedPrice/MostDecreasedPrice.js b/src/main/Browser/Pages/AllMarket/components/PriceInfo/components/MostDecreasedPrice/MostDecreasedPrice.js
index 26fb0843..dbec9afd 100644
--- a/src/main/Browser/Pages/AllMarket/components/PriceInfo/components/MostDecreasedPrice/MostDecreasedPrice.js
+++ b/src/main/Browser/Pages/AllMarket/components/PriceInfo/components/MostDecreasedPrice/MostDecreasedPrice.js
@@ -1,26 +1,26 @@
 import React from 'react';
-import {images} from "../../../../../../../../assets/images";
 import i18n from "i18next";
-import {BN} from "../../../../../../../../utils/utils";
-import {useTranslation} from "react-i18next";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
+import {useSelector} from "react-redux";
 
 const MostDecreasedPrice = ({mostDecreasedPrice}) => {
 
-    const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     return (
         <>
-            <img src={images[mostDecreasedPrice?.pairInfo?.baseAsset]}
+            <img src={currencies[mostDecreasedPrice?.pairInfo?.baseAsset]?.icon}
                  alt={mostDecreasedPrice?.pairInfo?.baseAsset}
                  title={mostDecreasedPrice?.pairInfo?.baseAsset}
                  className={`img-md-plus`}/>
-            <span>{t("currency." + mostDecreasedPrice?.pairInfo?.baseAsset)}</span>
+            <span>{getCurrencyNameOrAlias(currencies[mostDecreasedPrice?.pairInfo?.baseAsset], language)}</span>
             <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'} jc-center ai-center width-100`}>
                 <span className={`${i18n.language !== "fa" ? 'mr-025' : 'ml-025'} fs-0-6`}>{mostDecreasedPrice?.pairInfo?.quoteAsset}</span>
-                <span className={`${i18n.language !== "fa" ? 'mL-025' : 'mr-025'} fs-01`}>{new BN(mostDecreasedPrice?.lastPrice).toFormat()}</span>
+                <span className={`${i18n.language !== "fa" ? 'mL-025' : 'mr-025'} fs-01`}>{new BN(mostDecreasedPrice?.lastPrice).decimalPlaces(currencies[mostDecreasedPrice.pairInfo.quoteAsset]?.precision ?? 0).toFormat()}</span>
             </div>
             <div className={`row jc-center ai-center width-100`}>
-                <span className={`${mostDecreasedPrice?.priceChangePercent > 0 ? "text-green" : "text-red"} direction-ltr`}>{new BN(mostDecreasedPrice?.priceChangePercent).toFormat(2)} %</span>
+                <span className={`${mostDecreasedPrice?.priceChangePercent > 0 ? "text-green" : mostDecreasedPrice?.priceChangePercent < 0 ? "text-red" : ""} direction-ltr`}>{mostDecreasedPrice?.priceChangePercent === 0 ? "0 %" : `${new BN(mostDecreasedPrice?.priceChangePercent).toFormat(2)} %`}</span>
             </div>
         </>
     );
diff --git a/src/main/Browser/Pages/AllMarket/components/PriceInfo/components/MostIncreasedPrice/MostIncreasedPrice.js b/src/main/Browser/Pages/AllMarket/components/PriceInfo/components/MostIncreasedPrice/MostIncreasedPrice.js
index 1e4b60a8..213a4ebe 100644
--- a/src/main/Browser/Pages/AllMarket/components/PriceInfo/components/MostIncreasedPrice/MostIncreasedPrice.js
+++ b/src/main/Browser/Pages/AllMarket/components/PriceInfo/components/MostIncreasedPrice/MostIncreasedPrice.js
@@ -1,26 +1,29 @@
 import React from 'react';
 import {images} from "../../../../../../../../assets/images";
 import i18n from "i18next";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import {useTranslation} from "react-i18next";
+import {useSelector} from "react-redux";
 
 const MostIncreasedPrice = ({mostIncreasedPrice}) => {
 
     const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     return (
         <>
-            <img  src={images[mostIncreasedPrice?.pairInfo?.baseAsset]}
+            <img  src={currencies[mostIncreasedPrice?.pairInfo?.baseAsset]?.icon}
                   alt={mostIncreasedPrice?.pairInfo?.baseAsset}
                   title={mostIncreasedPrice?.pairInfo?.baseAsset}
                   className={`img-md-plus`}/>
-            <span>{t("currency." + mostIncreasedPrice?.pairInfo?.baseAsset)}</span>
+            <span>{getCurrencyNameOrAlias(currencies[mostIncreasedPrice?.pairInfo?.baseAsset], language)}</span>
             <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'} jc-center ai-center width-100`}>
                 <span className={`${i18n.language !== "fa" ? 'mr-025' : 'ml-025'} fs-0-6`}>{mostIncreasedPrice?.pairInfo?.quoteAsset}</span>
-                <span className={`${i18n.language !== "fa" ? 'mL-025' : 'mr-025'} fs-01`}>{new BN(mostIncreasedPrice?.lastPrice).toFormat()}</span>
+                <span className={`${i18n.language !== "fa" ? 'mL-025' : 'mr-025'} fs-01`}>{new BN(mostIncreasedPrice?.lastPrice).decimalPlaces(currencies[mostIncreasedPrice.pairInfo.quoteAsset]?.precision ?? 0).toFormat()}</span>
             </div>
             <div className={`row jc-center ai-center width-100`}>
-                <span  className={`${mostIncreasedPrice?.priceChangePercent > 0 ? "text-green" : "text-red"} direction-ltr`}>{new BN(mostIncreasedPrice?.priceChangePercent).toFormat(2)} %</span>
+                <span className={`${mostIncreasedPrice?.priceChangePercent > 0 ? "text-green" : mostIncreasedPrice?.priceChangePercent < 0 ? "text-red" : ""} direction-ltr`}>{mostIncreasedPrice?.priceChangePercent === 0 ? "0 %" : `${new BN(mostIncreasedPrice?.priceChangePercent).toFormat(2)} %`}</span>
             </div>
         </>
     );
diff --git a/src/main/Browser/Pages/AllMarket/components/VolumeInfo/components/MostTrades/MostTrades.js b/src/main/Browser/Pages/AllMarket/components/VolumeInfo/components/MostTrades/MostTrades.js
index 6eda6b87..54697300 100644
--- a/src/main/Browser/Pages/AllMarket/components/VolumeInfo/components/MostTrades/MostTrades.js
+++ b/src/main/Browser/Pages/AllMarket/components/VolumeInfo/components/MostTrades/MostTrades.js
@@ -1,20 +1,22 @@
 import React from 'react';
 import {images} from "../../../../../../../../assets/images";
 import i18n from "i18next";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import {useTranslation} from "react-i18next";
+import {useSelector} from "react-redux";
 
 const MostTrades = ({mostTrades}) => {
 
-    const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     return (
         <>
-            <img src={images[mostTrades?.pairInfo?.baseAsset]}
+            <img src={currencies[mostTrades?.pairInfo?.baseAsset]?.icon}
                  alt={mostTrades?.pairInfo?.baseAsset}
                  title={mostTrades?.pairInfo?.baseAsset}
                  className={`img-md-plus`}/>
-            <span>{t("currency." + mostTrades?.pairInfo?.baseAsset)}</span>
+            <span>{getCurrencyNameOrAlias(currencies[mostTrades?.pairInfo?.baseAsset], language)}</span>
             <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'} jc-center ai-center width-100`}>
                 <span className={`${i18n.language !== "fa" ? 'mL-025' : 'mr-025'} fs-01`}>{new BN(mostTrades?.tradeCount).toFormat()} </span>
             </div>
diff --git a/src/main/Browser/Pages/AllMarket/components/VolumeInfo/components/MostVolume/MostVolume.js b/src/main/Browser/Pages/AllMarket/components/VolumeInfo/components/MostVolume/MostVolume.js
index 8ca16917..3555cafc 100644
--- a/src/main/Browser/Pages/AllMarket/components/VolumeInfo/components/MostVolume/MostVolume.js
+++ b/src/main/Browser/Pages/AllMarket/components/VolumeInfo/components/MostVolume/MostVolume.js
@@ -1,23 +1,25 @@
 import React from 'react';
 import {images} from "../../../../../../../../assets/images";
 import i18n from "i18next";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import {useTranslation} from "react-i18next";
+import {useSelector} from "react-redux";
 
 const MostVolume = ({mostVolume}) => {
 
-    const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     return (
         <>
-            <img src={images[mostVolume?.pairInfo?.baseAsset]}
+            <img src={currencies[mostVolume?.pairInfo?.baseAsset]?.icon}
                  alt={mostVolume?.pairInfo?.baseAsset}
                  title={mostVolume?.pairInfo?.baseAsset}
                  className={`img-md-plus`}/>
-            <span>{t("currency." + mostVolume?.pairInfo?.baseAsset)}</span>
+            <span>{getCurrencyNameOrAlias(currencies[mostVolume?.pairInfo?.baseAsset], language)}</span>
             <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'} jc-center ai-center width-100`}>
                 <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>
+                <span className={`${i18n.language !== "fa" ? 'mL-025' : 'mr-025'} fs-01`}>{new BN(mostVolume?.volume).decimalPlaces(currencies[mostVolume?.pairInfo?.baseAsset]?.precision ?? 0).toFormat()}</span>
             </div>
 
             {/*++ to do ++*/}
diff --git a/src/main/Browser/Pages/EasyTrading/components/EasyOrder/EasyOrder.js b/src/main/Browser/Pages/EasyTrading/components/EasyOrder/EasyOrder.js
index 8ae33257..c65ab7ee 100644
--- a/src/main/Browser/Pages/EasyTrading/components/EasyOrder/EasyOrder.js
+++ b/src/main/Browser/Pages/EasyTrading/components/EasyOrder/EasyOrder.js
@@ -3,7 +3,7 @@ import classes from './EasyOrder.module.css'
 import {Trans, useTranslation} from "react-i18next";
 import {useDispatch, useSelector} from "react-redux";
 import {useGetUserAccount} from "../../../../../../queries/hooks/useGetUserAccount";
-import {BN, parsePriceString} from "../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias, parsePriceString} from "../../../../../../utils/utils";
 import {useOrderBook} from "../../../../../../queries";
 import {toast} from "react-hot-toast";
 import {createOrder} from "js-api-client";
@@ -13,6 +13,7 @@ import TextInput from "../../../../../../components/TextInput/TextInput";
 import Icon from "../../../../../../components/Icon/Icon";
 import NumberInput from "../../../../../../components/NumberInput/NumberInput";
 import Button from "../../../../../../components/Button/Button";
+import i18n from "i18next";
 
 const EasyOrder = () => {
 
@@ -22,7 +23,9 @@ const EasyOrder = () => {
     const [isLoading, setIsLoading] = useState(false)
     const isLogin = useSelector((state) => state.auth.isLogin)
 
-    const symbols = useSelector((state) => state.exchange.symbols)
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+    const pairsList = useSelector((state) => state.exchange.pairsList)
 
     const [alert, setAlert] = useState({
         submit: false,
@@ -30,8 +33,6 @@ const EasyOrder = () => {
         totalPrice: null,
     });
 
-
-
     const [order, setOrder] = useState({
         tradeFee: new BN(0),
         stopLimit: false,
@@ -43,31 +44,38 @@ const EasyOrder = () => {
     });
 
     const handleAvailableAssets = () => {
-        const availableAssets = [];
-        for (const symbol of symbols) {
-            if (!availableAssets.includes(symbol.baseAsset)) availableAssets.push(symbol.baseAsset)
-            if (!availableAssets.includes(symbol.quoteAsset)) availableAssets.push(symbol.quoteAsset)
-        }
-        return availableAssets;
-    }
+        const availableAssets = new Set();
+        Object.values(pairsList).forEach(pair => {
+            availableAssets.add(pair.baseAsset);
+            availableAssets.add(pair.quoteAsset);
+        });
+        return Array.from(availableAssets);
+    };
 
     const handleAvailableDest = (buy) => {
-        const dest = []
-        for (const symbol of symbols) {
-            if (symbol.baseAsset === buy) dest.push(symbol.quoteAsset)
-            if (symbol.quoteAsset === buy) dest.push(symbol.baseAsset)
-        }
-        return dest
-    }
+        const dest = new Set();
+        Object.values(pairsList).forEach(pair => {
+            if (pair.baseAsset === buy) dest.add(pair.quoteAsset);
+            if (pair.quoteAsset === buy) dest.add(pair.baseAsset);
+        });
+        return Array.from(dest);
+    };
+
+
+    const findPair = (buy, sell) =>
+        Object.values(pairsList)?.find(pair =>
+            (pair.baseAsset === buy && pair.quoteAsset === sell) ||
+            (pair.baseAsset === sell && pair.quoteAsset === buy)
+        );
 
-    const findPair = (buy, sell) => symbols?.find(s => ((s?.baseAsset === buy) && (s?.quoteAsset === sell)) || ((s?.baseAsset === sell) && (s?.quoteAsset === buy)))
+    const pairsArray = Object.values(pairsList);
 
     const [selected, setSelected] = useState({
-        buy: symbols[0].baseAsset,
-        sell: symbols[0].quoteAsset,
-        pair: findPair(symbols[0].baseAsset, symbols[0].quoteAsset),
+        buy: pairsArray[0]?.baseAsset,
+        sell: pairsArray[0]?.quoteAsset,
+        pair: findPair(pairsArray[0]?.baseAsset, pairsArray[0]?.quoteAsset),
         type: "ask"
-    })
+    });
 
     const reversePair = () => {
 
@@ -117,23 +125,24 @@ const EasyOrder = () => {
         let newAlert = null
         value = parsePriceString(value);
         const reqAmount = new BN(value);
-        let range = "baseRange"
-        if (selected.type === "bid") range = "quoteRange"
 
-        if (reqAmount.isZero() && reqAmount.isLessThan(selected.pair[range].min)) {
+        let selectedCurrency = "baseAsset"
+        if (selected.type === "bid") selectedCurrency = "quoteAsset"
+
+        if (reqAmount.isZero() && reqAmount.isLessThan(currencies[selected.pair[selectedCurrency]].minOrder)) {
             newAlert = <Trans
                 i18nKey="orders.minOrder"
                 values={{
-                    min: new BN(selected.pair[range].min).toFormat(),
-                    currency: t("currency." + selected.buy),
+                    min: new BN( currencies[selected.pair[selectedCurrency]].minOrder).toFormat(),
+                    currency: getCurrencyNameOrAlias(currencies[selected?.buy], language),
                 }}
             />
         }
 
-        if (!reqAmount.mod(selected.pair[range].step).isZero()) {
+        if (!reqAmount.mod(currencies[selected.pair[selectedCurrency]].step).isZero()) {
             newAlert = <Trans
                 i18nKey="orders.divisibility"
-                values={{mod: new BN(selected.pair[range].step).toFormat()}}
+                values={{mod: new BN(currencies[selected.pair[selectedCurrency]].step).toFormat()}}
             />
         }
         setAlert({...alert, reqAmount: newAlert});
@@ -146,28 +155,30 @@ const EasyOrder = () => {
         });
 
     };
+
     const totalPriceHandler = (value) => {
         let newAlert = null
         value = parsePriceString(value);
         const totalPrice = new BN(value);
-        let range = "quoteRange"
-        if (selected.type === "bid") range = "baseRange"
 
-        if (totalPrice.isZero() && totalPrice.isLessThan(selected.pair[range].min)) {
+        let selectedCurrency = "quoteAsset"
+        if (selected.type === "bid") selectedCurrency = "baseAsset"
+
+        if (totalPrice.isZero() && totalPrice.isLessThan(currencies[selected.pair[selectedCurrency]].minOrder)) {
             newAlert = <Trans
                 i18nKey="orders.minOrder"
                 values={{
-                    min: new BN(selected.pair[range].min).toFormat(),
-                    currency: t("currency." + selected.sell),
+                    min: new BN(currencies[selected.pair[selectedCurrency]].minOrder).toFormat(),
+                    currency: getCurrencyNameOrAlias(currencies[selected.sell], language),
                 }}
             />
 
         }
 
-        if (!totalPrice.mod(selected.pair[range].step).isZero()) {
+        if (!totalPrice.mod(currencies[selected.pair[selectedCurrency]].step).isZero()) {
             newAlert = <Trans
                 i18nKey="orders.divisibility"
-                values={{mod: new BN(selected.pair[range].min).toFormat()}}
+                values={{mod: new BN(currencies[selected.pair[selectedCurrency]].minOrder).toFormat()}}
             />
         }
         setAlert({...alert, totalPrice: newAlert});
@@ -184,8 +195,8 @@ const EasyOrder = () => {
         if (order.pricePerUnit.isEqualTo(0)) return toast.error(t("orders.hasNoOffer"));
         let totalPrice = new BN(userAccount?.wallets[selected?.sell]?.free);
         let reqAmount = totalPrice.dividedBy(order.pricePerUnit)
-        if (!reqAmount.mod(selected.pair?.[selected.type === "ask" ? "baseRange" : "quoteRange"].step).isZero()) {
-            reqAmount = reqAmount.minus(reqAmount.mod(selected.pair?.[selected.type === "ask" ? "baseRange" : "quoteRange"].step));
+        if (!reqAmount.mod(currencies[selected.pair?.[selected.type === "ask" ? "baseAsset" : "quoteAsset"]].step).isZero()) {
+            reqAmount = reqAmount.minus(reqAmount.mod(currencies[selected.pair?.[selected.type === "ask" ? "baseAsset" : "quoteAsset"]].step));
         }
         buyPriceHandler(
             reqAmount.toFormat(),
@@ -201,7 +212,7 @@ const EasyOrder = () => {
         setIsLoading(true)
         const newOrder = {...order}
         if (selected.type === "bid") {
-            newOrder.reqAmount = order.totalPrice.decimalPlaces(selected.pair?.baseAssetPrecision)
+            newOrder.reqAmount = order.totalPrice.decimalPlaces(currencies[selected?.pair?.baseAsset].precision)
         }
         createOrder(selected.pair?.symbol, selected.type === "ask" ? "BUY" : "SELL", newOrder)
             .then((res) => {
@@ -217,8 +228,8 @@ const EasyOrder = () => {
                 toast.success(<Trans
                     i18nKey="orders.success"
                     values={{
-                        base: t("currency." + selected.pair?.baseAsset),
-                        quote: t("currency." + selected.pair?.quoteAsset),
+                        base: getCurrencyNameOrAlias(selected?.pair?.baseAsset, language),
+                        quote: getCurrencyNameOrAlias(selected?.pair?.quoteAsset, language),
                         type: t("buy"),
                         reqAmount: order.reqAmount,
                         pricePerUnit: order.pricePerUnit,
@@ -248,20 +259,22 @@ const EasyOrder = () => {
 
     const buyOnChangeHandler = (e) => {
         const newBuy = e.value;
-        const sellOptions = handleAvailableDest(newBuy)
+        const sellOptions = handleAvailableDest(newBuy);
+
+        setOptions(prevOptions => ({
+            ...prevOptions,
+            sell: sellOptions,
+        }));
 
-        setOptions({
-            ...options,
-            "sell": sellOptions,
-        })
         const sell = sellOptions.includes(selected.sell) ? selected.sell : sellOptions[0];
-        const pair = findPair(newBuy, sell)
+        const pair = findPair(newBuy, sell) || {};
         setSelected({
             buy: newBuy,
             sell,
             pair,
-            type: newBuy === pair.baseAsset ? "ask" : "bid"
-        })
+            type: pair.baseAsset === newBuy ? "ask" : "bid"
+        });
+
         setOrder({
             tradeFee: new BN(0),
             stopLimit: false,
@@ -270,22 +283,26 @@ const EasyOrder = () => {
             reqAmount: new BN(0),
             pricePerUnit: new BN(0),
             totalPrice: new BN(0),
-        })
+        });
+
         setAlert({
             submit: false,
             reqAmount: null,
             totalPrice: null,
-        })
-    }
+        });
+    };
+
     const sellOnChangeHandler = (e) => {
         const newSell = e.value;
-        const pair = findPair(selected.buy, newSell)
-        setSelected({
-            ...selected,
+        const pair = findPair(selected.buy, newSell) || {};
+
+        setSelected(prevSelected => ({
+            ...prevSelected,
             sell: newSell,
             pair,
             type: selected.buy === pair.baseAsset ? "ask" : "bid"
-        })
+        }));
+
         setOrder({
             tradeFee: new BN(0),
             stopLimit: false,
@@ -294,35 +311,25 @@ const EasyOrder = () => {
             reqAmount: new BN(0),
             pricePerUnit: new BN(0),
             totalPrice: new BN(0),
-        })
+        });
+
         setAlert({
             submit: false,
             reqAmount: null,
             totalPrice: null,
-        })
-    }
+        });
+    };
     const showBestPrice = () => {
         if (order.pricePerUnit.isZero()) return 0
         if (selected.type === "ask") return order.pricePerUnit.toFormat()
-        return new BN(1).dividedBy(order.pricePerUnit).decimalPlaces(selected.pair?.baseAssetPrecision).toFormat()
+        return new BN(1).dividedBy(order.pricePerUnit).decimalPlaces(currencies[selected?.pair?.baseAsset].precision).toFormat()
     }
 
-/*    useEffect(() => {
-        if (order.totalPrice.isGreaterThan(userAccount?.wallets[selected?.sell]?.free)) {
-            return setAlert({
-                ...alert,
-                totalPrice: t('orders.notEnoughBalance')
-            })
-        }
-    }, [order.totalPrice])*/
-
-
     return (
         <div className={`container card-bg card-border ${classes.container} width-30 column jc-start ai-center`}>
 
             <div className={`${classes.header} card-header-bg row jc-between ai-center px-2 py-3 width-100 fs-02`}>
                 <span>{t("MarketTitle.easyTrading")}</span>
-
             </div>
 
             <div className={`width-100 column jc-between ai-center py-2 ${classes.content}`} >
@@ -334,9 +341,10 @@ const EasyOrder = () => {
                                 value: o,
                                 label: <div className={`row jc-start ai-center`}>
                                     <div className={`${classes.avatar}`}
-                                         style={{backgroundImage: `url("${images[o]}")`}}
+                                         /*style={{backgroundImage: `url("${images[o]}")`}}*/
+                                         style={{ backgroundImage: `url("${currencies[o]?.icon}")` }}
                                     />
-                                    <span className={`mr-1`}>{t('currency.' + o)}</span>
+                                    <span className={`mr-1`}>{getCurrencyNameOrAlias(currencies[o], language)}</span>
                                 </div>
                             }
                         }
@@ -345,15 +353,15 @@ const EasyOrder = () => {
                     type="select"
                     value={{
                         value: selected?.buy,
-                        label: t('currency.' + selected?.buy),
+                        label: getCurrencyNameOrAlias(currencies[selected?.buy], language),
                     }}
                     onchange={buyOnChangeHandler}
                     customClass={`width-90 ${classes.thisInput} mb-1`}
                 />
 
                 <div className={`row width-80 jc-between fs-0-9`}>
-                    <p>{t("MarketInfo.lastPrice")}{" "} {t("currency." + selected?.buy)}:</p>
-                    <span>{showBestPrice()}{" "}{t("currency." + selected?.sell)}</span>
+                    <p>{t("MarketInfo.lastPrice")}{" "} {getCurrencyNameOrAlias(currencies[selected?.buy], language)}:</p>
+                    <span>{showBestPrice()}{" "}{ getCurrencyNameOrAlias(currencies[selected?.sell], language)}</span>
                 </div>
 
                 <div className={`width-86 flex jc-center ai-center my-3`}>
@@ -373,9 +381,9 @@ const EasyOrder = () => {
                                 label: <div className={`row jc-start ai-center`}>
 
                                     <div className={`${classes.avatar}`}
-                                         style={{backgroundImage: `url("${images[o]}")`}}
+                                         style={{ backgroundImage: `url("${currencies[o]?.icon}")` }}
                                     />
-                                    <span className={`mr-1`}>{t('currency.' + o)}</span>
+                                    <span className={`mr-1`}>{getCurrencyNameOrAlias(currencies[o], language)}</span>
                                 </div>
                             }
                         }
@@ -384,7 +392,7 @@ const EasyOrder = () => {
                     type="select"
                     value={{
                         value: selected?.sell,
-                        label: selected?.sell ? t('currency.' + selected?.sell) : t("PersonalizationForm.placeholder"),
+                        label: selected?.sell ?  getCurrencyNameOrAlias(currencies[selected?.sell], language) : t("PersonalizationForm.placeholder"),
                     }}
                     onchange={sellOnChangeHandler}
                     customClass={`width-90 ${classes.thisInput} my-1`}
@@ -393,24 +401,25 @@ const EasyOrder = () => {
                 <div className={`row width-80 jc-between fs-0-9 cursor-pointer`}>
                     <p>{t("orders.availableAmount")}:{" "}</p>
                     <span
-                        onClick={fillBuyByWallet}>{new BN(userAccount?.wallets[selected?.sell]?.free || 0).toFormat()}{" "}{t("currency." + selected?.sell)}</span>
+                        onClick={fillBuyByWallet}>{new BN(userAccount?.wallets[selected?.sell]?.free || 0).decimalPlaces(currencies[selected?.sell]?.precision ?? 0).toFormat()}{" "}{getCurrencyNameOrAlias(currencies[selected?.sell], language)}</span>
                 </div>
 
                 <NumberInput
                     lead={t("orders.amount")}
-                    after={t("currency." + selected.buy)}
+                    after={getCurrencyNameOrAlias(currencies[selected?.buy], language)}
                     value={order.reqAmount.toFormat()}
-                    maxDecimal={selected.type === "ask" ? selected.pair?.baseAssetPrecision : selected.pair?.quoteAssetPrecision}
+                    maxDecimal={selected.type === "ask" ? currencies[selected?.pair?.baseAsset].precision : currencies[selected?.pair?.quoteAsset].precision}
                     onchange={(e) => buyPriceHandler(e.target.value)}
                     alert={alert.reqAmount}
                     customClass={`width-90 mb-1 mt-5`}
                     isAllowed={isAllowed}
                 />
+
                 <NumberInput
                     lead={t("orders.totalPrice")}
                     value={order?.totalPrice?.toFormat(selected.type === "ask" ? selected.pair?.quoteAssetPrecision : selected.pair?.baseAssetPrecision)}
-                    maxDecimal={selected.type === "ask" ? selected.pair?.quoteAssetPrecision : selected.pair?.baseAssetPrecision}
-                    after={t("currency." + selected.sell)}
+                    maxDecimal={selected.type === "ask" ? currencies[selected?.pair?.quoteAsset].precision : currencies[selected?.pair?.baseAsset].precision}
+                    after={getCurrencyNameOrAlias(currencies[selected?.sell], language)}
                     onchange={(e) => totalPriceHandler(e.target.value)}
                     alert={alert.totalPrice}
                     customClass={`width-90 my-1`}
diff --git a/src/main/Browser/Pages/Landing/components/MarketInfo/MarketInfo.js b/src/main/Browser/Pages/Landing/components/MarketInfo/MarketInfo.js
index c88dee96..e89d2f38 100644
--- a/src/main/Browser/Pages/Landing/components/MarketInfo/MarketInfo.js
+++ b/src/main/Browser/Pages/Landing/components/MarketInfo/MarketInfo.js
@@ -1,4 +1,4 @@
-import React, {useState} from 'react';
+import React, {useEffect, useState} from 'react';
 import classes from './MarketInfo.module.css'
 import Icon from "../../../../../../components/Icon/Icon";
 import MarketInfoTable from "./components/MarketInfoTable/MarketInfoTable";
@@ -10,24 +10,40 @@ import Loading from "../../../../../../components/Loading/Loading";
 import Error from "../../../../../../components/Error/Error";
 import {useTranslation} from "react-i18next";
 import i18n from "i18next";
+import {useSelector} from "react-redux";
+import {getCurrencyNameOrAlias} from "../../../../../../utils/utils";
 
 const MarketInfo = () => {
 
     const {t} = useTranslation();
 
     const [card, setCard] = useState(false)
-    const [activeCurrency, setActiveCurrency] = useState("")
+
+    const [activeCurrency, setActiveCurrency] = useState("");
 
     const interval = "24h"
+
+
+
     const quote = activeCurrency === "" ? null : activeCurrency
 
+    const currencies = useSelector((state) => state.exchange.currencies)
+    const language = i18n.language
+
     const {data: overview, isLoading, error} = useOverview(null, interval, quote)
-    const {data: currencies} = useGetQuoteCurrencies()
+    const {data: quoteCurrencies, isLoading:quoteCurrenciesIsLoading, error:quoteCurrenciesError} = useGetQuoteCurrencies()
+
+
+    useEffect(() => {
+        if (quoteCurrencies?.length > 0) {
+            setActiveCurrency(quoteCurrencies[0]);
+        }
+    }, [quoteCurrencies]);
 
 
     const content = () => {
-        if (isLoading) return <div style={{height: "40vh"}}><Loading/></div>
-        if (error) return <div style={{height: "40vh"}}><Error/></div>
+        if (isLoading || quoteCurrenciesIsLoading) return <div style={{height: "40vh"}}><Loading/></div>
+        if (error || quoteCurrenciesError) return <div style={{height: "40vh"}}><Error/></div>
         else return <>
             {card ?
                 <MarketInfoCard data={overview.slice(0, 5)} activeCurrency={activeCurrency}/>
@@ -50,8 +66,11 @@ const MarketInfo = () => {
                         <span className={`fs-0-8 mr-025`}>( {t("marketInterval." + interval)} )</span>
                     </div>
                     <div className={`row jc-center ai-center mr-1 fs-0-8`}>
-                        {currencies?.map((currency) =>
-                            <span className={`px-2 py-1 rounded-5 cursor-pointer hover-text ${classes.title} ${activeCurrency === currency && classes.active}`} onClick={() => setActiveCurrency(currency)} key={currency}>{t("currency." + currency)}</span>
+                        {quoteCurrencies?.map((currency) =>
+                            <span className={`px-2 py-1 rounded-5 cursor-pointer hover-text ${classes.title} ${activeCurrency === currency && classes.active}`} onClick={() => setActiveCurrency(currency)} key={currency}>
+                                {getCurrencyNameOrAlias(currencies[currency], language)}
+                                {/*{t("currency." + currency)}*/}
+                            </span>
                         )}
                     </div>
                 </div>
diff --git a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.js b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.js
index 91e2f346..7f786523 100644
--- a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.js
+++ b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.js
@@ -2,17 +2,20 @@ import React from 'react';
 import classes from './MarketInfoCard.module.css'
 import {images} from "../../../../../../../../assets/images";
 import {useTranslation} from "react-i18next";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 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 MarketInfoCard = ({data, activeCurrency}) => {
 
     const {t} = useTranslation();
     const navigate = useNavigate();
     const dispatch = useDispatch();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
     const allExchangeSymbols = useSelector((state) => state.exchange.symbols)
 
     const backgroundBar = (percent) => {
@@ -38,19 +41,23 @@ const MarketInfoCard = ({data, activeCurrency}) => {
                 return (
                     <div className={`${classes.item} card-border card-bg column jc-between ai-center py-3 cursor-pointer`} style={backgroundBar(tr.priceChangePercent.toString())} key={index} onClick={() => navigateToPanel(tr.symbol)}>
                         <div className={`row jc-center ai-center width-100`}>
-                            <img src={images[tr?.base]} alt={tr?.base}
+                            <img src={currencies[tr?.base]?.icon} alt={tr?.base}
                                  title={tr?.base} className={`img-lg ml-05`}/>
                             <div className={`column mr-05`}>
-                                <span className={`fs-01`}>{activeCurrency ? t("currency." + tr?.base) : tr?.base + " / " + tr?.quote}</span>
-                                <span
-                                    className={`${tr.priceChangePercent > 0 ? "text-green" : "text-red"} direction-ltr`}>{new BN(tr.priceChangePercent).toFormat(2)} %</span>
+                                <span className={`fs-01`}>{activeCurrency ?
+                                    <>
+                                        {getCurrencyNameOrAlias(currencies[tr?.base], language)}
+                                        <span className={`text-gray fs-0-8 mr-05`}>{tr?.base}</span>
+                                    </>
+                                    : tr?.base + " / " + tr?.quote}</span>
+                                <span className={`flex ${i18n.language !== "fa" ? 'jc-end' : 'jc-start'} ai-center ${tr.priceChangePercent > 0 ? "text-green" : tr.priceChangePercent < 0 ? "text-red" : ""} direction-ltr`}>{tr.priceChangePercent === 0 ? "0 %" : `${new BN(tr.priceChangePercent).toFormat(2)} %`}</span>
+
                             </div>
                         </div>
-                        <span
-                            className={`${tr.priceChangePercent > 0 ? "text-green" : "text-red"} fs-02`}>{new BN(tr.lastPrice).toFormat()} <span className={`fs-0-7 mr-05`}>{t("currency." + tr?.quote)}</span></span>
+                        <span className={`${tr.priceChangePercent > 0 ? "text-green" : "text-red"} fs-02`}>{new BN(tr.lastPrice).decimalPlaces(currencies[tr?.quote]?.precision ?? 0).toFormat()} <span className={`fs-0-7 mr-05`}>{tr?.quote}</span></span>
                         <div className={`row jc-center ai-center width-100`}>
                             <span className={`text-gray ml-05`}>{t("MarketInfo.volume")}:</span>
-                            <span className={`mr-05`}>{new BN(tr.volume).toFormat()}</span>
+                            <span className={`mr-05`}>{new BN(tr.volume).decimalPlaces(currencies[tr?.base]?.precision ?? 0).toFormat()} <span className={`text-gray fs-0-8 mr-05`}>{tr?.base}</span></span>
                         </div>
                         <div className={`column jc-center ai-center position-relative`}>
                             <img
diff --git a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js
index cf53721b..eb93c071 100644
--- a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js
+++ b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js
@@ -1,19 +1,21 @@
 import React from 'react';
 import classes from './MarketInfoTable.module.css'
 import {useTranslation} from "react-i18next";
-import {images} from "../../../../../../../../assets/images";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import i18n from "i18next";
 import {setActivePairInitiate} from "../../../../../../../../store/actions";
 import {useDispatch, useSelector} from "react-redux";
 import {Panel} from "../../../../../../Routes/routes";
 import {useNavigate} from "react-router-dom";
 
+
 const MarketInfoTable = ({data, activeCurrency}) => {
 
     const {t} = useTranslation();
     const navigate = useNavigate();
     const dispatch = useDispatch();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
     const allExchangeSymbols = useSelector((state) => state.exchange.symbols)
 
     const navigateToPanel = (symbol) => {
@@ -24,36 +26,43 @@ const MarketInfoTable = ({data, activeCurrency}) => {
 
     let head = (
         <div className="row text-gray px-2 py-2" style={{backgroundColor:"var(--tableHeader)"}}>
-            <span className="width-25 flex jc-start ai-center">{t("MarketInfo.name")}</span>
-            <span className="width-30 flex jc-start ai-center">{t("MarketInfo.lastPrice")}</span>
+            <span className="width-30 flex jc-start ai-center">{t("MarketInfo.name")}</span>
+            <span className="width-25 flex jc-start ai-center">{t("MarketInfo.lastPrice")}</span>
             <span className="width-25 flex jc-start ai-center">{t("MarketInfo.priceChange")}</span>
             <span className="width-20 flex jc-start ai-center">{t("MarketInfo.volume")}</span>
             <span className="width-25 flex jc-end ai-center">{t("MarketInfo.chart")}</span>
         </div>
     );
 
+    const base64Data = "<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:jfreesvg='http://www.jfree.org/jfreesvg/svg' width='100' height='35' text-rendering='auto' shape-rendering='auto'><defs><clipPath id='_1123974305133clip-0'><path d='M12,8L12,27L88,27L88,8Z'/></clipPath></defs><line x1='15.45' y1='24.23' x2='17.1' y2='22.02' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='17.1' y1='22.02' x2='18.74' y2='23.27' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='18.74' y1='23.27' x2='20.39' y2='20.57' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='20.39' y1='20.57' x2='22.03' y2='26.16' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='22.03' y1='26.16' x2='23.68' y2='19.45' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='23.68' y1='19.45' x2='25.32' y2='22.8' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='25.32' y1='22.8' x2='26.97' y2='23.63' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='26.97' y1='23.63' x2='28.61' y2='24.68' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='28.61' y1='24.68' x2='30.26' y2='19.67' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='30.26' y1='19.67' x2='31.9' y2='23.34' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='31.9' y1='23.34' x2='33.55' y2='22.63' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='33.55' y1='22.63' x2='35.19' y2='18.29' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='35.19' y1='18.29' x2='36.84' y2='17.62' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='36.84' y1='17.62' x2='38.48' y2='16.16' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='38.48' y1='16.16' x2='40.13' y2='21.84' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='40.13' y1='21.84' x2='41.77' y2='19.47' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='41.77' y1='19.47' x2='43.42' y2='22.39' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='43.42' y1='22.39' x2='45.06' y2='15.92' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='45.06' y1='15.92' x2='46.71' y2='15.69' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='46.71' y1='15.69' x2='48.35' y2='20.04' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='48.35' y1='20.04' x2='50' y2='15.34' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='50' y1='15.34' x2='51.65' y2='21.17' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='51.65' y1='21.17' x2='53.29' y2='20.6' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='53.29' y1='20.6' x2='54.94' y2='15.74' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='54.94' y1='15.74' x2='56.58' y2='16.79' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='56.58' y1='16.79' x2='58.23' y2='19.8' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='58.23' y1='19.8' x2='59.87' y2='13.96' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='59.87' y1='13.96' x2='61.52' y2='18.1' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='61.52' y1='18.1' x2='63.16' y2='11' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='63.16' y1='11' x2='64.81' y2='11.12' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='64.81' y1='11.12' x2='66.45' y2='14.76' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='66.45' y1='14.76' x2='68.1' y2='11.87' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='68.1' y1='11.87' x2='69.74' y2='16.17' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='69.74' y1='16.17' x2='71.39' y2='14.38' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='71.39' y1='14.38' x2='73.03' y2='16.1' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='73.03' y1='16.1' x2='74.68' y2='10.66' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='74.68' y1='10.66' x2='76.32' y2='12.51' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='76.32' y1='12.51' x2='77.97' y2='15.16' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='77.97' y1='15.16' x2='79.61' y2='8' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='79.61' y1='8' x2='81.26' y2='9.9' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='81.26' y1='9.9' x2='82.9' y2='10.79' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='82.9' y1='10.79' x2='84.55' y2='11.07' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/></svg>"
+    const svgBase64 = `data:image/svg+xml;base64,${base64Data}`;
+
+
     let body = (
         <>
          {data.map((tr, index) => {
             return (
                 <div className={`${classes.row} row fs-01 rounded-5 border-bottom cursor-pointer px-2 py-2`}  key={index} onClick={() => navigateToPanel(tr.symbol)}>
-                    <span className="width-25 row jc-start ai-center">
-                        <img src={images[tr?.base]} alt={tr?.base}
+                    <span className="width-30 row jc-start ai-center">
+                        <img src={currencies[tr?.base]?.icon} alt={tr?.base}
                              title={tr?.base} className={`img-lg ml-05`}/>
-                        <span className={`fs-01 mr-05`}>{activeCurrency ? t("currency." + tr?.base) : tr?.base + " / " + tr?.quote}</span>
+                        <span className={`fs-01 mr-05`}>{activeCurrency ?
+                            <>
+                                {getCurrencyNameOrAlias(currencies[tr?.base], language)}
+                                <span className={`text-gray fs-0-8 mr-05`}>{tr?.base}</span>
+                            </>
+                            : tr?.base + " / " + tr?.quote}</span>
                     </span>
-                    <span className={`width-30 flex jc-start ai-center ${tr.priceChangePercent > 0 ? "text-green" : "text-red"}`}>{new BN(tr.lastPrice).toFormat()} <span className={`fs-0-7 mr-05`}>{t("currency." + tr?.quote)}</span></span>
-                    <span className={`width-25 flex ${i18n.language !== "fa" ? 'jc-start' : 'jc-end'} ai-center ${tr.priceChangePercent > 0 ? "text-green" : "text-red"} direction-ltr`}>{new BN(tr.priceChangePercent).toFormat(2)} %</span>
-                    <span className="width-20 flex jc-start ai-center">{new BN(tr.volume).toFormat()}</span>
+
+                    <span className={`width-25 flex jc-start ai-center ${tr.priceChangePercent > 0 ? "text-green" : "text-red"}`}>{new BN(tr.lastPrice).decimalPlaces(currencies[tr?.quote]?.precision ?? 0).toFormat()} <span className={`fs-0-7 mr-05`}>{tr?.quote}</span></span>
+
+                    <span className={`width-25 flex ${i18n.language !== "fa" ? 'jc-start' : 'jc-end'} ai-center ${tr.priceChangePercent > 0 ? "text-green" : tr.priceChangePercent < 0 ? "text-red" : ""} direction-ltr`}>{tr.priceChangePercent === 0 ? "0 %" : `${new BN(tr.priceChangePercent).toFormat(2)} %`}</span>
+
+                    <span className="width-20 flex jc-start ai-center">{new BN(tr.volume).decimalPlaces(currencies[tr?.base]?.precision ?? 0).toFormat()} <span className={`text-gray fs-0-8 mr-05`}>{tr?.base}</span></span>
+
                     <span className="width-25 flex jc-end ai-center position-relative">
-                        <img
-                            className={`img-lg-2 ${classes.filter}`}
-                            src={images.chart}
-                            alt={""}
-                            title={""}
-                        />
-                        <span className={`fs-0-6 position-absolute`} style={{left:`${i18n.language !== "fa" ? "68%" : "13%"}`}}>{t("comingSoon")}</span>
-                    </span>
+                        {svgBase64 && <img src={svgBase64} alt="SVG Example" className={`${classes.filter}`}/>}
+                     </span>
                 </div>
             )
          })}
diff --git a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.module.css b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.module.css
index cf0d2b65..8e700398 100644
--- a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.module.css
+++ b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.module.css
@@ -11,5 +11,6 @@
 }
 
 .filter {
-    filter: blur(4px);
+    /*filter: invert(51%) sepia(94%) saturate(370%) hue-rotate(109deg) brightness(87%) contrast(92%);*/
+    filter: invert(38%) sepia(77%) saturate(5872%) hue-rotate(347deg) brightness(93%) contrast(79%);
 }
\ No newline at end of file
diff --git a/src/main/Browser/Pages/Landing/components/MarketView/components/MostDecreasedPrice/MostDecreasedPrice.js b/src/main/Browser/Pages/Landing/components/MarketView/components/MostDecreasedPrice/MostDecreasedPrice.js
index 0f4ca3d7..19d40377 100644
--- a/src/main/Browser/Pages/Landing/components/MarketView/components/MostDecreasedPrice/MostDecreasedPrice.js
+++ b/src/main/Browser/Pages/Landing/components/MarketView/components/MostDecreasedPrice/MostDecreasedPrice.js
@@ -1,13 +1,15 @@
 import React from 'react';
 import classes from "../../MarketView.module.css";
-import {images} from "../../../../../../../../assets/images";
 import i18n from "i18next";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import {useTranslation} from "react-i18next";
+import {useSelector} from "react-redux";
 
 const MostDecreasedPrice = ({mostDecreasedPrice}) => {
 
     const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     return (
         <div className={`column border-bottom  my-3`}>
@@ -16,21 +18,22 @@ const MostDecreasedPrice = ({mostDecreasedPrice}) => {
                 <div className={`row jc-center ai-center`}>
                     <img
                         className="img-md-plus ml-05"
-                        src={images[mostDecreasedPrice.pairInfo.baseAsset]}
+                        src={currencies[mostDecreasedPrice.pairInfo.baseAsset]?.icon}
                         alt={mostDecreasedPrice.pairInfo.baseAsset}
                         title={mostDecreasedPrice.pairInfo.baseAsset}
                     />
-                    <span className={`mr-05`}>{t("currency." + mostDecreasedPrice.pairInfo.baseAsset)}</span>
+                    <span className={`mr-05`}>{getCurrencyNameOrAlias(currencies[mostDecreasedPrice.pairInfo.baseAsset], language)}</span>
                 </div>
                 <div className={`column ai-end`}>
                     <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'}`}>
                         <span className={`fs-0-6 ${i18n.language !== "fa" ? 'mr-05' : 'ml-05'}`}>{mostDecreasedPrice.pairInfo.quoteAsset}</span>
-                        <span> {new BN(mostDecreasedPrice?.lastPrice).toFormat()} </span>
+                        <span>{new BN(mostDecreasedPrice?.lastPrice).decimalPlaces(currencies[mostDecreasedPrice.pairInfo.quoteAsset]?.precision ?? 0).toFormat()}</span>
                     </div>
-                    <span className={`${mostDecreasedPrice?.priceChangePercent > 0 ? "text-green" : "text-red"} direction-ltr`}>{new BN(mostDecreasedPrice?.priceChangePercent).toFormat(2)} %</span>
+                    <span className={`${mostDecreasedPrice?.priceChangePercent > 0 ? "text-green" : mostDecreasedPrice?.priceChangePercent < 0 ? "text-red" : ""} direction-ltr`}>{mostDecreasedPrice?.priceChangePercent === 0 ? "0 %" : `${new BN(mostDecreasedPrice?.priceChangePercent).toFormat(2)} %`}</span>
                 </div>
             </div>
         </div>
+
     );
 };
 
diff --git a/src/main/Browser/Pages/Landing/components/MarketView/components/MostIncreasedPrice/MostIncreasedPrice.js b/src/main/Browser/Pages/Landing/components/MarketView/components/MostIncreasedPrice/MostIncreasedPrice.js
index 9e75edf6..52c44b5a 100644
--- a/src/main/Browser/Pages/Landing/components/MarketView/components/MostIncreasedPrice/MostIncreasedPrice.js
+++ b/src/main/Browser/Pages/Landing/components/MarketView/components/MostIncreasedPrice/MostIncreasedPrice.js
@@ -2,12 +2,15 @@ import React from 'react';
 import classes from "../../MarketView.module.css";
 import {images} from "../../../../../../../../assets/images";
 import i18n from "i18next";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import {useTranslation} from "react-i18next";
+import {useSelector} from "react-redux";
 
 const MostIncreasedPrice = ({mostIncreasedPrice}) => {
 
     const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     return (
         <div className={`column border-bottom`}>
@@ -16,18 +19,18 @@ const MostIncreasedPrice = ({mostIncreasedPrice}) => {
                 <div className={`row jc-center ai-center`}>
                     <img
                         className="img-md-plus ml-05"
-                        src={images[mostIncreasedPrice.pairInfo.baseAsset]}
+                        src={currencies[mostIncreasedPrice.pairInfo.baseAsset]?.icon}
                         alt={mostIncreasedPrice.pairInfo.baseAsset}
                         title={mostIncreasedPrice.pairInfo.baseAsset}
                     />
-                    <span className={`mr-05`}>{t("currency." + mostIncreasedPrice.pairInfo.baseAsset)}</span>
+                    <span className={`mr-05`}>{getCurrencyNameOrAlias(currencies[mostIncreasedPrice.pairInfo.baseAsset], language)}</span>
                 </div>
                 <div className={`column ai-end`}>
                     <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'}`}>
                         <span className={`fs-0-6 ${i18n.language !== "fa" ? 'mr-05' : 'ml-05'}`}>{mostIncreasedPrice.pairInfo.quoteAsset}</span>
-                        <span>{new BN(mostIncreasedPrice?.lastPrice).toFormat()}</span>
+                        <span>{new BN(mostIncreasedPrice?.lastPrice).decimalPlaces(currencies[mostIncreasedPrice.pairInfo.quoteAsset]?.precision ?? 0).toFormat()}</span>
                     </div>
-                    <span className={`${mostIncreasedPrice?.priceChangePercent > 0 ? "text-green" : "text-red"} direction-ltr`}>{new BN(mostIncreasedPrice?.priceChangePercent).toFormat(2)} %</span>
+                    <span className={`${mostIncreasedPrice?.priceChangePercent > 0 ? "text-green" : mostIncreasedPrice?.priceChangePercent < 0 ? "text-red" : ""} direction-ltr`}>{mostIncreasedPrice?.priceChangePercent === 0 ? "0 %" : `${new BN(mostIncreasedPrice?.priceChangePercent).toFormat(2)} %`}</span>
                 </div>
             </div>
         </div>
diff --git a/src/main/Browser/Pages/Landing/components/MarketView/components/MostVolume/MostVolume.js b/src/main/Browser/Pages/Landing/components/MarketView/components/MostVolume/MostVolume.js
index 591a1538..4524f627 100644
--- a/src/main/Browser/Pages/Landing/components/MarketView/components/MostVolume/MostVolume.js
+++ b/src/main/Browser/Pages/Landing/components/MarketView/components/MostVolume/MostVolume.js
@@ -2,12 +2,15 @@ import React from 'react';
 import classes from "../../MarketView.module.css";
 import {images} from "../../../../../../../../assets/images";
 import i18n from "i18next";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import {useTranslation} from "react-i18next";
+import {useSelector} from "react-redux";
 
 const MostVolume = ({mostVolume}) => {
 
     const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     return (
         <div className={`column`}>
@@ -16,18 +19,17 @@ const MostVolume = ({mostVolume}) => {
                 <div className={`row jc-center ai-center`}>
                     <img
                         className="img-md-plus ml-05"
-                        src={images[mostVolume.pairInfo.baseAsset]}
-                        alt={mostVolume.pairInfo.baseAsset}
-                        title={mostVolume.pairInfo.baseAsset}
+                        src={currencies[mostVolume?.pairInfo?.baseAsset]?.icon}
+                        alt={mostVolume?.pairInfo?.baseAsset}
+                        title={mostVolume?.pairInfo?.baseAsset}
                     />
-                    <span className={`mr-05`}>{t("currency." + mostVolume.pairInfo.baseAsset)}</span>
+                    <span className={`mr-05`}>{getCurrencyNameOrAlias(currencies[mostVolume?.pairInfo?.baseAsset], language)}</span>
                 </div>
                 <div className={`column ai-end`}>
                     <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'}`}>
-                        <span className={`fs-0-6 ${i18n.language !== "fa" ? 'mr-05' : 'ml-05'}`}>{mostVolume.pairInfo.baseAsset}</span>
-                        <span> {new BN(mostVolume?.volume).toFormat()} </span>
+                        <span className={`fs-0-6 ${i18n.language !== "fa" ? 'mr-05' : 'ml-05'}`}>{mostVolume?.pairInfo?.baseAsset}</span>
+                        <span>{new BN(mostVolume?.volume).decimalPlaces(currencies[mostVolume?.pairInfo?.baseAsset]?.precision ?? 0).toFormat()}</span>
                     </div>
-
                     {/*++ to do ++*/}
                     {/*<span className={`${mostVolume?.change > 0 ? "text-green" : "text-red"} direction-ltr`}>{new BN(mostVolume?.change).toFormat(2)} %</span>*/}
                 </div>
diff --git a/src/main/Browser/Pages/Login/components/LoginForm/LoginForm.js b/src/main/Browser/Pages/Login/components/LoginForm/LoginForm.js
index 5d575f84..5f5c6513 100644
--- a/src/main/Browser/Pages/Login/components/LoginForm/LoginForm.js
+++ b/src/main/Browser/Pages/Login/components/LoginForm/LoginForm.js
@@ -90,9 +90,11 @@ const LoginForm = () => {
             })
             .catch((err) => {
                 if (err?.response?.status === 401) {
+                    setShowVerifyEmail(false)
                     return setLoginError(t("login.wrongPassword"));
                 }
                 if (err?.response?.status === 403) {
+                    setShowVerifyEmail(false)
                     setLoginError(t("login.wrongOTP"));
                     return setNeedOTP(true)
                 }
@@ -100,6 +102,7 @@ const LoginForm = () => {
                     setShowVerifyEmail(true)
                     return setLoginError(t("login.accountNotActive"));
                 }
+                setShowVerifyEmail(false)
                 setLoginError(t("login.loginError"));
             })
             .finally(() => {
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/DepositHistory/DepositHistory.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/DepositHistory/DepositHistory.js
index 465d475f..b71b40e4 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/DepositHistory/DepositHistory.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/DepositHistory/DepositHistory.js
@@ -13,6 +13,7 @@ import i18n from "i18next";
 import ToggleSwitch from "../../../../../../../../../../components/ToggleSwitch/ToggleSwitch";
 import Button from "../../../../../../../../../../components/Button/Button";
 import DepositHistoryTable from "../DepositHistoryTable/DepositHistoryTable";
+import {getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
 
 
 const DepositHistory = () => {
@@ -20,6 +21,10 @@ const DepositHistory = () => {
     const {t} = useTranslation();
     const coins = useSelector((state) => state.exchange.assets)
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
+
     const [query, setQuery] = useState({
         "currency": null, // optional
         "category": null, // optional [DEPOSIT, FEE, TRADE, WITHDRAW, ORDER_CANCEL, ORDER_CREATE, ORDER_FINALIZED]
@@ -54,8 +59,10 @@ const DepositHistory = () => {
         categoryOptions.push({value: o, label: t('TransactionCategory.' + o)})
     })
 
-    coins.forEach((o) => {
-        currenciesOptions.push({value: o, label: t('currency.' + o)})
+
+
+    Object.keys(currencies).forEach((o) => {
+        currenciesOptions.push({value: o, label: getCurrencyNameOrAlias(currencies[o], language)})
     })
 
 
@@ -137,7 +144,7 @@ const DepositHistory = () => {
                     type="select"
                     value={{
                         value: query?.currency,
-                        label:  query?.currency ? t('currency.'+ query?.currency) : t('all'),
+                        label:  query?.currency ? getCurrencyNameOrAlias(currencies[query?.currency], language) : t('all'),
                     }}
                     onchange={(e) => setQuery({...query, currency: e.value, offset:0})}
                     customClass={`width-20 ${classes.thisInput}`}
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/DepositHistoryTable/DepositHistoryTable.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/DepositHistoryTable/DepositHistoryTable.js
index 1e070d7a..9d58a785 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/DepositHistoryTable/DepositHistoryTable.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/DepositHistoryTable/DepositHistoryTable.js
@@ -4,12 +4,17 @@ import {useTranslation} from "react-i18next";
 import {useSelector} from "react-redux";
 import Date from "../../../../../../../../../../components/Date/Date";
 import moment from "moment-jalaali";
-import {BN} from "../../../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
+import i18n from "i18next";
 
 const DepositHistoryTable = ({txs, offset}) => {
 
     const {t} = useTranslation();
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
+
     let head = (
         <div className="row text-gray px-2 py-2" style={{backgroundColor:"var(--tableHeader)"}}>
             <span className="width-9 flex jc-start ai-center">{t("date")}</span>
@@ -37,7 +42,7 @@ const DepositHistoryTable = ({txs, offset}) => {
                             </span>
 
                             <span className="width-12 row jc-start ai-center">
-                                {t("currency." + tr.currency )}
+                                {getCurrencyNameOrAlias(currencies[tr.currency], language)}
                             </span>
 
                             <span className="width-10 row jc-start ai-center">
@@ -45,7 +50,7 @@ const DepositHistoryTable = ({txs, offset}) => {
                             </span>
 
                             <span className="width-12 row jc-start ai-center text-green">
-                                {new BN(tr?.amount).toFormat()}
+                                {new BN(tr?.amount).decimalPlaces(currencies[tr.currency].precision).toFormat()}
                             </span>
 
                             <span className="width-10 row jc-start ai-center">
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/Transactions/Transactions.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/Transactions/Transactions.js
index 933d0064..9dca0f66 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/Transactions/Transactions.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/Transactions/Transactions.js
@@ -13,12 +13,16 @@ import ToggleSwitch from "../../../../../../../../../../components/ToggleSwitch/
 import Button from "../../../../../../../../../../components/Button/Button";
 import TransactionsTable from "../TransactionsTable/TransactionsTable";
 import {useGetTransactionsHistory} from "../../../../../../../../../../queries";
+import {getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
 
 const Transactions = () => {
 
     const {t} = useTranslation();
     const coins = useSelector((state) => state.exchange.assets)
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const [query, setQuery] = useState({
         "currency": null, // optional
         "category": null, // optional [DEPOSIT, FEE, TRADE, WITHDRAW, ORDER_CANCEL, ORDER_CREATE, ORDER_FINALIZED]
@@ -52,8 +56,8 @@ const Transactions = () => {
         categoryOptions.push({value: o, label: t('TransactionCategory.' + o)})
     })
 
-    coins.forEach((o) => {
-        currenciesOptions.push({value: o, label: t('currency.' + o)})
+    Object.keys(currencies).forEach((o) => {
+        currenciesOptions.push({value: o, label: getCurrencyNameOrAlias(currencies[o], language)})
     })
 
     const scrollRef = useRef(null);
@@ -131,7 +135,7 @@ const Transactions = () => {
                     type="select"
                     value={{
                         value: query?.currency,
-                        label:  query?.currency ? t('currency.'+ query?.currency) : t('all'),
+                        label:  query?.currency ? getCurrencyNameOrAlias(currencies[query?.currency], language) : t('all'),
                     }}
                     onchange={(e) => setQuery({...query, currency: e.value, offset:0})}
                     customClass={`width-20 ${classes.thisInput}`}
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/TransactionsTable/TransactionsTable.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/TransactionsTable/TransactionsTable.js
index d434f2c9..f82de9d5 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/TransactionsTable/TransactionsTable.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/TransactionsTable/TransactionsTable.js
@@ -3,11 +3,16 @@ import classes from './TransactionsTable.module.css';
 import {useTranslation} from "react-i18next";
 import Date from "../../../../../../../../../../components/Date/Date";
 import moment from "moment-jalaali";
-import {BN} from "../../../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
+import i18n from "i18next";
+import {useSelector} from "react-redux";
 
 const TransactionsTable = ({txs}) => {
     const {t} = useTranslation();
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     let head = (
         <div className="row text-gray px-2 py-2" style={{backgroundColor:"var(--tableHeader)"}}>
             <span className="width-12 flex jc-start ai-center">{t("date")}</span>
@@ -35,13 +40,15 @@ const TransactionsTable = ({txs}) => {
                                 {t("TransactionCategory." + tr.category )}
                             </span>
                             <span className="width-17 row jc-start ai-center">
-                                {t("currency." + tr.currency )}
+                                {getCurrencyNameOrAlias(currencies[tr.currency], language)}
                             </span>
                             <span className="width-18 row jc-start ai-center">
                                 <span className={`direction-ltr ${new BN(tr?.balanceChange).isLessThan(0) ? "text-red" : "text-green"}`}>{new BN(tr?.balanceChange).toFormat()}</span>
+                                <span className={`direction-ltr mr-2 ${new BN(tr?.balanceChange).isLessThan(0) ? "text-red" : "text-green"}`}>{new BN(tr?.balanceChange).decimalPlaces(currencies[tr.currency].precision).toFormat()}</span>
                             </span>
                             <span className="width-24 row jc-end ai-center">
                                 <span className={`direction-ltr`}>{new BN(tr?.balance).toFormat()}</span>
+                                <span className={`direction-ltr mr-2`}>{new BN(tr?.balance).decimalPlaces(currencies[tr.currency].precision).toFormat()}</span>
                             </span>
                         </div>
                     </div>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/WithdrawHistory/WithdrawHistory.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/WithdrawHistory/WithdrawHistory.js
index 0a5333e4..85872412 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/WithdrawHistory/WithdrawHistory.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/WithdrawHistory/WithdrawHistory.js
@@ -13,12 +13,16 @@ import i18n from "i18next";
 import ToggleSwitch from "../../../../../../../../../../components/ToggleSwitch/ToggleSwitch";
 import Button from "../../../../../../../../../../components/Button/Button";
 import WithdrawHistoryTable from "../WithdrawHistoryTable/WithdrawHistoryTable";
+import {getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
 
 const WithdrawHistory = () => {
 
     const {t} = useTranslation();
     const coins = useSelector((state) => state.exchange.assets)
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const [query, setQuery] = useState({
         "currency": null, // optional
         "category": null, // optional [DEPOSIT, FEE, TRADE, WITHDRAW, ORDER_CANCEL, ORDER_CREATE, ORDER_FINALIZED]
@@ -53,11 +57,13 @@ const WithdrawHistory = () => {
         categoryOptions.push({value: o, label: t('TransactionCategory.' + o)})
     })
 
-    coins.forEach((o) => {
-        currenciesOptions.push({value: o, label: t('currency.' + o)})
+
+    Object.keys(currencies).forEach((o) => {
+        currenciesOptions.push({value: o, label: getCurrencyNameOrAlias(currencies[o], language)})
     })
 
 
+
     const scrollRef = useRef(null);
 
 
@@ -137,7 +143,7 @@ const WithdrawHistory = () => {
                     type="select"
                     value={{
                         value: query?.currency,
-                        label:  query?.currency ? t('currency.'+ query?.currency) : t('all'),
+                        label:  query?.currency ? getCurrencyNameOrAlias(currencies[query?.currency], language) : t('all'),
                     }}
                     onchange={(e) => setQuery({...query, currency: e.value, offset:0})}
                     customClass={`width-20 ${classes.thisInput}`}
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/WithdrawHistoryTable/WithdrawHistoryTable.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/WithdrawHistoryTable/WithdrawHistoryTable.js
index e80af9c9..96b8fb76 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/WithdrawHistoryTable/WithdrawHistoryTable.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/History/components/WithdrawHistoryTable/WithdrawHistoryTable.js
@@ -3,14 +3,21 @@ import classes from './WithdrawHistoryTable.module.css'
 import {useTranslation} from "react-i18next";
 import Date from "../../../../../../../../../../components/Date/Date";
 import moment from "moment-jalaali";
-import {BN} from "../../../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
 import Icon from "../../../../../../../../../../components/Icon/Icon";
+import i18n from "i18next";
+import {useSelector} from "react-redux";
 
 const WithdrawHistoryTable = ({txs, offset}) => {
 
+    const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
+
     const [isOpen, setIsOpen] = useState(false);
 
-    const {t} = useTranslation();
+
 
     let head = (
         <div className="row text-gray px-2 py-2" style={{backgroundColor:"var(--tableHeader)"}}>
@@ -41,7 +48,7 @@ const WithdrawHistoryTable = ({txs, offset}) => {
                             </span>
 
                             <span className="width-10 row jc-start ai-center">
-                                {t("currency." + tr.currency )}
+                                {getCurrencyNameOrAlias(currencies[tr.currency], language)}
                             </span>
 
                             <span className="width-10 row jc-start ai-center">
@@ -49,11 +56,11 @@ const WithdrawHistoryTable = ({txs, offset}) => {
                             </span>
 
                             <span className="width-9 row jc-start ai-center text-red">
-                                {new BN(tr?.amount).toFormat()}
+                                {new BN(tr?.amount).decimalPlaces(currencies[tr.currency].precision).toFormat()}
                             </span>
 
                             <span className="width-9 row jc-start ai-center">
-                                {new BN(tr?.appliedFee).toFormat()}
+                                {new BN(tr?.appliedFee).decimalPlaces(currencies[tr.currency].precision).toFormat()}
                             </span>
 
                             <span className="width-9 row jc-start ai-center">
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/LastTrades/LastTrades.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/LastTrades/LastTrades.js
index 93f04e00..74622aac 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/LastTrades/LastTrades.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/LastTrades/LastTrades.js
@@ -27,6 +27,8 @@ const LastTrades = () => {
         </div>
     }
 
+
+
     return (
         <div
             className={`width-100 card-bg card-border column ${classes.container}`}>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/LastTrades/components/LastTradesTable/LastTradesTable.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/LastTrades/components/LastTradesTable/LastTradesTable.js
index 779f523b..73078cd3 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/LastTrades/components/LastTradesTable/LastTradesTable.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/LastTrades/components/LastTradesTable/LastTradesTable.js
@@ -2,15 +2,20 @@ import React from "react";
 import classes from "./LastTradesTable.module.css";
 import {useTranslation} from "react-i18next";
 import moment from "moment-jalaali";
-import {connect} from "react-redux";
+import {connect, useSelector} from "react-redux";
 import ScrollBar from "../../../../../../../../../../../../components/ScrollBar";
 import {BN} from "../../../../../../../../../../../../utils/utils";
 import Date from "../../../../../../../../../../../../components/Date/Date";
+import i18n from "i18next";
 
 const LastTradesTable = (props) => {
     const {t} = useTranslation();
     const {activePair, data} = props
 
+
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     return (
         <div className={`column width-100 ${classes.container}`}>
             <ScrollBar>
@@ -38,9 +43,9 @@ const LastTradesTable = (props) => {
                             <tr key={index} style={{color: tr.isBuyerMaker === true ? "var(--green)" : "var(--red)",}}>
                                 <td><Date date={tr.time}/></td>
                                 <td>{moment(tr.time).format("HH:mm:ss")}</td>
-                                <td>{amount.decimalPlaces(activePair.baseAssetPrecision).toFormat()}</td>
-                                <td>{pricePerUnit.decimalPlaces(activePair.quoteAssetPrecision).toFormat()}</td>
-                                <td>{totalPrice.decimalPlaces(activePair.quoteAssetPrecision).toFormat()}</td>
+                                <td>{amount.decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</td>
+                                <td>{pricePerUnit.decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</td>
+                                <td>{totalPrice.decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</td>
                             </tr>
                         );
                     })}
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/MyOrders/components/OpenOrders/OpenOrders.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/MyOrders/components/OpenOrders/OpenOrders.js
index db2602c2..a0891f7b 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/MyOrders/components/OpenOrders/OpenOrders.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/MyOrders/components/OpenOrders/OpenOrders.js
@@ -12,6 +12,7 @@ import Error from "../../../../../../../../../../../../components/Error/Error";
 import {useMyOpenOrders} from "../../../../../../../../../../../../queries";
 import {cancelOrderByOrderID} from "js-api-client";
 import Date from "../../../../../../../../../../../../components/Date/Date";
+import i18n from "i18next";
 
 
 const OpenOrders = () => {
@@ -19,9 +20,13 @@ const OpenOrders = () => {
     const {t} = useTranslation();
     const [openOrder, setOpenOrder] = useState(null)
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
     const activePair = useSelector((state) => state.exchange.activePair)
     const lastTransaction = useSelector((state) => state.auth.lastTransaction);
 
+
+
     const {data, isLoading, error, refetch} = useMyOpenOrders(activePair.symbol)
 
     useEffect(() => {
@@ -71,9 +76,9 @@ const OpenOrders = () => {
                             <tr className={`${tr.side === "BUY" ? "text-green" : "text-red"}`}>
                                 <td className={`pr-05`}><Date date={tr.time}/></td>
                                 <td>{moment(tr.time).format("HH:mm:ss")}</td>
-                                <td>{origQty.decimalPlaces(activePair.baseAssetPrecision).toFormat()}</td>
-                                <td>{pricePerUnit.decimalPlaces(activePair.quoteAssetPrecision).toFormat()}</td>
-                                <td>{totalPrice.decimalPlaces(activePair.quoteAssetPrecision).toFormat()}</td>
+                                <td>{origQty.decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</td>
+                                <td>{pricePerUnit.decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</td>
+                                <td>{totalPrice.decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</td>
                                 <td>{executedQty.dividedBy(origQty).multipliedBy(100).toFormat(0)}</td>
                                 <td
                                     className={`width-5`}
@@ -113,7 +118,7 @@ const OpenOrders = () => {
                                         </p>
                                         <p className="width-47 row jc-between">
                                             {t("myOrders.tradedAmount")} :{" "}
-                                            <span>{executedQty.decimalPlaces(activePair.baseAssetPrecision).toFormat()}</span>
+                                            <span>{executedQty.decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</span>
                                         </p>
                                     </div>
                                     <div
@@ -125,7 +130,7 @@ const OpenOrders = () => {
                                         </p>
                                         <p className="width-47 row jc-between">
                                             {t("myOrders.tradedPrice")} :{" "}
-                                            <span>{executedQty.multipliedBy(pricePerUnit).decimalPlaces(activePair.baseAssetPrecision).toFormat()}</span>
+                                            <span>{executedQty.multipliedBy(pricePerUnit).decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</span>
                                         </p>
                                     </div>
                                 </td>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/MyOrders/components/OrdersHistory/OrdersHistory.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/MyOrders/components/OrdersHistory/OrdersHistory.js
index 42b66593..946b4749 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/MyOrders/components/OrdersHistory/OrdersHistory.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/MyOrders/components/OrdersHistory/OrdersHistory.js
@@ -9,6 +9,8 @@ import Icon from "../../../../../../../../../../../../components/Icon/Icon";
 import {useMyOrderHistory} from "../../../../../../../../../../../../queries";
 import Error from "../../../../../../../../../../../../components/Error/Error";
 import Date from "../../../../../../../../../../../../components/Date/Date";
+import i18n from "i18next";
+import {BN} from "../../../../../../../../../../../../utils/utils";
 
 const OrdersHistory = () => {
     const {t} = useTranslation();
@@ -17,6 +19,9 @@ const OrdersHistory = () => {
     const activePair = useSelector((state) => state.exchange.activePair)
     const lastTransaction = useSelector((state) => state.auth.lastTransaction);
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const {data, isLoading, error, refetch} = useMyOrderHistory(activePair.symbol)
 
     useEffect(() => {
@@ -53,10 +58,16 @@ const OrdersHistory = () => {
                         <tr className={tr.side === "BUY" ? "text-green" : "text-red"}>
                             <td className={`pr-05`}><Date date={tr.time}/></td>
                             <td>{moment(tr.time).format("HH:mm:ss")}</td>
-                            <td>{tr.origQty}</td>
-                            <td>{tr.price.toLocaleString()}</td>
-                            <td>{(tr.origQty * tr.price).toLocaleString()}</td>
+
+
+                            <td>{new BN(tr.origQty).decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</td>
+
+                            <td>{new BN(tr.price).decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</td>
+
+                            <td>{new BN(tr.origQty).multipliedBy(tr.price).decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</td>
+
                             <td>{t("orderStatus." + tr.status)}</td>
+
                             {openOrder === index ? (
                                 <td className={`width-7`} onClick={() => setOpenOrder(null)}>
                                     <Icon
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/MyOrders/components/Trades/Trades.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/MyOrders/components/Trades/Trades.js
index 14f5ceed..1033f6b8 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/MyOrders/components/Trades/Trades.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/MyOrders/components/Trades/Trades.js
@@ -9,7 +9,8 @@ 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";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../../../../../utils/utils";
+import i18n from "i18next";
 
 const Trades = () => {
 
@@ -20,6 +21,9 @@ const Trades = () => {
     const activePair = useSelector((state) => state.exchange.activePair)
     const lastTransaction = useSelector((state) => state.auth.lastTransaction);
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const {data, isLoading, error, refetch} = useMyTrades(activePair.symbol)
 
     useEffect(() => {
@@ -58,9 +62,10 @@ const Trades = () => {
                         <tr className={tr.isBuyer === false ? "text-green" : "text-red"}>
                             <td className={`pr-05`}><Date date={tr.time}/></td>
                             <td>{moment(tr.time).format("HH:mm:ss")}</td>
-                            <td>{tr.qty}</td>
-                            <td>{tr.price.toLocaleString()}</td>
-                            <td>{(tr.qty * tr.price).toLocaleString()}</td>
+                            <td>{new BN(tr.qty).decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</td>
+                            <td>{new BN(tr.price).decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</td>
+                            <td>{new BN(tr.qty).multipliedBy(tr.price).decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</td>
+
                             {openOrder === index ? (
                                 <td className={`width-7`} onClick={() => setOpenOrder(null)}>
                                     <Icon
@@ -81,13 +86,14 @@ const Trades = () => {
                             style={{display: openOrder === index ? "revert" : "none"}}>
                             <td colSpan="6" className={`pb-1 px-1 fs-0-8`}>
                                 <div
-                                    className="row jc-between  ai-center"
+                                    className="row jc-between ai-center"
                                     style={{width: "100%"}}>
                                     <p className="width-47 row jc-between">
                                         {t("myOrders.orderId")} : <span>{tr.orderId}</span>
                                     </p>
                                     <p className="width-47 row jc-between">
-                                        {t("commission")} : <span>{new BN(tr.commission).toFormat()} <span>{t("currency." + tr.commissionAsset.toUpperCase())}</span></span>
+                                        {t("commission")} : <span>{new BN(tr.commission).decimalPlaces(currencies[tr.commissionAsset.toUpperCase()].precision).toFormat()}
+                                        <span className={`mr-05`}>{getCurrencyNameOrAlias(currencies[tr.commissionAsset.toUpperCase()], language)}</span></span>
                                     </p>
                                 </div>
                             </td>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/Order/components/BuyOrder/BuyOrder.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/Order/components/BuyOrder/BuyOrder.js
index 47312f06..0954ee66 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/Order/components/BuyOrder/BuyOrder.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/Order/components/BuyOrder/BuyOrder.js
@@ -3,13 +3,14 @@ import {toast} from "react-hot-toast";
 import classes from "../../Order.module.css";
 import React, {useEffect, useState} from "react";
 import {Trans, useTranslation} from "react-i18next";
-import {BN, parsePriceString} from "../../../../../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias, parsePriceString} from "../../../../../../../../../../../../utils/utils";
 import NumberInput from "../../../../../../../../../../../../components/NumberInput/NumberInput";
 import Button from "../../../../../../../../../../../../components/Button/Button";
 import {setLastTransaction} from "../../../../../../../../../../../../store/actions/auth";
 import {images} from "../../../../../../../../../../../../assets/images";
 import {useGetUserAccount} from "../../../../../../../../../../../../queries/hooks/useGetUserAccount";
 import {createOrder} from "js-api-client";
+import i18n from "i18next";
 
 const BuyOrder = () => {
 
@@ -23,6 +24,9 @@ const BuyOrder = () => {
     const bestBuyPrice = useSelector((state) => state.exchange.activePairOrders.bestBuyPrice)
     const selectedBuyOrder = useSelector((state) => state.exchange.activePairOrders.selectedBuyOrder)
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const tradeFee = useSelector((state) => state.auth.tradeFee)
     const isLogin = useSelector((state) => state.auth.isLogin)
 
@@ -71,26 +75,27 @@ const BuyOrder = () => {
 
 
     const currencyValidator = (key, val, rule) => {
-        if (!val.isZero() && val.isLessThan(rule.min)) {
+
+        if (!val.isZero() && val.isLessThan(currencies[rule].minOrder)) {
             return setAlert({
                 ...alert,
                 [key]: (
                     <Trans
                         i18nKey="orders.minOrder"
                         values={{
-                            min: activePair.baseRange.min.toString(),
-                            currency: t("currency." + activePair.baseAsset),
+                            min: currencies[rule].min.toString(),
+                            currency: getCurrencyNameOrAlias(currencies[rule], language),
                         }}
                     />
                 ),
             });
         }
-        if (!val.mod(rule.step).isZero()) {
+        if (!val.mod(currencies?.[rule]?.step).isZero()) {
             return setAlert({
                 ...alert,
                 [key]: (<Trans
                     i18nKey="orders.divisibility"
-                    values={{mod: rule.step.toString()}}
+                    values={{mod: currencies?.[rule]?.step.toString()}}
                 />)
             })
         }
@@ -102,12 +107,14 @@ const BuyOrder = () => {
         switch (key) {
             case "reqAmount":
                 const reqAmount = new BN(value);
-                currencyValidator("reqAmount", reqAmount, activePair.baseRange);
+                currencyValidator("reqAmount", reqAmount, activePair.baseAsset);
                 setOrder({
                     ...order,
                     reqAmount,
-                    totalPrice: reqAmount.multipliedBy(order.pricePerUnit).decimalPlaces(activePair.quoteAssetPrecision),
-                    tradeFee: reqAmount.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.baseAssetPrecision),
+                    /*totalPrice: reqAmount.multipliedBy(order.pricePerUnit).decimalPlaces(activePair.quoteAssetPrecision),*/
+                    totalPrice: reqAmount.multipliedBy(order.pricePerUnit).decimalPlaces(currencies[activePair.quoteAsset].precision),
+                    /*tradeFee: reqAmount.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.baseAssetPrecision),*/
+                    tradeFee: reqAmount.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(currencies[activePair.baseAsset].precision),
                 });
                 break;
             case "pricePerUnit":
@@ -115,20 +122,24 @@ const BuyOrder = () => {
                 setOrder({
                     ...order,
                     pricePerUnit: pricePerUnit,
-                    totalPrice: pricePerUnit.multipliedBy(order.reqAmount).decimalPlaces(activePair.quoteAssetPrecision),
-                    tradeFee: order.reqAmount.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.baseAssetPrecision),
+                    /*totalPrice: pricePerUnit.multipliedBy(order.reqAmount).decimalPlaces(activePair.quoteAssetPrecision),*/
+                    totalPrice: pricePerUnit.multipliedBy(order.reqAmount).decimalPlaces(currencies[activePair.quoteAsset].precision),
+                    /*tradeFee: order.reqAmount.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.baseAssetPrecision),*/
+                    tradeFee: order.reqAmount.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(currencies[activePair.baseAsset].precision),
                 });
                 break;
             case "totalPrice":
                 const totalPrice = new BN(value);
-                const req = totalPrice.dividedBy(order.pricePerUnit).decimalPlaces(activePair.baseAssetPrecision);
+                /*const req = totalPrice.dividedBy(order.pricePerUnit).decimalPlaces(activePair.baseAssetPrecision);*/
+                const req = totalPrice.dividedBy(order.pricePerUnit).decimalPlaces(currencies[activePair.baseAsset].precision);
                 setOrder({
                     ...order,
                     reqAmount: req.isFinite() ? req : new BN(0),
                     totalPrice,
-                    tradeFee: req.isFinite() ? req.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.baseAssetPrecision) : new BN(0),
+                    /*tradeFee: req.isFinite() ? req.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.baseAssetPrecision) : new BN(0),*/
+                    tradeFee: req.isFinite() ? req.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(currencies[activePair.baseAsset].precision) : new BN(0),
                 });
-                currencyValidator("reqAmount", req, activePair.baseRange);
+                currencyValidator("reqAmount", req, activePair.baseAsset);
                 break;
             default:
         }
@@ -151,7 +162,7 @@ const BuyOrder = () => {
     useEffect(() => {
         setOrder((prevState) => ({
             ...order,
-            tradeFee: prevState.totalPrice.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.baseAssetPrecision),
+            tradeFee: prevState.totalPrice.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(currencies[activePair.baseAsset].precision),
         }));
     }, [tradeFee]);
 
@@ -169,10 +180,10 @@ const BuyOrder = () => {
             ...order,
             reqAmount,
             pricePerUnit: pricePerUnit,
-            totalPrice: reqAmount.multipliedBy(pricePerUnit).decimalPlaces(activePair.quoteAssetPrecision),
-            tradeFee: reqAmount.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.baseAssetPrecision),
+            totalPrice: reqAmount.multipliedBy(pricePerUnit).decimalPlaces(currencies[activePair.quoteAsset].precision),
+            tradeFee: reqAmount.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(currencies[activePair.baseAsset].precision),
         });
-        currencyValidator("reqAmount", reqAmount, activePair.baseRange);
+        currencyValidator("reqAmount", reqAmount, activePair.baseAsset);
     }, [selectedBuyOrder]);
 
 
@@ -181,9 +192,9 @@ const BuyOrder = () => {
         if (order.pricePerUnit.isEqualTo(0)) {
             const pricePerUnit = new BN(bestBuyPrice)
             let totalPrice = new BN(quote);
-            let reqAmount = totalPrice.dividedBy(pricePerUnit).decimalPlaces(activePair.baseAssetPrecision)
-            if (!reqAmount.mod(activePair.baseRange.step).isZero()) {
-                reqAmount = reqAmount.minus(reqAmount.mod(activePair.baseRange.step));
+            let reqAmount = totalPrice.dividedBy(pricePerUnit).decimalPlaces(currencies[activePair.baseAsset].precision)
+            if (!reqAmount.mod(currencies[activePair.baseAsset].step).isZero()) {
+                reqAmount = reqAmount.minus(reqAmount.mod(currencies[activePair.baseAsset].step));
                 totalPrice = reqAmount.multipliedBy(pricePerUnit);
             }
             setOrder({
@@ -191,13 +202,13 @@ const BuyOrder = () => {
                 reqAmount,
                 pricePerUnit,
                 totalPrice,
-                tradeFee: reqAmount.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.baseAssetPrecision),
+                tradeFee: reqAmount.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(currencies[activePair.baseAsset].precision),
             });
         } else {
             let totalPrice = new BN(quote);
-            let reqAmount = totalPrice.dividedBy(order.pricePerUnit).decimalPlaces(activePair.baseAssetPrecision)
-            if (!reqAmount.mod(activePair.baseRange.step).isZero()) {
-                reqAmount = reqAmount.minus(reqAmount.mod(activePair.baseRange.step));
+            let reqAmount = totalPrice.dividedBy(order.pricePerUnit).decimalPlaces(currencies[activePair.baseAsset].precision)
+            if (!reqAmount.mod(currencies[activePair.baseAsset].step).isZero()) {
+                reqAmount = reqAmount.minus(reqAmount.mod(currencies[activePair.baseAsset].step));
             }
             buyPriceHandler(
                 reqAmount.toFormat(),
@@ -236,8 +247,8 @@ const BuyOrder = () => {
                 toast.success(<Trans
                     i18nKey="orders.success"
                     values={{
-                        base: t("currency." + activePair.baseAsset),
-                        quote: t("currency." + activePair.quoteAsset),
+                        base: getCurrencyNameOrAlias(currencies[activePair.baseAsset], language),
+                        quote: getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language),
                         type: t("buy"),
                         reqAmount: order.reqAmount,
                         pricePerUnit: order.pricePerUnit,
@@ -274,8 +285,7 @@ const BuyOrder = () => {
                 }}>
                     {t("orders.availableAmount")}:{" "}
                     <span className="cursor-pointer">
-              {new BN(quote).toFormat()}{" "}
-                        {t("currency." + activePair.quoteAsset)}
+              {new BN(quote).toFormat()}{" "}{getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}
             </span>
                 </p>
                 <p onClick={() => {
@@ -283,7 +293,7 @@ const BuyOrder = () => {
                 }}>
                     {t("orders.bestOffer")}:{" "}
                     <span className="cursor-pointer">
-                        {new BN(bestBuyPrice).toFormat()}{" "}{t("currency." + activePair.quoteAsset)}
+                        {new BN(bestBuyPrice).toFormat()}{" "}{getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}
                     </span>
                 </p>
             </div>
@@ -313,9 +323,9 @@ const BuyOrder = () => {
 
             <NumberInput
                 lead={t("orders.amount")}
-                after={t("currency." + activePair.baseAsset)}
+                after={getCurrencyNameOrAlias(currencies[activePair.baseAsset], language)}
                 value={order.reqAmount.toFormat()}
-                maxDecimal={activePair.baseAssetPrecision}
+                maxDecimal={currencies[activePair.baseAsset].precision}
                 onchange={(e) => buyPriceHandler(e.target.value, "reqAmount")}
                 alert={alert.reqAmount}
                 isAllowed={isAllowed}
@@ -326,18 +336,18 @@ const BuyOrder = () => {
                     customClass={classes.stopMarket}
                     lead={t("orders.pricePerUnit")}
                     prefix="~"
-                    after={t("currency." + activePair.quoteAsset)}
+                    after={getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}
                     value={order.pricePerUnit.toFormat()}
-                    maxDecimal={activePair.quoteAssetPrecision}
+                    maxDecimal={currencies[activePair.quoteAsset].precision}
                     onchange={(e) => buyPriceHandler(e.target.value, "pricePerUnit")}
                     isAllowed={isAllowed}
                 />
             ) : (
                 <NumberInput
                     lead={t("orders.pricePerUnit")}
-                    after={t("currency." + activePair.quoteAsset)}
+                    after={getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}
                     value={order.pricePerUnit.toFormat()}
-                    maxDecimal={activePair.quoteAssetPrecision}
+                    maxDecimal={currencies[activePair.quoteAsset].precision}
                     onchange={(e) => buyPriceHandler(e.target.value, "pricePerUnit")}
                     isAllowed={isAllowed}
                 />
@@ -356,8 +366,8 @@ const BuyOrder = () => {
             <NumberInput
                 lead={t("orders.totalPrice")}
                 value={order.totalPrice.toFormat()}
-                maxDecimal={activePair.quoteAssetPrecision}
-                after={t("currency." + activePair.quoteAsset)}
+                maxDecimal={currencies[activePair.quoteAsset].precision}
+                after={getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}
                 onchange={(e) => buyPriceHandler(e.target.value, "totalPrice")}
                 alert={alert.totalPrice}
                 isAllowed={isAllowed}
@@ -367,12 +377,12 @@ const BuyOrder = () => {
                 <p>
                     {t("orders.tradeFee")}:{" "}
                     {order.tradeFee.toFormat()}{" "}
-                    {t("currency." + activePair.baseAsset)}
+                    {getCurrencyNameOrAlias(currencies[activePair.baseAsset], language)}
                 </p>
                 <p>
                     {t("orders.getAmount")}:{" "}
-                    {order.reqAmount.minus(order.tradeFee).decimalPlaces(activePair.baseAssetPrecision).toFormat()}{" "}
-                    {t("currency." + activePair.baseAsset)}
+                    {order.reqAmount.minus(order.tradeFee).decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}{" "}
+                    {getCurrencyNameOrAlias(currencies[activePair.baseAsset], language)}
                 </p>
             </div>
             <Button
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/Order/components/SellOrder/SellOrder.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/Order/components/SellOrder/SellOrder.js
index f33192c6..852a2a07 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/Order/components/SellOrder/SellOrder.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/Order/components/SellOrder/SellOrder.js
@@ -3,13 +3,14 @@ import {Trans, useTranslation} from "react-i18next";
 import classes from "../../Order.module.css";
 import {useDispatch, useSelector} from "react-redux";
 import {toast} from "react-hot-toast";
-import {BN, parsePriceString} from "../../../../../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias, parsePriceString} from "../../../../../../../../../../../../utils/utils";
 import NumberInput from "../../../../../../../../../../../../components/NumberInput/NumberInput";
 import Button from "../../../../../../../../../../../../components/Button/Button";
 import {setLastTransaction} from "../../../../../../../../../../../../store/actions/auth";
 import {images} from "../../../../../../../../../../../../assets/images";
 import {useGetUserAccount} from "../../../../../../../../../../../../queries/hooks/useGetUserAccount";
 import {createOrder} from "js-api-client";
+import i18n from "i18next";
 
 const SellOrder = () => {
 
@@ -27,6 +28,9 @@ const SellOrder = () => {
     const {data: userAccount} = useGetUserAccount()
     const base = userAccount?.wallets[activePair.baseAsset]?.free || 0;
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const [alert, setAlert] = useState({
         reqAmount: null,
         submit: false,
@@ -78,19 +82,19 @@ const SellOrder = () => {
                     <Trans
                         i18nKey="orders.minOrder"
                         values={{
-                            min: activePair.baseRange.min.toString(),
-                            currency: t("currency." + activePair.baseAsset),
+                            min: currencies[rule].min.toString(),
+                            currency: getCurrencyNameOrAlias(currencies[rule], language),
                         }}
                     />
                 ),
             });
         }
-        if (!val.mod(rule.step).isZero()) {
+        if (!val.mod(currencies?.[rule]?.step).isZero()) {
             return setAlert({
                 ...alert,
                 [key]: (<Trans
                     i18nKey="orders.divisibility"
-                    values={{mod: rule.step.toString()}}
+                    values={{mod: currencies?.[rule]?.step.toString()}}
                 />)
             })
         }
@@ -102,12 +106,12 @@ const SellOrder = () => {
         switch (key) {
             case "reqAmount":
                 const reqAmount = new BN(value);
-                currencyValidator("reqAmount", reqAmount, activePair.baseRange);
+                currencyValidator("reqAmount", reqAmount, activePair.baseAsset);
                 setOrder({
                     ...order,
                     reqAmount,
-                    totalPrice: reqAmount.multipliedBy(order.pricePerUnit).decimalPlaces(activePair.quoteAssetPrecision),
-                    tradeFee: reqAmount.multipliedBy(order.pricePerUnit).multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.quoteAssetPrecision),
+                    totalPrice: reqAmount.multipliedBy(order.pricePerUnit).decimalPlaces(currencies[activePair.quoteAsset].precision),
+                    tradeFee: reqAmount.multipliedBy(order.pricePerUnit).multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(currencies[activePair.baseAsset].precision),
                 });
                 break;
             case "pricePerUnit":
@@ -115,20 +119,20 @@ const SellOrder = () => {
                 setOrder({
                     ...order,
                     pricePerUnit: pricePerUnit,
-                    totalPrice: pricePerUnit.multipliedBy(order.reqAmount).decimalPlaces(activePair.quoteAssetPrecision),
-                    tradeFee: pricePerUnit.multipliedBy(order.reqAmount).multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.quoteAssetPrecision),
+                    totalPrice: pricePerUnit.multipliedBy(order.reqAmount).decimalPlaces(currencies[activePair.quoteAsset].precision),
+                    tradeFee: pricePerUnit.multipliedBy(order.reqAmount).multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(currencies[activePair.quoteAsset].precision),
                 });
                 break;
             case "totalPrice":
                 const totalPrice = new BN(value);
-                const req = totalPrice.dividedBy(order.pricePerUnit).decimalPlaces(activePair.baseAssetPrecision);
+                const req = totalPrice.dividedBy(order.pricePerUnit).decimalPlaces(currencies[activePair.baseAsset].precision);
                 setOrder({
                     ...order,
                     reqAmount: req.isFinite() ? req : new BN(0),
                     totalPrice,
-                    tradeFee: req.isFinite() ? totalPrice.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.quoteAssetPrecision) : new BN(0),
+                    tradeFee: req.isFinite() ? totalPrice.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(currencies[activePair.quoteAsset].precision) : new BN(0),
                 });
-                currencyValidator("reqAmount", req, activePair.baseRange);
+                currencyValidator("reqAmount", req, activePair.baseAsset);
                 break;
             default:
         }
@@ -137,7 +141,7 @@ const SellOrder = () => {
     useEffect(() => {
         setOrder((prevState) => ({
             ...order,
-            tradeFee: prevState.totalPrice.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.baseAssetPrecision),
+            tradeFee: prevState.totalPrice.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(currencies[activePair.baseAsset].precision),
         }));
     }, [tradeFee]);
 
@@ -155,23 +159,23 @@ const SellOrder = () => {
             ...order,
             reqAmount,
             pricePerUnit: pricePerUnit,
-            totalPrice: reqAmount.multipliedBy(pricePerUnit).decimalPlaces(activePair.quoteAssetPrecision),
-            tradeFee: reqAmount.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.baseAssetPrecision),
+            totalPrice: reqAmount.multipliedBy(pricePerUnit).decimalPlaces(currencies[activePair.quoteAsset].precision),
+            tradeFee: reqAmount.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(currencies[activePair.baseAsset].precision),
         });
-        currencyValidator("reqAmount", reqAmount, activePair.baseRange);
+        currencyValidator("reqAmount", reqAmount, activePair.baseAsset);
     }, [selectedSellOrder]);
 
     const fillSellByWallet = () => {
         if (order.pricePerUnit.isEqualTo(0) && bestSellPrice === 0) return toast.error(t("orders.hasNoOffer"));
         if (order.pricePerUnit.isEqualTo(0)) {
-            const reqAmount = new BN(base).decimalPlaces(activePair.baseAssetPrecision);
+            const reqAmount = new BN(base).decimalPlaces(currencies[activePair.baseAsset].precision);
             const pricePerUnit = new BN(bestSellPrice);
             setOrder({
                 ...order,
                 reqAmount: reqAmount,
                 pricePerUnit: pricePerUnit,
-                totalPrice: reqAmount.multipliedBy(pricePerUnit).decimalPlaces(activePair.quoteAssetPrecision),
-                tradeFee: reqAmount.multipliedBy(pricePerUnit).multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(activePair.baseAssetPrecision),
+                totalPrice: reqAmount.multipliedBy(pricePerUnit).decimalPlaces(currencies[activePair.quoteAsset].precision),
+                tradeFee: reqAmount.multipliedBy(pricePerUnit).multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(currencies[activePair.baseAsset].precision),
             });
         } else {
             sellPriceHandler(
@@ -223,8 +227,8 @@ const SellOrder = () => {
                 toast.success(<Trans
                     i18nKey="orders.success"
                     values={{
-                        base: t("currency." + activePair.baseAsset),
-                        quote: t("currency." + activePair.quoteAsset),
+                        base: getCurrencyNameOrAlias(currencies[activePair.baseAsset], language),
+                        quote: getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language),
                         type: t("sell"),
                         reqAmount: order.reqAmount,
                         pricePerUnit: order.pricePerUnit,
@@ -254,12 +258,12 @@ const SellOrder = () => {
             <div className="column jc-center">
                 <p onClick={() => fillSellByWallet()}>{t("orders.availableAmount")}:{" "}
                     <span
-                        className="cursor-pointer">{new BN(base).toFormat()}{" "}{t("currency." + activePair.baseAsset)}</span>
+                        className="cursor-pointer">{new BN(base).toFormat()}{" "}{getCurrencyNameOrAlias(currencies[activePair.baseAsset], language)}</span>
                 </p>
                 <p onClick={() => fillSellByBestPrice()}>
                     {t("orders.bestOffer")}:{" "}
                     <span className="cursor-pointer">
-                        {new BN(bestSellPrice).toFormat()}{" "}{t("currency." + activePair.quoteAsset)}
+                        {new BN(bestSellPrice).toFormat()}{" "}{getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}
                     </span>
                 </p>
             </div>
@@ -289,9 +293,9 @@ const SellOrder = () => {
 
             <NumberInput
                 lead={t("orders.amount")}
-                after={t("currency." + activePair.baseAsset)}
+                after={getCurrencyNameOrAlias(currencies[activePair.baseAsset], language)}
                 value={order.reqAmount.toFormat()}
-                maxDecimal={activePair.baseAssetPrecision}
+                maxDecimal={currencies[activePair.baseAsset].precision}
                 onchange={(e) => sellPriceHandler(e.target.value, "reqAmount")}
                 alert={alert.reqAmount}
                 isAllowed={isAllowed}
@@ -302,18 +306,18 @@ const SellOrder = () => {
                     customClass={classes.stopMarket}
                     lead={t("orders.pricePerUnit")}
                     prefix="~"
-                    after={t("currency." + activePair.quoteAsset)}
+                    after={getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}
                     value={order.pricePerUnit.toFormat()}
-                    maxDecimal={activePair.quoteAssetPrecision}
+                    maxDecimal={currencies[activePair.quoteAsset].precision}
                     onchange={(e) => sellPriceHandler(e.target.value, "pricePerUnit")}
                     isAllowed={isAllowed}
                 />
             ) : (
                 <NumberInput
                     lead={t("orders.pricePerUnit")}
-                    after={t("currency." + activePair.quoteAsset)}
+                    after={getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}
                     value={order.pricePerUnit.toFormat()}
-                    maxDecimal={activePair.quoteAssetPrecision}
+                    maxDecimal={currencies[activePair.quoteAsset].precision}
                     onchange={(e) => sellPriceHandler(e.target.value, "pricePerUnit")}
                     isAllowed={isAllowed}
                 />
@@ -332,8 +336,8 @@ const SellOrder = () => {
             <NumberInput
                 lead={t("orders.totalPrice")}
                 value={order.totalPrice.toFormat()}
-                maxDecimal={activePair.quoteAssetPrecision}
-                after={t("currency." + activePair.quoteAsset)}
+                maxDecimal={currencies[activePair.quoteAsset].precision}
+                after={getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}
                 onchange={(e) => sellPriceHandler(e.target.value, "totalPrice")}
                 alert={alert.totalPrice}
                 isAllowed={isAllowed}
@@ -343,12 +347,12 @@ const SellOrder = () => {
                 <p>
                     {t("orders.tradeFee")}:{" "}
                     {order.tradeFee.toFormat()}{" "}
-                    {t("currency." + activePair.quoteAsset)}
+                    {getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}
                 </p>
                 <p>
                     {t("orders.getAmount")}:{" "}
-                    {order.totalPrice.minus(order.tradeFee).decimalPlaces(activePair.quoteAssetPrecision).toFormat()}{" "}
-                    {t("currency." + activePair.quoteAsset)}
+                    {order.totalPrice.minus(order.tradeFee).decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}{" "}
+                    {getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}
                 </p>
             </div>
             <Button
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/OrderBook/OrderBook.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/OrderBook/OrderBook.js
index 406dfbda..2c738c43 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/OrderBook/OrderBook.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/OrderBook/OrderBook.js
@@ -6,6 +6,8 @@ import {useSelector} from "react-redux";
 import Error from "../../../../../../../../../../components/Error/Error";
 import Loading from "../../../../../../../../../../components/Loading/Loading";
 import {useOrderBook} from "../../../../../../../../../../queries";
+import i18n from "i18next";
+import {getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
 
 
 const OrderBook = () => {
@@ -14,6 +16,9 @@ const OrderBook = () => {
     const {data, isLoading, error, refetch} = useOrderBook(activePair.symbol)
     const lastTransaction = useSelector((state) => state.auth.lastTransaction)
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     useEffect(() => {
         refetch()
     }, lastTransaction)
@@ -32,8 +37,8 @@ const OrderBook = () => {
             <div className={`column border-bottom jc-between header-radius card-header-bg ${classes.header}`}>
                 <div className="row jc-start">
                     <h3>
-                        {t("orderBook.title")} ({t("currency." + activePair.baseAsset)}/
-                        {t("currency." + activePair.quoteAsset)})
+                        {t("orderBook.title")} ({getCurrencyNameOrAlias(currencies[activePair.baseAsset], language)}/
+                        {getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)})
                     </h3>
                 </div>
                 <div className="row jc-center">
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/OrderBook/components/OrderBookTable/OrderBookTable.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/OrderBook/components/OrderBookTable/OrderBookTable.js
index 62840935..064ceee4 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/OrderBook/components/OrderBookTable/OrderBookTable.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/OrderBook/components/OrderBookTable/OrderBookTable.js
@@ -18,6 +18,9 @@ const OrderBookTable = ({data, type}) => {
     const activePair = useSelector((state) => state.exchange.activePair)
     const dispatch = useDispatch();
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     let header;
 
     let totalAmount = data.reduce((total, asks) => parseFloat(asks[1]) + total, 0);
@@ -71,15 +74,15 @@ const OrderBookTable = ({data, type}) => {
         return `<div class="column jc-between col-100">
       <div class="row jc-between col-100">
         <span class="pl-05">${t("averagePrice")}:</span>
-        <span>${average.pricePerUnit.dividedBy(index + 1).decimalPlaces(activePair.quoteAssetPrecision).toFormat()}</span>
+        <span>${average.pricePerUnit.dividedBy(index + 1).decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</span>
       </div>
       <div class="row jc-between col-100">
         <span class="pl-05">${t("totalVolume",)}:</span>
-        <span>${average.amount.decimalPlaces(activePair.baseAssetPrecision).toFormat()}</span>
+        <span>${average.amount.decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</span>
       </div>
       <div class="row jc-between col-100">
         <span class="pl-05">${t("totalPrice")}:</span>
-        <span>${average.total.decimalPlaces(activePair.quoteAssetPrecision).toFormat()}</span>
+        <span>${average.total.decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</span>
       </div>
     </div>`
     }
@@ -114,15 +117,15 @@ const OrderBookTable = ({data, type}) => {
                                     data-tooltip-html={toolTipHandler(avg, index)}
                                     data-amount={avg.amount.toString()}
                                     onClick={(e) => dispatch(setSellOrder({
-                                        pricePerUnit: pricePerUnit.decimalPlaces(activePair.quoteAssetPrecision).toString(),
+                                        pricePerUnit: pricePerUnit.decimalPlaces(currencies[activePair.quoteAsset].precision).toString(),
                                         amount: parseFloat(e.currentTarget.getAttribute("data-amount")),
                                     }))}>
                                     <span
-                                        className="width-30">{pricePerUnit.decimalPlaces(activePair.quoteAssetPrecision).toFormat()}</span>
+                                        className="width-30">{pricePerUnit.decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</span>
                                     <span
-                                        className="width-30">{amount.decimalPlaces(activePair.baseAssetPrecision).toFormat()}</span>
+                                        className="width-30">{amount.decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</span>
                                     <span
-                                        className="width-40">{totalPrice.decimalPlaces(activePair.quoteAssetPrecision).toFormat()}</span>
+                                        className="width-40">{totalPrice.decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</span>
                                 </div>
                             ) : (
                                 <div
@@ -138,16 +141,16 @@ const OrderBookTable = ({data, type}) => {
                                     data-amount={avg.amount.toString()}
                                     onClick={(e) =>
                                         dispatch(setBuyOrder({
-                                            pricePerUnit: parseFloat(pricePerUnit.decimalPlaces(activePair.quoteAssetPrecision).toString()),
+                                            pricePerUnit: parseFloat(pricePerUnit.decimalPlaces(currencies[activePair.quoteAsset].precision).toString()),
                                             amount: parseFloat(e.currentTarget.getAttribute("data-amount")),
                                         }))
                                     }>
                                     <span
-                                        className="width-40">{totalPrice.decimalPlaces(activePair.quoteAssetPrecision).toFormat()}</span>
+                                        className="width-40">{totalPrice.decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</span>
                                     <span
-                                        className="width-30">{amount.decimalPlaces(activePair.baseAssetPrecision).toFormat()}</span>
+                                        className="width-30">{amount.decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</span>
                                     <span
-                                        className="width-30">{pricePerUnit.decimalPlaces(activePair.quoteAssetPrecision).toFormat()}</span>
+                                        className="width-30">{pricePerUnit.decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</span>
                                 </div>
                             );
                         })}
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/Overview/components/InformationBlock/InformationBlock.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/Overview/components/InformationBlock/InformationBlock.js
index 15e11c8d..f83dee71 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/Overview/components/InformationBlock/InformationBlock.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Market/components/Overview/components/InformationBlock/InformationBlock.js
@@ -5,38 +5,43 @@ import {useSelector} from "react-redux";
 import Loading from "../../../../../../../../../../../../components/Loading/Loading";
 import Error from "../../../../../../../../../../../../components/Error/Error";
 import {useOverview} from "../../../../../../../../../../../../queries";
+import i18n from "i18next";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../../../../../utils/utils";
 
 
 const InformationBlock = ({period}) => {
 
     const {t} = useTranslation();
     const activePair = useSelector((state) => state.exchange.activePair)
+
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const {data, isLoading, error} = useOverview(activePair.symbol, period)
 
     if (isLoading) return <Loading/>
     if (error) return <Error/>
 
     return (<div className={`${classes.content} column jc-between px-1 py-2`}>
-        <p>
-            {t("overview.change")}:{" "}
-            <span className={data.priceChange > 0 ? "text-green" : "text-red"}>
-            %{data.priceChangePercent.toFixed(2)}
-          </span>
-        </p>
-        <p>
-            {t("min")}:{" "}
-            <span className="text-red">{data.lowPrice.toLocaleString()}</span>{" "}
-            {t(`currency.${activePair.quoteAsset}`)}
-        </p>
-        <p>
-            {t("max")}:{" "}
-            <span className="text-green">{data.highPrice.toLocaleString()}</span>{" "}
-            {t(`currency.${activePair.quoteAsset}`)}
-        </p>
-        <p>
-            {t("overview.volume")}: <span>{data.volume.toLocaleString()} </span>
-            {t(`currency.${activePair.baseAsset}`)}
-        </p>
+        <div className={`row`}>
+            <p>{t("overview.change")}</p>
+            <span className={`flex ${i18n.language !== "fa" ? 'jc-start' : 'jc-end'} ai-center mr-05 ${data?.priceChangePercent > 0 ? "text-green" : data?.priceChangePercent < 0 ? "text-red" : ""} direction-ltr`}>{data?.priceChangePercent === 0 ? "0 %" : `${new BN(data?.priceChangePercent).toFormat(2)} %`}</span>
+        </div>
+        <div className={`row`}>
+            <p>{t("min")}:</p>
+            <span className={`mx-05`}>{new BN(data?.lowPrice).decimalPlaces(currencies[data?.quote]?.precision ?? 0).toFormat()}</span>
+            <span>{getCurrencyNameOrAlias(currencies[data?.quote], language)}</span>
+        </div>
+        <div className={`row`}>
+            <p>{t("max")}:</p>
+            <span className={`mx-05`}>{new BN(data?.highPrice).decimalPlaces(currencies[data?.quote]?.precision ?? 0).toFormat()}</span>
+            <span>{getCurrencyNameOrAlias(currencies[data?.quote], language)}</span>
+        </div>
+        <div className={`row`}>
+            <p>{t("volume")}:</p>
+            <span className={`mx-05`}>{new BN(data?.volume).decimalPlaces(currencies[data?.base]?.precision ?? 0).toFormat()}</span>
+            <span>{getCurrencyNameOrAlias(currencies[data?.base], language)}</span>
+        </div>
     </div>)
 }
 
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositTx/DepositTx.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositTx/DepositTx.js
index ffed24e3..3839d6b4 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositTx/DepositTx.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositTx/DepositTx.js
@@ -9,12 +9,17 @@ import DepositTxTable from "../DepositTxTable/DepositTxTable";
 import * as Routes from "../../../../../../../../Routes/routes";
 import Icon from "../../../../../../../../../../components/Icon/Icon";
 import i18n from "i18next";
+import {useSelector} from "react-redux";
+import {getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
 
 const DepositTx = () => {
 
     const {id} = useParams();
     const {t} = useTranslation();
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const query = {
         "currency": id, // optional
         "category": null, // optional [DEPOSIT, FEE, TRADE, WITHDRAW, ORDER_CANCEL, ORDER_CREATE, ORDER_FINALIZED]
@@ -44,7 +49,7 @@ const DepositTx = () => {
                     <Trans
                         i18nKey="DepositTx.title"
                         values={{
-                            currency: t("currency." + id),
+                            currency: getCurrencyNameOrAlias(currencies[id], language),
                         }}
                     />
                 </h4>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositTxTable/DepositTxTable.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositTxTable/DepositTxTable.js
index 4b604b4d..47f90d83 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositTxTable/DepositTxTable.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositTxTable/DepositTxTable.js
@@ -5,11 +5,16 @@ import Date from "../../../../../../../../../../components/Date/Date";
 import moment from "moment-jalaali";
 import {BN} from "../../../../../../../../../../utils/utils";
 import Icon from "../../../../../../../../../../components/Icon/Icon";
+import {useSelector} from "react-redux";
+import i18n from "i18next";
 
 const DepositTxTable = ({txs}) => {
 
     const {t} = useTranslation();
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const [isOpen, setIsOpen] = useState(false);
 
     let head = (
@@ -42,7 +47,7 @@ const DepositTxTable = ({txs}) => {
                             </span>
 
                             <span className="width-23 row jc-start ai-center text-green">
-                                {new BN(tr?.amount).toFormat()}
+                                {new BN(tr?.amount).decimalPlaces(currencies[tr.currency].precision).toFormat()}
                             </span>
 
                             <span className="width-18 row jc-start ai-center">
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/DepositWithdraw.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/DepositWithdraw.js
index b9333390..bb87b9b6 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/DepositWithdraw.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/DepositWithdraw.js
@@ -2,8 +2,9 @@ import React from "react";
 import classes from "./DepositWithdraw.module.css";
 import {useTranslation} from "react-i18next";
 import AccordionBox from "../../../../../../../../../../components/AccordionBox/AccordionBox";
-import Withdrawal from "./components/Withdrawal";
+
 import Deposit from "./components/Deposit/Deposit";
+import Withdrawal from "./components/Withdrawal/Withdrawal";
 
 
 const DepositWithdraw = () => {
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Deposit.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Deposit.js
index 696e850f..ec156ae8 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Deposit.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Deposit.js
@@ -1,63 +1,55 @@
-import React, {useEffect, useRef, useState} from "react";
-import classes from "../../DepositWithdraw.module.css";
-import TextInput from "../../../../../../../../../../../../components/TextInput/TextInput";
+import React, {useMemo} from "react";
 import {useParams} from "react-router-dom";
 import {useTranslation} from "react-i18next";
 import Error from "../../../../../../../../../../../../components/Error/Error";
 import Loading from "../../../../../../../../../../../../components/Loading/Loading";
-import {useGetCurrencyInfo} from "../../../../../../../../../../../../queries";
-import IRTDeposit from "./components/IRT/IRTDeposit";
-import Address from "./components/Address/Address";
+import {useGetGatewaysByCurrency} from "../../../../../../../../../../../../queries";
+import OnChainDeposit from "./Module/OnChainDeposit/OnChainDeposit";
+import {useSelector} from "react-redux";
 
 const Deposit = () => {
 
-    const {id} = useParams();
     const {t} = useTranslation();
-
-    const [networkName, setNetworkName] = useState({value: 0, error: []});
-
-    const selectRef = useRef()
-    const {data: currencyInfo, isLoading: CILoading, error: CIError, refetch: refetchCI} = useGetCurrencyInfo(id)
-
-    useEffect(() => {
-        setNetworkName({value: 0, error: []})
-
-    }, [id]);
-
-    useEffect(() => {
-        if (id !== "IRT") {
-            refetchCI()
-        }
-    }, [id]);
-
-
-    if (id === "IRT") return <IRTDeposit/>
-    if (CILoading) return <Loading/>
-    if (CIError) return <Error/>
-
-    return (
-        <div className={`px-1 py-3 column ${classes.content}`}>
-            <TextInput
-                select={true}
-                placeholder={t('DepositWithdraw.selectNetwork')}
-                options={currencyInfo?.chains.map((chain, index) => {
-                    return {value: index, label: `${chain.network} - ${chain.currency}`}
-                })}
-                lead={t('DepositWithdraw.network')}
-                type="select"
-                value={currencyInfo?.chains[networkName.value] && {
-                    value: networkName.value,
-                    label: `${currencyInfo?.chains[networkName.value].network} - ${currencyInfo?.chains[networkName.value].currency}`
-                }}
-                onchange={(e) => setNetworkName({value: e?.value || 0, error: []})}
-                customRef={selectRef}
-                alerts={networkName.error}
-                customClass={`width-64 ${classes.thisInput}`}
-            />
-
-            { currencyInfo && <Address network={currencyInfo?.chains[networkName?.value]?.network}/>}
-
-        </div>
-    )
+    const {id} = useParams();
+    const currencies = useSelector((state) => state.exchange.currencies)
+
+    const { data, isLoading, error } = useGetGatewaysByCurrency(id, {
+        includeManualGateways: false,
+        includeOffChainGateways: true,
+        includeOnChainGateways: true
+    });
+
+    const { hasOnChain, hasOffChain } = useMemo(() => ({
+        hasOnChain: data?.some(gateway => gateway.type === "OnChain"),
+        hasOffChain: data?.some(gateway => gateway.type === "OffChain")
+    }), [data]);
+
+    if (!currencies[id]?.depositAllowed) return <div className={`flex jc-center ai-center height-100`}>
+        <span>{t("noData")}</span>
+    </div>
+    if (isLoading) return <Loading/>
+    if (error) return <Error/>
+    if (data.length <= 0 ) return <div className={`flex jc-center ai-center height-100`}>
+        <span>{t("noData")}</span>
+    </div>
+
+    switch (true) {
+        case hasOnChain && hasOffChain:
+            return <div className="flex jc-center ai-center height-100">
+                <span>{t("comingSoon")}</span>
+            </div>;
+        case hasOnChain:
+            return <OnChainDeposit gateways={data}/>;
+        case hasOffChain:
+            return <div className="flex jc-center ai-center height-100">
+                <span>{t("comingSoon")}</span>
+            </div>;
+        default:
+            return (
+                <div className="flex jc-center ai-center height-100">
+                    <span>{t("noData")}</span>
+                </div>
+            );
+    }
 }
 export default Deposit;
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Module/OnChainDeposit/OnChainDeposit.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Module/OnChainDeposit/OnChainDeposit.js
new file mode 100644
index 00000000..7f96ef6f
--- /dev/null
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Module/OnChainDeposit/OnChainDeposit.js
@@ -0,0 +1,107 @@
+import React, {useEffect, useRef, useState} from 'react';
+import classes from './OnChainDeposit.module.css'
+import TextInput from "../../../../../../../../../../../../../../components/TextInput/TextInput";
+import {Trans, useTranslation} from "react-i18next";
+import {useGetDepositAddress} from "../../../../../../../../../../../../../../queries";
+import {useParams} from "react-router-dom";
+import Icon from "../../../../../../../../../../../../../../components/Icon/Icon";
+import QRCode from "react-qr-code";
+import {toast} from "react-hot-toast";
+
+const OnChainDeposit = ({gateways}) => {
+
+    const {t} = useTranslation();
+    const {id} = useParams();
+
+    const [networkName, setNetworkName] = useState({value: 0, error: []})
+
+    const {data: address, isLoading, error, refetch: refetchAddress} = useGetDepositAddress(id, gateways[networkName.value].chain)
+
+    const selectRef = useRef()
+
+    useEffect(() => {
+        refetchAddress()
+    }, [gateways]);
+
+    const addressRef = useRef(null);
+    const copyToClipboard = () => {
+        addressRef.current.select();
+        document.execCommand("copy");
+        toast.success(<Trans
+            i18nKey="DepositWithdraw.success"
+        />);
+    };
+
+    const content = () => {
+        if (isLoading) return <span className={`flashit width-100 flex jc-center ai-center mt-6`}>{t('DepositWithdraw.gettingAddress')}</span>
+        if (error) return <span className={` width-100 flex jc-center ai-center mt-6`}>{t('DepositWithdraw.errorGettingAddress')}</span>
+        return  <div className={`row jc-between`}>
+            <div className={`column width-80`}>
+                 <span className={`my-2`}>
+                        <Trans
+                            i18nKey="DepositWithdraw.minDepositText"
+                        />
+                </span>
+
+                <TextInput
+                    after={
+                        <Icon
+                            iconName="icon-copy fs-02"
+                            onClick={() => copyToClipboard()}
+                            customClass={`hover-text cursor-pointer`}
+                        />
+                    }
+                    readOnly={true}
+                    type="text"
+                    customRef={addressRef}
+                    value={address.address}
+                    customClass={`${classes.depositInput} width-80`}
+                />
+            </div>
+
+            <div className={`width-20 py-1 flex ai-center jc-center`}>
+                <QRCode
+                    value={address.address}
+                    bgColor="var(--cardBody)"
+                    fgColor="var(--textColor)"
+                    level='L'
+                    size={140}
+                />
+            </div>
+
+        </div>
+    }
+    return (
+        <div  className={`px-1 py-3 column height-100`}>
+            <TextInput
+                select={true}
+                placeholder={t('DepositWithdraw.selectNetwork')}
+                options={gateways.map((chain, index) => ({
+                    value: index,
+                    label: `${chain.chain} - ${chain.implementationSymbol}`,
+                    isDisabled: !chain.isActive // غیرفعال کردن در صورت عدم اجازه‌ی واریز
+                }))}
+                lead={t('DepositWithdraw.network')}
+                type="select"
+                value={gateways[networkName.value] && {
+                    value: networkName.value,
+                    label: `${gateways[networkName.value].chain} - ${gateways[networkName.value].implementationSymbol}`
+                }}
+                onchange={(e) => setNetworkName({ value: e?.value || 0, error: [] })}
+                customRef={selectRef}
+                alerts={networkName.error}
+                customClass={`width-64 ${classes.thisInput}`}
+            />
+
+
+            {content()}
+
+
+
+
+
+        </div>
+    );
+};
+
+export default OnChainDeposit;
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Module/OnChainDeposit/OnChainDeposit.module.css b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Module/OnChainDeposit/OnChainDeposit.module.css
new file mode 100644
index 00000000..d02c4cee
--- /dev/null
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Module/OnChainDeposit/OnChainDeposit.module.css
@@ -0,0 +1,18 @@
+.thisInput :global(.lead) {
+    width: 18%;
+}
+.thisInput :global(.selectExternalClass) {
+    width: 82% !important;
+}
+.depositInput {
+    width: 80%;
+}
+.depositInput :global(.after) {
+    width: 15%;
+    cursor: pointer;
+}
+.depositInput :global(input) {
+    width: 85% !important;
+    cursor: not-allowed;
+    font-family: 'Roboto', sans-serif;
+}
\ No newline at end of file
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Module/OnChainDepositAddress/OnChainDepositAddress.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Module/OnChainDepositAddress/OnChainDepositAddress.js
new file mode 100644
index 00000000..60a35e1f
--- /dev/null
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Module/OnChainDepositAddress/OnChainDepositAddress.js
@@ -0,0 +1,12 @@
+import React from 'react';
+import classes from "./OnChainDepositAddress.module.css"
+
+const OnChainDepositAddress = ({}) => {
+    return (
+        <div>
+
+        </div>
+    );
+};
+
+export default OnChainDepositAddress;
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Module/OnChainDepositAddress/OnChainDepositAddress.module.css b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Deposit/Module/OnChainDepositAddress/OnChainDepositAddress.module.css
new file mode 100644
index 00000000..e69de29b
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Withdrawal/Module/OnChainWithdraw/OnChainWithdraw.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Withdrawal/Module/OnChainWithdraw/OnChainWithdraw.js
new file mode 100644
index 00000000..601b29d5
--- /dev/null
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Withdrawal/Module/OnChainWithdraw/OnChainWithdraw.js
@@ -0,0 +1,268 @@
+import React, {useEffect, useRef, useState} from 'react';
+import classes from './OnChainWithdraw.module.css'
+import {Trans, useTranslation} from "react-i18next";
+import {useParams} from "react-router-dom";
+import TextInput from "../../../../../../../../../../../../../../components/TextInput/TextInput";
+import NumberInput from "../../../../../../../../../../../../../../components/NumberInput/NumberInput";
+import {BN, getCurrencyNameOrAlias, parsePriceString} from "../../../../../../../../../../../../../../utils/utils";
+import {useGetUserAccount} from "../../../../../../../../../../../../../../queries/hooks/useGetUserAccount";
+import {
+    useGetUserAssets,
+    useGetUserAssetsEstimatedValue,
+    useGetWithdrawHistory
+} from "../../../../../../../../../../../../../../queries";
+import i18n from "i18next";
+import {useSelector} from "react-redux";
+import Button from "../../../../../../../../../../../../../../components/Button/Button";
+import {images} from "../../../../../../../../../../../../../../assets/images";
+import {sendWithdrawReq} from "js-api-client";
+import {toast} from "react-hot-toast";
+
+const OnChainWithdraw = ({gateways}) => {
+
+    const {t} = useTranslation();
+    const {id} = useParams();
+
+    const refCurrency = useSelector((state) => state.exchange.baseCurrency)
+
+    const [isLoading, setIsLoading] = useState(false)
+
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
+    const [input, setInput] = useState({
+        network: {value: 0, error: []},
+        address: {value: "", error: []},
+        txPassword: {value: "", error: []},
+    });
+
+    const [amount, setAmount] = useState({value: new BN(0), error: []});
+
+    useEffect(() => {
+        setInput({
+            network: {value: 0, error: []},
+            address: {value: "", error: []},
+            txPassword: {value: "", error: []},
+        })
+        setAmount({value: new BN(0), error: []})
+    }, [id]);
+
+    const selectRef = useRef()
+
+    const {data: userAccount} = useGetUserAccount()
+    const freeWallet = new BN(userAccount?.wallets[id]?.free || 0).decimalPlaces(currencies[id]?.precision ?? 0).toFormat() || 0
+
+    const {refetch: getUserAccount} = useGetUserAccount();
+    const {refetch: getUserAssets} = useGetUserAssets(refCurrency);
+    const {refetch: getUserAssetsEstimatedValue} = useGetUserAssetsEstimatedValue(refCurrency);
+
+    const withdrawFee = new BN(gateways?.[input?.network.value]?.withdrawFee).decimalPlaces(currencies[id]?.precision ?? 0).toFormat()
+    const withdrawMin = new BN(gateways?.[input?.network.value]?.withdrawMin).decimalPlaces(currencies[id]?.precision ?? 0).toFormat()
+    const withdrawMax = new BN(gateways?.[input?.network.value]?.withdrawMax).decimalPlaces(currencies[id]?.precision ?? 0).toFormat()
+
+    const query = {
+        "currency": id, // optional
+        "category": null, // optional [DEPOSIT, FEE, TRADE, WITHDRAW, ORDER_CANCEL, ORDER_CREATE, ORDER_FINALIZED]
+        "startTime": null,
+        "endTime": null,
+        "ascendingByTime": false,
+        "limit": 10,
+        "offset": 0,
+    }
+
+    const {refetch: getWithdrawHistory} = useGetWithdrawHistory(query);
+
+    const validation = (value) => {
+
+        const newAmount = {...amount}
+        newAmount.error = []
+
+        if (new BN(value).isGreaterThan(new BN(freeWallet))) {
+            newAmount.error = [t('DepositWithdraw.noInventory')]
+        }
+
+        if (new BN(value).isEqualTo(new BN(freeWallet))) {
+            newAmount.error = [t('DepositWithdraw.noInventorywithdrawFee')]
+        }
+
+        if (new BN(value).isLessThan(new BN(withdrawMin))) {
+            newAmount.error = [t('DepositWithdraw.allowableWithdraw')]
+        }
+
+        if (new BN(value).minus(new BN(withdrawFee)).isLessThanOrEqualTo(0)) {
+            newAmount.error = [t('DepositWithdraw.noInventorywithdrawFee')]
+        }
+
+        if (new BN(value).isLessThan(new BN(withdrawFee)) ) {
+            newAmount.error = [t('DepositWithdraw.allowableWithdraw')]
+        }
+
+        newAmount.value = new BN(value)
+        setAmount(newAmount)
+    }
+
+
+    const fillByWallet = () => {
+        const validateAmount = new BN(freeWallet).isGreaterThan(0)
+            ? new BN(freeWallet).minus(new BN(withdrawFee))
+            : new BN(freeWallet);
+        validation(validateAmount);
+    };
+
+    const fillByMinWithdraw = () => {
+        validation(new BN(withdrawMin).plus(new BN(withdrawFee)))
+    };
+
+    const fillByMaxWithdraw = () => {
+        validation(new BN(withdrawMax).minus(new BN(withdrawFee)))
+    };
+
+    const inputChangeHandler = (value) => {
+        validation(parsePriceString(value))
+
+    }
+
+    const submitButtonTextHandler = () => {
+        if (isLoading) return <img className={`${classes.thisLoading}`} src={images.linearLoadingBgOrange}
+                                   alt="linearLoading"/>
+        return t('DepositWithdrawTx.withdrawReqSubmit')
+    }
+
+
+    const sendWithdrawHandler = async (e) => {
+        e.preventDefault()
+        if (isLoading) return
+        setIsLoading(true)
+
+        const withdrawRequestData = {
+            "amount": amount.value,
+            "destSymbol": gateways?.[input?.network.value]?.currencySymbol,
+            "gatewayUuid": gateways?.[input?.network.value]?.gatewayUuid,
+            "destAddress": input?.address.value
+        }
+
+        sendWithdrawReq(withdrawRequestData)
+            .then(() => {
+
+                setAmount({value: new BN(0), error: []})
+                setInput({
+                    network: {value: 0, error: []},
+                    address: {value: "", error: []},
+                    txPassword: {value: "", error: []},
+                })
+                toast.success(<Trans
+                    i18nKey="DepositWithdrawTx.success"
+                    values={{
+                        asset: getCurrencyNameOrAlias(currencies[id], language),
+                        amount: amount.value,
+                    }}
+                />);
+                getUserAccount()
+                getWithdrawHistory()
+                getUserAssets()
+                getUserAssetsEstimatedValue()
+            })
+            .catch((error) => {
+                toast.error(t('error'));
+            })
+            .finally(() => setIsLoading(false))
+
+    }
+
+
+    return (
+        <div className={`px-1 py-3 column height-100`}>
+            <TextInput
+                select={true}
+                placeholder={t('DepositWithdraw.selectNetwork')}
+                options={gateways.map((chain, index) => ({
+                    value: index,
+                    label: `${chain.chain} - ${chain.implementationSymbol}`,
+                    isDisabled: !chain.isActive // غیرفعال کردن در صورت عدم اجازه‌ی واریز
+                }))}
+                lead={t('DepositWithdraw.network')}
+                type="select"
+                value={gateways[input?.network?.value] && {
+                    value: input?.network?.value,
+                    label: `${gateways[input?.network?.value].chain} - ${gateways[input?.network?.value].implementationSymbol}`
+                }}
+                onchange={(e) => setInput({...input, network: { value: e?.value || 0, error: [] }}) }
+                customRef={selectRef}
+                alerts={input?.input?.error}
+                customClass={`width-68 ${classes.thisInput}`}
+            />
+
+            <form onSubmit={(e) => sendWithdrawHandler(e)}  className={` py-3 column jc-between height-100`}>
+                <div className={`row width-100 mb-2`}>
+
+                    <div className={`column width-50`}>
+                        <div className={`my-05`}>
+                            <span className={`ml-05`}>{t("DepositWithdrawTx.freeWallet")}:</span>
+                            <span className={`hover-text cursor-pointer`} onClick={() => {fillByWallet()}}>{freeWallet} {getCurrencyNameOrAlias(currencies[id], language)}</span>
+                        </div>
+
+                        <div className={`my-05`}>
+                            <span className={`ml-05`}>{t('DepositWithdrawTx.minWithdraw')}:</span>
+                            <span className={`hover-text cursor-pointer`} onClick={() => {fillByMinWithdraw()}}>{new BN(withdrawMin).toString()} {getCurrencyNameOrAlias(currencies[id], language)}</span>
+                        </div>
+
+                        <div className={`my-05`}>
+                            <span className={`ml-05`}>{t('DepositWithdrawTx.maxWithdrawal')}:</span>
+                            <span className={`hover-text cursor-pointer`} onClick={() => {fillByMaxWithdraw()}}>{new BN(withdrawMax).toString()} {getCurrencyNameOrAlias(currencies[id], language)}</span>
+                        </div>
+                    </div>
+
+                    <div className={`column width-50`}>
+                        <div className={`my-05`}>
+                            <span className={`ml-05`}>{t('commission')}:</span>
+                            <span className={`text-orange`}>{withdrawFee ? withdrawFee : 0} {getCurrencyNameOrAlias(currencies[id], language)} </span>
+                        </div>
+                        <div className={`my-05`}>
+                            <span className={`ml-05`}>{t('DepositWithdrawTx.reqAmount')}:</span>
+                            <span className={`text-green`}>{new BN(amount.value).minus(withdrawFee).isGreaterThan(0) ? new BN(amount.value).minus(withdrawFee).toFormat() : 0} {getCurrencyNameOrAlias(currencies[id], language)}</span>
+                        </div>
+                    </div>
+
+                </div>
+
+                <NumberInput
+                    lead={t('volume') + " " + getCurrencyNameOrAlias(currencies[id], language)}
+                    value={amount.value.toString()}
+                    alerts={amount.error}
+                    customClass={`width-68 ${classes.thisInput} my-1`}
+                    onchange={(e) => inputChangeHandler(e.target.value)}
+                    type="text"
+                />
+
+                <div className="column width-100 my-1">
+                    <TextInput
+                        lead={t("DepositWithdrawTx.destAddress") + " " + getCurrencyNameOrAlias(currencies[id], language)}
+                        customClass={`width-100 ${classes.addressInput}`}
+                        type="text"
+                        value={input?.address.value}
+                        alerts={input?.address.error}
+                        onchange={(e) => setInput({...input, address: {...input?.address, value: e.target.value}})}
+                    />
+                    <span className="pt-05 text-end fs-0-7">{t('DepositWithdrawTx.withdrawWarn')}</span>
+                </div>
+
+                <div className="pt-1">
+                    <span>{t('DepositWithdraw.securityConsiderations')}</span>
+                </div>
+
+                <div className={`row jc-end mt-2`}>
+                    <Button
+                        buttonClass={`${classes.thisButton} ${classes.withdrawal} ${isLoading ? "cursor-not-allowed" : "cursor-pointer"} px-3`}
+                        buttonTitle={submitButtonTextHandler()}
+                        disabled={!(new BN(amount.value).minus(withdrawFee).isGreaterThan(0)) || new BN(amount.value).isGreaterThan(freeWallet) || input?.address?.value.length <= 0 || amount?.error?.length > 0}
+                        type="submit"
+                    />
+                </div>
+
+            </form>
+
+        </div>
+    );
+};
+
+export default OnChainWithdraw;
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Withdrawal/Module/OnChainWithdraw/OnChainWithdraw.module.css b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Withdrawal/Module/OnChainWithdraw/OnChainWithdraw.module.css
new file mode 100644
index 00000000..5dfe8445
--- /dev/null
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Withdrawal/Module/OnChainWithdraw/OnChainWithdraw.module.css
@@ -0,0 +1,44 @@
+.thisInput :global(.lead) {
+    width: 28%;
+}
+.thisInput :global(.selectExternalClass) {
+    width: 78% !important;
+}
+
+.thisInput :global(input) {
+    width: 78% !important;
+}
+
+.addressInput :global(.lead) {
+    width: 18% !important;
+}
+.addressInput :global(input) {
+    width: 82% !important;
+}
+
+.withdrawalInput :global(.lead) {
+    width: 24%;
+}
+.withdrawalInput :global(input) {
+    width: 76% !important;
+}
+.withdrawNumberInput :global(.lead) {
+    width: 50%;
+}
+.withdrawNumberInput :global(input) {
+    width: 50% !important;
+}
+
+
+.thisButton.withdrawal{
+    background-color: var(--orange);
+    color: #000;
+    border: 1px solid var(--cardBorder);
+}
+
+.thisButton:disabled,.button[disabled] {
+    /*border: 0.3vh solid var(--cardBodyAlpha);*/
+    background: var(--cardBodyAlpha);
+    color: var(--textColor);
+    cursor: not-allowed;
+}
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Withdrawal/Withdrawal.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Withdrawal/Withdrawal.js
new file mode 100644
index 00000000..c5bb7be2
--- /dev/null
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/DepositWithdraw/components/Withdrawal/Withdrawal.js
@@ -0,0 +1,57 @@
+import React, {useMemo} from 'react';
+import {useTranslation} from "react-i18next";
+import {useParams} from "react-router-dom";
+import {useSelector} from "react-redux";
+import {useGetGatewaysByCurrency} from "../../../../../../../../../../../../queries";
+import Loading from "../../../../../../../../../../../../components/Loading/Loading";
+import Error from "../../../../../../../../../../../../components/Error/Error";
+import OnChainDeposit from "../Deposit/Module/OnChainDeposit/OnChainDeposit";
+import OnChainWithdraw from "./Module/OnChainWithdraw/OnChainWithdraw";
+
+const Withdrawal = () => {
+
+    const {t} = useTranslation();
+    const {id} = useParams();
+    const currencies = useSelector((state) => state.exchange.currencies)
+
+    const { data, isLoading, error } = useGetGatewaysByCurrency(id, {
+        includeManualGateways: false,
+        includeOffChainGateways: true,
+        includeOnChainGateways: true
+    });
+
+    const { hasOnChain, hasOffChain } = useMemo(() => ({
+        hasOnChain: data?.some(gateway => gateway.type === "OnChain"),
+        hasOffChain: data?.some(gateway => gateway.type === "OffChain")
+    }), [data]);
+
+    if (!currencies[id]?.withdrawAllowed) return <div className={`flex jc-center ai-center height-100`}>
+        <span>{t("noData")}</span>
+    </div>
+    if (isLoading) return <Loading/>
+    if (error) return <Error/>
+    if (data.length <= 0 ) return <div className={`flex jc-center ai-center height-100`}>
+        <span>{t("noData")}</span>
+    </div>
+
+    switch (true) {
+        case hasOnChain && hasOffChain:
+            return <div className="flex jc-center ai-center height-100">
+                <span>{t("comingSoon")}</span>
+            </div>;
+        case hasOnChain:
+            return <OnChainWithdraw gateways={data}/>;
+        case hasOffChain:
+            return <div className="flex jc-center ai-center height-100">
+                <span>{t("comingSoon")}</span>
+            </div>;
+        default:
+            return (
+                <div className="flex jc-center ai-center height-100">
+                    <span>{t("noData")}</span>
+                </div>
+            );
+    }
+};
+
+export default Withdrawal;
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/WithdrawTx/WithdrawTx.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/WithdrawTx/WithdrawTx.js
index 1fac782a..50b8007c 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/WithdrawTx/WithdrawTx.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/WithdrawTx/WithdrawTx.js
@@ -10,12 +10,18 @@ import WithdrawTxTable from "../WithdrawTxTable/WithdrawTxTable";
 import * as Routes from "../../../../../../../../Routes/routes";
 import Icon from "../../../../../../../../../../components/Icon/Icon";
 import i18n from "i18next";
+import {useSelector} from "react-redux";
+import {getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
 
 const WithdrawTx = () => {
 
     const {id} = useParams();
     const {t} = useTranslation();
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
+
     const query = {
         "currency": id, // optional
         "category": null, // optional [DEPOSIT, FEE, TRADE, WITHDRAW, ORDER_CANCEL, ORDER_CREATE, ORDER_FINALIZED]
@@ -44,7 +50,7 @@ const WithdrawTx = () => {
                     <Trans
                         i18nKey="WithdrawTx.title"
                         values={{
-                            currency: t("currency." + id),
+                            currency: getCurrencyNameOrAlias(currencies[id], language),
                         }}
                     />
                 </h4>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/WithdrawTxTable/WithdrawTxTable.js b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/WithdrawTxTable/WithdrawTxTable.js
index 5429ec10..b8296d17 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/WithdrawTxTable/WithdrawTxTable.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Content/components/Wallet/components/WithdrawTxTable/WithdrawTxTable.js
@@ -11,11 +11,17 @@ import {cancelWithdrawReq} from "js-api-client/client/withdraw";
 import toast from "react-hot-toast";
 import {useGetWithdrawHistory} from "../../../../../../../../../../queries";
 import {useParams} from "react-router-dom";
+import i18n from "i18next";
+import {useSelector} from "react-redux";
 
 const WithdrawTxTable = ({txs}) => {
 
     const {t} = useTranslation();
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
+
     const [isOpen, setIsOpen] = useState(false);
 
     const [isLoading, setIsLoading] = useState(false)
@@ -88,10 +94,8 @@ const WithdrawTxTable = ({txs}) => {
                                 {tr.destNetwork ?? "- - -"}
                             </span>
 
-
-
                             <span className="width-23 row jc-start ai-center text-red">
-                                {new BN(tr?.amount).toFormat()}
+                                {new BN(tr?.amount).decimalPlaces(currencies[tr.currency].precision).toFormat()}
                             </span>
 
                             <span className="width-18 row jc-start ai-center">
@@ -107,7 +111,7 @@ const WithdrawTxTable = ({txs}) => {
                             <div className={`row width-100 my-05`}>
                                 <span className={`width-40`}>{t("history.fee")}</span>
                                 <span className={`width-60 text-end`}>
-                                    {new BN(tr?.appliedFee).toFormat()}
+                                    {new BN(tr?.appliedFee).decimalPlaces(currencies[tr.currency].precision).toFormat()}
                                 </span>
                             </div>
                             <div className={`row width-100 my-05`}>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Header/components/MarketHeader/MarketHeader.js b/src/main/Browser/Pages/UserPanel/Sections/Header/components/MarketHeader/MarketHeader.js
index 79443266..81b7c3bd 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Header/components/MarketHeader/MarketHeader.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Header/components/MarketHeader/MarketHeader.js
@@ -2,11 +2,12 @@ import React, {useEffect, useState} from "react";
 import classes from "./MarketHeader.module.css";
 import {useTranslation} from "react-i18next";
 import {useSelector} from "react-redux";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import Icon from "../../../../../../../../components/Icon/Icon";
 import Popup from "../../../../../../../../components/Popup/Popup";
 import {useGetUserAccount} from "../../../../../../../../queries/hooks/useGetUserAccount";
 import {useGetLastPrices} from "../../../../../../../../queries/hooks/useGetLastPrices";
+import i18n from "i18next";
 
 
 const MarketHeader = () => {
@@ -19,6 +20,9 @@ const MarketHeader = () => {
     const base = userAccount?.wallets[activePair.baseAsset]?.free || 0
     const quote = userAccount?.wallets[activePair.quoteAsset]?.free || 0
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const [showPopUp, setShowPopUp] = useState(false);
     const [showPopUpAsset, setShowPopUpAsset] = useState(null);
 
@@ -42,8 +46,8 @@ const MarketHeader = () => {
     return (
         <>
             <div className={`col-25 column ai-start`}>
-                <h2 className="mb-05">{t("currency." + activePair.baseAsset)}/{t("currency." + activePair.quoteAsset)}</h2>
-                <p className={`mt-05`}>{t("header.lastPrice")}:{" "}<span/>{" "}{new BN(lastPrices[activePair.symbol] || 0).toFormat()+" "+t("currency." + activePair.quoteAsset)}</p>
+                <h2 className="mb-05">{getCurrencyNameOrAlias(currencies[activePair?.baseAsset], language)}/{getCurrencyNameOrAlias(currencies[activePair?.quoteAsset], language)}</h2>
+                <p className={`mt-05`}>{t("header.lastPrice")}:{" "}<span/>{" "}{new BN(lastPrices[activePair.symbol] || 0).decimalPlaces(currencies[activePair?.quoteAsset]?.precision ?? 0).toFormat() +" "+ getCurrencyNameOrAlias(currencies[activePair?.quoteAsset], language)}</p>
             </div>
             <div className={`col-50 column ai-center`}>
                 <p className="mb-05">{t("header.availableBalance")}</p>
@@ -51,12 +55,12 @@ const MarketHeader = () => {
                     <div className="col-50 flex ai-center jc-end">
                         <Icon iconName="icon-plus-circle fs-03 flex" customClass={`cursor-pointer ${classes.iconBG}`} onClick={()=>ClickHandler(activePair.baseAsset)}/>
                         {/*<span>{ new BN (base).decimalPlaces(activePair.baseAssetPrecision).toFormat()}</span>*/}
-                        <span>{ new BN (base).toFormat()}</span>
-                        <span>{t("currency." + activePair.baseAsset)}</span>
+                        <span>{ new BN (base).decimalPlaces(currencies[activePair?.baseAsset]?.precision ?? 0).toFormat()}</span>
+                        <span>{getCurrencyNameOrAlias(currencies[activePair?.baseAsset], language)}</span>
                     </div>
                     <div className="col-50 flex ai-center  jc-start">
-                        <span>{ new BN(quote).toFormat()}</span>
-                        <span>{t("currency." + activePair.quoteAsset)}</span>
+                        <span>{ new BN(quote).decimalPlaces(currencies[activePair?.quoteAsset]?.precision ?? 0).toFormat()}</span>
+                        <span>{getCurrencyNameOrAlias(currencies[activePair?.quoteAsset], language)}</span>
                         <Icon iconName="icon-plus-circle fs-03 flex" customClass={`cursor-pointer ${classes.iconBG}`} onClick={()=>ClickHandler(activePair.quoteAsset)}/>
                     </div>
                 </div>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/Header/components/WalletHeader/WalletHeader.js b/src/main/Browser/Pages/UserPanel/Sections/Header/components/WalletHeader/WalletHeader.js
index 23f75804..8a0cd742 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/Header/components/WalletHeader/WalletHeader.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/Header/components/WalletHeader/WalletHeader.js
@@ -2,10 +2,11 @@ import React from "react";
 import classes from "./WalletHeader.module.css";
 import {useTranslation} from "react-i18next";
 import {useParams} from "react-router-dom";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import {useGetUserAccount} from "../../../../../../../../queries/hooks/useGetUserAccount";
 import {useGetUserAssets} from "../../../../../../../../queries";
 import {useSelector} from "react-redux";
+import i18n from "i18next";
 
 const WalletHeader = () => {
     const {id} = useParams()
@@ -17,28 +18,34 @@ const WalletHeader = () => {
     const {data: estimateValue , isLoading, error} = useGetUserAssets(refCurrency)
     const allEstimateValue = (isLoading || error) ?  0 : (estimateValue?.find( q => q.asset === id ))
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     return (
         <>
             <div className={`col-25`}>
-                <h2 className={`text-orange mb-05`}>{t("currency." + id)}</h2>
+                <h2 className={`text-orange mb-05`}>{getCurrencyNameOrAlias(currencies[id], language)}</h2>
                 <span className={`text-orange mt-05`}>{id}</span>
             </div>
             <div className={`col-35 column ai-center`}>
                 <span className={`mb-05`}>{t("header.free")}</span>
-                <span className={`mt-05`}>{new BN(userAccount?.wallets[id]?.free || 0).toFormat()}
-                    <span className={`fs-0-7 text-gray`}> ( {refCurrency === id ? new BN(userAccount?.wallets[id]?.free || 0).toFormat() : new BN(allEstimateValue?.free || 0).toFormat()} {t("currency."+refCurrency)} )</span>
+                <span className={`mt-05`}>
+                    {new BN(userAccount?.wallets[id]?.free || 0).decimalPlaces(currencies[id]?.precision ?? 0).toFormat()}
+                    <span className={`fs-0-7 text-gray`}> ({ refCurrency === id ? new BN(userAccount?.wallets[id]?.free || 0).decimalPlaces(currencies[id]?.precision ?? 0).toFormat() : new BN(allEstimateValue?.free || 0).decimalPlaces(currencies[refCurrency]?.precision ?? 0).toFormat()} {refCurrency} )</span>
                 </span>
             </div>
             <div className={`col-35 column ai-center ${classes.border}`}>
                 <span className={`mb-05`}>{t("header.locked")}</span>
-                <span className={`mt-05`}>{new BN(userAccount?.wallets[id]?.locked || 0).toFormat()}
-                    <span className={`fs-0-7 text-gray`}> ( {refCurrency === id ? new BN(userAccount?.wallets[id]?.locked || 0).toFormat() : new BN(allEstimateValue?.locked || 0).toFormat()} {t("currency."+refCurrency)} )</span>
+                <span className={`mt-05`}>
+                    {new BN(userAccount?.wallets[id]?.locked || 0).decimalPlaces(currencies[id]?.precision ?? 0).toFormat()}
+                    <span className={`fs-0-7 text-gray`}> ({ refCurrency === id ? new BN(userAccount?.wallets[id]?.locked || 0).decimalPlaces(currencies[id]?.precision ?? 0).toFormat() : new BN(allEstimateValue?.locked || 0).decimalPlaces(currencies[refCurrency]?.precision ?? 0).toFormat()} {refCurrency} )</span>
                 </span>
             </div>
             <div className={`col-35 column ai-center`}>
                 <span className={`mb-05`}>{t("header.inWithdrawalProcess")}</span>
-                <span className={`mt-05`}>{new BN(userAccount?.wallets[id]?.withdraw || 0).toFormat()}
-                    <span className={`fs-0-7 text-gray`}> ( {refCurrency === id ? new BN(userAccount?.wallets[id]?.withdraw || 0).toFormat() : new BN(allEstimateValue?.withdrawing || 0).toFormat()} {t("currency."+refCurrency)} )</span>
+                <span className={`mt-05`}>
+                    {new BN(userAccount?.wallets[id]?.withdraw || 0).decimalPlaces(currencies[id]?.precision ?? 0).toFormat()}
+                    <span className={`fs-0-7 text-gray`}> ({ refCurrency === id ? new BN(userAccount?.wallets[id]?.withdraw || 0).decimalPlaces(currencies[id]?.precision ?? 0).toFormat() : new BN(allEstimateValue?.withdrawing || 0).decimalPlaces(currencies[refCurrency]?.precision ?? 0).toFormat()} {refCurrency} )</span>
                 </span>
             </div>
         </>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/MarketSubMenu.js b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/MarketSubMenu.js
index f7aa2128..c30f6e10 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/MarketSubMenu.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/MarketSubMenu.js
@@ -12,6 +12,9 @@ const MarketSubMenu = () => {
     const {t} = useTranslation();
     const [activeTab] = useState(JSON.parse(localStorage.getItem("activeMarketTab")) || 1);
     const symbols = useSelector((state) => state.exchange.symbols)
+
+    const pairsList = useSelector((state) => state.exchange.pairsList)
+
     const fav = useSelector((state) => state.auth.favoritePairs)
     const dispatch = useDispatch();
 
@@ -31,10 +34,11 @@ const MarketSubMenu = () => {
                 <MarketCard
                     id="0"
                     type="fav"
-                    pairs={symbols.filter(p => fav.includes(p.symbol))}
+                    pairs={Object.values(pairsList).filter(pair => fav.includes(pair.symbol))}
                     favPair={fav}
                     addFav={(selected) => addToFav(selected)}
                 />
+
             ),
         },
         {
@@ -43,7 +47,7 @@ const MarketSubMenu = () => {
                 <MarketCard
                     id="1"
                     type="all"
-                    pairs={symbols}
+                    pairs={pairsList}
                     favPair={fav}
                     addFav={(selected) => addToFav(selected)}
                 />
@@ -57,7 +61,7 @@ const MarketSubMenu = () => {
                     id="2"
                     type="BTC"
                     favPair={fav}
-                    pairs={symbols.filter(p => (p.baseAsset === "BTC" || p.quoteAsset === "BTC"))}
+                    pairs={Object.values(pairsList).filter(pair => pair.baseAsset === "BTC" || pair.quoteAsset === "BTC")}
                     addFav={(selected) => addToFav(selected)}
                 />
             ),
@@ -70,7 +74,7 @@ const MarketSubMenu = () => {
                     id="3"
                     type="USDT"
                     favPair={fav}
-                    pairs={symbols.filter(p => (p.baseAsset === "USDT" || p.quoteAsset === "USDT"))}
+                    pairs={Object.values(pairsList).filter(pair => pair.baseAsset === "USDT" || pair.quoteAsset === "USDT")}
                     addFav={(selected) => addToFav(selected)}
                 />
             ),
diff --git a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/components/MarketCard/MarketCard.js b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/components/MarketCard/MarketCard.js
index 8db19022..a26f4941 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/components/MarketCard/MarketCard.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/components/MarketCard/MarketCard.js
@@ -7,7 +7,13 @@ const MarketCard = ({type, ...props}) => {
     return (
         <div style={{height: "100%"}}>
             <ScrollBar>
-                {props.pairs.map((pair) => <MarketPairCard {...props} pair={pair} key={pair.symbol}/>)}
+
+                {
+                    Object.keys(props?.pairs)
+
+                        .map((pair) => <MarketPairCard {...props} pair={props?.pairs[pair]} key={props?.pairs[pair].symbol}/>)
+                }
+
             </ScrollBar>
         </div>
     );
diff --git a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/components/MarketPairCard/MarketCard.module.css b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/components/MarketPairCard/MarketCard.module.css
index cf953119..7783ea07 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/components/MarketPairCard/MarketCard.module.css
+++ b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/components/MarketPairCard/MarketCard.module.css
@@ -6,7 +6,7 @@
   width: 14%;
 }
 .marketCardContent {
-  width: 86%;
+  width: 84%;
 }
 .selected {
   background-color: var(--mainContent);
diff --git a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/components/MarketPairCard/MarketPairCard.js b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/components/MarketPairCard/MarketPairCard.js
index 53881382..4fd9fe49 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/components/MarketPairCard/MarketPairCard.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/components/MarketPairCard/MarketPairCard.js
@@ -3,42 +3,48 @@ import classes from "./MarketCard.module.css";
 import {useDispatch, useSelector} from "react-redux";
 import {images} from "../../../../../../../../../../assets/images";
 import Icon from "../../../../../../../../../../components/Icon/Icon";
-import {BN} from "../../../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
 import {setActivePairInitiate} from "../../../../../../../../../../store/actions";
 import {useGetLastPrices} from "../../../../../../../../../../queries/hooks/useGetLastPrices";
+import i18n from "i18next";
 
 const MarketPairCard = ({id, pair, favPair, addFav}) => {
     const activePair = useSelector((state) => state.exchange.activePair.symbol)
     const {data: prices} = useGetLastPrices()
+
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const dispatch = useDispatch();
-    const changeActivePair = () =>{
+    /*const changeActivePair = () =>{
         if (activePair !== pair.symbol) dispatch(setActivePairInitiate(pair, id))
-    }
+    }*/
+
+    const changeActivePair = () => {
+        const pairSymbolFormatted = `${pair.baseAsset}_${pair.quoteAsset}`;
+        if (activePair !== pairSymbolFormatted) {
+            dispatch(setActivePairInitiate(`${pair.baseAsset}_${pair.quoteAsset}`, id));
+        }
+    };
+
     return (
         <div onClick={changeActivePair}
-             className={`width-100 row jc-between ai-center px-1 py-05 cursor-pointer double-striped ${classes.container} ${activePair === pair.symbol ? classes.selected : ""} `}>
+             className={`width-100 row jc-between ai-center px-1 py-05 cursor-pointer double-striped border-bottom ${classes.container} ${activePair === pair.symbol ? classes.selected : ""} `}>
             <div className={` row jc-between ai-center ${classes.marketCardImage}`}>
                 <img
                     className="img-md flex"
-                    src={images[pair.baseAsset]}
-                    alt={pair.symbol}
-                    title={pair.symbol}
+                    src={currencies[pair?.baseAsset]?.icon}
+                    alt={pair?.symbol}
+                    title={pair?.symbol}
                 />
             </div>
             <div className={`row jc-between ai-center ${classes.marketCardContent}`}>
-                <div className="row">
-                    <div
-                        onClick={(e) => {
-                            e.stopPropagation();
-                            addFav(pair.symbol);
-                        }}
-                        data-name={pair.symbol}>
-                        <Icon iconName={`${favPair.includes(pair.symbol) ? "icon-star-filled" : "icon-star"} text-color fs-01`}/>
-                    </div>
-                    {pair.baseAsset + " / " + pair.quoteAsset}
+                <div className={`row`}>
+                    <Icon iconName={`${favPair.includes(pair?.symbol) ? "icon-star-filled" : "icon-star"} text-color`} customClass={` ml-05`} onClick={(e) => {e.stopPropagation();addFav(pair?.symbol);}}/>
+                    <span className={``}>{pair?.baseAsset + " / " + pair?.quoteAsset }</span>
                 </div>
-                <div>
-                    {new BN(prices[pair.symbol] || 0).toFormat()}
+                <div className={`${language !== "fa" ? 'row-reverse' : 'row'} jc-center`}>
+                    <span>{new BN(prices[pair?.symbol] || 0).decimalPlaces(currencies[pair?.quoteAsset]?.precision ?? 0).toFormat()}</span>
                 </div>
             </div>
         </div>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/WalletSubMenu.js b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/WalletSubMenu.js
index 918710ed..ec68212d 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/WalletSubMenu.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/WalletSubMenu.js
@@ -8,15 +8,35 @@ import WalletBalance from "./components/WalletBalance/WalletBalance";
 import ScrollBar from "../../../../../../../../components/ScrollBar";
 import {useGetUserAccount} from "../../../../../../../../queries/hooks/useGetUserAccount";
 import Loading from "../../../../../../../../components/Loading/Loading";
+import i18n from "i18next";
 
 const WalletSubMenu = () => {
     const {t} = useTranslation();
     const [showZero, setShowZero] = useState(false);
     const assets = useSelector((state) => state.exchange.assets)
 
-    console.log("assets", assets)
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const {data: data, isLoading} = useGetUserAccount()
-    console.log("data", data)
+
+
+    const wallets = Object.keys(currencies)
+        .map(symbol => ({
+            symbol,
+            name: currencies[symbol].name,
+            alias: currencies[symbol].alias,
+            icon: currencies[symbol].icon,
+            order: currencies[symbol].order,
+            isActive: currencies[symbol].isActive,
+            free: data?.wallets?.[symbol]?.free || 0,
+        }))
+        .filter(wallet => wallet.isActive || wallet.free > 0);
+
+    wallets.sort((a, b) => {
+        if (b.free !== a.free) return b.free - a.free;
+        return a.order - b.order;
+    });
 
     return (
         <div className={`width-100 card-bg column ${classes.container}`}>
@@ -35,9 +55,23 @@ const WalletSubMenu = () => {
                             </div>
                             <WalletBalance/>
                             <ScrollBar customClass={`column`}>
-                                {assets?.filter(asset => data?.wallets?.[asset]?.free > 0)
+
+                                {
+                                    wallets.map((wallet) => (
+                                    <WalletListItem
+                                        symbol={wallet.symbol}
+                                        data={wallet}
+                                        key={wallet.symbol}
+                                        assetName={wallet.symbol}
+                                        freeWallet={wallet.free}
+                                        showZero={showZero}
+                                    />
+                                    ))
+                                }
+
+                                {/*{assets?.filter(asset => data?.wallets?.[asset]?.free > 0)
                                     .concat(assets.filter(asset => data?.wallets?.[asset]?.free === 0))
-                                    .map((name) => <WalletListItem key={name} assetName={name} showZero={showZero}/>)}
+                                    .map((name) => <WalletListItem key={name} assetName={name} showZero={showZero}/>)}*/}
                             </ScrollBar>
                         </div>
                         <div className={`${classes.footer} flex jc-center ai-center px-1 text-gray fs-0-7 px-1 py-05`} style={{lineHeight:"3vh"}}>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/WalletSubMenu.module.css b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/WalletSubMenu.module.css
index 0b0b25fe..845a3031 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/WalletSubMenu.module.css
+++ b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/WalletSubMenu.module.css
@@ -106,3 +106,9 @@
 .selected:last-child:before{
   width: 0;
 }
+
+.iconDisabled {
+  filter: grayscale(0.75);
+  opacity: 0.9;/*
+    background-color: var(--lightGray)*/
+}
\ No newline at end of file
diff --git a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/components/WalletBalance/WalletBalance.js b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/components/WalletBalance/WalletBalance.js
index abfaa719..78f59625 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/components/WalletBalance/WalletBalance.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/components/WalletBalance/WalletBalance.js
@@ -2,9 +2,10 @@ import React from 'react';
 import classes from '../../WalletSubMenu.module.css'
 import {useTranslation} from "react-i18next";
 import {images} from "../../../../../../../../../../assets/images";
-import {BN} from "../../../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
 import {useGetUserAssetsEstimatedValue} from "../../../../../../../../../../queries";
 import {useSelector} from "react-redux";
+import i18n from "i18next";
 
 const WalletBalance = () => {
 
@@ -13,6 +14,10 @@ const WalletBalance = () => {
     const {data , isLoading, error} = useGetUserAssetsEstimatedValue(refCurrency)
     const totalValue = (isLoading || error) ?  0 : data.value
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
+
     return ( <div className={"container row ai-center cursor-pointer position-relative px-1 py-105"} style={{cursor:"initial"}}>
             <div className={` row jc-start ai-center ${classes.PairImage}`}>
                 <img
@@ -28,7 +33,7 @@ const WalletBalance = () => {
                     <span className="fs-0-7">{t("WalletSubMenu.approximate")}</span>
                 </div>
                 <div className="column ai-end">
-                    <span>{new BN(totalValue).toFormat()}{" "}<span className="fs-0-7">{t("currency."+refCurrency)}</span></span>
+                    <span>{new BN(totalValue).decimalPlaces(currencies[refCurrency]?.precision ?? 0).toFormat()}{" "}<span className="fs-0-7">{getCurrencyNameOrAlias(currencies[refCurrency], language)}</span></span>
                 </div>
             </div>
         </div>
diff --git a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/components/WalletListItem/WalletListItem.js b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/components/WalletListItem/WalletListItem.js
index 2a871ce3..039f7294 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/components/WalletListItem/WalletListItem.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/WalletSubMenu/components/WalletListItem/WalletListItem.js
@@ -4,45 +4,52 @@ import {NavLink} from "react-router-dom";
 import {useTranslation} from "react-i18next";
 import {images} from "../../../../../../../../../../assets/images";
 import * as Routes from "../../../../../../../../Routes/routes";
-import {BN} from "../../../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
 import {useGetUserAccount} from "../../../../../../../../../../queries/hooks/useGetUserAccount";
 import {useGetUserAssets} from "../../../../../../../../../../queries";
 import {useSelector} from "react-redux";
+import i18n from "i18next";
+
+const WalletListItem = ({symbol, data, assetName, freeWallet, showZero}) => {
 
-const WalletListItem = ({assetName, showZero}) => {
     const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const refCurrency = useSelector((state) => state.exchange.baseCurrency)
     const {data: userAccount} = useGetUserAccount()
     const free = userAccount?.wallets[assetName]?.free || 0
 
     const {data: estimateValue , isLoading, error} = useGetUserAssets(refCurrency)
-    const freeEstimateValue = (isLoading || error) ?  0 : (estimateValue?.find( q => q.asset === assetName )?.free || 0)
+    const freeEstimateValue = (isLoading || error) ?  0 : (estimateValue?.find( q => q.asset === symbol )?.free || 0)
+
+    const active = currencies[symbol]?.isActive
 
     if (showZero && free === 0) return <></>
 
     return (
         <NavLink
             className={({isActive}) =>
-                isActive ? "width-100 row ai-center cursor-pointer position-relative px-1 py-105 " + classes.selected : "width-100 row ai-center cursor-pointer position-relative px-1 py-105"
+                isActive ? `width-100 row ai-center cursor-pointer position-relative px-1 py-105 ${!active && 'text-gray'} ${classes.selected}` : `width-100 row ai-center cursor-pointer position-relative px-1 py-105 ${!active && 'text-gray'}`
             }
-            to={Routes.Wallet + "/" + assetName}>
+            to={Routes.Wallet + "/" + symbol}>
             <div className={` row jc-start ai-center ${classes.PairImage}`}>
                 <img
-                    className={`img-md flex`}
-                    src={images[assetName]}
+                    className={`img-md flex ${!active && classes.iconDisabled}`}
+                    src={currencies[assetName]?.icon}
                     alt={assetName}
                     title={assetName}
                 />
             </div>
             <div className={`row jc-between px-05 ${classes.pairDetails}`}>
                 <div className="column ai-start">
-                    <span>{assetName}</span>
-                    <span className="fs-0-7">{t("currency." + assetName)}</span>
+                    <span>{symbol}</span>
+                    <span className="fs-0-7">{getCurrencyNameOrAlias(currencies[symbol], language)}</span>
                 </div>
                 <div className="column ai-end">
-                    <span>{new BN(free).toFormat() + " "} <span className="fs-0-7">{t("currency." + assetName)}</span></span>
+                    <span>{new BN(freeWallet).decimalPlaces(currencies[symbol]?.precision ?? 0).toFormat() + " "} <span className="fs-0-7">{getCurrencyNameOrAlias(currencies[symbol], language)}</span></span>
                     <span className="fs-0-7 text-gray" >
-                        <span>~ </span> {refCurrency === assetName ? new BN(free).toFormat() : new BN(freeEstimateValue).toFormat()}<span> {t("currency."+refCurrency)}</span>
+                        <span>~ </span> {refCurrency === assetName ? new BN(free).decimalPlaces(currencies[refCurrency]?.precision ?? 0).toFormat() : new BN(freeEstimateValue).decimalPlaces(currencies[refCurrency]?.precision ?? 0).toFormat()}<span> {t("currency."+refCurrency)}</span>
                     </span>
                 </div>
             </div>
diff --git a/src/queries/hooks/useGetGatewaysByCurrency.js b/src/queries/hooks/useGetGatewaysByCurrency.js
new file mode 100644
index 00000000..ad3fad88
--- /dev/null
+++ b/src/queries/hooks/useGetGatewaysByCurrency.js
@@ -0,0 +1,13 @@
+import {useQuery} from "@tanstack/react-query";
+import {getGatewaysByCurrency} from "js-api-client";
+
+export const useGetGatewaysByCurrency = (currency = "", config = {}) => {
+    return useQuery({
+        queryKey: ['gateways', currency, config],
+        queryFn: async () => {
+            const { data } = await getGatewaysByCurrency(currency, config);
+            return data?.gateways;
+        },
+        enabled: !!currency,
+    });
+};
diff --git a/src/queries/index.js b/src/queries/index.js
index b4d09d5b..1ae9b4db 100644
--- a/src/queries/index.js
+++ b/src/queries/index.js
@@ -25,4 +25,5 @@ export {useGetUserAssetsEstimatedValue} from "./hooks/useGetUserAssetsEstimatedV
 export {useGetBuyAndSellHistory} from "./hooks/useGetBuyAndSellHistory";
 export {useGetWithdrawHistory} from "./hooks/useGetWithdrawHistory";
 export {useGetDepositHistory} from "./hooks/useGetDepositHistory";
-export {useGetTransactionsHistory} from "./hooks/useGetTransactionsHistory";
\ No newline at end of file
+export {useGetTransactionsHistory} from "./hooks/useGetTransactionsHistory";
+export {useGetGatewaysByCurrency} from "./hooks/useGetGatewaysByCurrency";
\ No newline at end of file
diff --git a/src/setup/configs/configs.js b/src/setup/configs/configs.js
index 2feded4f..8fcf72ac 100644
--- a/src/setup/configs/configs.js
+++ b/src/setup/configs/configs.js
@@ -8,6 +8,6 @@ export const defaultConfigs = {
     ],
     "defaultTheme": "DARK",
     "supportEmail": "supportEmail@gmail.com",
-    "baseCurrency": "TUSDT",
+    "baseCurrency": "USDT",
     "dateType": "Hijri"
 }
\ No newline at end of file
diff --git a/src/store/actions/actionTypes.js b/src/store/actions/actionTypes.js
index 1c897a99..699da1ab 100644
--- a/src/store/actions/actionTypes.js
+++ b/src/store/actions/actionTypes.js
@@ -53,4 +53,9 @@ export const SET_USER_CONFIG = "SET_USER_CONFIG"
 export const SET_FAV_PAIR = "SET_FAV_PAIR"
 export const SET_FAV_PAIR_INITIATE = "SET_FAV_PAIR_INITIATE"
 
-export const GET_USER_CONFIGS_INITIATE = "GET_USER_CONFIGS_INITIATE"
\ No newline at end of file
+export const GET_USER_CONFIGS_INITIATE = "GET_USER_CONFIGS_INITIATE"
+
+
+export const GET_CURRENCIES = "GET_CURRENCIES";
+export const GET_PAIRS = "GET_PAIRS";
+export const GET_FEES = "GET_FEES";
\ No newline at end of file
diff --git a/src/store/actions/exchange.js b/src/store/actions/exchange.js
index 79c0d27a..2261c7af 100644
--- a/src/store/actions/exchange.js
+++ b/src/store/actions/exchange.js
@@ -1,4 +1,5 @@
 import * as actionTypes from "./actionTypes";
+import {GET_FEES} from "./actionTypes";
 
 export const setActivePairInitiate = (pair, activeTab) => {
     return {
@@ -97,4 +98,23 @@ export const setExchangeConfigs = configs => {
         type: actionTypes.SET_EXCHANGE_CONFIG,
         configs: configs
     };
+};
+
+export const getCurrencies = currencies => {
+    return {
+        type: actionTypes.GET_CURRENCIES,
+        currencies,
+    };
+};
+export const getPairs = pairs => {
+    return {
+        type: actionTypes.GET_PAIRS,
+        pairs,
+    };
+};
+export const getFees = fees => {
+    return {
+        type: actionTypes.GET_FEES,
+        fees,
+    };
 };
\ No newline at end of file
diff --git a/src/store/actions/index.js b/src/store/actions/index.js
index 0acfe700..36947b0a 100644
--- a/src/store/actions/index.js
+++ b/src/store/actions/index.js
@@ -22,8 +22,10 @@ export {
     setIPGInitiate,
     setVerifyEmailLock,
     setVerifyEmailLockInitiate,
-    setExchangeConfigs
-
+    setExchangeConfigs,
+    getCurrencies,
+    getPairs,
+    getFees
 } from "./exchange";
 
 export {
diff --git a/src/store/reducers/exchangeReducer.js b/src/store/reducers/exchangeReducer.js
index a34e2f46..087fc3cd 100644
--- a/src/store/reducers/exchangeReducer.js
+++ b/src/store/reducers/exchangeReducer.js
@@ -4,7 +4,7 @@ const initialState = {
     assets: [],
     pairs: [],
     symbols: [],
-    activePair: {},
+    activePair: [],
     activePairOrders: {
         bestBuyPrice: 0,
         bestSellPrice: 0,
@@ -27,9 +27,14 @@ const initialState = {
     defaultTheme: "",
     supportEmail: "",
     baseCurrency: "",
-    dateType: ""
+    dateType: "",
+    currencies: [],
+    pairsList: [],
+    fees: [],
 };
 
+
+
 const exchangeReducer = (state = initialState, action) => {
     switch (action.type) {
         case actionTypes.SET_IPG:
@@ -42,13 +47,32 @@ const exchangeReducer = (state = initialState, action) => {
                 ...state,
                 verifyEmailLock: action.verifyEmailLockTime,
             };
-        case actionTypes.SET_ACTIVE_PAIR:
+        /*case actionTypes.SET_ACTIVE_PAIR:
             return {
                 ...state,
                 activePair: {
                     ...state.activePair,
                     ...action.pair,
-                    name: action.pair.baseAsset + "/" + action.pair.quoteAsset
+                    // name: action.pair.baseAsset + "/" + action.pair.quoteAsset
+                },
+                activePairOrders: {
+                    ...state.activePairOrders,
+                    bestBuyPrice: 0,
+                    bestSellPrice: 0,
+                    lastTradePrice: 0,
+                },
+            };*/
+
+
+        case actionTypes.SET_ACTIVE_PAIR:
+            const [baseAsset, quoteAsset] = action.pair.split('_');
+            return {
+                ...state,
+                activePair: {
+                    symbol: `${baseAsset}${quoteAsset}`,
+                    pair: action.pair,
+                    baseAsset: baseAsset,
+                    quoteAsset: quoteAsset,
                 },
                 activePairOrders: {
                     ...state.activePairOrders,
@@ -57,6 +81,7 @@ const exchangeReducer = (state = initialState, action) => {
                     lastTradePrice: 0,
                 },
             };
+
         case actionTypes.SET_BEST_BUY_PRICE:
             return {
                 ...state,
@@ -105,6 +130,23 @@ const exchangeReducer = (state = initialState, action) => {
                 ...state,
                 ...action.configs
             };
+
+        case actionTypes.GET_CURRENCIES:
+            return {
+                ...state,
+                currencies: action.currencies,
+            };
+        case actionTypes.GET_PAIRS:
+            return {
+                ...state,
+                pairsList: action.pairs,
+            };
+        case actionTypes.GET_FEES:
+            return {
+                ...state,
+                fees: action.fees,
+            };
+
         default:
             return state;
     }
diff --git a/src/store/sagas/global.js b/src/store/sagas/global.js
index 3bf4294c..d5de38aa 100644
--- a/src/store/sagas/global.js
+++ b/src/store/sagas/global.js
@@ -21,7 +21,7 @@ export function* setThemeSaga(action) {
 }
 
 export function* setActivePair(action) {
-    yield call([localStorage, 'setItem'], "activePair", action.pair.symbol)
+    yield call([localStorage, 'setItem'], "activePair", action.pair)
     yield call([localStorage, 'setItem'], "activeMarketTab", action.activeTab)
     yield put(actions.setActivePair(action.pair));
 }
@@ -53,8 +53,9 @@ function* getExchangeInfo() {
 
     for (let i = 0; i < 10; i++) {
         try {
-            const {data: {symbols}} = yield call(axios.get, '/api/v3/exchangeInfo')
-            return symbols
+            const {data} = yield call(axios.get, '/api/v3/exchangeInfo')
+
+            return data
         } catch (err) {
             if (i < 2) {
                 yield delay(1000)
@@ -65,6 +66,70 @@ function* getExchangeInfo() {
         throw new Error('getExchangeInfo failed!')
     }
 }
+/*function* fetchCurrencies() {
+    for (let i = 0; i < 10; i++) {
+        try {
+            const response = yield call(axios.get, '/wallet/currency');
+            const { currencies } = response.data;
+            return currencies;
+        } catch (err) {
+            if (i < 9) {
+                yield delay(1000);
+            } else {
+                throw new Error('Failed to fetch currencies after 10 attempts.');
+            }
+        }
+    }
+}*/
+
+/*function* fetchCurrencies() {
+    const formData = new URLSearchParams();
+    formData.append('includeManualGateways', 'true');
+    formData.append('includeOffChainGateways', 'true');
+    formData.append('includeOnChainGateways', 'true');
+
+    for (let i = 0; i < 10; i++) {
+        try {
+            const response = yield call(axios.post, '/wallet/currency', formData, {
+                headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                }
+            });
+
+            const { currencies } = response.data;
+            return currencies;
+        } catch (err) {
+            if (i < 9) {
+                yield delay(1000);
+            } else {
+                throw new Error('Failed to fetch currencies after 10 attempts.');
+            }
+        }
+    }
+}*/
+
+function* fetchCurrencies() {
+    const params = {
+        includeManualGateways: false,
+        includeOffChainGateways: true,
+        includeOnChainGateways: true
+    };
+
+    for (let i = 0; i < 10; i++) {
+        try {
+            const response = yield call(axios.get, '/wallet/currency', { params });
+
+            const { currencies } = response.data;
+            return currencies;
+        } catch (err) {
+            if (i < 9) {
+                yield delay(1000);
+            } else {
+                throw new Error('Failed to fetch currencies after 10 attempts.');
+            }
+        }
+    }
+}
 
 export function* loadConfig(action) {
 
@@ -100,10 +165,66 @@ export function* loadConfig(action) {
 
     try {
 
+        const exchangeInfo = yield call(getExchangeInfo);
+
+        const currencies = yield call(fetchCurrencies);
+
+
+        /*const currenciesMap = currencies.reduce((acc, currency) => {
+            acc[currency.symbol] = currency;
+            return acc;
+        }, {});*/
+
+        const currenciesMap = currencies.reduce((acc, currency) => {
+            const precisionValue = currency.precision.toString();
+            const decimalPlaces = precisionValue.includes('.')
+                ? precisionValue.split('.')[1].length
+                : 0;
+
+            const decimalFactor = Number((Math.pow(10, -decimalPlaces)).toFixed(decimalPlaces));
+
+            acc[currency.symbol] = {
+                ...currency,
+                precision: decimalPlaces,
+                minOrder: decimalFactor,
+                step: decimalFactor,
+            };
+            return acc;
+        }, {});
+
+        yield put(actions.getCurrencies(currenciesMap));
+
+        const pairsList = exchangeInfo.symbols;
+        const pairsListMap = pairsList.reduce((acc, pair) => {
+            /*acc[pair.symbol] = pair;*/
+            const key = `${pair.baseAsset}_${pair.quoteAsset}`;
+            acc[key] = {
+                symbol: pair.symbol,
+                baseAsset: pair.baseAsset,
+                quoteAsset: pair.quoteAsset,
+                orderTypes: pair.orderTypes,
+            };
+            return acc;
+        }, {});
+        yield put(actions.getPairs(pairsListMap));
+
+        const fees = exchangeInfo.fees;
+        const feesMap = fees.reduce((acc, fee) => {
+            acc[fee.pair] = fee;
+           /* acc[pair.symbol] = {
+                symbol: pair.symbol,
+                baseAsset: pair.baseAsset,
+                quoteAsset: pair.quoteAsset,
+                orderTypes: pair.orderTypes,
+            };*/
+            return acc;
+        }, {});
+        yield put(actions.getFees(feesMap));
+
         const localTheme = yield call([localStorage, 'getItem'], 'theme')
         if (localTheme) appTheme = localTheme;
 
-        const symbols = yield call(getExchangeInfo)
+        const symbols = exchangeInfo.symbols
         for (const symbol of symbols) {
             if (symbol.symbol.toUpperCase().includes("NLN")) continue
             if (!assets.includes(symbol.baseAsset)) {
@@ -125,11 +246,21 @@ export function* loadConfig(action) {
             lastPrice[symbol.symbol] = 0
         }
         yield put(actions.setExchange({pairs, assets, symbols, lastPrice}));
+        /*yield put(actions.getCurrencies({currencies}));*/
         yield put(actions.setUserAccountInfo({wallets, tradeFee}));
 
         const activePair = yield call([localStorage, 'getItem'], 'activePair')
-        const lastActivePair = symbols.find(symbol => symbol.symbol === activePair)
-        yield put(actions.setActivePair(lastActivePair || symbols[0]));
+        const lastActivePair = Object.keys(pairsListMap).includes(activePair) ? activePair : null;
+
+        /*const lastActivePair = lastActivePairKey ? pairsListMap[lastActivePairKey] : null;*/
+
+
+
+        /*const lastActivePair = symbols.find(symbol => symbol.symbol === activePair)*/
+
+
+
+        yield put(actions.setActivePair(lastActivePair || Object.keys(pairsListMap)[0]));
 
     } catch (e) {
         yield put(actions.setError(true))
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 07535afa..7888f187 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -32,6 +32,10 @@ export const encodeQueryData = (params) => {
 }
 
 export const BN = BigNumber.clone({
+
+    DECIMAL_PLACES: 8,
+    ROUNDING_MODE: BigNumber.ROUND_DOWN,
+
     FORMAT: {
         groupSize: 3,
         groupSeparator: ',',
@@ -72,4 +76,19 @@ export const timeValidator = str => {
     return /^(2[0-3]|[01]?[0-9]):([0-5]?[0-9])$/.test(str);
 }
 
-export const toAbsoluteUrl = (path) => process.env.PUBLIC_URL + path
\ No newline at end of file
+export const toAbsoluteUrl = (path) => process.env.PUBLIC_URL + path
+
+export function getCurrencyNameOrAlias(currency, lang) {
+
+    const languagesConfig = { fa: "alias", en: "name", ar: "alias" };
+    const langOption = languagesConfig[lang] || 'name';
+
+    if (!currency || typeof currency !== 'object') {
+        return '-';
+    }
+
+    const name = currency.name || '-';
+    const alias = currency.alias || '-';
+
+    return langOption === 'alias' ? alias : name;
+}
diff --git a/yarn.lock b/yarn.lock
index 245ad7d2..d4504862 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9486,8 +9486,8 @@ __metadata:
 
 "js-api-client@https://github.com/opexdev/js-api-client.git#develop":
   version: 1.0.0-beta2
-  resolution: "js-api-client@https://github.com/opexdev/js-api-client.git#commit=c352c8f2dc8f7d225090061d519ae579278ae960"
-  checksum: 61b0c4519dfd1dd0092d417d6cc28e7b97c0c425da37506c2a7c35d94db72e57bf1956787614cbc7059111f8438675a3b3745e50e5dd0b68b027ff8032d07069
+  resolution: "js-api-client@https://github.com/opexdev/js-api-client.git#commit=e3bb06671718e426e03d618c6a742e079c6a1449"
+  checksum: 6dd6286f1df7fa812ed56d5fe20f16dadc057cfda979d349379e90a2b76e189cfcda6aba48bdc974f7722bdb7f24233c4a631c89038d7b8192d7e90e3e3fc351
   languageName: node
   linkType: hard