From 685759b9599860311272cc3debd24fa95e329ea6 Mon Sep 17 00:00:00 2001 From: ebrahimmfadae Date: Tue, 16 Aug 2022 17:29:49 +0430 Subject: [PATCH 1/3] Add WEB_APP_ENV to docker-compose --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) 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 From 9c2c1473b802eca0bc548f1f5da5970f0160994e Mon Sep 17 00:00:00 2001 From: Benyamin001 <23664159+Benyamin001@users.noreply.github.com> Date: Tue, 16 Aug 2022 17:36:08 +0430 Subject: [PATCH 2/3] Close #98, Change landing currency --- env-map.js | 3 +- .../components/AllMarketInfo/AllMarketInfo.js | 8 +++-- .../components/MarketInfo/MarketInfo.js | 31 ++++++++++++------- 3 files changed, 26 insertions(+), 16 deletions(-) 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/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 = () => {
setIRT(true)}>{t("currency.IRT")} - setIRT(false)}>{t("currency.USDT")} + setIRT(false)}>{t("currency."+baseCurrency)}
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
else return <> {card ? - + : - + } } @@ -50,19 +52,24 @@ const MarketInfo = () => {
- setCard(prevState => !prevState)}/> + setCard(prevState => !prevState)}/>

{t("market.title")}

( {t("marketInterval." + interval)} )
- setIRT(true)}>{t("currency.IRT")} - setIRT(false)}>{t("currency.USDT")} + setIRT(true)}>{t("currency.IRT")} + setIRT(false)}>{t("currency."+baseCurrency)}
{t("MarketInfo.viewAllMarket")} - +
From 87776216d7dfd59157063e4ff1fb02186d220d4b Mon Sep 17 00:00:00 2001 From: Hossein Date: Wed, 17 Aug 2022 11:03:16 +0430 Subject: [PATCH 3/3] #98, Add version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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": {