diff --git a/docker-compose.yml b/docker-compose.yml
index 3ed1230e..bb530d00 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@ services:
   web-app:
     image: ghcr.io/opexdev/web-app
     environment:
+      - ENV=$WEB_APP_ENV
       - API_BASE_URL=$API_BASE_URL
       - CLIENT_ID=$CLIENT_ID
       - CLIENT_SECRET=$CLIENT_SECRET
diff --git a/env-map.js b/env-map.js
index 69d3faa4..3b469afa 100644
--- a/env-map.js
+++ b/env-map.js
@@ -1,5 +1,6 @@
 window.env = {
+    REACT_APP_ENV: "$ENV",
     REACT_APP_API_BASE_URL: "$API_BASE_URL",
     REACT_APP_CLIENT_ID: "$CLIENT_ID",
     REACT_APP_CLIENT_SECRET: "$CLIENT_SECRET"
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 2f8c1642..7ab466f8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opex",
-  "version": "v1.0.0-beta.2",
+  "version": "v1.0.1-beta.2",
   "homepage": "",
   "private": true,
   "dependencies": {
diff --git a/src/main/Browser/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/AllMarketInfo.js b/src/main/Browser/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/AllMarketInfo.js
index 7f68680e..219cf43c 100644
--- a/src/main/Browser/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/AllMarketInfo.js
+++ b/src/main/Browser/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/AllMarketInfo.js
@@ -21,13 +21,15 @@ const AllMarketInfo = () => {
     const dispatch = useDispatch();
 
     let USDTMarket,IRTMarket
+    const baseCurrency = window.env.REACT_APP_ENV === "development" ? "USDT" : "BUSD";
+
     if (!isLoading) {
         const overviewWithPair = overview.map((o)=>{
             o.pairInfo = allSymbols.find((s => s.symbol === o.symbol))
             return o
         })
-        const USDTPrice = overview.find(s => s.symbol.includes("USDTIRT")).lastPrice
-        USDTMarket = overviewWithPair.filter(s => s.symbol.includes("USDT")).sort((a , b) => b.lastPrice * b.volume * USDTPrice - a.lastPrice * a.volume * USDTPrice)
+        const USDTPrice = overview.find(s => s.symbol.includes(baseCurrency+"IRT")).lastPrice
+        USDTMarket = overviewWithPair.filter(s => s.symbol.includes(baseCurrency)).sort((a , b) => b.lastPrice * b.volume * USDTPrice - a.lastPrice * a.volume * USDTPrice)
         IRTMarket = overviewWithPair.filter(s => s.symbol.includes("IRT")).sort((a , b) => b.lastPrice * b.volume - a.lastPrice * a.volume)
     }
 
@@ -57,7 +59,7 @@ const AllMarketInfo = () => {
                 </div>
                 <div className={`row jc-center ai-center mr-1`}>
                     <span className={`px-2 py-1 rounded cursor-pointer hover-text ${IRT && classes.active}`} onClick={()=>setIRT(true)}>{t("currency.IRT")}</span>
-                    <span className={`px-2 py-1 rounded cursor-pointer hover-text ${!IRT && classes.active}`} onClick={()=>setIRT(false)}>{t("currency.USDT")}</span>
+                    <span className={`px-2 py-1 rounded cursor-pointer hover-text ${!IRT && classes.active}`} onClick={()=>setIRT(false)}>{t("currency."+baseCurrency)}</span>
                 </div>
             </div>
             <div className={`${classes.content}`}>
diff --git a/src/main/Browser/Pages/Landing/Sections/LandingContent/components/MarketInfo/MarketInfo.js b/src/main/Browser/Pages/Landing/Sections/LandingContent/components/MarketInfo/MarketInfo.js
index a9741fff..fd413467 100644
--- a/src/main/Browser/Pages/Landing/Sections/LandingContent/components/MarketInfo/MarketInfo.js
+++ b/src/main/Browser/Pages/Landing/Sections/LandingContent/components/MarketInfo/MarketInfo.js
@@ -16,21 +16,23 @@ const MarketInfo = () => {
 
     const {t} = useTranslation();
     const interval = "24h"
-    const {data:overview, isLoading, error} = useOverview(null , interval)
+    const {data: overview, isLoading, error} = useOverview(null, interval)
     const [card, setCard] = useState(false)
     const [IRT, setIRT] = useState(true)
     const allSymbols = useSelector((state) => state.exchange.symbols)
 
-    let USDTMarket,IRTMarket
+    let USDTMarket, IRTMarket
+
+    const baseCurrency = window.env.REACT_APP_ENV === "development" ? "USDT" : "BUSD";
 
     if (!isLoading) {
-        const overviewWithPair = overview.map((o)=>{
+        const overviewWithPair = overview.map((o) => {
             o.pairInfo = allSymbols.find((s => s.symbol === o.symbol))
             return o
         })
-        const USDTPrice = overview.find(s => s.symbol.includes("USDTIRT")).lastPrice
-        USDTMarket = overviewWithPair.filter(s => s.symbol.includes("USDT")).sort((a , b) => b.lastPrice * b.volume * USDTPrice - a.lastPrice * a.volume * USDTPrice).slice(0 , 5)
-        IRTMarket = overviewWithPair.filter(s => s.symbol.includes("IRT")).sort((a , b) => b.lastPrice * b.volume - a.lastPrice * a.volume).slice(0 , 5)
+        const USDTPrice = overview.find(s => s.symbol.includes(baseCurrency+"IRT")).lastPrice
+        USDTMarket = overviewWithPair.filter(s => s.symbol.includes(baseCurrency)).sort((a, b) => b.lastPrice * b.volume * USDTPrice - a.lastPrice * a.volume * USDTPrice).slice(0, 5)
+        IRTMarket = overviewWithPair.filter(s => s.symbol.includes("IRT")).sort((a, b) => b.lastPrice * b.volume - a.lastPrice * a.volume).slice(0, 5)
     }
 
     const content = () => {
@@ -38,9 +40,9 @@ const MarketInfo = () => {
         if (error) return <div style={{height: "40vh"}}><Error/></div>
         else return <>
             {card ?
-                <MarketInfoCard data={ IRT ? IRTMarket : USDTMarket}/>
+                <MarketInfoCard data={IRT ? IRTMarket : USDTMarket}/>
                 :
-                <MarketInfoTable data={ IRT ? IRTMarket : USDTMarket}/>
+                <MarketInfoTable data={IRT ? IRTMarket : USDTMarket}/>
             }
         </>
     }
@@ -50,19 +52,24 @@ const MarketInfo = () => {
         <div className={`${classes.container} card-background card-border width-90 my-4`}>
             <div className={`${classes.header} card-header-bg row jc-between ai-center px-2 py-2`}>
                 <div className={`row jc-center ai-center`}>
-                    <Icon iconName={`${card ? 'icon-row' : 'icon-grid'} font-size-md-01 flex cursor-pointer hover-text`} onClick={()=>setCard(prevState => !prevState)}/>
+                    <Icon iconName={`${card ? 'icon-row' : 'icon-grid'} font-size-md-01 flex cursor-pointer hover-text`}
+                          onClick={() => setCard(prevState => !prevState)}/>
                     <div className={`row jc-center ai-baseline mr-1 ml-1`}>
                         <h2 className={`ml-025`}>{t("market.title")}</h2>
                         <span className={`font-size-sm-plus mr-025`}>( {t("marketInterval." + interval)} )</span>
                     </div>
                     <div className={`row jc-center ai-center mr-1`}>
-                        <span className={`px-2 py-1 rounded cursor-pointer hover-text ${IRT && classes.active}`} onClick={()=>setIRT(true)}>{t("currency.IRT")}</span>
-                        <span className={`px-2 py-1 rounded cursor-pointer hover-text ${!IRT && classes.active}`} onClick={()=>setIRT(false)}>{t("currency.USDT")}</span>
+                        <span className={`px-2 py-1 rounded cursor-pointer hover-text ${IRT && classes.active}`}
+                              onClick={() => setIRT(true)}>{t("currency.IRT")}</span>
+                        <span className={`px-2 py-1 rounded cursor-pointer hover-text ${!IRT && classes.active}`}
+                              onClick={() => setIRT(false)}>{t("currency."+baseCurrency)}</span>
                     </div>
                 </div>
                 <Link to={Routes.AllMarket} className={`row jc-center ai-center cursor-pointer hover-text`}>
                     <span className={`ml-05`}>{t("MarketInfo.viewAllMarket")}</span>
-                    <Icon iconName={`${i18n.language !== "fa" ? 'icon-right-open-1' : 'icon-left-open-1'} font-size-md flex`} className={`mr-05`}/>
+                    <Icon
+                        iconName={`${i18n.language !== "fa" ? 'icon-right-open-1' : 'icon-left-open-1'} font-size-md flex`}
+                        className={`mr-05`}/>
                 </Link>
             </div>
             <div className={`${classes.content}`}>