diff --git a/package.json b/package.json
index 1d21422..c9c61a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opex",
-  "version": "v1.0.1-beta.4",
+  "version": "v1.0.1-beta.5",
   "homepage": "",
   "private": true,
   "dependencies": {
diff --git a/public/assets/locales/en/translation.json b/public/assets/locales/en/translation.json
index cd87d80..a75cd9f 100644
--- a/public/assets/locales/en/translation.json
+++ b/public/assets/locales/en/translation.json
@@ -254,7 +254,8 @@
     "coin": "Coins",
     "category": "Categories",
     "size": "Number",
-    "period" : "Period"
+    "period" : "Period",
+    "ascendingByTime" : "Ascending By Time"
   },
   "TransactionCategory": {
     "DEPOSIT": "Deposit",
@@ -263,7 +264,8 @@
     "WITHDRAW": "Withdraw",
     "ORDER_CANCEL": "Cancel Order",
     "ORDER_CREATE": "Create Order",
-    "ORDER_FINALIZED": "Finalized Order"
+    "ORDER_FINALIZED": "Finalized Order",
+    "ETC" : "Unknown"
   },
   "DepositWithdraw": {
     "title": "Deposit / Withdraw",
diff --git a/public/assets/locales/fa/translation.json b/public/assets/locales/fa/translation.json
index e63092c..43d4209 100644
--- a/public/assets/locales/fa/translation.json
+++ b/public/assets/locales/fa/translation.json
@@ -254,7 +254,8 @@
     "coin" : "ارز",
     "category" : "نوع تراکنش",
     "size" : "تعداد",
-    "period" : "بازه زمانی"
+    "period" : "بازه زمانی",
+    "ascendingByTime" : "نمایش براساس جدیدترین"
   },
   "TransactionCategory": {
     "DEPOSIT" : "واریز",
@@ -263,7 +264,8 @@
     "WITHDRAW" : "برداشت",
     "ORDER_CANCEL" : "لغو سفارش",
     "ORDER_CREATE" : "ثبت سفارش",
-    "ORDER_FINALIZED" : "اتمام سفارش"
+    "ORDER_FINALIZED" : "اتمام سفارش",
+    "ETC" : "نامشخص"
   },
   "DepositWithdraw": {
     "title": "واریز/برداشت",
diff --git a/public/assets/locales/uzb/translation.json b/public/assets/locales/uzb/translation.json
index c0960e0..4620bbc 100644
--- a/public/assets/locales/uzb/translation.json
+++ b/public/assets/locales/uzb/translation.json
@@ -254,7 +254,8 @@
     "coin": "Koins",
     "category": "Toifalar",
     "size": "Raqam",
-    "period" : "Davr"
+    "period" : "Davr",
+    "ascendingByTime" : "Eng so'nggisiga asoslangan ko'rsatish"
   },
   "TransactionCategory": {
     "DEPOSIT": "Depozit",
@@ -263,7 +264,8 @@
     "WITHDRAW": "Olib chiqish",
     "ORDER_CANCEL": "Buyurtmani bekor qilish",
     "ORDER_CREATE": "Buyurtma yaratish",
-    "ORDER_FINALIZED": "Buyurtma yakunlandi"
+    "ORDER_FINALIZED": "Buyurtma yakunlandi",
+    "ETC" : "Noma'lum"
   },
   "DepositWithdraw": {
     "title": "Depozit / Pul olish",
diff --git a/src/components/Loading/Loading.js b/src/components/Loading/Loading.js
index 24110f9..c0d2992 100644
--- a/src/components/Loading/Loading.js
+++ b/src/components/Loading/Loading.js
@@ -6,10 +6,10 @@ import {isMobile} from 'react-device-detect';
 
 const Loading = ({type}) => {
     const {t} = useTranslation();
-    const isDark = useSelector((state) => state.global.isDark)
+    const theme = useSelector((state) => state.global.theme)
     return (
         <div className="width-100 column ai-center jc-center" style={{height: "100%"}}>
-            <img className="mb-05" style={{width: isMobile ? "10vw" : "3vw"}} src={isDark ? type === "linear" ? images.linearLoading : images.squareLoading : type === "linear" ? images.linearLoading : images.squareLoadingLight} alt="loading..."/>
+            <img className="mb-05" style={{width: isMobile ? "10vw" : "3vw"}} src={theme === "DARK" ? type === "linear" ? images.linearLoading : images.squareLoading : type === "linear" ? images.linearLoading : images.squareLoadingLight} alt="loading..."/>
             {type !== "linear" && <span className="flashit mt-1">{t('loading')}</span>}
         </div>
     );
diff --git a/src/components/SideMenu/SideMenu.js b/src/components/SideMenu/SideMenu.js
index 6ce5df9..901f1af 100644
--- a/src/components/SideMenu/SideMenu.js
+++ b/src/components/SideMenu/SideMenu.js
@@ -2,33 +2,45 @@ import React, {useEffect} from 'react';
 import classes from './SideMenu.module.css'
 import Icon from "../Icon/Icon";
 import {useDispatch, useSelector} from "react-redux";
-import {setThemeInitiate, showSideMenu} from "../../store/actions/global";
+import { showSideMenu} from "../../store/actions/global";
 import {Link, useLocation} from "react-router-dom";
 import {useTranslation} from "react-i18next";
 import ReactTooltip from "react-tooltip";
 import {setLogoutInitiate} from "../../store/actions";
 import {toast} from "react-hot-toast";
-import {logout} from "js-api-client";
+import {logout, setUserConfig} from "js-api-client";
 import {images} from "../../assets/images";
 import i18n from "i18next";
 import ToggleSwitch from "../ToggleSwitch/ToggleSwitch";
 import *  as Routes from "../../main/Mobile/Routes/routes";
 import {toAbsoluteUrl} from "../../utils/utils";
 import packageJson from "../../../package.json"
+import {setThemeInitiate} from "../../store/actions";
 
 
 const SideMenu = () => {
 
     const {t} = useTranslation();
-    const isDark = useSelector((state) => state.global.isDark)
-    const dispatch = useDispatch();
+    let location = useLocation();
+    const dispatch = useDispatch()
+
     const open = useSelector((state) => state.global.showSideMenu)
-    const isLogin = useSelector((state) => state.auth.isLogin)
     const firstName = useSelector((state) => state.auth.firstName)
     const lastName = useSelector((state) => state.auth.lastName)
-    let location = useLocation();
+    const theme = useSelector((state) => state.global.theme)
+    const isLogin = useSelector((state) => state.auth.isLogin)
+    const languages = useSelector((state) => state.exchange.supportedLanguages)
+
+    const changeLanguage = (lang) => {
+        i18n.changeLanguage(lang)
+        if (isLogin) {
+            setUserConfig({
+                language: lang
+            })
+        }
+    }
+
 
-    const languages = window.env.REACT_APP_LANGS_SUPPORT.split(",")
 
     useEffect(() => {
         ReactTooltip.rebuild();
@@ -44,7 +56,7 @@ const SideMenu = () => {
     }
 
     const changeLanguageHandler = (lang) => {
-        i18n.changeLanguage(lang)
+        changeLanguage(lang)
         dispatch(showSideMenu(false))
     }
 
@@ -143,7 +155,10 @@ const SideMenu = () => {
                     </div>}
                     <div className={`row ai-center mb-2`}>
                         <span className={`ml-2`}>{t("Footer.darkMode")}:</span>
-                        <ToggleSwitch onchange={(e) => dispatch(setThemeInitiate(e.target.checked))} checked={isDark}/>
+                        <ToggleSwitch
+                            onchange={(e) => dispatch(setThemeInitiate(e.target.checked ? "DARK" : "LIGHT", isLogin))}
+                            checked={theme === "DARK"}/>
+
                     </div>
                     <img src={toAbsoluteUrl('/assets/logo/logo.svg')} alt={t("title")} title={t("title")} className={`img-lg-1 mb-1 mt-2`}/>
                     <span className={`mt-1`}>{packageJson.version}</span>
diff --git a/src/components/TextInput/TextInput.js b/src/components/TextInput/TextInput.js
index 2fc6d39..a25bfd5 100644
--- a/src/components/TextInput/TextInput.js
+++ b/src/components/TextInput/TextInput.js
@@ -6,15 +6,13 @@ import DatePicker from "react-multi-date-picker";
 import persian_fa from "react-date-object/locales/persian_fa";
 import persian from "react-date-object/calendars/persian";
 import {useSelector} from "react-redux";
-import i18n from "../../i18n/i18n";
+import i18n from "i18next";
 import "react-multi-date-picker/styles/backgrounds/bg-dark.css"
 
 const TextInput = (props) => {
     const {customRef,readOnly,onchange,customClass,options, lead, ltr, after ,select ,alerts ,max, datePicker, ...other} = props
 
-    const isDark = useSelector((state) => state.global.isDark)
-
-    console.log("isDark", isDark)
+    const theme = useSelector((state) => state.global.theme)
 
     const optionClassHandler = (state) => {
         let className = classes.selectOptions
@@ -64,7 +62,7 @@ const TextInput = (props) => {
 
     if ( datePicker ){
         inputSection = <DatePicker
-            className={`${isDark && "bg-dark"}`}
+            className={`${theme === "DARK" && "bg-dark"}`}
             locale={i18n.language === "fa" ? persian_fa : null}
             calendar={i18n.language === "fa" ? persian : null}
             onChange={onchange}
diff --git a/src/i18n/i18n.js b/src/i18n/i18n.js
deleted file mode 100644
index d767e77..0000000
--- a/src/i18n/i18n.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import i18n from "i18next";
-import LanguageDetector from "i18next-browser-languagedetector";
-import {initReactI18next} from "react-i18next";
-import Backend from "i18next-http-backend";
-
-
-i18n
-    .use(LanguageDetector)
-    .use(Backend)
-    .use(initReactI18next)
-    .init({
-        preload: [window.env.REACT_APP_PRELOAD_LANG],
-        fallbackLng: window.env.REACT_APP_PRELOAD_LANG,
-        debug: process.env.NODE_ENV === "development",
-        detection: {
-            order: ["localStorage"],
-            lookupLocalStorage: "language",
-            caches: ["localStorage"],
-        },
-        backend: {
-            loadPath: process.env.PUBLIC_URL+'/assets/locales/{{lng}}/{{ns}}.json',
-        },
-        interpolation: {
-            escapeValue: false,
-        },
-    });
-
-export default i18n;
diff --git a/src/index.js b/src/index.js
index 5ab9137..304aebd 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,5 +1,4 @@
 import React from "react";
-import "./i18n/i18n";
 import {Provider} from "react-redux";
 import {applyMiddleware, combineReducers, compose, createStore} from "redux";
 import createSagaMiddleware from "redux-saga";
@@ -17,6 +16,10 @@ import {StyleRoot} from "radium";
 import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
 import {ReactQueryDevtools} from '@tanstack/react-query-devtools'
 import {createRoot} from "react-dom/client";
+import i18n from "i18next";
+import LanguageDetector from "i18next-browser-languagedetector";
+import Backend from "i18next-http-backend";
+import {initReactI18next} from "react-i18next";
 
 
 const sagaMiddleware = createSagaMiddleware();
@@ -26,12 +29,6 @@ const rootReducer = combineReducers({
     auth: authReducer,
 });
 
-//add custom title & meta
-const meta = document.getElementsByTagName('meta')
-document.title = window.env.REACT_APP_TITLE ? window.env.REACT_APP_TITLE : " ";
-meta.description.content = window.env.REACT_APP_DESCRIPTION_CONTENT ? window.env.REACT_APP_DESCRIPTION_CONTENT : " "
-
-
 /**
  * Base URL of the website.
  *
@@ -52,6 +49,30 @@ sagaMiddleware.run(watchGlobal);
 
 setupAxios(axios, store);
 
+const {exchange: {defaultLanguage}} = store.getState()
+
+i18n
+    .use(LanguageDetector)
+    .use(Backend)
+    .use(initReactI18next)
+    .init({
+        preload: [defaultLanguage],
+        fallbackLng: defaultLanguage,
+        debug: process.env.NODE_ENV === "development",
+        detection: {
+            order: ["localStorage"],
+            lookupLocalStorage: "language",
+            caches: ["localStorage"],
+        },
+        backend: {
+            loadPath: process.env.PUBLIC_URL + '/assets/locales/{{lng}}/{{ns}}.json',
+        },
+        interpolation: {
+            escapeValue: false,
+        },
+    });
+
+
 //React query client
 const queryClient = new QueryClient()
 
diff --git a/src/main/Mobile/Mobile.js b/src/main/Mobile/Mobile.js
index cbb97e0..1183527 100644
--- a/src/main/Mobile/Mobile.js
+++ b/src/main/Mobile/Mobile.js
@@ -30,15 +30,16 @@ import EasyTrading from "./Pages/EasyTrading/EasyTrading";
 
 const Mobile = () => {
 
-    const dispatch = useDispatch();
     const query = useQuery();
+    const dispatch = useDispatch();
 
-    const isDark = useSelector((state) => state.global.isDark)
+    const theme = useSelector((state) => state.global.theme)
     const isLoading = useSelector((state) => state.global.isLoading)
     const hasError = useSelector((state) => state.global.hasError)
-    const isLogin = useSelector((state) => state.auth.isLogin)
+    const title = useSelector((state) => state.exchange.title)
+    const description = useSelector((state) => state.exchange.description)
 
-    isDark ? document.body.classList.add('dark') : document.body.classList.remove('dark');
+    theme === "DARK" ? document.body.classList.add('dark') : document.body.classList.remove('dark');
 
     useEffect(() => {
         const impersonate = query.get("impersonate");
@@ -57,13 +58,19 @@ const Mobile = () => {
     }, []);
 
 
-    useInterval(() => {
+    /*useInterval(() => {
         dispatch(setUserAccountInfoInitiate());
     }, isLogin ? 3000 : null)
 
     useInterval(() => {
         dispatch(setLastPriceInitiate());
-    }, 3000)
+    }, 3000)*/
+
+    useEffect(() => {
+        const meta = document.getElementsByTagName('meta')
+        document.title = title ? title : " ";
+        meta.description.content = description ? description : " "
+    }, [title, description])
 
     const Toast = () => <Toaster position="top-center" toastOptions={
         {
@@ -93,24 +100,16 @@ const Mobile = () => {
             },
         }} containerStyle={{}}/>
 
-    if (isLoading) {
-        return <FullWidthLoading/>
-    }
-    if (hasError) {
-        return <FullWidthError/>
-    }
+    if (isLoading) return <FullWidthLoading/>
+
+    if (hasError)  return <FullWidthError/>
 
     return (
         <div className={`mobile-container`}>
             <Routes>
                 <Route path={RoutesName.Login} element={<Login/>}/>
                 <Route path={RoutesName.User + "/*"} element={<User/>}/>
-                {/*<Route path={RoutesName.Landing} element={<Landing/>}/>*/}
-                {/*<Route path={RoutesName.AllMarket} element={<AllMarket/>}/>*/}
-                {/*<Route path={RoutesName.Guide} element={<Guide/>}/>*/}
                 <Route path={RoutesName.Panel + "/*"} element={<UserPanel/>}/>
-
-
                 <Route element={<Layout/>}>
                     <Route path={RoutesName.Landing} element={<Landing/>}/>
                     <Route path={RoutesName.AllMarket} element={<AllMarket/>}/>
@@ -122,14 +121,10 @@ const Mobile = () => {
                     <Route path={RoutesName.Rules} element={<Rules/>}/>
                     <Route path={RoutesName.ContactUs} element={<ContactUs/>}/>
                 </Route>
-
-
             </Routes>
-
             <ReactTooltip data-html={true} data-effect="float"/>
             <Toast/>
             <SideMenu/>
-
         </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 1b7df0b..84783f2 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
@@ -6,8 +6,6 @@ import {useTranslation} from "react-i18next";
 
 const MostIncreasedPrice = ({mostIncreasedPrice}) => {
 
-    console.log("mostIncreasedPrice" , mostIncreasedPrice)
-
     const {t} = useTranslation();
 
     return (
diff --git a/src/main/Mobile/Pages/Login/Login.js b/src/main/Mobile/Pages/Login/Login.js
index e0ff3dd..d5aefad 100644
--- a/src/main/Mobile/Pages/Login/Login.js
+++ b/src/main/Mobile/Pages/Login/Login.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, {useEffect} from "react";
 import {useSelector} from "react-redux";
 import classes from "./Login.module.css";
 import {images} from "../../../../assets/images";
@@ -6,14 +6,21 @@ import AccordionBox from "../../../../components/AccordionBox/AccordionBox";
 import LoginForm from "./components/LoginForm/LoginForm";
 import RegisterForm from "./components/RegisterForm/RegisterForm";
 import {useTranslation} from "react-i18next";
-import {useNavigate} from "react-router-dom";
+import {useLocation, useNavigate} from "react-router-dom";
+
 
 const Login = () => {
+
     const {t} = useTranslation();
     const navigate = useNavigate();
+    const location = useLocation();
+
     const isLogin = useSelector((state) => state.auth.isLogin)
+    const from = location.state?.from?.pathname || "/";
 
-    if (isLogin) navigate("/", {replace: true});
+    useEffect(() => {
+        if (isLogin) navigate(from, {replace: true});
+    }, [])
 
     const data = [
         {
@@ -26,12 +33,9 @@ const Login = () => {
 
     return (
         <div className={`width-100 flex  ai-center jc-center px-1 ${classes.container}`} style={{backgroundImage: `url("${images.spaceStar}")`}}>
-
             <div className={`${classes.content}`}>
                 <AccordionBox title={t('login.title')} content={data}/>
             </div>
-
-
         </div>
     );
 };
diff --git a/src/main/Mobile/Pages/Login/components/LoginForm/LoginForm.js b/src/main/Mobile/Pages/Login/components/LoginForm/LoginForm.js
index 44808ce..cff42fd 100644
--- a/src/main/Mobile/Pages/Login/components/LoginForm/LoginForm.js
+++ b/src/main/Mobile/Pages/Login/components/LoginForm/LoginForm.js
@@ -1,9 +1,9 @@
-import {useDispatch, useSelector} from "react-redux";
+import {useDispatch} from "react-redux";
 import React, {useEffect, useState} from "react";
 import classes from "../../Login.module.css";
 import TextInput from "../../../../../../components/TextInput/TextInput";
 import LoginFormLoading from "../LoginLoading/LoginFormLoading";
-import {setUserAccountInfoInitiate, setUserInfo, setUserTokensInitiate} from "../../../../../../store/actions";
+import {getUserConfigsInitiate, setUserInfo, setUserTokensInitiate} from "../../../../../../store/actions";
 import {useLocation, useNavigate} from "react-router-dom";
 import {useTranslation} from "react-i18next";
 import Button from "../../../../../../components/Button/Button";
@@ -18,10 +18,11 @@ import {login, parseToken} from "js-api-client";
 
 
 const LoginForm = () => {
+
     const {t} = useTranslation();
     const navigate = useNavigate();
-    const dispatch = useDispatch();
     const location = useLocation();
+    const dispatch = useDispatch();
 
     const isDevelopment = window.env.REACT_APP_ENV === "development";
     const [isInputVisible, setIsInputVisible] = useState(false);
@@ -33,16 +34,11 @@ const LoginForm = () => {
     const {refetch: getKycStatus} = useGetKycStatus();
 
     const from = location.state?.from?.pathname || "/";
-    const isLogin = useSelector((state) => state.auth.isLogin)
 
     const agent = [deviceType, browserName, fullBrowserVersion]
     const clientSecret = window.env.REACT_APP_CLIENT_SECRET
     const clientId = window.env.REACT_APP_CLIENT_ID
 
-    useEffect(() => {
-        if (isLogin) navigate(from, {replace: true});
-    }, [])
-
     useEffect(() => {
         setNeedOTP(undefined)
     }, [credential.username])
@@ -77,9 +73,9 @@ const LoginForm = () => {
             .then(async (res) => {
                 const userToken = parseToken(res.data);
                 const jwt = jwtDecode(userToken.accessToken)
-                await dispatch(setUserInfo(jwt));
-                await dispatch(setUserTokensInitiate(userToken));
-                await dispatch(setUserAccountInfoInitiate())
+                dispatch(setUserInfo(jwt));
+                dispatch(setUserTokensInitiate(userToken));
+                dispatch(getUserConfigsInitiate());
                 await getKycStatus()
                 return navigate(from, {replace: true});
             })
diff --git a/src/main/Mobile/Pages/Login/components/LoginLoading/LoginFormLoading.js b/src/main/Mobile/Pages/Login/components/LoginLoading/LoginFormLoading.js
index 24e7569..6f851d6 100644
--- a/src/main/Mobile/Pages/Login/components/LoginLoading/LoginFormLoading.js
+++ b/src/main/Mobile/Pages/Login/components/LoginLoading/LoginFormLoading.js
@@ -4,10 +4,10 @@ import {useSelector} from "react-redux";
 
 const LoginFormLoading = () => {
 
-    const isDark = useSelector((state) => state.global.isDark)
+    const theme = useSelector((state) => state.global.theme)
 
     return <div className= "flex jc-center ai-center" style={{height: "35vh"}}>
-        <img style={{width: "8vw", textAlign: "center"}} src={isDark ? images.squareLoading : images.squareLoadingLight} alt="Loading"/>
+        <img style={{width: "8vw", textAlign: "center"}} src={theme === "DARK" ? images.squareLoading : images.squareLoadingLight} alt="Loading"/>
     </div>
 }
 
diff --git a/src/main/Mobile/Pages/Login/components/RegisterForm/RegisterForm.js b/src/main/Mobile/Pages/Login/components/RegisterForm/RegisterForm.js
index a1f09b0..35f0e01 100644
--- a/src/main/Mobile/Pages/Login/components/RegisterForm/RegisterForm.js
+++ b/src/main/Mobile/Pages/Login/components/RegisterForm/RegisterForm.js
@@ -142,6 +142,9 @@ const RegisterForm = () => {
             } else if (e?.response?.data?.error === "UserAlreadyExists") {
                 setUserData({...userData, email: {...userData.email, error: [t("login.UserAlreadyExists")]}})
                 setRegisterStatus("")
+            } else if (e?.response?.data?.error === "RegisterIsLimited") {
+                setUserData({...userData, email: {...userData.email, error: [t("login.RegisterIsLimited")]}})
+                setRegisterStatus("")
             } else {
                 setRegisterStatus("finishedWithError");
             }
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/TradingView/components/MarketChart/MarketChart.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/TradingView/components/MarketChart/MarketChart.js
index 42ebc0b..63ee7fe 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/TradingView/components/MarketChart/MarketChart.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Market/components/TradingView/components/MarketChart/MarketChart.js
@@ -16,7 +16,7 @@ const MarketChart = ({type}) => {
     let chartProperties, candleSeries, volumeSeries;
     const chart = useRef();
 
-    const isDark = useSelector((state) => state.global.isDark)
+    const theme = useSelector((state) => state.global.theme)
     const activePairSymbol = useSelector((state) => state.exchange.activePair.symbol)
 
     const {data, error} = useGetChartCandlesticks(activePairSymbol, type)
@@ -54,7 +54,7 @@ const MarketChart = ({type}) => {
         priceScale: lightTheme.priceScale,
         timeScale: {...lightTheme.timeScale, ...timeScale}
     };
-    if (isDark) {
+    if (theme === "DARK") {
         chartProperties = {
             ...chartProperties,
             layout: {
@@ -77,7 +77,7 @@ const MarketChart = ({type}) => {
             chartProperties,
         );
 
-        candleSeries = chart.current.addCandlestickSeries(isDark ? darkTheme : candleColors);
+        candleSeries = chart.current.addCandlestickSeries(theme === "DARK" ? darkTheme : candleColors);
         volumeSeries = chart.current.addHistogramSeries({
             priceFormat: {
                 type: 'volume',
@@ -134,7 +134,7 @@ const MarketChart = ({type}) => {
     }, [])
 
     useEffect(() => {
-        if (isDark) {
+        if (theme === "DARK") {
             chart.current.applyOptions({
                 ...chartProperties,
                 layout: {
@@ -155,7 +155,7 @@ const MarketChart = ({type}) => {
                 timeScale: lightTheme.timeScale,
             });
         }
-    }, [isDark]);
+    }, [theme]);
 
     return (
         <div ref={chartContainerRef} className={`width-100  ${classes.chartContainer}`}>
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/TransactionHistory.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/TransactionHistory.js
index a09ea6d..5184084 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/TransactionHistory.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/TransactionHistory.js
@@ -14,6 +14,7 @@ import {useTransactionHistory} from "../../../../../../../../queries";
 import Date from "../../../../../../../../components/Date/Date";
 import DatePanel from "react-multi-date-picker/plugins/date_panel";
 import Button from "../../../../../../../../components/Button/Button";
+import ToggleSwitch from "../../../../../../../../components/ToggleSwitch/ToggleSwitch";
 
 const TransactionHistory = () => {
 
@@ -25,6 +26,7 @@ const TransactionHistory = () => {
         "category": null, // optional [DEPOSIT, FEE, TRADE, WITHDRAW, ORDER_CANCEL, ORDER_CREATE, ORDER_FINALIZED]
         "startTime": moment().subtract(1, 'months').startOf("day").valueOf(),
         "endTime": moment().endOf("day").valueOf(),
+        "ascendingByTime": false,
         "limit": 10,
         "offset": 0
     });
@@ -181,14 +183,22 @@ const TransactionHistory = () => {
                     range
                     customClass={`width-100 my-1 ${classes.thisInput}`}
                 />
+
+                <div className={`row jc-between ai-center my-1 px-1 fs-0-8 width-100`}>
+                    <span className={`fs-0-8 ml-1`}>{t("TransactionHistory.ascendingByTime")}</span>
+                    <ToggleSwitch
+                        onchange={ () => setQuery(prevState => {return {
+                            ...prevState,
+                            ascendingByTime: !prevState.ascendingByTime
+                        }}) }
+                        checked={!query?.ascendingByTime}/>
+                </div>
             </div>
             <div className={`card-bg card-border width-100 my-3`} ref={scrollRef}>
                 <div className={`card-header-bg row jc-between ai-center px-5 py-3`}>
                     <div className={`row jc-center ai-center`}>
                         <h3 className={``}>{t("txHistory.title")}</h3>
-
                     </div>
-
                     <div className={`row mr-1 text-gray fs-0-8`}>
                         <span className={`mx-05`}>{t("from")}</span>
                         <span><Date date={query?.startTime}/></span>
@@ -200,29 +210,32 @@ const TransactionHistory = () => {
                     {content()}
                 </div>
             </div>
-            <div className={`row jc-center ai-center width-100 pb-5`}>
+            <div className={`row jc-between ai-center width-100 border card-bg px-5 py-3 mb-2 rounded-8`}>
                 <Button
-                    buttonClass={`${classes.thisButton} px-7`}
+                    buttonClass={`${classes.thisButton} width-30`}
                     buttonTitle={t('first')}
                     disabled={pagination.page === 1}
                     type="button"
                     onClick={firstPage}
                 />
                 <Button
-                    buttonClass={`${classes.thisButton} px-7 mx-4`}
+                    buttonClass={`${classes.thisButton} width-30`}
                     buttonTitle={t('prev')}
                     disabled={pagination.page === 1}
                     type="button"
                     onClick={prevPage}
                 />
                 <Button
-                    buttonClass={`${classes.thisButton} px-7`}
+                    buttonClass={`${classes.thisButton} width-30`}
                     buttonTitle={t('next')}
                     disabled={pagination.isLastPage}
                     type="button"
                     onClick={nextPage}
                 />
             </div>
+
+            <div className={`width-100 pb-1`}/>
+
         </div>
     );
 };
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/components/TransactionHistoryTable/TransactionHistoryTable.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/components/TransactionHistoryTable/TransactionHistoryTable.js
index 7ae9894..877f491 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/components/TransactionHistoryTable/TransactionHistoryTable.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/TransactionHistory/components/TransactionHistoryTable/TransactionHistoryTable.js
@@ -11,6 +11,27 @@ const TransactionHistoryTable = ({txs, offset}) => {
     const [openItem, setOpenItem] = useState(null);
     const {t} = useTranslation();
 
+    const txCategory = (category) => {
+        switch (category) {
+            case "DEPOSIT":
+                return t("TransactionCategory.DEPOSIT");
+            case "FEE":
+                return t("TransactionCategory.FEE");
+            case "TRADE":
+                return t("TransactionCategory.TRADE");
+            case "WITHDRAW":
+                return t("TransactionCategory.WITHDRAW");
+            case "ORDER_CANCEL":
+                return t("TransactionCategory.ORDER_CANCEL");
+            case "ORDER_CREATE":
+                return t("TransactionCategory.ORDER_CREATE");
+            case "ORDER_FINALIZED":
+                return t("TransactionCategory.ORDER_FINALIZED");
+            default:
+                return t("TransactionCategory.ETC");
+        }
+    };
+
     return  <div className={`${classes.striped} fs-0-9`}>
         {txs.map((tr, index) => {
             return (
@@ -36,7 +57,7 @@ const TransactionHistoryTable = ({txs, offset}) => {
                         </div>
                     </div>
                     <div className={`row jc-between ai-center my-1`}>
-                        <span className={`text-orange`}>{t('TransactionCategory.'+tr.category)}</span>
+                        <span className={`text-orange`}>{txCategory(tr.category)}</span>
                         <div className={`row jc-end ai-center`}>
                             <span className={`ml-3`}>{t("volume")}:</span>
                             <div className={`row`}>
@@ -47,7 +68,14 @@ const TransactionHistoryTable = ({txs, offset}) => {
                     </div>
                     <div style={{display: openItem === index ? "revert" : "none"}} className={`column`}>
                         <div className={`row wrap jc-start ai-center width-100 my-1`}>
-                            {(tr?.category === "DEPOSIT" || tr?.category === "WITHDRAW") ? "----" :
+                            {(
+                                tr?.category === "FEE" ||
+                                tr?.category === "TRADE" ||
+                                tr?.category === "ORDER_CANCEL" ||
+                                tr?.category === "ORDER_CREATE"  ||
+                                tr?.category === "ORDER_FINALIZED" )
+
+                                ?
                                 <>
                                     <span> {t('TransactionCategory.'+tr.category)}</span>
                                     <span className={`mr-1`}>{tr?.additionalData?.ask && t('sell')} {tr?.additionalData?.bid && t('buy')}</span>
@@ -57,6 +85,7 @@ const TransactionHistoryTable = ({txs, offset}) => {
                                     <span className={`mr-1`}>{new BN(tr?.additionalData?.origPrice).toFormat()}</span>
                                     <span className={`mr-1`}>{t("currency." + tr?.additionalData?.pair?.rightSideName )}</span>
                                 </>
+                                 : "----"
                             }
                         </div>
                     </div>
diff --git a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/withdrawal/withdrawal.js b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/withdrawal/withdrawal.js
index 4d01cab..675815d 100644
--- a/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/withdrawal/withdrawal.js
+++ b/src/main/Mobile/Pages/UserPanel/Secttions/Content/components/Wallet/components/withdrawal/withdrawal.js
@@ -67,7 +67,6 @@ const Withdrawal = () => {
         if (navigator.clipboard !== undefined) {
             navigator.clipboard.readText()
                 .then(text => {
-                    //console.log('Pasted content: ', text);
                     setAddress({...address, value: text})
                     toast.success(t('DepositWithdraw.paste'));
                 })
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 c33b6ee..1eae2a6 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
@@ -3,17 +3,21 @@ import Icon from "../../../../../../../../components/Icon/Icon";
 import {useDispatch, useSelector} from "react-redux";
 import {useTranslation} from "react-i18next";
 import {activeActionSheet} from "../../../../../../../../store/actions/global";
+import i18n from "i18next";
 
 const MarketHeader = () => {
     const {t} = useTranslation();
     const dispatch = useDispatch();
     const activePair = useSelector((state) => state.exchange.activePair)
+    const active = useSelector((state) => state.global.activeActionSheet.subMenu)
 
     return (
         <>
-            <h3 className={`mr-2`} onClick={() => dispatch(activeActionSheet({subMenu: true}))}>
-                {t("currency." + activePair.baseAsset)}/{t("currency." + activePair.quoteAsset)}
-            </h3>
+            <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>
+                <Icon iconName={`${active ? 'icon-up-micro' : 'icon-down-micro'}  fs-07 mr-05 flex`}/>
+            </div>
+
             <Icon iconName="icon-market fs-20 flex"
                   onClick={() => dispatch(activeActionSheet({menu: true}))}
             />
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 2ef0ca8..4482e6d 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
@@ -3,7 +3,7 @@ import Icon from "../../../../../../../../components/Icon/Icon";
 import {useParams} from "react-router-dom";
 import {useTranslation} from "react-i18next";
 import {activeActionSheet} from "../../../../../../../../store/actions/global";
-import {useDispatch} from "react-redux";
+import {useDispatch, useSelector} from "react-redux";
 import i18n from "i18next";
 
 const WalletHeader = () => {
@@ -12,11 +12,14 @@ const WalletHeader = () => {
     const {t} = useTranslation()
     const dispatch = useDispatch();
 
+    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-1`}>{t("currency." + id)}</span>
-                {i18n.language === "fa" && <span className={`mr-1`}>{id}</span>}
+                <span className={`ml-05`}>{t("currency." + id)}</span>
+                {i18n.language === "fa" && <span className={`mr-05`}>{id}</span>}
+                <Icon iconName={`${active ? 'icon-up-micro' : 'icon-down-micro'}  fs-07 mr-05 flex`}/>
             </div>
             <Icon iconName="icon-safe fs-20 flex"
                   onClick={() => dispatch(activeActionSheet({menu: true}))}
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 cbcdcae..25b7173 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
@@ -4,23 +4,28 @@ import {useTranslation} from "react-i18next";
 import AccordionBox from "../../../../../../../../components/AccordionBox/AccordionBox";
 import Icon from "../../../../../../../../components/Icon/Icon";
 import MarketCard from "./components/MarketCard/MarketCard";
+import {useDispatch, useSelector} from "react-redux";
+import {setFavPairInitiate} from "../../../../../../../../store/actions";
 
 const MarketSubMenu = () => {
 
     const {t} = useTranslation();
     const [activeTab] = useState(JSON.parse(localStorage.getItem("activeMarketTab")) || 1);
-    const [fav, setFav] = useState(JSON.parse(localStorage.getItem("favPair")) || []);
+    const symbols = useSelector((state) => state.exchange.symbols)
+    const fav = useSelector((state) => state.auth.favoritePairs)
+    const dispatch = useDispatch();
 
-    useEffect(() => {
+
+    /*useEffect(() => {
         localStorage.setItem("favPair", JSON.stringify(fav))
-    }, [fav])
+    }, [fav])*/
 
     const addToFav = (selected) => {
         if (fav.includes(selected)) {
             const newFav = fav.filter((item) => item !== selected);
-            setFav(newFav);
+            dispatch(setFavPairInitiate(newFav))
         } else {
-            setFav((prev) => [...prev, selected]);
+            dispatch(setFavPairInitiate([...fav, selected]))
         }
     };
 
@@ -31,6 +36,7 @@ const MarketSubMenu = () => {
                 <MarketCard
                     id="0"
                     type="fav"
+                    pairs={symbols.filter(p => fav.includes(p.symbol))}
                     favPair={fav}
                     addFav={(selected) => addToFav(selected)}
                 />
@@ -42,6 +48,7 @@ const MarketSubMenu = () => {
                 <MarketCard
                     id="1"
                     type="all"
+                    pairs={symbols}
                     favPair={fav}
                     addFav={(selected) => addToFav(selected)}
                 />
@@ -55,6 +62,7 @@ const MarketSubMenu = () => {
                     id="2"
                     type="BTC"
                     favPair={fav}
+                    pairs={symbols.filter(p => (p.baseAsset === "BTC" || p.quoteAsset === "BTC"))}
                     addFav={(selected) => addToFav(selected)}
                 />
             ),
@@ -67,6 +75,7 @@ const MarketSubMenu = () => {
                     id="4"
                     type="USDT"
                     favPair={fav}
+                    pairs={symbols.filter(p => (p.baseAsset === "USDT" || p.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 5ae06b8..672adca 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
@@ -4,20 +4,11 @@ import ScrollBar from "../../../../../../../../../../components/ScrollBar";
 import MarketPairCard from "../MarketPairCard/MarketPairCard";
 
 const MarketCard = ({type, ...props}) => {
-    let all = useSelector((state) => state.exchange.symbols)
-
-    if (type === "fav") {
-        all = all.filter(p => props.favPair.includes(p.symbol))
-    }
-
-    if (type !== "all" && type !== "fav") {
-        all = all.filter(p => (p.baseAsset === type || p.quoteAsset === type))
-    }
 
     return (
         <div style={{height: "100%"}}>
             <ScrollBar>
-                {all.map((pair) => <MarketPairCard {...props} pair={pair} key={pair.symbol}/>)}
+                {props.pairs.map((pair) => <MarketPairCard {...props} pair={pair} key={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 3d62110..f6ffeed 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
@@ -6,24 +6,25 @@ import Icon from "../../../../../../../../../../components/Icon/Icon";
 import {BN} from "../../../../../../../../../../utils/utils";
 import {setActivePairInitiate} from "../../../../../../../../../../store/actions";
 import {activeActionSheet} from "../../../../../../../../../../store/actions/global";
+import {useGetLastPrices} from "../../../../../../../../../../queries/hooks/useGetLastPrices";
 
 
 const MarketPairCard = ({id, pair,favPair,addFav}) => {
 
     const activePair = useSelector((state) => state.exchange.activePair.symbol)
-    const price = useSelector((state) => state.exchange.lastPrice[pair.symbol])
+    const {data: prices} = useGetLastPrices()
     const dispatch = useDispatch();
-
-    const onClickHandler = () => {
-
-        dispatch(setActivePairInitiate(pair, id))
-        dispatch(activeActionSheet({
-            menu: false,
-            subMenu: false,
-        }))
+    const changeActivePair = () =>{
+        if (activePair !== pair.symbol) {
+            dispatch(setActivePairInitiate(pair, id))
+            dispatch(activeActionSheet({
+                menu: false,
+                subMenu: false,
+            }))
+        }
     }
 
-    return (<div onClick={onClickHandler}
+    return (<div onClick={changeActivePair}
                  className={`width-100 row jc-between ai-center px-4 py-2 my-1 cursor-pointer double-striped m-auto ${classes.container} ${activePair === pair.symbol ? classes.selected : ""} `}>
             <div className={` row jc-between ai-center ${classes.marketCardImage}`}>
                 <img
@@ -48,7 +49,7 @@ const MarketPairCard = ({id, pair,favPair,addFav}) => {
                     </span>
                 </div>
                 <div>
-                    { new BN(price).toFormat()}
+                    {new BN(prices[pair.symbol] || 0).toFormat()}
                 </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 ae1e6b5..dabbe23 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
@@ -6,6 +6,8 @@ import ToggleSwitch from "../../../../../../../../components/ToggleSwitch/Toggle
 import ScrollBar from "../../../../../../../../components/ScrollBar";
 import WalletListItem from "./components/WalletListItem/WalletListItem";
 import WalletBalance from "./components/WalletBalance/WalletBalance";
+import {useGetUserAccount} from "../../../../../../../../queries/hooks/useGetUserAccount";
+import Loading from "../../../../../../../../components/Loading/Loading";
 
 
 const WalletSubMenu = () => {
@@ -13,26 +15,35 @@ const WalletSubMenu = () => {
     const {t} = useTranslation();
     const [showZero, setShowZero] = useState(false);
     const assets = useSelector((state) => state.exchange.assets)
+    const {data: data, isLoading} = useGetUserAccount()
 
     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}`}>
                 <h2>{t("WalletSubMenu.title")}</h2>
             </div>
-            <div className={`column width-100 ${classes.content} px-3`}>
-                <div className={`width-100 row jc-around ai-center py-2 border-bottom`}>
-                    <span className={`fs-0-7`}>{t("WalletSubMenu.showZeroBalance")}</span>
-                    <ToggleSwitch onchange={() => setShowZero(prevState => !prevState)} checked={showZero}/>
-                </div>
-                <WalletBalance/>
-                <ScrollBar customClass={`column`}>
-                    {assets.map((name) => <WalletListItem key={name} assetName={name} showZero={showZero}/>)}
-                </ScrollBar>
-            </div>
-            <div className={`${classes.footer} flex jc-center ai-center px-1 text-gray fs-0-7 px-1 py-05`}
-                 style={{lineHeight: "3vh"}}>
-                <span>{t("WalletSubMenu.estimateAlert")}</span>
-            </div>
+            {
+                isLoading ? <Loading/> :
+                    <>
+                        <div className={`column width-100 ${classes.content} px-3`}>
+                            <div className={`width-100 row jc-around ai-center py-2 border-bottom`}>
+                                <span className={`fs-0-7`}>{t("WalletSubMenu.showZeroBalance")}</span>
+                                <ToggleSwitch onchange={() => setShowZero(prevState => !prevState)} checked={showZero}/>
+                            </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}/>)}
+                            </ScrollBar>
+                        </div>
+                        <div className={`${classes.footer} flex jc-center ai-center px-1 text-gray fs-0-7 px-1 py-05`}
+                             style={{lineHeight: "3vh"}}>
+                            <span>{t("WalletSubMenu.estimateAlert")}</span>
+                        </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 9d47c1e..29342e1 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
@@ -45,7 +45,7 @@ const WalletListItem = ({assetName, showZero}) => {
                 <div className="column ai-end">
                     <span>{new BN(free).toFormat() + " "} <span className="fs-0-7">{t("currency." + assetName)}</span></span>
                     <span className="fs-0-7 text-gray" >
-                        <span>{t("WalletSubMenu.equivalent")} </span> {refCurrency === assetName ? new BN(free).toFormat() : new BN(freeEstimateValue).toFormat()}<span> {t("currency."+refCurrency)}</span>
+                        <span>~ </span> {refCurrency === assetName ? new BN(free).toFormat() : new BN(freeEstimateValue).toFormat()}<span> {t("currency."+refCurrency)}</span>
                     </span>
                 </div>
             </div>
diff --git a/src/queries/hooks/useTransactionHistory.js b/src/queries/hooks/useTransactionHistory.js
index ca61f46..53a795c 100644
--- a/src/queries/hooks/useTransactionHistory.js
+++ b/src/queries/hooks/useTransactionHistory.js
@@ -1,10 +1,11 @@
 import {useQuery} from "@tanstack/react-query";
 import axios from "axios";
+import {getTransactionHistory} from "js-api-client/client/txs";
 
 export const useTransactionHistory = (user_id, query) => {
 
     return useQuery(
-        ['allTxHistory', user_id, query.coin, query.category, query.endTime, query.startTime, query.limit, query.offset],
+        ['allTxHistory', user_id, query.coin, query.category, query.endTime, query.startTime, query.limit, query.offset, query.ascendingByTime],
         () => getWithdrawTxsFunc(user_id, query),
         {
             retry: 1,
@@ -18,6 +19,3 @@ const getWithdrawTxsFunc = async (user_id, query) => {
     return data;
 }
 
-const getTransactionHistory = (user_id, query) => {
-    return axios.post(`/wallet/transaction/${user_id}`, query)
-}
diff --git a/src/store/actions/actionTypes.js b/src/store/actions/actionTypes.js
index 6cc1275..69b605d 100644
--- a/src/store/actions/actionTypes.js
+++ b/src/store/actions/actionTypes.js
@@ -24,10 +24,8 @@ export const SET_BEST_BUY_PRICE = "SET_BEST_BUY_PRICE";
 export const SET_BEST_SELL_PRICE = "SET_BEST_SELL_PRICE";
 export const SET_LAST_TRADE_PRICE = "SET_LAST_TRADE_PRICE";
 
-export const SET_PANEL_TOKENS = "SET_PANEL_TOKENS";
-export const SET_PANEL_TOKENS_INITIATE = "SET_PANEL_TOKENS_INITIATE";
-
 export const SET_EXCHANGE = "SET_EXCHANGE";
+export const SET_EXCHANGE_CONFIG = "SET_EXCHANGE_CONFIG";
 export const SET_LAST_PRICE = "SET_LAST_PRICE";
 export const SET_LAST_PRICE_INITIATE = "SET_LAST_PRICE_INITIATE";
 
@@ -45,14 +43,22 @@ export const SET_KYC_STATUS = "SET_KYC_STATUS";
 export const SET_KYC_STATUS_INITIATE = "SET_KYC_STATUS_INITIATE";
 export const SET_LAST_TRANSACTION = "SET_LAST_TRANSACTION";
 
-export const LOGIN_INITIATE = "LOGIN_INITIATE";
 export const LOGOUT = "LOGOUT";
 export const LOGOUT_INITIATE = "LOGOUT_INITIATE";
 
+export const SET_MARKET_INTERVAL = "SET_MARKET_INTERVAL";
+
+export const SET_USER_CONFIG = "SET_USER_CONFIG"
+
+export const SET_FAV_PAIR = "SET_FAV_PAIR"
+export const SET_FAV_PAIR_INITIATE = "SET_FAV_PAIR_INITIATE"
+
+export const GET_USER_CONFIGS_INITIATE = "GET_USER_CONFIGS_INITIATE"
+
 export const SET_SHOW_SIDE_MENU = "SET_SHOW_SIDE_MENU";
 
 export const ACTIVE_ORDER_LAYOUT = "ACTIVE_ORDER_LAYOUT";
 
 export const ACTIVE_ACTION_SHEET = "ACTIVE_ACTION_SHEET";
 
-export const Set_MARKET_INTERVAL = "Set_MARKET_INTERVAL";
+
diff --git a/src/store/actions/auth.js b/src/store/actions/auth.js
index fc69fcc..3b22c48 100644
--- a/src/store/actions/auth.js
+++ b/src/store/actions/auth.js
@@ -79,3 +79,30 @@ export const setLogoutInitiate = () => {
         type: actionTypes.LOGOUT_INITIATE,
     };
 };
+
+export const setFavPairInitiate = (favoritePairs) => {
+    return {
+        type: actionTypes.SET_FAV_PAIR_INITIATE,
+        favoritePairs
+    };
+};
+export const setFavPair = (favoritePairs) => {
+    return {
+        type: actionTypes.SET_FAV_PAIR,
+        favoritePairs
+    };
+};
+export const setUserConfig = (configs) => {
+    return {
+        type: actionTypes.SET_USER_CONFIG,
+        configs
+    };
+};
+
+export const getUserConfigsInitiate = (configs) => {
+    return {
+        type: actionTypes.GET_USER_CONFIGS_INITIATE,
+        configs
+    };
+};
+
diff --git a/src/store/actions/exchange.js b/src/store/actions/exchange.js
index 09eeeed..04e0f64 100644
--- a/src/store/actions/exchange.js
+++ b/src/store/actions/exchange.js
@@ -96,4 +96,11 @@ export const setLastPriceInitiate = () => {
     return {
         type: actionTypes.SET_LAST_PRICE_INITIATE,
     };
+};
+
+export const setExchangeConfigs = configs => {
+    return {
+        type: actionTypes.SET_EXCHANGE_CONFIG,
+        configs: configs
+    };
 };
\ No newline at end of file
diff --git a/src/store/actions/global.js b/src/store/actions/global.js
index 84f06b1..fee74ee 100644
--- a/src/store/actions/global.js
+++ b/src/store/actions/global.js
@@ -1,16 +1,17 @@
 import * as actionTypes from "./actionTypes";
 
-export const setThemeInitiate = (isDark) => {
+export const setThemeInitiate = (theme, isLogin) => {
   return {
     type: actionTypes.SET_THEME_INITIATE,
-    isDark,
+    isLogin,
+    theme,
   };
 };
 
-export const setTheme = (isDark) => {
+export const setTheme = (theme) => {
   return {
     type: actionTypes.SET_THEME,
-    isDark,
+    theme: theme.toUpperCase(),
   };
 };
 
@@ -45,7 +46,7 @@ export const setInfoMessage = (messageType, message) => {
 
 export const setMarketInterval = (interval) => {
   return {
-    type: actionTypes.Set_MARKET_INTERVAL,
+    type: actionTypes.SET_MARKET_INTERVAL,
     interval,
   };
 };
diff --git a/src/store/actions/index.js b/src/store/actions/index.js
index a15a7b9..0acfe70 100644
--- a/src/store/actions/index.js
+++ b/src/store/actions/index.js
@@ -21,7 +21,8 @@ export {
     setIPG,
     setIPGInitiate,
     setVerifyEmailLock,
-    setVerifyEmailLockInitiate
+    setVerifyEmailLockInitiate,
+    setExchangeConfigs
 
 } from "./exchange";
 
@@ -35,7 +36,9 @@ export {
     setUserAccountInfo,
     setUserAccountInfoInitiate,
     setKYCStatus,
-    setKYCStatusInitiate
-} from "./auth";
-
-
+    setKYCStatusInitiate,
+    setUserConfig,
+    getUserConfigsInitiate,
+    setFavPair,
+    setFavPairInitiate
+} from "./auth";
\ No newline at end of file
diff --git a/src/store/reducers/authReducer.js b/src/store/reducers/authReducer.js
index 25bc671..c867b35 100644
--- a/src/store/reducers/authReducer.js
+++ b/src/store/reducers/authReducer.js
@@ -17,6 +17,7 @@ const initialState = {
     lastTransaction: null,
     tradeFee: {},
     isLogin: false,
+    favoritePairs: []
 };
 
 const reducer = (state = initialState, action) => {
@@ -73,6 +74,16 @@ const reducer = (state = initialState, action) => {
                 ...state,
                 lastTransaction: action.time
             }
+        case actionTypes.SET_USER_CONFIG:
+            return {
+                ...state,
+                ...action.configs
+            }
+        case actionTypes.SET_FAV_PAIR:
+            return {
+                ...state,
+                favoritePairs: action.favoritePairs
+            }
         default:
             return state;
     }
diff --git a/src/store/reducers/exchangeReducer.js b/src/store/reducers/exchangeReducer.js
index de98e60..8a5923c 100644
--- a/src/store/reducers/exchangeReducer.js
+++ b/src/store/reducers/exchangeReducer.js
@@ -21,6 +21,15 @@ const initialState = {
     },
     ipgLock: null,
     verifyEmailLock: null,
+    logoUrl: "",
+    title: "",
+    description: "",
+    defaultLanguage: "en",
+    supportedLanguages: [],
+    defaultTheme: "",
+    supportEmail: "",
+    baseCurrency: "",
+    dateType: ""
 };
 
 const exchangeReducer = (state = initialState, action) => {
@@ -93,6 +102,11 @@ const exchangeReducer = (state = initialState, action) => {
                 ...state,
                 ...action.exchangeInfo
             };
+        case actionTypes.SET_EXCHANGE_CONFIG:
+            return {
+                ...state,
+                ...action.configs
+            };
         default:
             return state;
     }
diff --git a/src/store/reducers/globalReducer.js b/src/store/reducers/globalReducer.js
index 10c38ea..94ff32d 100644
--- a/src/store/reducers/globalReducer.js
+++ b/src/store/reducers/globalReducer.js
@@ -1,7 +1,7 @@
 import * as actionTypes from "../actions/actionTypes";
 
 const initialState = {
-    isDark: window.env.REACT_APP_DEFAULT_THEME === 'DARK',
+    theme: "DARK",
     isLoading: true,
     hasError: false,
     marketInterval: "24h",
@@ -22,7 +22,7 @@ const globalReducer = (state = initialState, action) => {
         case actionTypes.SET_THEME:
             return {
                 ...state,
-                isDark: action.isDark,
+                theme: action.theme,
             };
         case actionTypes.SET_INFO_MESSAGE:
             return {
@@ -42,7 +42,7 @@ const globalReducer = (state = initialState, action) => {
                 ...state,
                 hasError: action.error,
             };
-        case actionTypes.Set_MARKET_INTERVAL:
+        case actionTypes.SET_MARKET_INTERVAL:
             return {
                 ...state,
                 marketInterval: action.interval
diff --git a/src/store/sagas/auth.js b/src/store/sagas/auth.js
index 58a0e4b..1c661f7 100644
--- a/src/store/sagas/auth.js
+++ b/src/store/sagas/auth.js
@@ -1,6 +1,7 @@
 import {call, put} from "redux-saga/effects";
 import * as actions from "../actions/index";
 import axios from "axios";
+import i18n from "i18next";
 
 export function* logout() {
     yield call([localStorage, 'removeItem'], "refreshToken")
@@ -19,4 +20,32 @@ export function* getUserKYCStatus() {
     } catch (e) {
         console.log(e)
     }
+}
+
+export function* getUserConfigs() {
+    try {
+        const {
+            data: {
+                theme: userTheme,
+                language,
+                ...userConfigs
+            }
+        } = yield call(axios.get, '/config/user/v1')
+        yield i18n.changeLanguage(language)
+        yield put(actions.setUserConfig(userConfigs));
+        if (userTheme) yield put(actions.setTheme(userTheme));
+    } catch (e) {
+        console.log(e)
+    }
+}
+
+export function* setFavPair(action) {
+    try {
+        yield put(actions.setFavPair(action.favoritePairs));
+        yield call(axios.post, '/config/user/v1', {
+            favoritePairs: action.favoritePairs
+        })
+    } catch (e) {
+        console.log(e)
+    }
 }
\ No newline at end of file
diff --git a/src/store/sagas/global.js b/src/store/sagas/global.js
index 12c967b..d798644 100644
--- a/src/store/sagas/global.js
+++ b/src/store/sagas/global.js
@@ -1,11 +1,21 @@
-import {call, put} from "redux-saga/effects";
+import {call, delay, put} from "redux-saga/effects";
 import * as actions from "../actions/index";
 import jwtDecode from "jwt-decode";
 import axios from "axios";
+import i18n from "i18next";
 
 export function* setThemeSaga(action) {
-    yield call([localStorage, 'setItem'], "isDark", action.isDark)
-    yield put(actions.setTheme(action.isDark));
+    try {
+        yield put(actions.setTheme(action.theme));
+        yield call([localStorage, 'setItem'], "theme", action.theme)
+        if (action.isLogin) {
+            yield call(axios.post, '/config/user/v1', {
+                theme: action.theme
+            })
+        }
+    } catch (e) {
+        console.log(e)
+    }
 }
 
 export function* setActivePair(action) {
@@ -37,11 +47,30 @@ export function* getExchangeLastPrice() {
     }
 }
 
+function* getExchangeInfo() {
+
+    for (let i = 0; i < 10; i++) {
+        try {
+            const {data: {symbols}} = yield call(axios.get, '/api/v3/exchangeInfo')
+            return symbols
+        } catch (err) {
+            if (i < 2) {
+                yield delay(1000)
+                continue
+            }
+        }
+
+        throw new Error('getExchangeInfo failed!')
+    }
+}
+
 export function* loadConfig(action) {
 
     yield put(actions.setLoading(true))
     yield put(actions.setError(false))
 
+    let appTheme;
+
     const pairs = [];
     const assets = [];
     const wallets = {};
@@ -49,7 +78,21 @@ export function* loadConfig(action) {
     const lastPrice = {};
 
     try {
-        const {data: {symbols}} = yield call(axios.get, '/api/v3/exchangeInfo')
+        const {
+            data: {
+                defaultTheme,
+                ...configs
+            }
+        } = yield call(axios.get, '/config/web/v1')
+
+        yield put(actions.setExchangeConfigs(configs));
+
+        appTheme = defaultTheme;
+
+        const localTheme = yield call([localStorage, 'getItem'], 'theme')
+        if (localTheme) appTheme = localTheme;
+
+        const symbols = yield call(getExchangeInfo)
         for (const symbol of symbols) {
             if (symbol.symbol.toUpperCase().includes("NLN")) continue
             if (!assets.includes(symbol.baseAsset)) {
@@ -65,7 +108,7 @@ export function* loadConfig(action) {
             if (!pairs.includes(symbol.symbol)) pairs.push(symbol.symbol)
             symbol.baseRange = {min: 0.000001, max: 100000, step: 0.00001}
             symbol.quoteRange = {min: 0.000001, max: 100000, step: 0.00001}
-            symbol.name = symbol.baseAsset+"/"+symbol.quoteAsset
+            symbol.name = symbol.baseAsset + "/" + symbol.quoteAsset
             lastPrice[symbol.symbol] = 0
         }
         yield put(actions.setExchange({pairs, assets, symbols, lastPrice}));
@@ -80,11 +123,8 @@ export function* loadConfig(action) {
         return yield put(actions.setLoading(false));
     }
 
-    const isDark = yield call([localStorage, 'getItem'], 'isDark')
-    if (isDark) yield put(actions.setTheme(JSON.parse(isDark)));
-
     if (action.token) {
-        yield put(actions.setUserTokens({refreshToken : null, accessToken: action.token}));
+        yield put(actions.setUserTokens({refreshToken: null, accessToken: action.token}));
         yield call([localStorage, 'removeItem'], "refreshToken")
         const jwt = jwtDecode(action.token)
         yield put(actions.setUserInfo(jwt));
@@ -99,16 +139,24 @@ export function* loadConfig(action) {
     if (verifyEmailLockTime) yield put(actions.setVerifyEmailLock(verifyEmailLockTime));
 
     const refreshToken = localStorage.getItem("refreshToken")
-
     if (refreshToken) {
         const params = new URLSearchParams();
         params.append('client_id', window.env.REACT_APP_CLIENT_ID);
         params.append('client_secret', window.env.REACT_APP_CLIENT_SECRET);
         params.append('grant_type', 'refresh_token');
         params.append('refresh_token', refreshToken);
-
         try {
             const {data: {access_token}} = yield call(axios.post, '/auth/realms/opex/protocol/openid-connect/token', params)
+            const {
+                data: {
+                    theme: userTheme,
+                    language,
+                    ...userConfigs
+                }
+            } = yield call(axios.get, '/config/user/v1', {headers: {Authorization: `Bearer ${access_token}`}})
+            i18n.changeLanguage(language)
+            yield put(actions.setUserConfig(userConfigs));
+            if (userTheme) appTheme = userTheme
             const jwt = jwtDecode(access_token)
             yield call([localStorage, 'setItem'], "refreshToken", refreshToken)
             yield put(actions.setUserTokens({refreshToken, accessToken: access_token}));
@@ -117,7 +165,8 @@ export function* loadConfig(action) {
         } catch (e) {
             yield put(actions.setLogoutInitiate());
         }
-    }
 
+    }
+    yield put(actions.setTheme(appTheme));
     yield put(actions.setLoading(false));
 }
diff --git a/src/store/sagas/index.js b/src/store/sagas/index.js
index 193a678..8f8e702 100644
--- a/src/store/sagas/index.js
+++ b/src/store/sagas/index.js
@@ -3,7 +3,7 @@ import * as actionTypes from "../actions/actionTypes";
 
 import {getExchangeLastPrice, loadConfig, setActivePair, setIPGLock, setThemeSaga, setVerifyEmailLock} from "./global";
 
-import {getUserKYCStatus, logout, setUserTokens} from "./auth";
+import {getUserConfigs, getUserKYCStatus, logout, setFavPair, setUserTokens} from "./auth";
 
 export function* watchGlobal() {
   yield takeEvery(actionTypes.LOGOUT_INITIATE, logout);
@@ -15,4 +15,6 @@ export function* watchGlobal() {
   yield takeEvery(actionTypes.SET_VERIFY_EMAIL_LOCK_INITIATE, setVerifyEmailLock);
   yield takeEvery(actionTypes.SET_KYC_STATUS_INITIATE, getUserKYCStatus);
   yield takeEvery(actionTypes.SET_LAST_PRICE_INITIATE, getExchangeLastPrice);
+  yield takeEvery(actionTypes.SET_FAV_PAIR_INITIATE, setFavPair);
+  yield takeEvery(actionTypes.GET_USER_CONFIGS_INITIATE, getUserConfigs);
 }
diff --git a/yarn.lock b/yarn.lock
index 1b9d94a..90ba258 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=c185b3b2b61c2655592b4d31276473bed5b47a25"
-  checksum: e5b1085d4b7ece8766720ac12ad56a1270acd9705bd3a8d364b776273b9a99b14ff9a5768074aedfb96131ae92b198d1035b30ff794f45217c0d5a393e903b5a
+  resolution: "js-api-client@https://github.com/opexdev/js-api-client.git#commit=754533374a6d8c61a80fe95122810b33229815d0"
+  checksum: a97c02196681a0538c164fb3e0c8348eeee1a8a0fd984441ab257b9187675a4d7b71b16153dfc4f7399c7554fc94d1bdbb29d6422fd9c783b34130f1acd882e2
   languageName: node
   linkType: hard