From 61f88a707c9cc4031cd2d4cea474aa142a11c6b4 Mon Sep 17 00:00:00 2001 From: Taump Date: Mon, 8 Aug 2022 22:10:29 +0600 Subject: [PATCH 1/3] fix img --- src/components/PredictionList/PredictionItem.js | 4 ++-- src/forms/CreateNowForm.js | 4 ++-- src/pages/MarketPage/MarketPage.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/PredictionList/PredictionItem.js b/src/components/PredictionList/PredictionItem.js index 8e28875..ee07369 100644 --- a/src/components/PredictionList/PredictionItem.js +++ b/src/components/PredictionList/PredictionItem.js @@ -140,7 +140,7 @@ export const PredictionItem = ({ reserve_asset = 'base', aa_address, reserve = 0 :
= 576) ? "bottom" : 'middle'}> - } src={[`https://crests.football-data.org/${yes_team_id}.png`, `https://crests.football-data.org/${yes_team_id}.svg`]} className={styles.crests} /> + } src={[`https://crests.football-data.org/${yes_team_id}.svg`, `https://crests.football-data.org/${yes_team_id}.png`]} className={styles.crests} />
{yes_team}
@@ -161,7 +161,7 @@ export const PredictionItem = ({ reserve_asset = 'base', aa_address, reserve = 0 } /> diff --git a/src/forms/CreateNowForm.js b/src/forms/CreateNowForm.js index dee8924..a4966c6 100644 --- a/src/forms/CreateNowForm.js +++ b/src/forms/CreateNowForm.js @@ -181,7 +181,7 @@ export const CreateNowForm = ({ feed_name, event_date, expect_datafeed_value, ye return
{type === 'sport' ? - +
{yes_team}
@@ -196,7 +196,7 @@ export const CreateNowForm = ({ feed_name, event_date, expect_datafeed_value, ye
diff --git a/src/pages/MarketPage/MarketPage.js b/src/pages/MarketPage/MarketPage.js index f520115..3cc73e4 100644 --- a/src/pages/MarketPage/MarketPage.js +++ b/src/pages/MarketPage/MarketPage.js @@ -300,7 +300,7 @@ export const MarketPage = () => { {(teams.yes === null || teams.no === null) ?
{event}
:
- +
{teams.yes.name}
@@ -316,7 +316,7 @@ export const MarketPage = () => { From b5648ed4e9382183bb3ec3d91937cc6f6ffd9c6d Mon Sep 17 00:00:00 2001 From: Taump Date: Thu, 29 Aug 2024 18:04:58 +0400 Subject: [PATCH 2/3] fix(Modal & Drawer): rename visible->open --- src/components/Header/Header.js | 2 +- src/modals/AddLiquidityModal.js | 2 +- src/modals/ClaimProfitModal.js | 2 +- src/modals/CreateNowModal.js | 2 +- src/modals/TradeModal.js | 2 +- src/modals/ViewParamsModal.js | 2 +- src/modals/WalletModal.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js index dd55a1d..b03eec3 100644 --- a/src/components/Header/Header.js +++ b/src/components/Header/Header.js @@ -46,7 +46,7 @@ export const Header = () => { : <> - = 320 ? 320 : width} visible={showMenu} onClose={changeVisible} bodyStyle={{ width: '100%', textAlign: 'center', display: 'flex', flexDirection: 'column', maxHeight: 'calc(100vh - 50px)' }}> + = 320 ? 320 : width} open={showMenu} onClose={changeVisible} bodyStyle={{ width: '100%', textAlign: 'center', display: 'flex', flexDirection: 'column', maxHeight: 'calc(100vh - 50px)' }}>
diff --git a/src/modals/AddLiquidityModal.js b/src/modals/AddLiquidityModal.js index 2db5524..7e35124 100644 --- a/src/modals/AddLiquidityModal.js +++ b/src/modals/AddLiquidityModal.js @@ -37,7 +37,7 @@ export const AddLiquidityModal = ({ disabled, yes_team, no_team }) => { width={width > 640 ? 640 : width} placement="right" size="large" - visible={visible} + open={visible} onClose={close} > diff --git a/src/modals/ClaimProfitModal.js b/src/modals/ClaimProfitModal.js index 243b7bf..f874904 100644 --- a/src/modals/ClaimProfitModal.js +++ b/src/modals/ClaimProfitModal.js @@ -46,7 +46,7 @@ export const ClaimProfitModal = ({ disabled, yes_team, no_team }) => { width={width > 640 ? 640 : width} placement="right" size="large" - visible={visible} + open={visible} onClose={close} > {t("modals.claim_profit.title", "Claim profit")} diff --git a/src/modals/CreateNowModal.js b/src/modals/CreateNowModal.js index d9058cf..7f56f6d 100644 --- a/src/modals/CreateNowModal.js +++ b/src/modals/CreateNowModal.js @@ -25,7 +25,7 @@ export const CreateNowModal = (props) => { placement="right" size="large" key={`${props.feed_name} ${props.event_date} ${props.expect_datafeed_value}`} - visible={visible} + open={visible} onClose={close} autoFocus={true} destroyOnClose={true} diff --git a/src/modals/TradeModal.js b/src/modals/TradeModal.js index 62e98a6..d275e36 100644 --- a/src/modals/TradeModal.js +++ b/src/modals/TradeModal.js @@ -67,7 +67,7 @@ export const TradeModal = memo(({ disabled, visible, setVisible, yes_team, no_te width={width > 640 ? 640 : width} placement="right" size="large" - visible={visible} + open={visible} onClose={close} > diff --git a/src/modals/ViewParamsModal.js b/src/modals/ViewParamsModal.js index e2e0a2a..101e4ae 100644 --- a/src/modals/ViewParamsModal.js +++ b/src/modals/ViewParamsModal.js @@ -37,7 +37,7 @@ export const ViewParamsModal = ({ reserve_asset, allow_draw, oracle, feed_name, width={width > 640 ? 640 : width} placement="right" size="large" - visible={visible} + open={visible} onClose={close} > {t("modals.view_params.title", "View params")} diff --git a/src/modals/WalletModal.js b/src/modals/WalletModal.js index 036838d..e43d280 100644 --- a/src/modals/WalletModal.js +++ b/src/modals/WalletModal.js @@ -75,7 +75,7 @@ export const WalletModal = ({ children = "WALLET", type = "default", styles = {} From 19619eabab8444afcff8fb208b85d25faa6f86cf Mon Sep 17 00:00:00 2001 From: Taump Date: Thu, 29 Aug 2024 18:09:46 +0400 Subject: [PATCH 3/3] feat: add venue information to MarketPage --- src/pages/MarketPage/MarketPage.js | 11 ++++++++++- src/pages/MarketPage/MarketPage.module.css | 8 ++++++++ src/services/backend.js | 5 +++++ src/store/slices/activeSlice.js | 6 ++++-- src/store/thunks/setActiveMarket.js | 10 +++++++++- 5 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/pages/MarketPage/MarketPage.js b/src/pages/MarketPage/MarketPage.js index 358de20..b063a77 100644 --- a/src/pages/MarketPage/MarketPage.js +++ b/src/pages/MarketPage/MarketPage.js @@ -21,7 +21,8 @@ import { selectActiveMarketParams, selectActiveMarketStateVars, selectActiveMarketStatus, - selectActiveTeams + selectActiveTeams, + selectActiveVenue } from "store/slices/activeSlice"; import { setActiveMarket } from "store/thunks/setActiveMarket"; import { selectLanguage, selectPriceOrOdds, selectReserveAssets, selectReservesRate } from "store/slices/settingsSlice"; @@ -123,6 +124,8 @@ export const MarketPage = () => { const reserveAssets = useSelector(selectReserveAssets); const stateVars = useSelector(selectActiveMarketStateVars); + const venue = useSelector(selectActiveVenue); + const candles = useSelector(selectActiveDailyCandles); const datafeedValue = useSelector(selectActiveDatafeedValue); @@ -400,6 +403,12 @@ export const MarketPage = () => {
} + {venue ? + + {venue} + + : null} + { + const venueRes = await this.axios.get(`/venue/${feed_name}`); + return venueRes?.data; + } } export default new Backend(); \ No newline at end of file diff --git a/src/store/slices/activeSlice.js b/src/store/slices/activeSlice.js index e87c6b9..4f11cc1 100644 --- a/src/store/slices/activeSlice.js +++ b/src/store/slices/activeSlice.js @@ -44,7 +44,7 @@ export const activeSlice = createSlice({ }, extraReducers: (builder) => { builder.addCase(setActiveMarket.fulfilled, (state, action) => { - const { params, stateVars, recentEvents, recentEventsCount, dailyCandles, datafeedValue, yesTeam, noTeam, currencyCandles, currencyCurrentValue, league, created_at, committed_at, base_aa, first_trade_ts, yes_odds, no_odds, draw_odds, yes_crest_url, no_crest_url } = action.payload; + const { params, stateVars, recentEvents, recentEventsCount, dailyCandles, datafeedValue, yesTeam, noTeam, currencyCandles, currencyCurrentValue, league, created_at, committed_at, base_aa, first_trade_ts, yes_odds, no_odds, draw_odds, yes_crest_url, no_crest_url, venue = null } = action.payload; state.params = { ...params, ...league, created_at, committed_at, first_trade_ts, base_aa, yes_odds, no_odds, draw_odds, yes_crest_url, no_crest_url }; state.stateVars = stateVars; @@ -55,7 +55,8 @@ export const activeSlice = createSlice({ state.currencyCandles = currencyCandles || []; state.currencyCurrentValue = currencyCurrentValue || 0; state.teams = { yes: yesTeam || null, no: noTeam || null }; - + state.venue = venue; + state.status = 'loaded'; }); @@ -104,5 +105,6 @@ export const selectActiveRecentEventsCount = state => state.active.recentEventsC export const selectActiveDailyCandles = state => state.active.dailyCandles; export const selectActiveDatafeedValue = state => state.active.datafeedValue; export const selectActiveTeams = state => state.active.teams; +export const selectActiveVenue = state => state.active.venue; export const selectActiveCurrencyCandles = state => state.active.currencyCandles; export const selectActiveCurrencyCurrentValue = state => state.active.currencyCurrentValue; \ No newline at end of file diff --git a/src/store/thunks/setActiveMarket.js b/src/store/thunks/setActiveMarket.js index 3744533..75d4304 100644 --- a/src/store/thunks/setActiveMarket.js +++ b/src/store/thunks/setActiveMarket.js @@ -88,6 +88,7 @@ export const setActiveMarket = createAsyncThunk( let currencyCurrentValue = 0; let league_emblem = null; let league = null; + let venue = null; let yes_odds = null; let no_odds = null; @@ -115,8 +116,14 @@ export const setActiveMarket = createAsyncThunk( } const [championship, yes_abbreviation, no_abbreviation] = params.feed_name.split("_"); - const championships = await backend.getChampionships(); + const [venueData, championships] = await Promise.all([ + backend.getVenue(params.feed_name).then(data => data?.data).catch(() => null), + backend.getChampionships() + ]); + + venue = venueData; + const sport = Object.entries(championships).find(([_, cs]) => cs.find(({ code }) => code === championship)); if (sport) { @@ -183,6 +190,7 @@ export const setActiveMarket = createAsyncThunk( return { params, + venue, stateVars, base_aa, dailyCandles,