diff --git a/views/components/main/parts/mini-ship/mini-ship-pane.es b/views/components/main/parts/mini-ship/mini-ship-pane.es index 224636d6c..28655214a 100644 --- a/views/components/main/parts/mini-ship/mini-ship-pane.es +++ b/views/components/main/parts/mini-ship/mini-ship-pane.es @@ -27,7 +27,7 @@ export const PaneBodyMini = connect(() => { }) })(({ fleetId, shipsId, enableAvatar, enableOverviewFleetDetail, width }) => ( <> - + {!enableOverviewFleetDetail ? (shipsId || []).map((shipId, i) => ( diff --git a/views/components/ship-parts/fleet-stat.es b/views/components/ship-parts/fleet-stat.es index d0a308efa..255cedaf4 100644 --- a/views/components/ship-parts/fleet-stat.es +++ b/views/components/ship-parts/fleet-stat.es @@ -1,6 +1,6 @@ /* global ROOT, getStore */ import { connect } from 'react-redux' -import React, { Component } from 'react' +import React, { Component, useId } from 'react' import PropTypes from 'prop-types' import { join } from 'path-extra' import { get, join as joinString, memoize } from 'lodash' @@ -35,7 +35,7 @@ import { InfoTooltipItem, } from 'views/components/etc/styled-components' -const isActive = () => getStore('ui.activeMainTab') === 'ship-view' +const isActive = () => ['ship-view', 'main-view'].includes(getStore('ui.activeMainTab')) const FleetStats = styled.div` white-space: nowrap; @@ -224,6 +224,7 @@ export const FleetStat = compose( condTarget, canNotify, t, + isMainView = false, }) => { const { saku33, saku33x2, saku33x3, saku33x4 } = saku const { speed } = fleetSpeed @@ -253,6 +254,9 @@ export const FleetStat = compose( conds.map((cond) => recoveryEndTime(condTick, cond, condTarget)), ) } + + const timerId = useId() + return ( {isMini ? ( @@ -332,10 +336,10 @@ export const FleetStat = compose(