Skip to content

Commit 24a4846

Browse files
committed
chore: simplify station popup further
1 parent ecd4e5c commit 24a4846

File tree

1 file changed

+16
-27
lines changed

1 file changed

+16
-27
lines changed

src/features/station/StationPopup.jsx

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import Grid from '@mui/material/Unstable_Grid2'
1313
import IconButton from '@mui/material/IconButton'
1414
import Menu from '@mui/material/Menu'
1515
import MenuItem from '@mui/material/MenuItem'
16-
import Rating from '@mui/material/Rating'
1716
import Typography from '@mui/material/Typography'
1817
import Stack from '@mui/material/Stack'
1918
import Box from '@mui/material/Box'
@@ -37,7 +36,6 @@ import {
3736
import { VirtualGrid } from '@components/virtual/VirtualGrid'
3837
import { getStationDamageBoost } from '@utils/getAttackBonus'
3938
import { CopyCoords } from '@components/popups/Coords'
40-
import { PokeMove } from '@components/popups/PokeMove'
4139

4240
import { useGetStationMons } from './useGetStationMons'
4341

@@ -103,7 +101,6 @@ function StationHeader({ name }) {
103101

104102
/** @param {import('@rm/types').Station} props */
105103
function StationRating({
106-
battle_level,
107104
battle_start,
108105
battle_end,
109106
is_battle_available,
@@ -123,10 +120,6 @@ function StationRating({
123120
return (
124121
<CardContent sx={{ p: 0, py: 1 }}>
125122
<Stack alignItems="center" justifyContent="center">
126-
<Rating value={battle_level} max={Math.max(5, battle_level)} readOnly />
127-
<Typography variant="caption">
128-
{t(`max_battle_${battle_level}`)}
129-
</Typography>
130123
{showBattleCountdown && (
131124
<LiveTimeStamp start={isStarting} epoch={epoch} variant="caption" />
132125
)}
@@ -274,15 +267,11 @@ function StationMedia({
274267
battle_pokemon_costume,
275268
battle_pokemon_gender,
276269
battle_pokemon_bread_mode,
277-
battle_pokemon_move_1,
278-
battle_pokemon_move_2,
270+
battle_level,
279271
battle_end,
280-
start_time,
281272
}) {
282-
const { t } = useTranslateById()
283-
const stationImage = useMemory((s) =>
284-
s.Icons.getStation(start_time < Date.now() / 1000),
285-
)
273+
const { t: tById } = useTranslateById()
274+
const { t } = useTranslation()
286275
const battleEndEpoch = battle_end ?? 0
287276
const isBattleActive = battleEndEpoch > Date.now() / 1000
288277
const types = useMemory((s) => {
@@ -311,12 +300,17 @@ function StationMedia({
311300
{!!battle_pokemon_costume && (
312301
<Box textAlign="center">
313302
<Typography variant="caption">
314-
&nbsp;({t(`costume_${battle_pokemon_costume}`)})
303+
&nbsp;({tById(`costume_${battle_pokemon_costume}`)})
315304
</Typography>
316305
</Box>
317306
)}
318307
</Stack>
319-
<Stack alignItems="center" justifyContent="center" spacing={0.5}>
308+
<Stack
309+
alignItems="center"
310+
justifyContent="center"
311+
spacing={0.5}
312+
width="100%"
313+
>
320314
<Stack
321315
direction="row"
322316
justifyContent="space-evenly"
@@ -330,20 +324,15 @@ function StationMedia({
330324
<PokeType key={type} id={type} size="medium" />
331325
))}
332326
</Stack>
333-
{battle_pokemon_move_1 && <PokeMove id={battle_pokemon_move_1} />}
334-
{battle_pokemon_move_2 && <PokeMove id={battle_pokemon_move_2} />}
327+
{!!battle_level && (
328+
<Typography variant="caption" align="center">
329+
{t(`max_battle_${battle_level}`)}
330+
</Typography>
331+
)}
335332
</Stack>
336333
</Box>
337334
</CardMedia>
338-
) : (
339-
<Box width="100%" className="flex-center">
340-
<CardMedia
341-
component="img"
342-
src={stationImage}
343-
sx={{ maxWidth: 75, maxHeight: 75 }}
344-
/>
345-
</Box>
346-
)
335+
) : null
347336
}
348337

349338
/** @param {import('@rm/types').Station} station */

0 commit comments

Comments
 (0)