diff --git a/public/assets/locales/en/translation.json b/public/assets/locales/en/translation.json
index 5bc59f0..2e3c08b 100644
--- a/public/assets/locales/en/translation.json
+++ b/public/assets/locales/en/translation.json
@@ -286,6 +286,13 @@
   "depositStatus": {
     "DONE": "Done"
   },
+  "withdrawStatus": {
+    "CREATED": "Created",
+    "PROCESSING": "Processing",
+    "CANCELED": "Canceled",
+    "REJECTED": "Rejected",
+    "DONE": "Done"
+  },
   "HistoryStatus": {
     "DONE": "Done",
     "CREATED": "Created",
diff --git a/public/assets/locales/fa/translation.json b/public/assets/locales/fa/translation.json
index dac45c2..6643f48 100644
--- a/public/assets/locales/fa/translation.json
+++ b/public/assets/locales/fa/translation.json
@@ -286,6 +286,13 @@
   "depositStatus": {
     "DONE": "انجام شده"
   },
+  "withdrawStatus": {
+    "CREATED": "جاری شده",
+    "PROCESSING": "در حال انجام",
+    "CANCELED": "لغو شده",
+    "REJECTED": "رد شده",
+    "DONE": "انجام شده"
+  },
   "HistoryStatus": {
     "DONE" : "انجام شده",
     "CREATED": "جاری شده",
diff --git a/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js b/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js
index 0a07baa..2dbc005 100644
--- a/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js
+++ b/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js
@@ -1,4 +1,4 @@
-import React, {useState} from 'react';
+import React, {useEffect, useState} from 'react';
 import {useTranslation} from "react-i18next";
 import classes from "./AllMarketInfo.module.css"
 import {useSelector} from "react-redux";
@@ -6,6 +6,8 @@ import {useGetQuoteCurrencies, useOverview} from "../../../../../../queries";
 import AllMarketInfoTable from "./components/AllMarketInfoTable/AllMarketInfoTable";
 import Loading from "../../../../../../components/Loading/Loading";
 import Error from "../../../../../../components/Error/Error";
+import {getCurrencyNameOrAlias} from "../../../../../../utils/utils";
+import i18n from "i18next";
 
 const AllMarketInfo = () => {
 
@@ -17,17 +19,26 @@ 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 ?
-                <AllMarketInfoTable data={overview} activeCurrency={activeCurrency}/>
+                <AllMarketInfoTable data={overview} activeCurrency={activeCurrency} interval={interval}/>
                 :
-                <AllMarketInfoTable data={overview} activeCurrency={activeCurrency}/>
+                <AllMarketInfoTable data={overview} activeCurrency={activeCurrency} interval={interval}/>
             }
         </>
     }
@@ -42,8 +53,10 @@ const AllMarketInfo = () => {
                 </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)}
+                        </span>
                     )}
                 </div>
 
diff --git a/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js b/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js
index 6576007..5e82ab3 100644
--- a/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js
+++ b/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js
@@ -4,15 +4,15 @@ import {useNavigate} from "react-router-dom";
 import {useTranslation} from "react-i18next";
 import {useDispatch, useSelector} from "react-redux";
 import {setActivePairInitiate} from "../../../../../../../../store/actions";
-import {images} from "../../../../../../../../assets/images";
 import i18n from "i18next";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import {Order} from "../../../../../../Routes/routes";
 import Button from "../../../../../../../../components/Button/Button";
 import Icon from "../../../../../../../../components/Icon/Icon";
 import {LeadingActions, SwipeableList, SwipeableListItem, SwipeAction, TrailingActions} from "react-swipeable-list";
+import {useGetChartData} from "../../../../../../../../queries";
 
-const AllMarketInfoTable = ({data, activeCurrency}) => {
+const AllMarketInfoTable = ({data, activeCurrency, interval}) => {
 
     const {t} = useTranslation();
 
@@ -20,12 +20,20 @@ const AllMarketInfoTable = ({data, activeCurrency}) => {
     const dispatch = useDispatch();
     const allExchangeSymbols = useSelector((state) => state.exchange.symbols)
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
+    const pairsList = useSelector((state) => state.exchange.pairsList)
+    const symbols = Object.keys(pairsList);
+
+    const { data: ChartData, isLoading: ChartDataIsLoading, error: ChartDataError } = useGetChartData(symbols, interval);
+
     const [swipeRight, setSwipeRight] = useState(null);
     const [swipeLeft, setSwipeLeft] = useState(null);
 
-    const navigateToPanel = (symbol) => {
-        const selectedPair = allExchangeSymbols.find( s => s.symbol === symbol)
-        dispatch(setActivePairInitiate(selectedPair, 0))
+    const navigateToPanel = (baseAsset, quoteAsset) => {
+        const pairSymbolFormatted = `${baseAsset}_${quoteAsset}`;
+        dispatch(setActivePairInitiate(`${baseAsset}_${quoteAsset}`, 0));
         navigate(Order)
     }
 
@@ -81,9 +89,20 @@ const AllMarketInfoTable = ({data, activeCurrency}) => {
         </div>
     );
 
+    const chartView = (chartInfo) => {
+        if (ChartDataIsLoading) {
+            return <span className="flashit ">-----</span>
+        }
+        if (ChartDataError || !(chartInfo?.svgData)) {
+            return
+        }
+        return <img src={`data:image/svg+xml;base64,${chartInfo?.svgData}`} alt={chartInfo?.symbol} className={`${classes.chart} ${chartInfo?.isTrendUp ? classes.filterUp : classes.filterDown }`}/>
+    }
+
     let body = (
         <>
             {data.map((tr, index) => {
+                const chartInfo = ChartData?.find(chart => chart.symbol.replace("_", "") === tr.symbol);
                 return (
                     <SwipeableList threshold={0.01}>
                         <SwipeableListItem
@@ -95,31 +114,31 @@ const AllMarketInfoTable = ({data, activeCurrency}) => {
                                     <div className={`row width-100`}>
                                         <div className="width-50 row jc-start ai-center">
                                             <img
-                                                 src={images[tr?.base]}
+                                                src={currencies[tr?.base]?.icon}
                                                  alt={tr?.base}
                                                  title={tr?.baseAsset}
                                                  className={`img-md ml-1`}
                                             />
-                                            <span className={`mr-1`}>{activeCurrency ? t("currency." + tr?.base) : tr?.base + " / " + tr?.quote}</span>
+                                            <span className={`mr-1`}>{activeCurrency ? getCurrencyNameOrAlias(currencies[tr?.base], language) : tr?.base + " / " + tr?.quote}</span>
                                         </div>
                                         <div className={`width-50 column jc-center ai-end`}>
                                             <div className={`row jc-center ai-center`}>
-                                                <span className={`fs-0-6 ml-3 ${tr.priceChange > 0 ? "text-green" : "text-red"}`}>{tr.priceChange} %</span>
-                                                <span className={`mr-1 ${tr.priceChange > 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={`fs-0-6 ml-3 ${tr.priceChangePercent > 0 ? "text-green" : tr.priceChangePercent < 0 ? "text-red" : ""}`}>{tr.priceChangePercent === 0 ? "0 %" : `${new BN(tr.priceChangePercent).toFormat(2)} %`}</span>
+                                                <span className={`mr-1 ${tr.priceChangePercent > 0 ? "text-green" : tr.priceChangePercent < 0 ? "text-red" : ""}`}>{new BN(tr.lastPrice).decimalPlaces(currencies[tr?.quote]?.precision  ?? 0).toFormat()} <span className={`fs-0-7 mr-05`}>{tr?.quote}</span></span>
                                             </div>
-                                            <span className={`fs-0-8`}>{new BN(tr.volume).toFormat()}</span>
+                                            <span className={`fs-0-8`}>{new BN(tr?.volume).decimalPlaces(currencies[tr?.base]?.precision ?? 0).toFormat()}</span>
                                         </div>
                                     </div>
                                     <div className={`width-100 row`}>
                                         <div className="width-100 row jc-between ai-start">
 
                                             <div className={`row jc-center ai-center`}>
-                                                <Icon iconName="icon-up-micro fs-02 flex  text-green"/>
-                                                <span className={`mr-05 fs-0-8`}>{new BN(tr?.highPrice).toFormat()}</span>
+                                                <Icon iconName="icon-up-micro fs-02 flex text-green"/>
+                                                <span className={`mr-05 fs-0-8`}>{new BN(tr?.highPrice).decimalPlaces(currencies[tr?.quote]?.precision ?? 0).toFormat()}</span>
                                             </div>
                                             <div className={`row jc-center ai-center`}>
-                                                <Icon iconName="icon-down-micro fs-02 flex  text-red"/>
-                                                <span className={`mr-05 fs-0-8`}>{new BN(tr?.lowPrice).toFormat()}</span>
+                                                <Icon iconName="icon-down-micro fs-02 flex text-red"/>
+                                                <span className={`mr-05 fs-0-8`}>{new BN(tr?.lowPrice).decimalPlaces(currencies[tr?.quote]?.precision ?? 0).toFormat()}</span>
                                             </div>
                                         </div>
                                     </div>
@@ -135,17 +154,12 @@ const AllMarketInfoTable = ({data, activeCurrency}) => {
                                         <Button
                                             buttonClass={classes.thisButton}
                                             type="button"
-                                            onClick={() => navigateToPanel(tr.symbol)}
+                                            onClick={() => navigateToPanel(tr?.base, tr?.quote)}
                                             buttonTitle={t("MarketInfo.trade")}
                                         />
                                     </div>
                                     <div className="width-30 flex jc-end ai-center">
-                                         <img
-                                             className={`img-lg ${classes.filter}`}
-                                             src={images.chart}
-                                             alt={""}
-                                             title={""}
-                                         />
+                                        {chartView(chartInfo)}
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.module.css b/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.module.css
index 98fb9b6..fd3dc4d 100644
--- a/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.module.css
+++ b/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.module.css
@@ -59,6 +59,12 @@
     bottom: 0;
 }
 
-.filter {
-    filter: blur(4px);
+.chart {
+    width: 75%;
+}
+.filterUp {
+    filter: invert(51%) sepia(94%) saturate(370%) hue-rotate(109deg) brightness(87%) contrast(92%);
+}
+.filterDown {
+    filter: invert(50%) sepia(53%) saturate(2527%) hue-rotate(337deg) brightness(68%) contrast(175%);
 }
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostDecreasedPrice/MostDecreasedPrice.js b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostDecreasedPrice/MostDecreasedPrice.js
index fe52187..56679f5 100644
--- a/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostDecreasedPrice/MostDecreasedPrice.js
+++ b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostDecreasedPrice/MostDecreasedPrice.js
@@ -1,41 +1,29 @@
 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]}
-                 alt={mostDecreasedPrice?.pairInfo?.baseAsset}
-                 title={mostDecreasedPrice?.pairInfo?.baseAsset}
-                 className={`img-md-plus`}/>
-            <span>{t("currency." + mostDecreasedPrice?.pairInfo?.baseAsset)}</span>
-            <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'} jc-center ai-center width-100 text-red`}>
-                <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>
-            </div>
-            <div className={`row jc-center ai-center width-100 text-red`}>
-                <span className={`direction-ltr`}>{new BN(mostDecreasedPrice?.priceChangePercent).toFormat(2)} %</span>
-            </div>*/}
             <div className={`column jc-center ai-start`}>
-                <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 mb-05`}/>
-                <span className={`mt-05`}>{t("currency." + mostDecreasedPrice?.pairInfo?.baseAsset)}</span>
+                <span className={`mt-05`}>{getCurrencyNameOrAlias(currencies[mostDecreasedPrice?.pairInfo?.baseAsset], language)}</span>
             </div>
             <div className={`column jc-end ai-center`}>
                 <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'} jc-end ai-center width-100 text-green mb-05`}>
                     <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={`${mostDecreasedPrice?.priceChangePercent > 0 ? "text-green" : "text-red"} ${i18n.language !== "fa" ? 'jc-end' : 'jc-start'} direction-ltr width-100 row ai-center mt-05`}>
-                    {new BN(mostDecreasedPrice?.priceChangePercent).toFormat(2)} %
+                <div className={`${mostDecreasedPrice?.priceChangePercent > 0 ? "text-green" : mostDecreasedPrice?.priceChangePercent < 0 ? "text-red" : ""} ${i18n.language !== "fa" ? 'jc-end' : 'jc-start'} direction-ltr width-100 row ai-center mt-05`}>
+                    {mostDecreasedPrice?.priceChangePercent === 0 ? "0 %" : `${new BN(mostDecreasedPrice?.priceChangePercent).toFormat(2)} %`}
                 </div>
             </div>
 
diff --git a/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostIncreasedPrice/MostIncreasedPrice.js b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostIncreasedPrice/MostIncreasedPrice.js
index 7c4b290..4b03578 100644
--- a/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostIncreasedPrice/MostIncreasedPrice.js
+++ b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostIncreasedPrice/MostIncreasedPrice.js
@@ -1,29 +1,29 @@
 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 MostIncreasedPrice = ({mostIncreasedPrice}) => {
 
-    const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     return (
         <>
             <div className={`column jc-center ai-start`}>
-                <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 mb-05`}/>
-                <span className={`mt-05`}>{t("currency." + mostIncreasedPrice?.pairInfo?.baseAsset)}</span>
+                <span className={`mt-05`}>{getCurrencyNameOrAlias(currencies[mostIncreasedPrice?.pairInfo?.baseAsset], language)}</span>
             </div>
             <div className={`column jc-end ai-center`}>
                 <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'} jc-end ai-center width-100 text-green mb-05`}>
                     <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={`${mostIncreasedPrice?.priceChangePercent > 0 ? "text-green" : "text-red"} ${i18n.language !== "fa" ? 'jc-end' : 'jc-start'} direction-ltr width-100 row ai-center mt-05`}>
-                    {new BN(mostIncreasedPrice?.priceChangePercent).toFormat(2)} %
+                <div className={`${mostIncreasedPrice?.priceChangePercent > 0 ? "text-green" : mostIncreasedPrice?.priceChangePercent < 0 ? "text-red" : ""} ${i18n.language !== "fa" ? 'jc-end' : 'jc-start'} direction-ltr width-100 row ai-center mt-05`}>
+                    {mostIncreasedPrice?.priceChangePercent === 0 ? "0 %" : `${new BN(mostIncreasedPrice?.priceChangePercent).toFormat(2)} %`}
                 </div>
             </div>
         </>
diff --git a/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostTrades/MostTrades.js b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostTrades/MostTrades.js
index 706ce43..ff1ebc0 100644
--- a/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostTrades/MostTrades.js
+++ b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostTrades/MostTrades.js
@@ -1,34 +1,24 @@
 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 MostTrades = ({mostTrades}) => {
 
-    const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     return (
         <>
-            {/*<img src={images[mostTrades?.pairInfo?.baseAsset]}
-                 alt={mostTrades?.pairInfo?.baseAsset}
-                 title={mostTrades?.pairInfo?.baseAsset}
-                 className={`img-md-plus`}/>
-            <span>{t("currency." + mostTrades?.pairInfo?.baseAsset)}</span>
-            <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'} jc-center ai-center width-100 text-green`}>
-                <span className={`${i18n.language !== "fa" ? 'mL-025' : 'mr-025'} fs-01`}>{new BN(mostTrades?.tradeCount).toFormat()} </span>
-            </div>*/}
-
-
             <div className={`column jc-center ai-start`}>
-                <img  src={images[mostTrades?.pairInfo?.baseAsset]}
-                      alt={mostTrades?.pairInfo?.baseAsset}
-                      title={mostTrades?.pairInfo?.baseAsset}
-                      className={`img-md-plus mb-05`}/>
-                <span className={`mt-05`}>{t("currency." + mostTrades?.pairInfo?.baseAsset)}</span>
+                <img src={currencies[mostTrades?.pairInfo?.baseAsset]?.icon}
+                     alt={mostTrades?.pairInfo?.baseAsset}
+                     title={mostTrades?.pairInfo?.baseAsset}
+                     className={`img-md-plus mb-05`}/>
+                <span className={`mt-05`}>{getCurrencyNameOrAlias(currencies[mostTrades?.pairInfo?.baseAsset], language)}</span>
             </div>
             <div className={`column jc-end ai-center`}>
-                <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'} jc-end ai-center width-100 text-green`}>
+                <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'} jc-end ai-center width-100`}>
                     <span className={`${i18n.language !== "fa" ? 'mL-025' : 'mr-025'} fs-01`}>{new BN(mostTrades?.tradeCount).toFormat()} </span>
                 </div>
             </div>
diff --git a/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostVolume/MostVolume.js b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostVolume/MostVolume.js
index e30bc62..ccafea2 100644
--- a/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostVolume/MostVolume.js
+++ b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostVolume/MostVolume.js
@@ -1,41 +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 MostVolume = ({mostVolume}) => {
 
-    const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     return (
         <>
-            {/*<img src={images[mostVolume?.pairInfo?.baseAsset]}
-                 alt={mostVolume?.pairInfo?.baseAsset}
-                 title={mostVolume?.pairInfo?.baseAsset}
-                 className={`img-md-plus`}/>
-            <span>{t("currency." + mostVolume?.pairInfo?.baseAsset)}</span>
-            <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'} jc-center ai-center width-100 text-green`}>
-                <span className={`${i18n.language !== "fa" ? 'mr-025' : 'ml-025'} fs-0-6`}>{mostVolume?.pairInfo?.quoteAsset}</span>
-                <span className={`${i18n.language !== "fa" ? 'mL-025' : 'mr-025'} fs-01`}>{new BN(mostVolume?.volume).toFormat()} </span>
-            </div>
-            <div className={`row jc-center ai-center width-100 text-green`}>
-                <span>% {new BN(mostVolume?.change).toFormat(2)}+</span>
-            </div>*/}
-
-
-
             <div className={`column jc-center ai-start`}>
-                <img  src={images[mostVolume?.pairInfo?.baseAsset]}
-                      alt={mostVolume?.pairInfo?.baseAsset}
-                      title={mostVolume?.pairInfo?.baseAsset}
-                      className={`img-md-plus mb-05`}/>
-                <span className={`mt-05`}>{t("currency." + mostVolume?.pairInfo?.baseAsset)}</span>
+                <img src={currencies[mostVolume?.pairInfo?.baseAsset]?.icon}
+                     alt={mostVolume?.pairInfo?.baseAsset}
+                     title={mostVolume?.pairInfo?.baseAsset}
+                     className={`img-md-plus mb-05`}/>
+                <span className={`mt-05`}>{getCurrencyNameOrAlias(currencies[mostVolume?.pairInfo?.baseAsset], language)}</span>
             </div>
             <div className={`column jc-end ai-center`}>
                 <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'} jc-end ai-center width-100 text-green mb-05`}>
-                    <span className={`${i18n.language !== "fa" ? 'mr-025' : 'ml-025'} fs-0-6`}>{mostVolume?.pairInfo?.quoteAsset}</span>
-                    <span className={`${i18n.language !== "fa" ? 'mL-025' : 'mr-025'} fs-01`}>{new BN(mostVolume?.volume).toFormat()}</span>
+                    <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).decimalPlaces(currencies[mostVolume?.pairInfo?.baseAsset]?.precision ?? 0).toFormat()}</span>
                 </div>
             </div>
 
diff --git a/src/main/Mobile/Pages/EasyTrading/components/EasyOrder/EasyOrder.js b/src/main/Mobile/Pages/EasyTrading/components/EasyOrder/EasyOrder.js
index dbeb0f0..6679823 100644
--- a/src/main/Mobile/Pages/EasyTrading/components/EasyOrder/EasyOrder.js
+++ b/src/main/Mobile/Pages/EasyTrading/components/EasyOrder/EasyOrder.js
@@ -4,7 +4,7 @@ import {Trans, useTranslation} from "react-i18next";
 import {useDispatch, useSelector} from "react-redux";
 import {useGetUserAccount} from "../../../../../../queries/hooks/useGetUserAccount";
 import {useOrderBook} from "../../../../../../queries";
-import {BN, parsePriceString} from "../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias, parsePriceString} from "../../../../../../utils/utils";
 import {toast} from "react-hot-toast";
 import {setLastTransaction} from "../../../../../../store/actions/auth";
 import {images} from "../../../../../../assets/images";
@@ -26,6 +26,10 @@ const EasyOrder = () => {
     const [isLoading, setIsLoading] = useState(false)
     const isLogin = useSelector((state) => state.auth.isLogin)
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+    const pairsList = useSelector((state) => state.exchange.pairsList)
+
     const symbols = useSelector((state) => state.exchange.symbols)
 
     const [alert, setAlert] = useState({
@@ -45,31 +49,37 @@ 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 = () => {
 
@@ -80,6 +90,12 @@ const EasyOrder = () => {
             type: selected?.type ==="ask" ? "bid" : "ask"
         })
 
+        setAlert({
+            submit: false,
+            reqAmount: null,
+            totalPrice: null,
+        })
+
     }
 
     const [options, setOptions] = useState({
@@ -107,36 +123,28 @@ const EasyOrder = () => {
         bestPriceHandler()
     }, [orderBook, selected])
 
-
     const buyPriceHandler = (value) => {
         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.isGreaterThan(selected.pair[range].max)) {
-            newAlert = <Trans
-                i18nKey="orders.maxOrder"
-                values={{
-                    max: selected.pair[range].max?.toLocaleString(),
-                    currency: t("currency." + selected.buy),
-                }}
-            />
-        }*/
-        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});
@@ -149,36 +157,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.isGreaterThan(selected.pair[range].max)) {
-            newAlert = <Trans
-                i18nKey="orders.maxOrder"
-                values={{
-                    max: selected.pair[range].max?.toLocaleString(),
-                    currency: t("currency." + selected.sell),
-                }}
-            />
-        }*/
-        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});
@@ -195,8 +197,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(),
@@ -212,7 +214,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) => {
@@ -228,8 +230,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,
@@ -259,20 +261,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,
@@ -281,17 +285,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,
@@ -300,12 +313,19 @@ 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(() => {
@@ -328,7 +348,7 @@ const EasyOrder = () => {
                 <span>{t("MarketTitle.easyTrading")}</span>
 
                 <div className={`row jc-center ai-center cursor-pointer hover-text fs-0-9`}>
-                    <Link to={Routes.TxHistory} className={`ml-05 hover-text`}>{t("txHistory.title")}</Link>
+                    <Link to={Routes.TransactionsHistory} className={`ml-05 hover-text`}>{t("txHistory.title")}</Link>
                     <Icon
                         iconName={`${i18n.language !== "fa" ? 'icon-right-open-1' : 'icon-left-open-1'}  fs-0-9 flex`}
                         className={`mr-05`}/>
@@ -345,9 +365,9 @@ const EasyOrder = () => {
                                 value: o,
                                 label: <div className={`row jc-start ai-center px-2`}>
                                     <div className={`${classes.avatar}`}
-                                         style={{backgroundImage: `url("${images[o]}")`}}
+                                         style={{ backgroundImage: `url("${currencies[o]?.icon}")` }}
                                     />
-                                    <span className={`mr-4`}>{t('currency.' + o)}</span>
+                                    <span className={`mr-4`}>{getCurrencyNameOrAlias(currencies[o], language)}</span>
                                 </div>
                             }
                         }
@@ -356,15 +376,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`}>
@@ -384,9 +404,9 @@ const EasyOrder = () => {
                                 label: <div className={`row jc-start ai-center px-2`}>
 
                                     <div className={`${classes.avatar}`}
-                                         style={{backgroundImage: `url("${images[o]}")`}}
+                                         style={{ backgroundImage: `url("${currencies[o]?.icon}")` }}
                                     />
-                                    <span className={`mr-4`}>{t('currency.' + o)}</span>
+                                    <span className={`mr-4`}>{getCurrencyNameOrAlias(currencies[o], language)}</span>
                                 </div>
                             }
                         }
@@ -395,7 +415,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`}
@@ -404,14 +424,14 @@ 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`}
@@ -420,8 +440,8 @@ const EasyOrder = () => {
                 <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/Mobile/Pages/Landing/components/MarketInfo/MarketInfo.js b/src/main/Mobile/Pages/Landing/components/MarketInfo/MarketInfo.js
index 5c22232..d763569 100644
--- a/src/main/Mobile/Pages/Landing/components/MarketInfo/MarketInfo.js
+++ b/src/main/Mobile/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 Title from "../../../../../../components/Title/Title";
 import {Link} from "react-router-dom";
@@ -11,6 +11,8 @@ import Error from "../../../../../../components/Error/Error";
 import MarketInfoCard from "./components/MarketInfoCard/MarketInfoCard";
 import {useTranslation} from "react-i18next";
 import i18n from "i18next";
+import {useSelector} from "react-redux";
+import {getCurrencyNameOrAlias} from "../../../../../../utils/utils";
 
 const MarketInfo = () => {
     const {t} = useTranslation();
@@ -20,17 +22,28 @@ const MarketInfo = () => {
     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}/>
+                <MarketInfoCard data={overview.slice(0, 5)} activeCurrency={activeCurrency} interval={interval}/>
                 :
-                <MarketInfoTable data={overview.slice(0, 5)} activeCurrency={activeCurrency}/>
+                <MarketInfoTable data={overview.slice(0, 5)} activeCurrency={activeCurrency} interval={interval}/>
             }
         </>
     }
@@ -61,8 +74,10 @@ const MarketInfo = () => {
                     </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)}
+                            </span>
                         )}
                     </div>
                 </div>
diff --git a/src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js b/src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js
index a05e1b2..2fd5609 100644
--- a/src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js
+++ b/src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js
@@ -6,25 +6,35 @@ import {Order} from "../../../../../../Routes/routes";
 import {useDispatch, useSelector} from "react-redux";
 import {useNavigate} from "react-router-dom";
 import {setActivePairInitiate} from "../../../../../../../../store/actions";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import {LeadingActions, SwipeableList, SwipeableListItem, SwipeAction, TrailingActions} from "react-swipeable-list";
 import Button from "../../../../../../../../components/Button/Button";
 import i18n from "i18next";
+import {useGetChartData} from "../../../../../../../../queries";
 
-const MarketInfoTable = ({data, activeCurrency}) => {
+const  MarketInfoTable = ({data, activeCurrency, interval}) => {
 
     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 pairsList = useSelector((state) => state.exchange.pairsList)
+    const symbols = Object.keys(pairsList);
+
+    const { data: ChartData, isLoading: ChartDataIsLoading, error: ChartDataError } = useGetChartData(symbols, interval);
+
+
     const [swipRight, setSwipRight] = useState(null);
     const [swipLeft, setSwipLeft] = useState(null);
 
 
-    const navigateToPanel = (symbol) => {
-        const selectedPair = allExchangeSymbols.find(s => s.symbol === symbol)
-        dispatch(setActivePairInitiate(selectedPair, 0))
+    const navigateToPanel = (baseAsset, quoteAsset) => {
+        const pairSymbolFormatted = `${baseAsset}_${quoteAsset}`;
+        dispatch(setActivePairInitiate(`${baseAsset}_${quoteAsset}`, 0));
         navigate(Order)
     }
 
@@ -80,9 +90,20 @@ const MarketInfoTable = ({data, activeCurrency}) => {
         </div>
     );
 
+    const chartView = (chartInfo) => {
+        if (ChartDataIsLoading) {
+            return <span className="flashit ">-----</span>
+        }
+        if (ChartDataError || !(chartInfo?.svgData)) {
+            return
+        }
+        return <img src={`data:image/svg+xml;base64,${chartInfo?.svgData}`} alt={chartInfo?.symbol} className={`${classes.chart} ${chartInfo?.isTrendUp ? classes.filterUp : classes.filterDown }`}/>
+    }
+
     let body = (
         <>
             {data.map((tr, index) => {
+                const chartInfo = ChartData?.find(chart => chart.symbol.replace("_", "") === tr.symbol);
                 return (
                     <SwipeableList threshold={0.01} key={index}>
                         <SwipeableListItem
@@ -95,18 +116,25 @@ const MarketInfoTable = ({data, activeCurrency}) => {
                                          <img
                                              src={images[tr?.base]}
                                              alt={tr?.base}
-                                             title={tr?.baseAsset}
+                                             title={tr?.base}
                                              className={`img-md ml-1`}
                                          />
-                                         <span className={`mr-1`}>{activeCurrency ? t("currency." + tr?.base) : tr?.base + " / " + tr?.quote}</span>
+                                         <span className={`mr-1`}>{activeCurrency ? getCurrencyNameOrAlias(currencies[tr?.base], language) : tr?.base + " / " + tr?.quote}</span>
                                     </div>
                                     <div className={`width-50 column jc-start ai-end`}>
                                         <div className={`row jc-center ai-center`}>
-                                            <span className={`fs-0-6 ml-3 ${tr.priceChange > 0 ? "text-green" : "text-red"}`}>{tr.priceChange} %</span>
-                                            <span className={`mr-1 ${tr.priceChange > 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={`fs-0-6 ml-3 ${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={`mr-1 ${tr.priceChangePercent > 0 ? "text-green" : tr.priceChangePercent < 0 ? "text-red" : ""}`}>{new BN(tr.lastPrice).decimalPlaces(currencies[tr?.quote]?.precision ?? 0).toFormat()}
+                                            <span className={`fs-0-7 mr-05`}>{getCurrencyNameOrAlias(currencies[tr?.quote], language)}</span></span>
                                         </div>
-                                        <span className={`fs-0-8`}>{new BN(tr.volume).toFormat()}</span>
+                                        <span className={`fs-0-8`}>{new BN(tr.volume).decimalPlaces(currencies[tr?.base]?.precision ?? 0).toFormat()}</span>
                                     </div>
                                 </div>
 
@@ -115,18 +143,13 @@ const MarketInfoTable = ({data, activeCurrency}) => {
                                         <Button
                                             buttonClass={classes.thisButton}
                                             type="button"
-                                            onClick={() => navigateToPanel(tr.symbol)}
+                                            onClick={() => navigateToPanel(tr?.base, tr?.quote)}
                                             buttonTitle={t("MarketInfo.trade")}
                                         />
                                     </div>
 
                                     <div className="width-30 flex jc-end ai-center">
-                                        <img
-                                            className={`img-lg ${classes.filter}`}
-                                            src={images.chart}
-                                            alt={""}
-                                            title={""}
-                                        />
+                                        {chartView(chartInfo)}
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.module.css b/src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.module.css
index 24a3c92..d8cc017 100644
--- a/src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.module.css
+++ b/src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.module.css
@@ -62,6 +62,13 @@
     bottom: 0;
 }
 
-.filter {
-    filter: blur(4px);
+.chart {
+    width: 75%;
+}
+.filterUp {
+    filter: invert(51%) sepia(94%) saturate(370%) hue-rotate(109deg) brightness(87%) contrast(92%);
+
+}
+.filterDown {
+    filter: invert(50%) sepia(53%) saturate(2527%) hue-rotate(337deg) brightness(68%) contrast(175%);
 }
diff --git a/src/main/Mobile/Pages/Landing/components/MarketView/components/MarketViewCard/MarketViewCard.js b/src/main/Mobile/Pages/Landing/components/MarketView/components/MarketViewCard/MarketViewCard.js
index c054942..8e27e3d 100644
--- a/src/main/Mobile/Pages/Landing/components/MarketView/components/MarketViewCard/MarketViewCard.js
+++ b/src/main/Mobile/Pages/Landing/components/MarketView/components/MarketViewCard/MarketViewCard.js
@@ -1,17 +1,18 @@
 import React from 'react';
 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 Loading from "../../../../../../../../components/Loading/Loading";
 import Error from "../../../../../../../../components/Error/Error";
+import {useSelector} from "react-redux";
 
 const MarketViewCard = ({title, data, error, isLoading, volume}) => {
 
-    console.log("title", title)
-    console.log("data", data)
 
     const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     const content = () => {
         if (isLoading) return <span className={`py-3 width-100`}><Loading type="linear"/></span>
@@ -19,20 +20,19 @@ const MarketViewCard = ({title, data, error, isLoading, volume}) => {
         else return <>
             <div className={`fle row jc-start ai-center`}>
                 <img
-                    src={images[data.pairInfo.baseAsset]}
+                    src={currencies[data.pairInfo.baseAsset]?.icon}
                     alt={data.pairInfo.baseAsset}
                     title={data.pairInfo.baseAsset}
                     className={`img-md-plus ml-1`}
                 />
-                <span className={`mr-2`}>{t("currency." + data.pairInfo.baseAsset)}</span>
+                <span className={`mr-2`}>{getCurrencyNameOrAlias(currencies[data.pairInfo.baseAsset], language)}</span>
             </div>
             <div className={`column ai-end text-green`}>
                 <div className={`${i18n.language !== "fa" ? 'row-reverse' : 'row'}`}>
-                    <span
-                        className={`fs-0-6 ${i18n.language !== "fa" ? 'mr-05' : 'ml-05'}`}>{data.pairInfo.quoteAsset}</span>
-                    <span>{new BN(volume ? data?.volume : data?.lastPrice).toFormat()}</span>
+                    <span className={`fs-0-6 ${i18n.language !== "fa" ? 'mr-05' : 'ml-05'}`}>{data.pairInfo.quoteAsset}</span>
+                    <span>{new BN(volume ? data?.volume : data?.lastPrice).decimalPlaces(currencies[data.pairInfo.quoteAsset]?.precision ?? 0).toFormat()}</span>
                 </div>
-                {data?.priceChangePercent && <span className={`${data?.priceChangePercent > 0 ? "text-green" : "text-red"} direction-ltr`}>
+                {data?.priceChangePercent && <span className={`${data.priceChangePercent > 0 ? "text-green" : data.priceChangePercent < 0 ? "text-red" : ""} direction-ltr`}>
                     {new BN(data?.priceChangePercent).toFormat(2)} %
                 </span>}
             </div>
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/DepositHistory/DepositHistory.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/DepositHistory/DepositHistory.js
index ad5e8d7..3ccb142 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/DepositHistory/DepositHistory.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/DepositHistory/DepositHistory.js
@@ -13,12 +13,17 @@ import TextInput from "../../../../../../../../../../components/TextInput/TextIn
 import DatePanel from "react-multi-date-picker/plugins/date_panel";
 import ToggleSwitch from "../../../../../../../../../../components/ToggleSwitch/ToggleSwitch";
 import Button from "../../../../../../../../../../components/Button/Button";
+import {getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
+import i18n from "i18next";
 
 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]
@@ -52,8 +57,8 @@ 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)})
     })
 
 
@@ -134,7 +139,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-100 my-1 ${classes.thisInput}`}
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/DepositHistoryTable/DepositHistoryTable.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/DepositHistoryTable/DepositHistoryTable.js
index 833f07e..05d4fc9 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/DepositHistoryTable/DepositHistoryTable.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/DepositHistoryTable/DepositHistoryTable.js
@@ -4,14 +4,17 @@ import {useTranslation} from "react-i18next";
 import {toast} from "react-hot-toast";
 import Date from "../../../../../../../../../../components/Date/Date";
 import moment from "moment-jalaali";
-import {BN, shortenHash} from "../../../../../../../../../../utils/utils";
+import {BN, formatWithPrecision, shortenHash} from "../../../../../../../../../../utils/utils";
 import Icon from "../../../../../../../../../../components/Icon/Icon";
+import i18n from "i18next";
+import {useSelector} from "react-redux";
 
 const DepositHistoryTable = ({data}) => {
 
     const [isOpen, setIsOpen] = useState(false);
     const {t} = useTranslation();
-
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     const copyToClipboard = (e, value) => {
         e.stopPropagation();
@@ -30,15 +33,15 @@ const DepositHistoryTable = ({data}) => {
                         <span className={``}>{moment.utc(data?.createDate).local().format("HH:mm:ss")}</span>
                     </div>
 
-                    <span className={`row jc-center ai-center`}>{t("HistoryStatus."+ data?.status)}</span>
+                    <span className={`row jc-center ai-center`}>{t("depositStatus."+ data?.status)}</span>
 
                     {/*<span className={`row jc-center ai-center`}>{moment(data?.date).format("HH:mm:ss")}</span>*/}
                 </div>
 
                 <div className={`width-100 row jc-between ai-center`}>
-                    <span>{data?.network}</span>
+                    <span>{data.network ?? "- - -"}</span>
                     <div className={`direction-ltr row ${data?.status !== "INVALID" ? 'text-green' : 'text-gray'}`} style={{alignItems:"baseline"}}>
-                        <span className={`fs-03`}>{new BN(data?.amount).toFormat()}</span>
+                        <span className={`fs-03`}>{formatWithPrecision(data?.amount, currencies[data?.currency].precision)}</span>
                         <span className={`${classes.spacing}`}/>
                         <span>{data?.currency}</span>
 
@@ -47,7 +50,7 @@ const DepositHistoryTable = ({data}) => {
 
                 <div className={`width-100 row jc-between ai-center`}>
                     <span>{t("history.type")}</span>
-                    <span>{t("HistoryType."+ data?.type)}</span>
+                    <span>{data?.type}</span>
                 </div>
 
 
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/Transactions/Transactions.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/Transactions/Transactions.js
index 02c0b13..8f4022b 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/Transactions/Transactions.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/Transactions/Transactions.js
@@ -13,12 +13,16 @@ import Loading from "../../../../../../../../../../components/Loading/Loading";
 import Error from "../../../../../../../../../../components/Error/Error";
 import Date from "../../../../../../../../../../components/Date/Date";
 import Button from "../../../../../../../../../../components/Button/Button";
+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]
@@ -54,8 +58,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);
@@ -132,7 +136,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-100 my-1 ${classes.thisInput}`}
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/TransactionsTable/TransactionsTable.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/TransactionsTable/TransactionsTable.js
index 9425830..16706aa 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/TransactionsTable/TransactionsTable.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/TransactionsTable/TransactionsTable.js
@@ -2,8 +2,10 @@ import React, {useState} from 'react';
 import classes from './TransactionsTable.module.css'
 import {useTranslation} from "react-i18next";
 import Date from "../../../../../../../../../../components/Date/Date";
-import {BN} from "../../../../../../../../../../utils/utils";
+import {BN, formatWithPrecision} from "../../../../../../../../../../utils/utils";
 import moment from "moment-jalaali";
+import i18n from "i18next";
+import {useSelector} from "react-redux";
 
 const TransactionsTable = ({data}) => {
 
@@ -11,6 +13,9 @@ const TransactionsTable = ({data}) => {
 
     const {t} = useTranslation();
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     return (
         <div className={`width-100 px-4 py-2 columns jc-between ai-center ${classes.container} ${classes.striped}`} >
             <div className={`width-100 column jc-between ai-center ${classes.rectangle}`} onClick={()=>data?.description && setIsOpen(prevState => !prevState)}>
@@ -30,7 +35,7 @@ const TransactionsTable = ({data}) => {
                 <div className={`width-100 row jc-between ai-center`}>
                     <span>{t("history.balanceChange")}</span>
                     <div className={`direction-ltr row ${new BN(data?.balanceChange).isLessThan(0) ? "text-red" : "text-green"}`} style={{alignItems:"baseline"}}>
-                        <span className={`fs-03`}>{new BN(data?.balanceChange).isGreaterThan(0) && "+"}{new BN(data?.balanceChange).toFormat()}</span>
+                        <span className={`fs-03`}>{new BN(data?.balanceChange).isGreaterThan(0) && "+"}{formatWithPrecision(data?.balanceChange, currencies[data?.currency].precision)}</span>
                         <span className={`${classes.spacing}`}/>
                         <span>{data?.currency}</span>
 
@@ -41,7 +46,7 @@ const TransactionsTable = ({data}) => {
                 <div className={`width-100 row jc-between ai-center`}>
                     <span>{t("history.balance")}</span>
                     <div className={`direction-ltr row`} style={{alignItems:"baseline"}}>
-                        <span className={`row jc-center ai-center`}>{new BN(data?.balance).toFormat()}</span>
+                        <span className={`row jc-center ai-center`}>{formatWithPrecision(data?.balance, currencies[data?.currency].precision)}</span>
                         <span className={`${classes.spacing}`}/>
                         <span>{data?.currency}</span>
 
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/WithdrawHistory/WithdrawHistory.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/WithdrawHistory/WithdrawHistory.js
index 0f18996..f6065a8 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/WithdrawHistory/WithdrawHistory.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/WithdrawHistory/WithdrawHistory.js
@@ -13,11 +13,16 @@ import TextInput from "../../../../../../../../../../components/TextInput/TextIn
 import DatePanel from "react-multi-date-picker/plugins/date_panel";
 import ToggleSwitch from "../../../../../../../../../../components/ToggleSwitch/ToggleSwitch";
 import Button from "../../../../../../../../../../components/Button/Button";
+import i18n from "i18next";
+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]
@@ -51,8 +56,8 @@ 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)})
     })
 
 
@@ -131,7 +136,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-100 my-1 ${classes.thisInput}`}
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/WithdrawHistoryTable/WithdrawHistoryTable.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/WithdrawHistoryTable/WithdrawHistoryTable.js
index 5088b5e..9cc53b7 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/WithdrawHistoryTable/WithdrawHistoryTable.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/History/components/WithdrawHistoryTable/WithdrawHistoryTable.js
@@ -4,16 +4,20 @@ import {useTranslation} from "react-i18next";
 import {toast} from "react-hot-toast";
 import Date from "../../../../../../../../../../components/Date/Date";
 import moment from "moment-jalaali";
-import {BN, shortenHash} from "../../../../../../../../../../utils/utils";
+import {BN, formatWithPrecision, shortenHash} from "../../../../../../../../../../utils/utils";
 import Button from "../../../../../../../../../../components/Button/Button";
 import {useGetWithdrawHistory} from "../../../../../../../../../../queries";
 import {cancelWithdrawReq} from "js-api-client";
 import Loading from "../../../../../../../../../../components/Loading/Loading";
 import Icon from "../../../../../../../../../../components/Icon/Icon";
+import i18n from "i18next";
+import {useSelector} from "react-redux";
 
 const WithdrawHistoryTable = ({data, query}) => {
 
     const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
 
     const [isOpen, setIsOpen] = useState(false);
     const [isLoading, setIsLoading] = useState(false)
@@ -59,15 +63,15 @@ const WithdrawHistoryTable = ({data, query}) => {
                         <span className={``}>{moment.utc(data?.createDate).local().format("HH:mm:ss")}</span>
                     </div>
 
-                    <span className={`row jc-center ai-center`}>{t("HistoryStatus."+ data?.status)}</span>
+                    <span className={`row jc-center ai-center`}>{t("withdrawStatus."+ data?.status)}</span>
 
                     {/*<span className={`row jc-center ai-center`}>{moment(data?.date).format("HH:mm:ss")}</span>*/}
                 </div>
 
                 <div className={`width-100 row jc-between ai-center`}>
-                    <span>{data?.network}</span>
+                    <span>{data?.destNetwork}</span>
                     <div className={`direction-ltr row text-red`} style={{alignItems:"baseline"}}>
-                        <span className={`fs-03`}>{new BN(data?.amount).toFormat()}</span>
+                        <span className={`fs-03`}>{formatWithPrecision(data?.amount, currencies[data?.currency].precision)}</span>
                         <span className={`${classes.spacing}`}/>
                         <span>{data?.currency}</span>
 
@@ -99,7 +103,7 @@ const WithdrawHistoryTable = ({data, query}) => {
                     <span>{t("history.appliedFee")}</span>
 
                     { data?.appliedFee ? <div className={`direction-ltr row`} style={{alignItems:"baseline"}}>
-                        <span className={``}>{new BN(data?.amount).toFormat()}</span>
+                        <span className={``}>{formatWithPrecision(data?.appliedFee, currencies[data.currency].precision)}</span>
                         <span className={`${classes.spacing}`}/>
                         <span className={`fs-0-8`}>{data?.currency}</span>
 
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/LastTrades/components/LastTradesTable/LastTradesTable.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/LastTrades/components/LastTradesTable/LastTradesTable.js
index f5d4c71..6362f17 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/LastTrades/components/LastTradesTable/LastTradesTable.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/LastTrades/components/LastTradesTable/LastTradesTable.js
@@ -6,10 +6,15 @@ import {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 = ({data}) => {
     const {t} = useTranslation();
     const activePair = useSelector((state) => state.exchange.activePair)
+
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     return (
         <div className={`column width-100 ${classes.container}`}>
             <ScrollBar>
@@ -37,9 +42,9 @@ const LastTradesTable = ({data}) => {
                             <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/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/MyOrder/components/OpenOrders/OpenOrders.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/MyOrder/components/OpenOrders/OpenOrders.js
index 6cd9235..e9ed29f 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/MyOrder/components/OpenOrders/OpenOrders.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/MyOrder/components/OpenOrders/OpenOrders.js
@@ -5,13 +5,14 @@ import {useTranslation} from "react-i18next";
 import {useSelector} from "react-redux";
 import Loading from "../../../../../../../../../../../../components/Loading/Loading";
 import ScrollBar from "../../../../../../../../../../../../components/ScrollBar";
-import {BN} from "../../../../../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../../../../../utils/utils";
 import {toast} from "react-hot-toast";
 import Error from "../../../../../../../../../../../../components/Error/Error";
 import {useMyOpenOrders} from "../../../../../../../../../../../../queries";
 import {cancelOrderByOrderID} from "js-api-client";
 import Date from "../../../../../../../../../../../../components/Date/Date";
 import Button from "../../../../../../../../../../../../components/Button/Button";
+import i18n from "i18next";
 
 
 const OpenOrders = () => {
@@ -22,6 +23,9 @@ const OpenOrders = () => {
     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} = useMyOpenOrders(activePair.symbol)
 
     useEffect(() => {
@@ -63,8 +67,8 @@ const OpenOrders = () => {
                                 <div className={`row jc-end ai-center`}>
                                     <span className={`ml-3`}>{t("volume")}:</span>
                                     <div className={`row ${color}`}>
-                                        <span className={`fs-02`}>{origQty.decimalPlaces(activePair.baseAssetPrecision).toFormat()}  </span>
-                                        <span className={`fs-0-8 mr-1`}>{t("currency." + activePair.baseAsset.toUpperCase())}</span>
+                                        <span className={`fs-02`}>{origQty.decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}  </span>
+                                        <span className={`fs-0-8 mr-1`}>{getCurrencyNameOrAlias(currencies[activePair.baseAsset.toUpperCase()], language)}</span>
                                     </div>
                                 </div>
                             </div>
@@ -78,8 +82,8 @@ const OpenOrders = () => {
                                 <div className={`row jc-end ai-center`}>
                                     <span className={`ml-3`}>{t("totalPrice")}:</span>
                                     <div className={`row ${color}`}>
-                                        <span className={`fs-02`}>{totalPrice.decimalPlaces(activePair.quoteAssetPrecision).toFormat()}</span>
-                                        <span className={`fs-0-8 mr-1`}>{t("currency." + activePair.quoteAsset.toUpperCase())}</span>
+                                        <span className={`fs-02`}>{totalPrice.decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</span>
+                                        <span className={`fs-0-8 mr-1`}>{getCurrencyNameOrAlias(currencies[activePair.quoteAsset.toUpperCase()], language)}</span>
                                     </div>
                                 </div>
                             </div>
@@ -89,8 +93,8 @@ const OpenOrders = () => {
                                 <div className={`row jc-between ai-center width-100 my-1`}>
                                     <span className={`ml-3`}>{t("pricePerUnit")}:</span>
                                     <div className={`row ${color}`}>
-                                        <span className={`fs-02`}>{pricePerUnit.decimalPlaces(activePair.quoteAssetPrecision).toFormat()}</span>
-                                        <span className={`fs-0-8 mr-1`}>{t("currency." + activePair.quoteAsset.toUpperCase())}</span>
+                                        <span className={`fs-02`}>{pricePerUnit.decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</span>
+                                        <span className={`fs-0-8 mr-1`}>{getCurrencyNameOrAlias(currencies[activePair.quoteAsset.toUpperCase()], language)}</span>
                                     </div>
                                 </div>
 
@@ -105,7 +109,7 @@ const OpenOrders = () => {
                                     <div className={`row jc-end ai-center`}>
                                         <span className={`ml-3`}>{t("myOrders.tradedAmount")}:</span>
                                         <div className={`row`}>
-                                            <span>{executedQty.decimalPlaces(activePair.baseAssetPrecision).toFormat()}</span>
+                                            <span>{executedQty.decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</span>
                                         </div>
                                     </div>
                                 </div>
@@ -120,7 +124,7 @@ const OpenOrders = () => {
                                     <div className={`row jc-end ai-center`}>
                                         <span className={`ml-3`}>{t("myOrders.tradedPrice")}:</span>
                                         <div className={`row`}>
-                                            <span>{executedQty.multipliedBy(pricePerUnit).decimalPlaces(activePair.baseAssetPrecision).toFormat()}</span>
+                                            <span>{executedQty.multipliedBy(pricePerUnit).decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</span>
                                         </div>
                                     </div>
                                 </div>
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/MyOrder/components/OrdersHistory/OrdersHistory.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/MyOrder/components/OrdersHistory/OrdersHistory.js
index 0267921..9db3185 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/MyOrder/components/OrdersHistory/OrdersHistory.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/MyOrder/components/OrdersHistory/OrdersHistory.js
@@ -8,6 +8,8 @@ import ScrollBar from "../../../../../../../../../../../../components/ScrollBar"
 import {useMyOrderHistory} from "../../../../../../../../../../../../queries";
 import Error from "../../../../../../../../../../../../components/Error/Error";
 import Date from "../../../../../../../../../../../../components/Date/Date";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../../../../../utils/utils";
+import i18n from "i18next";
 
 const OrdersHistory = () => {
     const {t} = useTranslation();
@@ -16,6 +18,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(() => {
@@ -46,8 +51,8 @@ const OrdersHistory = () => {
                                 <div className={`row jc-end ai-center`}>
                                     <span className={`ml-3`}>{t("volume")}:</span>
                                     <div className={`row ${color}`}>
-                                        <span className={`fs-02`}>{tr.origQty}</span>
-                                        <span className={`fs-0-8 mr-1`}>{t("currency." + activePair.baseAsset.toUpperCase())}</span>
+                                        <span className={`fs-02`}>{new BN(tr.origQty).decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</span>
+                                        <span className={`fs-0-8 mr-1`}>{getCurrencyNameOrAlias(currencies[activePair.baseAsset.toUpperCase()], language)}</span>
                                     </div>
                                 </div>
                             </div>
@@ -56,22 +61,18 @@ const OrdersHistory = () => {
                                 <div className={`row jc-end ai-center`}>
                                     <span className={`ml-3`}>{t("totalPrice")}:</span>
                                     <div className={`row ${color}`}>
-                                        <span className={`fs-02`}>{(tr.origQty * tr.price).toLocaleString()}</span>
-                                        <span className={`fs-0-8 mr-1`}>{t("currency." + activePair.quoteAsset.toUpperCase())}</span>
+                                        <span className={`fs-02`}>{new BN(tr.origQty).multipliedBy(tr.price).decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</span>
+                                        <span className={`fs-0-8 mr-1`}>{getCurrencyNameOrAlias(currencies[activePair.quoteAsset.toUpperCase()], language)}</span>
                                     </div>
                                 </div>
                             </div>
                             <div style={{display: openOrder === index ? "revert" : "none"}} className={`column`}>
                                 <div className={`row jc-between ai-center width-100 my-1`}>
-
-
-
-                                        <span className={`ml-3`}>{t("pricePerUnit")}:</span>
-                                        <div className={`row ${color}`}>
-                                            <span className={`fs-02`}>{tr.price.toLocaleString()}</span>
-                                            <span className={`fs-0-8 mr-1`}>{t("currency." + activePair.quoteAsset.toUpperCase())}</span>
-                                        </div>
-
+                                    <span className={`ml-3`}>{t("pricePerUnit")}:</span>
+                                    <div className={`row ${color}`}>
+                                        <span className={`fs-02`}>{new BN(tr.price).decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</span>
+                                        <span className={`fs-0-8 mr-1`}>{getCurrencyNameOrAlias(currencies[activePair.quoteAsset.toUpperCase()], language)}</span>
+                                    </div>
                                 </div>
                                 <div className={`row jc-between ai-center width-100 my-1`}>
                                     <div className={`row jc-start ai-center`}>
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/MyOrder/components/Trades/Trades.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/MyOrder/components/Trades/Trades.js
index 4ed062d..cb8b902 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/MyOrder/components/Trades/Trades.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/MyOrder/components/Trades/Trades.js
@@ -8,7 +8,8 @@ import ScrollBar from "../../../../../../../../../../../../components/ScrollBar"
 import Error from "../../../../../../../../../../../../components/Error/Error";
 import {useMyTrades} from "../../../../../../../../../../../../queries";
 import Date from "../../../../../../../../../../../../components/Date/Date";
-import {BN} from "../../../../../../../../../../../../utils/utils";
+import {BN, formatWithPrecision, getCurrencyNameOrAlias} from "../../../../../../../../../../../../utils/utils";
+import i18n from "i18next";
 
 const Trades = () => {
 
@@ -21,6 +22,9 @@ const Trades = () => {
 
     const {data, isLoading, error, refetch} = useMyTrades(activePair.symbol)
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     useEffect(() => {
         refetch()
     }, [lastTransaction])
@@ -48,8 +52,8 @@ const Trades = () => {
                                 <div className={`row jc-end ai-center`}>
                                     <span className={`ml-3`}>{t("volume")}:</span>
                                     <div className={`row ${color}`}>
-                                        <span className={`fs-02`}>{tr.qty}</span>
-                                        <span className={`fs-0-8 mr-1`}>{t("currency." + activePair.baseAsset.toUpperCase())}</span>
+                                        <span className={`fs-02`}>{new BN(tr.qty).decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</span>
+                                        <span className={`fs-0-8 mr-1`}>{getCurrencyNameOrAlias(currencies[activePair.baseAsset.toUpperCase()], language)}</span>
                                     </div>
                                 </div>
                             </div>
@@ -57,19 +61,17 @@ const Trades = () => {
                             <div className={`row jc-between ai-center my-1`}>
                                 <span className={`ml-3`}>{t("totalPrice")}:</span>
                                 <div className={`row ${color}`}>
-                                    <span className={`fs-02`}>{(tr.qty * tr.price).toLocaleString()}</span>
-                                    <span className={`fs-0-8 mr-1`}>{t("currency." + activePair.quoteAsset.toUpperCase())}</span>
+                                    <span className={`fs-02`}>{new BN(tr.qty).multipliedBy(tr.price).decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</span>
+                                    <span className={`fs-0-8 mr-1`}>{getCurrencyNameOrAlias(currencies[activePair.quoteAsset.toUpperCase()], language)}</span>
                                 </div>
                             </div>
 
-
                             <div style={{display: openOrder === index ? "revert" : "none"}} className={`column`}>
-
                                 <div className={`row jc-between ai-center my-1`}>
                                     <span className={`ml-3`}>{t("pricePerUnit")}:</span>
                                     <div className={`row ${color}`}>
-                                        <span className={`fs-02`}>{(tr.price)}</span>
-                                        <span className={`fs-0-8 mr-1`}>{t("currency." + activePair.quoteAsset.toUpperCase())}</span>
+                                        <span className={`fs-02`}>{new BN(tr.price).decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</span>
+                                        <span className={`fs-0-8 mr-1`}>{getCurrencyNameOrAlias(currencies[activePair.quoteAsset.toUpperCase()], language)}</span>
                                     </div>
                                 </div>
                                 <div className={`row jc-between ai-center width-100 my-1`}>
@@ -82,8 +84,8 @@ const Trades = () => {
                                     <div className={`row jc-end ai-center`}>
                                         <span className={`ml-3`}>{t("commission")}:</span>
                                         <div className={`row`}>
-                                            <span>{new BN(tr.commission).toFormat()}</span>
-                                            <span className={`fs-0-8 mr-1`}>{t("currency." + tr.commissionAsset.toUpperCase())}</span>
+                                            <span>{formatWithPrecision(tr.commission, currencies[tr.commissionAsset.toUpperCase()].precision)}</span>
+                                            <span className={`fs-0-8 mr-1`}>{getCurrencyNameOrAlias(currencies[tr.commissionAsset.toUpperCase()], language)}</span>
                                         </div>
                                     </div>
                                 </div>
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/Order/components/BuyOrder/BuyOrder.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/Order/components/BuyOrder/BuyOrder.js
index 5abea37..015fd21 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/Order/components/BuyOrder/BuyOrder.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/Order/components/BuyOrder/BuyOrder.js
@@ -3,7 +3,12 @@ import classes from "../../Order.module.css";
 import {Trans, useTranslation} from "react-i18next";
 import {setLastTransaction} from "../../../../../../../../../../../../store/actions/auth";
 import {useDispatch, useSelector} from "react-redux";
-import {BN, parsePriceString} from "../../../../../../../../../../../../utils/utils";
+import {
+    BN,
+    formatWithPrecision,
+    getCurrencyNameOrAlias,
+    parsePriceString
+} from "../../../../../../../../../../../../utils/utils";
 import {useNavigate} from "react-router-dom";
 import Button from "../../../../../../../../../../../../components/Button/Button";
 import {Login as LoginRoute} from "../../../../../../../../../../Routes/routes";
@@ -12,6 +17,7 @@ import {images} from "../../../../../../../../../../../../assets/images";
 import {createOrder} from "../../api/order";
 import {useGetUserAccount} from "../../../../../../../../../../../../queries/hooks/useGetUserAccount";
 import NumberInput from "../../../../../../../../../../../../components/NumberInput/NumberInput";
+import i18n from "i18next";
 
 
 const BuyOrder = () => {
@@ -31,6 +37,9 @@ const BuyOrder = () => {
     const tradeFee = useSelector((state) => state.auth.tradeFee)
     const isLogin = useSelector((state) => state.auth.isLogin)
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const quote = userAccount?.wallets[activePair.quoteAsset]?.free || 0;
 
     const [alert, setAlert] = useState({
@@ -75,26 +84,27 @@ const BuyOrder = () => {
     }, [activePair])
 
     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()}}
                 />)
             })
         }
@@ -106,12 +116,12 @@ 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(currencies[activePair.quoteAsset].precision),
+                    tradeFee: reqAmount.multipliedBy(tradeFee[activePair.quoteAsset]).decimalPlaces(currencies[activePair.baseAsset].precision),
                 });
                 break;
             case "pricePerUnit":
@@ -119,20 +129,20 @@ 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(currencies[activePair.quoteAsset].precision),
+                    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(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(currencies[activePair.baseAsset].precision) : new BN(0),
                 });
-                currencyValidator("reqAmount", req, activePair.baseRange);
+                currencyValidator("reqAmount", req, activePair.baseAsset);
                 break;
             default:
         }
@@ -154,7 +164,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]);
 
@@ -172,10 +182,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]);
 
 
@@ -184,9 +194,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({
@@ -194,13 +204,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(),
@@ -239,8 +249,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,19 +284,19 @@ const BuyOrder = () => {
             <div className={`column`}>
                 <div className={`row jc-between ai-center fs-0-8`} onClick={() => {fillBuyByWallet()}}>
                     <span>{t("orders.availableAmount")}:</span>
-                    <span>{new BN(quote).toFormat()}{" "}{t("currency." + activePair.quoteAsset)}</span>
+                    <span>{new BN(quote).toFormat()}{" "}{getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}</span>
                 </div>
                 <div className={`row jc-between ai-center fs-0-8`} onClick={() => fillBuyByBestPrice()}>
                     <span>{t("orders.bestOffer")}:</span>
-                    <span>{new BN(bestBuyPrice).toFormat()}{" "}{t("currency." + activePair.quoteAsset)}</span>
+                    <span>{formatWithPrecision(bestBuyPrice, currencies[activePair.quoteAsset]?.precision ?? 0)}{" "}{getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}</span>
                 </div>
             </div>
 
             <NumberInput
                 lead={t("volume")}
-                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}
                 customClass={`${classes.smallInput} fs-0-8`}
@@ -294,9 +304,9 @@ const BuyOrder = () => {
             />
             <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")}
                 customClass={`${classes.smallInput} fs-0-8 my-05`}
                 isAllowed={isAllowed}
@@ -304,8 +314,8 @@ const BuyOrder = () => {
             <NumberInput
                 lead={t("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")}
                 customClass={`${classes.smallInput} fs-0-8`}
                 alert={alert.totalPrice}
@@ -315,13 +325,13 @@ const BuyOrder = () => {
                 <div className="column jc-center fs-0-8">
                     <p>
                         {t("orders.tradeFee")}:{" "}
-                        {order.tradeFee.toFormat()}{" "}
-                        {t("currency." + activePair.baseAsset)}
+                        {formatWithPrecision(order.tradeFee, currencies[activePair.baseAsset]?.precision ?? 0)}{" "}
+                        {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/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/Order/components/SellOrder/SellOrder.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/Order/components/SellOrder/SellOrder.js
index 49680d6..2f94d21 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/Order/components/SellOrder/SellOrder.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/Order/components/SellOrder/SellOrder.js
@@ -5,11 +5,17 @@ import {useDispatch, useSelector} from "react-redux";
 import {useGetUserAccount} from "../../../../../../../../../../../../queries/hooks/useGetUserAccount";
 import {toast} from "react-hot-toast";
 import {setLastTransaction} from "../../../../../../../../../../../../store/actions/auth";
-import {BN, parsePriceString} from "../../../../../../../../../../../../utils/utils";
+import {
+    BN,
+    formatWithPrecision,
+    getCurrencyNameOrAlias,
+    parsePriceString
+} from "../../../../../../../../../../../../utils/utils";
 import {createOrder} from "js-api-client";
 import {images} from "../../../../../../../../../../../../assets/images";
 import NumberInput from "../../../../../../../../../../../../components/NumberInput/NumberInput";
 import Button from "../../../../../../../../../../../../components/Button/Button";
+import i18n from "i18next";
 
 
 const SellOrder = () => {
@@ -28,6 +34,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,
@@ -80,19 +89,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()}}
                 />)
             })
         }
@@ -104,12 +113,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":
@@ -117,20 +126,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:
         }
@@ -139,7 +148,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]);
 
@@ -157,8 +166,8 @@ 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);
     }, [selectedSellOrder]);
@@ -166,14 +175,14 @@ const SellOrder = () => {
     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(
@@ -225,8 +234,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,
@@ -257,18 +266,18 @@ const SellOrder = () => {
             <div className={`column`}>
                 <div className={`row jc-between ai-center fs-0-8`} onClick={() => {fillSellByWallet()}}>
                     <span>{t("orders.availableAmount")}:</span>
-                    <span>{new BN(base).toFormat()}{" "}{t("currency." + activePair.baseAsset)}</span>
+                    <span>{new BN(base).toFormat()}{" "}{getCurrencyNameOrAlias(currencies[activePair.baseAsset], language)}</span>
                 </div>
                 <div className={`row jc-between ai-center fs-0-8`} onClick={() => fillSellByBestPrice()}>
-                    <span> {t("orders.bestOffer")}:</span>
-                    <span> {new BN(bestSellPrice).toFormat()}{" "}{t("currency." + activePair.quoteAsset)}</span>
+                    <span>{t("orders.bestOffer")}:</span>
+                    <span>{formatWithPrecision(bestSellPrice, currencies[activePair.quoteAsset]?.precision ?? 0)}{" "}{getCurrencyNameOrAlias(currencies[activePair.quoteAsset], language)}</span>
                 </div>
             </div>
             <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}
                 customClass={`${classes.smallInput} fs-0-8`}
@@ -276,9 +285,9 @@ const SellOrder = () => {
             />
             <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")}
                 customClass={`${classes.smallInput} fs-0-8 my-05`}
                 isAllowed={isAllowed}
@@ -286,8 +295,8 @@ const SellOrder = () => {
             <NumberInput
                 lead={t("orders.totalPrice")}
                 value={order.totalPrice.toString()}
-                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")}
                 customClass={`${classes.smallInput} fs-0-8`}
                 alert={alert.totalPrice}
@@ -297,13 +306,13 @@ const SellOrder = () => {
                 <div className="column jc-center fs-0-8">
                     <p>
                         {t("orders.tradeFee")}:{" "}
-                        {order.tradeFee.toFormat()}{" "}
-                        {t("currency." + activePair.quoteAsset)}
+                        {formatWithPrecision(order.tradeFee, currencies[activePair.quoteAsset]?.precision ?? 0)}{" "}
+                        {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/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/OrderBook/OrderBook.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/OrderBook/OrderBook.js
index 7ccced2..e61d337 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/OrderBook/OrderBook.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/OrderBook/OrderBook.js
@@ -6,6 +6,8 @@ import Loading from "../../../../../../../../../../components/Loading/Loading";
 import OrderBookTable from "./components/OrderBookTable/OrderBookTable";
 import {useOrderBook} from "../../../../../../../../../../queries";
 import {useSelector} from "react-redux";
+import i18n from "i18next";
+import {getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
 
 const OrderBook = ({orderLayout}) => {
 
@@ -14,6 +16,9 @@ const OrderBook = ({orderLayout}) => {
     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)
@@ -34,8 +39,8 @@ const OrderBook = ({orderLayout}) => {
             <div className={`column border-bottom jc-between header-radius card-header-bg ${classes.header}`}>
                 {orderLayout ? "" : <div className="row jc-center">
                     <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/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/OrderBook/components/OrderBookTable/OrderBookTable.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/OrderBook/components/OrderBookTable/OrderBookTable.js
index 658d042..7cd70d5 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/OrderBook/components/OrderBookTable/OrderBookTable.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/OrderBook/components/OrderBookTable/OrderBookTable.js
@@ -20,6 +20,8 @@ const OrderBookTable = ({data, type}) => {
     const location = useLocation();
 
     const dispatch = useDispatch();
+
+    const currencies = useSelector((state) => state.exchange.currencies)
     const activePair = useSelector((state) => state.exchange.activePair)
 
     let header;
@@ -92,16 +94,16 @@ const OrderBookTable = ({data, type}) => {
                                     className='cursor-pointer row jc-between'
                                     onClick={() => {
                                         dispatch(setSellOrder({
-                                            pricePerUnit: parseFloat(pricePerUnit.decimalPlaces(activePair.quoteAssetPrecision).toString()),
+                                            pricePerUnit: pricePerUnit.decimalPlaces(currencies[activePair.quoteAsset].precision).toString(),
                                             amount: 0,
                                         }))
                                         if (location.pathname === OrderBookRoute) navigate(OrderRoute, {replace: true})
                                     }
                                     }>
                                     <span
-                                        className="width-50">{pricePerUnit.decimalPlaces(activePair.quoteAssetPrecision).toFormat()}</span>
+                                        className="width-50">{pricePerUnit.decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}</span>
                                     <span
-                                        className="width-50">{amount.decimalPlaces(activePair.baseAssetPrecision).toFormat()}</span>
+                                        className="width-50">{amount.decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}</span>
                                 </div>
                             ) : (
                                 <div
@@ -110,17 +112,17 @@ const OrderBookTable = ({data, type}) => {
                                     className='cursor-pointer row jc-between'
                                     onClick={() => {
                                         dispatch(setBuyOrder({
-                                            pricePerUnit: parseFloat(pricePerUnit.decimalPlaces(activePair.quoteAssetPrecision).toString()),
+                                            pricePerUnit: parseFloat(pricePerUnit.decimalPlaces(currencies[activePair.quoteAsset].precision).toString()),
                                             amount: 0,
                                         }))
                                         if (location.pathname === OrderBookRoute) navigate(OrderRoute, {replace: true})
                                     }
                                     }>
                                     <span className="width-50">
-                                        {amount.decimalPlaces(activePair.baseAssetPrecision).toFormat()}
+                                        {amount.decimalPlaces(currencies[activePair.baseAsset].precision).toFormat()}
                                     </span>
                                     <span className="width-50">
-                                        {pricePerUnit.decimalPlaces(activePair.quoteAssetPrecision).toFormat()}
+                                        {pricePerUnit.decimalPlaces(currencies[activePair.quoteAsset].precision).toFormat()}
                                     </span>
                                 </div>
                             );
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/Overview/components/InformationBlock/InformationBlock.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/Overview/components/InformationBlock/InformationBlock.js
index fc4feac..195f422 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/Overview/components/InformationBlock/InformationBlock.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/Overview/components/InformationBlock/InformationBlock.js
@@ -5,12 +5,18 @@ import {useSelector} from "react-redux";
 import Loading from "../../../../../../../../../../../../components/Loading/Loading";
 import Error from "../../../../../../../../../../../../components/Error/Error";
 import {useOverview} from "../../../../../../../../../../../../queries";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../../../../../utils/utils";
+import i18n from "i18next";
 
 
 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/>
@@ -21,25 +27,25 @@ const InformationBlock = ({period}) => {
         <div className={`column jc-between`}>
             <p>
                 {t("overview.change")}:{" "}
-                <span className={data.priceChange > 0 ? "text-green" : "text-red"}>
-            %{data.priceChangePercent.toFixed(2)}
+                <span className={`${data?.priceChangePercent > 0 ? "text-green" : data?.priceChangePercent < 0 ? "text-red" : ""}`}>{data?.priceChangePercent === 0 ? "0 %" : `${new BN(data?.priceChangePercent).toFormat(2)} %`}
           </span>
             </p>
             <p>
-                {t("overview.volume")}: <span>{data.volume.toLocaleString()} </span>
-                {t(`currency.${activePair.quoteAsset}`)}
+                {t("overview.volume")}:{" "}
+                <span>{new BN(data?.volume).decimalPlaces(currencies[data?.base]?.precision ?? 0).toFormat()}</span>{" "}
+                {getCurrencyNameOrAlias(currencies[data?.base], language)}
             </p>
         </div>
         <div className={`column jc-between`}>
             <p>
                 {t("min")}:{" "}
-                <span className="text-red">{data.lowPrice.toLocaleString()}</span>{" "}
-                {t(`currency.${activePair.quoteAsset}`)}
+                <span className="text-red">{new BN(data?.lowPrice).decimalPlaces(currencies[data?.quote]?.precision ?? 0).toFormat()}</span>{" "}
+                {getCurrencyNameOrAlias(currencies[data?.quote], language)}
             </p>
             <p>
                 {t("max")}:{" "}
-                <span className="text-green">{data.highPrice.toLocaleString()}</span>{" "}
-                {t(`currency.${activePair.quoteAsset}`)}
+                <span className="text-green">{new BN(data?.highPrice).decimalPlaces(currencies[data?.quote]?.precision ?? 0).toFormat()}</span>{" "}
+                {getCurrencyNameOrAlias(currencies[data?.quote], language)}
             </p>
         </div>
     </div>)
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Header/components/MarketHeader/MarketHeader.js b/src/main/Mobile/Pages/UserPanel/Secttions/Header/components/MarketHeader/MarketHeader.js
index 1eae2a6..986ca43 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Header/components/MarketHeader/MarketHeader.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Header/components/MarketHeader/MarketHeader.js
@@ -4,6 +4,7 @@ import {useDispatch, useSelector} from "react-redux";
 import {useTranslation} from "react-i18next";
 import {activeActionSheet} from "../../../../../../../../store/actions/global";
 import i18n from "i18next";
+import {getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 
 const MarketHeader = () => {
     const {t} = useTranslation();
@@ -11,10 +12,13 @@ const MarketHeader = () => {
     const activePair = useSelector((state) => state.exchange.activePair)
     const active = useSelector((state) => state.global.activeActionSheet.subMenu)
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     return (
         <>
             <div className={`row jc-center ai-center fs-02`} onClick={() => dispatch(activeActionSheet({subMenu: true}))}>
-                <span className={`ml-05`}>{t("currency." + activePair.baseAsset)}/{t("currency." + activePair.quoteAsset)}</span>
+                <span className={`ml-05`}>{getCurrencyNameOrAlias(currencies[activePair?.baseAsset], language)}/{getCurrencyNameOrAlias(currencies[activePair?.quoteAsset], language)}</span>
                 <Icon iconName={`${active ? 'icon-up-micro' : 'icon-down-micro'}  fs-07 mr-05 flex`}/>
             </div>
 
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Header/components/WalletHeader/WalletHeader.js b/src/main/Mobile/Pages/UserPanel/Secttions/Header/components/WalletHeader/WalletHeader.js
index 4482e6d..60a64b3 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Header/components/WalletHeader/WalletHeader.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Header/components/WalletHeader/WalletHeader.js
@@ -5,6 +5,7 @@ import {useTranslation} from "react-i18next";
 import {activeActionSheet} from "../../../../../../../../store/actions/global";
 import {useDispatch, useSelector} from "react-redux";
 import i18n from "i18next";
+import {getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 
 const WalletHeader = () => {
 
@@ -12,13 +13,16 @@ const WalletHeader = () => {
     const {t} = useTranslation()
     const dispatch = useDispatch();
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const active = useSelector((state) => state.global.activeActionSheet.subMenu)
 
     return (
         <>
             <div className={`row jc-center ai-center text-orange fs-02`} onClick={() => dispatch(activeActionSheet({subMenu: true}))}>
-                <span className={`ml-05`}>{t("currency." + id)}</span>
-                {i18n.language === "fa" && <span className={`mr-05`}>{id}</span>}
+                <span className={`ml-05`}>{getCurrencyNameOrAlias(currencies[id], language)}</span>
+                <span className={`mr-05 fs-0-8`}>({id})</span>
                 <Icon iconName={`${active ? 'icon-up-micro' : 'icon-down-micro'}  fs-07 mr-05 flex`}/>
             </div>
             <Icon iconName="icon-safe fs-20 flex"
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/components/MarketSubHeader/MarketSubHeader.js b/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/components/MarketSubHeader/MarketSubHeader.js
index e877279..a3c19e5 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/components/MarketSubHeader/MarketSubHeader.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/components/MarketSubHeader/MarketSubHeader.js
@@ -3,14 +3,19 @@ import {useSelector} from "react-redux";
 import {useTranslation} from "react-i18next";
 import {useGetLastPrices} from "../../../../../../../../queries/hooks/useGetLastPrices";
 import {useGetUserAccount} from "../../../../../../../../queries/hooks/useGetUserAccount";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, getCurrencyNameOrAlias} from "../../../../../../../../utils/utils";
 import classes from "./MarketSubHeader.module.css"
+import i18n from "i18next";
 
 const MarketSubHeader = () => {
 
     const {t} = useTranslation();
 
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const activePair = useSelector((state) => state.exchange.activePair)
+
     const {data: lastPrices} = useGetLastPrices()
     const {data: userAccount} = useGetUserAccount()
 
@@ -23,20 +28,20 @@ const MarketSubHeader = () => {
                <span >{t("header.lastPrice")}</span>
             </div>
             <div className={`width-100 row jc-between ai-start mb-1`}>
-                <span>{new BN(lastPrices[activePair.symbol] || 0).toFormat()+"  "+t("currency." + activePair.quoteAsset)}</span>
+                <span>{" "}{new BN(lastPrices[activePair.symbol] || 0).decimalPlaces(currencies[activePair?.quoteAsset]?.precision ?? 0).toFormat() +" "+ getCurrencyNameOrAlias(currencies[activePair?.quoteAsset], language)}</span>
             </div>
             <div className={`width-100 row jc-between ai-start my-05`}>
                 <div>{t("header.availableBalance")}</div>
             </div>
             <div className={`width-100 row jc-start ai-start mb-1`}>
                 <div className=" row ai-center jc-end">
-                    <span className={`pl-05`}>{ new BN (base).toFormat()}</span>
-                    <span className={`pr-05`}>{t("currency." + activePair.baseAsset)}</span>
+                    <span className={`pl-05`}>{new BN (base).decimalPlaces(currencies[activePair?.baseAsset]?.precision ?? 0).toFormat()}</span>
+                    <span className={`pr-05`}>{getCurrencyNameOrAlias(currencies[activePair?.baseAsset], language)}</span>
                 </div>
                 <span className={`text-orange mx-3`}>|</span>
                 <div className=" row ai-center  jc-end">
-                    <span className={`pl-05`}>{ new BN(quote).toFormat()}</span>
-                    <span className={`pr-05`}>{t("currency." + activePair.quoteAsset)}</span>
+                    <span className={`pl-05`}>{new BN(quote).decimalPlaces(currencies[activePair?.quoteAsset]?.precision ?? 0).toFormat()}</span>
+                    <span className={`pr-05`}>{getCurrencyNameOrAlias(currencies[activePair?.quoteAsset], language)}</span>
                 </div>
             </div>
         </>
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/components/WalletSubHeader/WalletSubHeader.js b/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/components/WalletSubHeader/WalletSubHeader.js
index ebaeaaa..1383bef 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/components/WalletSubHeader/WalletSubHeader.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/SubHeader/components/WalletSubHeader/WalletSubHeader.js
@@ -4,13 +4,19 @@ import {useParams} from "react-router-dom";
 import {useGetUserAssets} from "../../../../../../../../queries";
 import {useTranslation} from "react-i18next";
 import {useGetUserAccount} from "../../../../../../../../queries/hooks/useGetUserAccount";
-import {BN} from "../../../../../../../../utils/utils";
+import {BN, formatWithPrecision} from "../../../../../../../../utils/utils";
+import i18n from "i18next";
+import {useSelector} from "react-redux";
 
 const WalletSubHeader = () => {
 
     const {id} = useParams()
     const {t} = useTranslation()
-    const refCurrency = window.env.REACT_APP_REFERENCE_FIAT_CURRENCY
+    const refCurrency = useSelector((state) => state.exchange.baseCurrency)
+
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const {data: userAccount} = useGetUserAccount()
 
     const {data: estimateValue , isLoading, error} = useGetUserAssets(refCurrency)
@@ -21,18 +27,18 @@ const WalletSubHeader = () => {
 
             <div className={`col-35 column ai-center`}>
                 <span className={`mb-05 text-center`}>{t("header.free")}</span>
-                <span className={`mt-05`}>{new BN(userAccount?.wallets[id]?.free || 0).toFormat()}</span>
-                <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>
+                <span className={`fs-0-7 text-gray`}> ({ refCurrency === id ? formatWithPrecision(userAccount?.wallets[id]?.free || 0, currencies[id]?.precision ?? 0) : formatWithPrecision(allEstimateValue?.free || 0, currencies[refCurrency]?.precision ?? 0)} {refCurrency} )</span>
             </div>
             <div className={`col-35 column ai-center ${classes.border}`}>
                 <span className={`mb-05 text-center`}>{t("header.locked")}</span>
-                <span className={`mt-05`}>{new BN(userAccount?.wallets[id]?.locked || 0).toFormat()}</span>
-                <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>
+                <span className={`fs-0-7 text-gray`}> ({ refCurrency === id ? formatWithPrecision(userAccount?.wallets[id]?.locked || 0, currencies[id]?.precision ?? 0) : formatWithPrecision(allEstimateValue?.locked || 0, currencies[refCurrency]?.precision ?? 0)} {refCurrency} )</span>
             </div>
             <div className={`col-35 column ai-center`}>
                 <span className={`mb-05 text-center`}>{t("header.inWithdrawalProcess")}</span>
-                <span className={`mt-05`}>{new BN(userAccount?.wallets[id]?.withdraw || 0).toFormat()}</span>
-                <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>
+                <span className={`fs-0-7 text-gray`}> ({ refCurrency === id ? formatWithPrecision(userAccount?.wallets[id]?.withdraw || 0, currencies[id]?.precision ?? 0) : formatWithPrecision(allEstimateValue?.withdrawing || 0, currencies[refCurrency]?.precision ?? 0)} {refCurrency} )</span>
             </div>
         </div>
     );
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/MarketSubMenu/MarketSubMenu.js b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/MarketSubMenu/MarketSubMenu.js
index 25b7173..2bf84e4 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/MarketSubMenu/MarketSubMenu.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/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();
 
@@ -36,7 +39,7 @@ 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)}
                 />
@@ -48,7 +51,7 @@ const MarketSubMenu = () => {
                 <MarketCard
                     id="1"
                     type="all"
-                    pairs={symbols}
+                    pairs={pairsList}
                     favPair={fav}
                     addFav={(selected) => addToFav(selected)}
                 />
@@ -62,7 +65,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)}
                 />
             ),
@@ -75,7 +78,7 @@ const MarketSubMenu = () => {
                     id="4"
                     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/Mobile/Pages/UserPanel/Secttions/SubMenu/components/MarketSubMenu/components/MarketCard/MarketCard.js b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/MarketSubMenu/components/MarketCard/MarketCard.js
index 672adca..f2a51fb 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/MarketSubMenu/components/MarketCard/MarketCard.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/MarketSubMenu/components/MarketCard/MarketCard.js
@@ -1,5 +1,4 @@
 import React from "react";
-import {useSelector} from "react-redux";
 import ScrollBar from "../../../../../../../../../../components/ScrollBar";
 import MarketPairCard from "../MarketPairCard/MarketPairCard";
 
@@ -8,7 +7,11 @@ 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/Mobile/Pages/UserPanel/Secttions/SubMenu/components/MarketSubMenu/components/MarketPairCard/MarketPairCard.js b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/MarketSubMenu/components/MarketPairCard/MarketPairCard.js
index f6ffeed..1b8c56b 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/MarketSubMenu/components/MarketPairCard/MarketPairCard.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/MarketSubMenu/components/MarketPairCard/MarketPairCard.js
@@ -3,20 +3,28 @@ import classes from "../MarketCard/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, formatWithPrecision} from "../../../../../../../../../../utils/utils";
 import {setActivePairInitiate} from "../../../../../../../../../../store/actions";
 import {activeActionSheet} from "../../../../../../../../../../store/actions/global";
 import {useGetLastPrices} from "../../../../../../../../../../queries/hooks/useGetLastPrices";
+import i18n from "i18next";
 
 
 const MarketPairCard = ({id, pair,favPair,addFav}) => {
 
+    console.log("id", id)
+
     const activePair = useSelector((state) => state.exchange.activePair.symbol)
     const {data: prices} = useGetLastPrices()
     const dispatch = useDispatch();
+
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
+
     const changeActivePair = () =>{
-        if (activePair !== pair.symbol) {
-            dispatch(setActivePairInitiate(pair, id))
+        const pairSymbolFormatted = `${pair.baseAsset}_${pair.quoteAsset}`;
+        if (activePair !== pairSymbolFormatted) {
+            dispatch(setActivePairInitiate(`${pair.baseAsset}_${pair.quoteAsset}`, id));
             dispatch(activeActionSheet({
                 menu: false,
                 subMenu: false,
@@ -29,27 +37,27 @@ const MarketPairCard = ({id, pair,favPair,addFav}) => {
             <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}>
+                        addFav(pair?.symbol);
+                    }} data-name={pair?.symbol}>
                         <Icon
                             iconName={`${favPair.includes(pair.symbol) ? "icon-star-filled" : "icon-star"} text-color fs-04 ml-05`}
                         />
                     </div>
                     <span className={`mr-1`}>
-                        {pair.baseAsset +"/"+pair.quoteAsset}
+                        {pair?.baseAsset + " / " + pair?.quoteAsset}
                     </span>
                 </div>
                 <div>
-                    {new BN(prices[pair.symbol] || 0).toFormat()}
+                    {formatWithPrecision(prices[pair?.symbol] || 0, currencies[pair?.quoteAsset]?.precision ?? 0)}
                 </div>
             </div>
         </div>
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/WalletSubMenu.js b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/WalletSubMenu.js
index 0e8c4d6..9962ef8 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/WalletSubMenu.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/WalletSubMenu.js
@@ -8,15 +8,35 @@ import WalletListItem from "./components/WalletListItem/WalletListItem";
 import WalletBalance from "./components/WalletBalance/WalletBalance";
 import {useGetUserAccount} from "../../../../../../../../queries/hooks/useGetUserAccount";
 import Loading from "../../../../../../../../components/Loading/Loading";
+import i18n from "i18next";
 
 
 const WalletSubMenu = () => {
 
     const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
     const [showZero, setShowZero] = useState(false);
     const assets = useSelector((state) => state.exchange.assets)
     const {data: data, isLoading} = useGetUserAccount()
 
+    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 column card-bg `} style={{height: "70vh"}}>
             <div className={`flex jc-start ai-center border-bottom card-header-bg px-7 ${classes.header}`}>
@@ -32,9 +52,18 @@ const WalletSubMenu = () => {
                             </div>
                             <WalletBalance/>
                             <ScrollBar customClass={`column`}>
-                                {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}/>)}
+                                {
+                                    wallets.map((wallet) => (
+                                        <WalletListItem
+                                            symbol={wallet.symbol}
+                                            data={wallet}
+                                            key={wallet.symbol}
+                                            assetName={wallet.symbol}
+                                            freeWallet={wallet.free}
+                                            showZero={showZero}
+                                        />
+                                    ))
+                                }
                             </ScrollBar>
                         </div>
                         <div className={`${classes.footer} flex jc-center ai-center px-1 text-gray fs-0-7 px-1 py-05`}
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/WalletSubMenu.module.css b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/WalletSubMenu.module.css
index a2bffff..b475e49 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/WalletSubMenu.module.css
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/WalletSubMenu.module.css
@@ -59,3 +59,8 @@
     border-radius: 10px;
 }
 
+.iconDisabled {
+    filter: grayscale(0.75);
+    opacity: 0.9;/*
+    background-color: var(--lightGray)*/
+}
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/components/WalletBalance/WalletBalance.js b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/components/WalletBalance/WalletBalance.js
index d99cb77..1a792db 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/components/WalletBalance/WalletBalance.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/components/WalletBalance/WalletBalance.js
@@ -2,16 +2,21 @@ 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, formatWithPrecision, getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
 import {useGetUserAssetsEstimatedValue} from "../../../../../../../../../../queries";
+import i18n from "i18next";
+import {useSelector} from "react-redux";
 
 const WalletBalance = () => {
 
     const {t} = useTranslation();
-    const refCurrency = window.env.REACT_APP_REFERENCE_FIAT_CURRENCY
+    const refCurrency = useSelector((state) => state.exchange.baseCurrency)
     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={"row ai-center cursor-pointer position-relative px-3 py-105"} style={{cursor:"initial"}}>
             <div className={` row jc-start ai-center ${classes.PairImage}`}>
                 <img
@@ -27,7 +32,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>{formatWithPrecision(totalValue, currencies[refCurrency]?.precision ?? 0)}{" "}<span className="fs-0-7">{getCurrencyNameOrAlias(currencies[refCurrency], language)}</span></span>
                 </div>
             </div>
         </div>
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/components/WalletListItem/WalletListItem.js b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/components/WalletListItem/WalletListItem.js
index 29342e1..ee6eb26 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/components/WalletListItem/WalletListItem.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/SubMenu/components/WalletSubMenu/components/WalletListItem/WalletListItem.js
@@ -4,20 +4,25 @@ import {NavLink, useParams} 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, formatWithPrecision, getCurrencyNameOrAlias} from "../../../../../../../../../../utils/utils";
 import {useGetUserAccount} from "../../../../../../../../../../queries/hooks/useGetUserAccount";
 import {useGetUserAssets} from "../../../../../../../../../../queries";
+import i18n from "i18next";
+import {useSelector} from "react-redux";
 
-const WalletListItem = ({assetName, showZero}) => {
+const WalletListItem = ({symbol, data, assetName, freeWallet, showZero}) => {
 
     const {t} = useTranslation();
+    const language = i18n.language
+    const currencies = useSelector((state) => state.exchange.currencies)
     const {path} = useParams()
-    const refCurrency = window.env.REACT_APP_REFERENCE_FIAT_CURRENCY
+    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 active = currencies[symbol]?.isActive
 
     if (showZero && free === 0) return <></>
 
@@ -31,21 +36,21 @@ const WalletListItem = ({assetName, showZero}) => {
 
             <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 ? formatWithPrecision(free, currencies[refCurrency]?.precision ?? 0) : formatWithPrecision(freeEstimateValue, currencies[refCurrency]?.precision ?? 0)}<span> {getCurrencyNameOrAlias(currencies[refCurrency], language)}</span>
                     </span>
                 </div>
             </div>
diff --git a/src/queries/hooks/useGetChartData.js b/src/queries/hooks/useGetChartData.js
new file mode 100644
index 0000000..99879fb
--- /dev/null
+++ b/src/queries/hooks/useGetChartData.js
@@ -0,0 +1,45 @@
+import { useQuery } from "@tanstack/react-query";
+import { fetchChartData } from "js-api-client";
+import axios from "axios";
+
+const apiBaseUrl = window.env.REACT_APP_API_BASE_URL
+
+
+/*export const useGetChartData = (symbols = [], period = "WEEKLY", config = {}) => {
+    return useQuery({
+        queryKey: ["chartData", symbols, period],
+        queryFn: async () => {
+            const { data } = await fetchChartData({ symbols, period });
+            return data;
+        },
+        enabled: symbols.length > 0,
+        staleTime: 1000 * 60 * 5,
+        retry: 1,
+        ...config,
+    });
+};*/
+
+export const useGetChartData = (symbols = [], period = "WEEKLY", config = {}) => {
+    return useQuery({
+        queryKey: ["chartData", symbols, period],
+
+        queryFn: async () => {
+            const params = new URLSearchParams();
+            params.append("symbols", symbols.join(","));
+            params.append("period", period);
+
+            const { data } = await axios.get(`${apiBaseUrl}/market/v1/chart/spark-line?${params.toString()}`, {
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            });
+
+            return data;
+        },
+        enabled: symbols.length > 0,
+        staleTime: 1000 * 60 * 5,
+        retry: 1,
+        ...config,
+    });
+};
+
diff --git a/src/queries/index.js b/src/queries/index.js
index 3c57c4f..6bc3d1b 100644
--- a/src/queries/index.js
+++ b/src/queries/index.js
@@ -25,4 +25,5 @@ export {useGetUserAssetsEstimatedValue} from "./hooks/useGetUserAssetsEstimatedV
 export {useTransactionHistory} from "./hooks/useTransactionHistory";
 export {useGetTransactionsHistory} from "./hooks/useGetTransactionsHistory";
 export {useGetDepositHistory} from "./hooks/useGetDepositHistory.js";
-export {useGetWithdrawHistory} from "./hooks/useGetWithdrawHistory.js";
\ No newline at end of file
+export {useGetWithdrawHistory} from "./hooks/useGetWithdrawHistory.js";
+export {useGetChartData} from "./hooks/useGetChartData.js";
\ No newline at end of file
diff --git a/src/store/actions/actionTypes.js b/src/store/actions/actionTypes.js
index 69b605d..94c2588 100644
--- a/src/store/actions/actionTypes.js
+++ b/src/store/actions/actionTypes.js
@@ -61,4 +61,6 @@ export const ACTIVE_ORDER_LAYOUT = "ACTIVE_ORDER_LAYOUT";
 
 export const ACTIVE_ACTION_SHEET = "ACTIVE_ACTION_SHEET";
 
-
+export const GET_CURRENCIES = "GET_CURRENCIES";
+export const GET_PAIRS = "GET_PAIRS";
+export const GET_FEES = "GET_FEES";
diff --git a/src/store/actions/exchange.js b/src/store/actions/exchange.js
index 04e0f64..7701e6d 100644
--- a/src/store/actions/exchange.js
+++ b/src/store/actions/exchange.js
@@ -103,4 +103,22 @@ 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 0acfe70..36947b0 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 8a5923c..2395f08 100644
--- a/src/store/reducers/exchangeReducer.js
+++ b/src/store/reducers/exchangeReducer.js
@@ -4,8 +4,7 @@ const initialState = {
     assets: [],
     pairs: [],
     symbols: [],
-    activePair: {},
-    //lastPrice:{},
+    activePair: [],
     activePairOrders: {
         bestBuyPrice: 0,
         bestSellPrice: 0,
@@ -29,7 +28,10 @@ const initialState = {
     defaultTheme: "",
     supportEmail: "",
     baseCurrency: "",
-    dateType: ""
+    dateType: "",
+    currencies: [],
+    pairsList: [],
+    fees: [],
 };
 
 const exchangeReducer = (state = initialState, action) => {
@@ -45,12 +47,14 @@ const exchangeReducer = (state = initialState, action) => {
                 verifyEmailLock: action.verifyEmailLockTime,
             };
         case actionTypes.SET_ACTIVE_PAIR:
+            const [baseAsset, quoteAsset] = action.pair.split('_');
             return {
                 ...state,
                 activePair: {
-                    ...state.activePair,
-                    ...action.pair,
-                    name: action.pair.baseAsset + "/" + action.pair.quoteAsset
+                    symbol: `${baseAsset}${quoteAsset}`,
+                    pair: action.pair,
+                    baseAsset: baseAsset,
+                    quoteAsset: quoteAsset,
                 },
                 activePairOrders: {
                     ...state.activePairOrders,
@@ -107,8 +111,25 @@ 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 8c1fccb..d096410 100644
--- a/src/store/sagas/global.js
+++ b/src/store/sagas/global.js
@@ -5,6 +5,7 @@ import axios from "axios";
 import i18n from "i18next";
 import {defaultConfigs} from "../../setup/configs/configs";
 
+
 export function* setThemeSaga(action) {
     try {
         yield put(actions.setTheme(action.theme));
@@ -20,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));
 }
@@ -52,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 +67,29 @@ function* getExchangeInfo() {
     }
 }
 
+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) {
 
     yield put(actions.setLoading(true))
@@ -91,7 +116,6 @@ export function* loadConfig(action) {
         i18n.changeLanguage(language)
         appTheme = defaultTheme;
 
-
     } catch (e) {
         i18n.changeLanguage(defaultConfigs?.defaultLanguage)
         appTheme = defaultConfigs?.defaultTheme;
@@ -99,11 +123,59 @@ export function* loadConfig(action) {
     }
 
     try {
+        const exchangeInfo = yield call(getExchangeInfo);
+        const currencies = yield call(fetchCurrencies);
+
+        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 +197,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))
@@ -197,4 +279,4 @@ const assetsScope = {
     SOL: {min: 0.00001, step: 0.00001},
     TON: {min: 0.0001, step: 0.0001},
     DOGE: {min: 0.0001, step: 0.0001},
-}
+}
\ No newline at end of file
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 7c36f68..1292114 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -72,4 +72,41 @@ export const shortenHash = (hash) => {
         return hash;
     }
     return `${hash.substring(0, 6)} - - - ${hash.substring(hash.length - 4)}`;
-}
\ No newline at end of file
+}
+
+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;
+}
+
+export const formatWithPrecision = (value, precision, maxAttempts = 2) => {
+
+    if (!value || isNaN(value) || value === Infinity || value === -Infinity) {
+        return "0";
+    }
+
+    let bnValue = new BN(value);
+    if (bnValue.isNaN()) return "0";
+
+    let currentPrecision = precision;
+    let formatted = bnValue.decimalPlaces(currentPrecision).toNumber();
+
+    let attempts = 0;
+    while (formatted === 0 && attempts < maxAttempts) {
+        currentPrecision += 1;
+        formatted = bnValue.decimalPlaces(currentPrecision).toNumber();
+        attempts++;
+    }
+
+    return bnValue.decimalPlaces(currentPrecision).toFormat();
+};
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index d2a596d..a2a1324 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8930,8 +8930,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=80c1affbcf83d7da6962e541c5cbb5cdcf0933a1"
+  checksum: 5e5aca483a1c18eca58fb229d318de06f1200323ce122d18f42704b154a53592af1cf32f9a7e74dcb28375e8a29d644cc69ccc28d733dfeba302096f0bdcd297
   languageName: node
   linkType: hard