fix: count down timer not running on main tab

poooi · Jan 5, 2024 · 6bcaad2 · 6bcaad2
1 parent d91dbf2
commit 6bcaad2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git 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 }) => (
   <>
-    <FleetStat fleetId={fleetId} isMini={!enableOverviewFleetDetail} />
+    <FleetStat fleetId={fleetId} isMini={!enableOverviewFleetDetail} isMainView />
     <ShipDetailsMini className="ship-details-mini">
       {!enableOverviewFleetDetail
         ? (shipsId || []).map((shipId, i) => (

diff --git 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 (
       <FleetStats className="fleet-stat">
         {isMini ? (
@@ -332,10 +336,10 @@ export const FleetStat = compose(
               </Item>
               <Item label={inExpedition ? t('main:Expedition') : t('main:Resting')}>
                 <CountdownLabel
-                  fleetId={fleetId}
+                  fleetId={`${timerId}-${fleetId}`}
                   fleetName={fleetName}
                   completeTime={completeTime}
-                  shouldNotify={!inExpedition && !inBattle && canNotify}
+                  shouldNotify={!inExpedition && !inBattle && !isMainView && canNotify}
                 />
               </Item>
             </Container>