From 5c0aaae059a56de6773316a7557a23b031861c60 Mon Sep 17 00:00:00 2001
From: Brett Edwards <brett.1.edwards@gov.bc.ca>
Date: Tue, 28 Jul 2026 15:53:11 -0700
Subject: [PATCH 01/12] init

---
 .../fba/components/ActualForecastControl.tsx  |  2 +-
 .../components/actualForecastControl.test.tsx |  2 +-
 .../features/fba/components/map/FBAMap.tsx    |  3 +-
 .../fba/components/map/fbaMap.test.tsx        |  2 +-
 .../wps-web/src/features/fba/cqlBuilder.ts    |  4 +-
 .../fba/pages/FireBehaviourAdvisoryPage.tsx   | 14 ++--
 .../src/features/fba/pmtilesBuilder.ts        |  4 +-
 .../fba/slices/fireCentreHFIFuelStatsSlice.ts |  3 +-
 .../fba/slices/fireCentreTPIStatsSlice.ts     |  3 +-
 .../fba/slices/fireZoneElevationInfoSlice.ts  |  4 +-
 .../fba/slices/provincialSummarySlice.ts      |  8 +-
 .../features/fba/slices/runDatesSlice.test.ts | 11 +--
 .../src/features/fba/slices/runDatesSlice.ts  |  4 +-
 .../components/RunTypeDropdown.test.tsx       | 24 ++++++
 .../components/RunTypeDropdown.tsx            | 39 ++++++++++
 .../sfmsInsights/components/map/SFMSMap.tsx   | 14 +++-
 .../components/map/layerDefinitions.test.ts   | 29 +++++--
 .../components/map/layerDefinitions.ts        | 21 +++--
 .../components/map/sfmsMap.test.tsx           | 34 +++++++-
 .../pages/SFMSInsightsPage.test.tsx           | 77 +++++++++++++++----
 .../sfmsInsights/pages/SFMSInsightsPage.tsx   | 70 ++++++++++++-----
 .../slices/sfmsInsightsSlice.test.ts          | 26 ++++++-
 .../sfmsInsights/slices/sfmsInsightsSlice.ts  | 27 ++++---
 web/packages/api/src/fbaAPI.ts                | 38 ++-------
 web/packages/api/src/runType.test.ts          |  9 +++
 web/packages/api/src/runType.ts               |  4 +
 web/packages/api/src/sfmsAPI.ts               | 20 +----
 web/packages/api/src/sfmsBounds.ts            | 16 ++++
 28 files changed, 366 insertions(+), 146 deletions(-)
 create mode 100644 web/apps/wps-web/src/features/sfmsInsights/components/RunTypeDropdown.test.tsx
 create mode 100644 web/apps/wps-web/src/features/sfmsInsights/components/RunTypeDropdown.tsx
 create mode 100644 web/packages/api/src/runType.test.ts
 create mode 100644 web/packages/api/src/runType.ts
 create mode 100644 web/packages/api/src/sfmsBounds.ts

diff --git a/web/apps/wps-web/src/features/fba/components/ActualForecastControl.tsx b/web/apps/wps-web/src/features/fba/components/ActualForecastControl.tsx
index 2b5315714a..74e2494d1b 100644
--- a/web/apps/wps-web/src/features/fba/components/ActualForecastControl.tsx
+++ b/web/apps/wps-web/src/features/fba/components/ActualForecastControl.tsx
@@ -1,5 +1,5 @@
 import { FormControl, FormControlLabel, FormLabel, Radio, RadioGroup } from '@mui/material'
-import { RunType } from '@wps/api/fbaAPI'
+import { RunType } from '@wps/api/runType'
 import { theme } from '@wps/ui/theme'
 import { isNull } from 'lodash'
 import React from 'react'
diff --git a/web/apps/wps-web/src/features/fba/components/actualForecastControl.test.tsx b/web/apps/wps-web/src/features/fba/components/actualForecastControl.test.tsx
index ecdf8cd305..1568f9a0cd 100644
--- a/web/apps/wps-web/src/features/fba/components/actualForecastControl.test.tsx
+++ b/web/apps/wps-web/src/features/fba/components/actualForecastControl.test.tsx
@@ -1,5 +1,5 @@
 import { fireEvent, render } from '@testing-library/react'
-import { RunType } from '@wps/api/fbaAPI'
+import { RunType } from '@wps/api/runType'
 import { vi } from 'vitest'
 import ActualForecastControl from './ActualForecastControl'
 
diff --git a/web/apps/wps-web/src/features/fba/components/map/FBAMap.tsx b/web/apps/wps-web/src/features/fba/components/map/FBAMap.tsx
index 00591ce729..06e3b874b3 100644
--- a/web/apps/wps-web/src/features/fba/components/map/FBAMap.tsx
+++ b/web/apps/wps-web/src/features/fba/components/map/FBAMap.tsx
@@ -1,5 +1,6 @@
 import { Box } from '@mui/material'
-import { type FireShape, RunType } from '@wps/api/fbaAPI'
+import type { FireShape } from '@wps/api/fbaAPI'
+import { RunType } from '@wps/api/runType'
 import type { FireCentre } from '@wps/types/fireCentre'
 import { ErrorBoundary } from '@wps/ui/ErrorBoundary'
 import { createHillshadeVectorTileLayer, createVectorTileLayer, getStyleJson } from '@wps/utils/vectorLayerUtils'
diff --git a/web/apps/wps-web/src/features/fba/components/map/fbaMap.test.tsx b/web/apps/wps-web/src/features/fba/components/map/fbaMap.test.tsx
index b4a180f321..83d9581c92 100644
--- a/web/apps/wps-web/src/features/fba/components/map/fbaMap.test.tsx
+++ b/web/apps/wps-web/src/features/fba/components/map/fbaMap.test.tsx
@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react'
-import { RunType } from '@wps/api/fbaAPI'
+import { RunType } from '@wps/api/runType'
 import { createHillshadeVectorTileLayer, createVectorTileLayer, getStyleJson } from '@wps/utils/vectorLayerUtils'
 import store from 'app/store'
 import FBAMap from 'features/fba/components/map/FBAMap'
diff --git a/web/apps/wps-web/src/features/fba/cqlBuilder.ts b/web/apps/wps-web/src/features/fba/cqlBuilder.ts
index 43af099a33..a30a8a7f2b 100644
--- a/web/apps/wps-web/src/features/fba/cqlBuilder.ts
+++ b/web/apps/wps-web/src/features/fba/cqlBuilder.ts
@@ -1,4 +1,4 @@
-import type { RunType } from '@wps/api/fbaAPI'
+import type { RunType } from '@wps/api/runType'
 import type { DateTime } from 'luxon'
 
 /**
@@ -17,6 +17,6 @@ import type { DateTime } from 'luxon'
  */
 // TODO: add in param for run_date: DateTime
 export const buildHFICql = (for_date: DateTime, run_type: RunType) => {
-  const queryParams = encodeURIComponent(`for_date=${for_date.toISODate()} AND run_type='${run_type.toLowerCase()}'`)
+  const queryParams = encodeURIComponent(`for_date=${for_date.toISODate()} AND run_type='${run_type}'`)
   return `filter=${queryParams}`
 }
diff --git a/web/apps/wps-web/src/features/fba/pages/FireBehaviourAdvisoryPage.tsx b/web/apps/wps-web/src/features/fba/pages/FireBehaviourAdvisoryPage.tsx
index b9fb34d788..4d42eebc25 100644
--- a/web/apps/wps-web/src/features/fba/pages/FireBehaviourAdvisoryPage.tsx
+++ b/web/apps/wps-web/src/features/fba/pages/FireBehaviourAdvisoryPage.tsx
@@ -1,5 +1,6 @@
 import { Box, FormControl, Grid, styled } from '@mui/material'
-import { type FireShape, RunType } from '@wps/api/fbaAPI'
+import type { FireShape } from '@wps/api/fbaAPI'
+import { RunType } from '@wps/api/runType'
 import { getStations, StationSource } from '@wps/api/stationAPI'
 import type { FireCentre } from '@wps/types/fireCentre'
 import AboutDataPopover from '@wps/ui/AboutDataPopover'
@@ -52,7 +53,7 @@ const FireBehaviourAdvisoryPage: React.FunctionComponent = () => {
       ? DateTime.now().setZone(`UTC${PST_UTC_OFFSET}`)
       : DateTime.now().setZone(`UTC${PST_UTC_OFFSET}`).plus({ days: 1 })
   )
-  const [runType, setRunType] = useState(RunType.FORECAST)
+  const [runType, setRunType] = useState<RunType>(RunType.FORECAST)
   // Set some reasonable historical min and max dates for ASA (used by the DatePicker).
   const [historicalMinDate, setHistoricalMinDate] = useState<DateTime>(
     DateTime.fromObject({ year: 2022, month: 4, day: 1 })
@@ -67,11 +68,10 @@ const FireBehaviourAdvisoryPage: React.FunctionComponent = () => {
 
   const updateDatePickerOptions = useCallback(() => {
     const dates: DateTime[] = []
-    const runTypeLower = runType.toLocaleLowerCase()
     if (!isNull(sfmsBounds) && !isEmpty(sfmsBounds)) {
       for (const key of Object.keys(sfmsBounds)) {
-        const minValue = sfmsBounds[key]?.[runTypeLower]?.minimum
-        const maxValue = sfmsBounds[key]?.[runTypeLower]?.maximum
+        const minValue = sfmsBounds[key]?.[runType]?.minimum
+        const maxValue = sfmsBounds[key]?.[runType]?.maximum
         if (minValue && maxValue) {
           const minDate = DateTime.fromISO(minValue)
           const maxDate = DateTime.fromISO(maxValue)
@@ -84,8 +84,8 @@ const FireBehaviourAdvisoryPage: React.FunctionComponent = () => {
         setHistoricalMaxDate(dates[dates.length - 1].plus({ days: 1 }))
       }
     }
-    const currentYearMin = sfmsBounds?.[dateOfInterestYear]?.[runTypeLower]?.minimum ?? `${dateOfInterestYear}-04-01`
-    const currentYearMax = sfmsBounds?.[dateOfInterestYear]?.[runTypeLower]?.maximum ?? `${dateOfInterestYear}-10-31`
+    const currentYearMin = sfmsBounds?.[dateOfInterestYear]?.[runType]?.minimum ?? `${dateOfInterestYear}-04-01`
+    const currentYearMax = sfmsBounds?.[dateOfInterestYear]?.[runType]?.maximum ?? `${dateOfInterestYear}-10-31`
     setCurrentYearMinDate(DateTime.fromISO(currentYearMin))
     setCurrentYearMaxDate(DateTime.fromISO(currentYearMax))
   }, [dateOfInterestYear, runType, sfmsBounds])
diff --git a/web/apps/wps-web/src/features/fba/pmtilesBuilder.ts b/web/apps/wps-web/src/features/fba/pmtilesBuilder.ts
index 7f94ef554c..cbad3a3ce6 100644
--- a/web/apps/wps-web/src/features/fba/pmtilesBuilder.ts
+++ b/web/apps/wps-web/src/features/fba/pmtilesBuilder.ts
@@ -1,4 +1,4 @@
-import type { RunType } from '@wps/api/fbaAPI'
+import type { RunType } from '@wps/api/runType'
 import { PMTILES_BUCKET } from '@wps/utils/env'
 import type { DateTime } from 'luxon'
 
@@ -10,7 +10,7 @@ import type { DateTime } from 'luxon'
  * @returns a URL to the PMTiles stored in our s3 bucket
  */
 export const buildPMTilesURL = (for_date: DateTime, run_type: RunType, run_date: DateTime): string => {
-  const PMTilesURL = `${PMTILES_BUCKET}hfi/${run_type.toLowerCase()}/${run_date.toISODate()}/hfi${for_date.toISODate({
+  const PMTilesURL = `${PMTILES_BUCKET}hfi/${run_type}/${run_date.toISODate()}/hfi${for_date.toISODate({
     format: 'basic'
   })}.pmtiles`
 
diff --git a/web/apps/wps-web/src/features/fba/slices/fireCentreHFIFuelStatsSlice.ts b/web/apps/wps-web/src/features/fba/slices/fireCentreHFIFuelStatsSlice.ts
index 1e10f962e1..37c883326a 100644
--- a/web/apps/wps-web/src/features/fba/slices/fireCentreHFIFuelStatsSlice.ts
+++ b/web/apps/wps-web/src/features/fba/slices/fireCentreHFIFuelStatsSlice.ts
@@ -1,5 +1,6 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit'
-import { type FireCentreHFIStats, getFireCentreHFIStats, type RunType } from '@wps/api/fbaAPI'
+import { type FireCentreHFIStats, getFireCentreHFIStats } from '@wps/api/fbaAPI'
+import type { RunType } from '@wps/api/runType'
 import { logError } from '@wps/utils/error'
 import type { AppThunk } from 'app/store'
 
diff --git a/web/apps/wps-web/src/features/fba/slices/fireCentreTPIStatsSlice.ts b/web/apps/wps-web/src/features/fba/slices/fireCentreTPIStatsSlice.ts
index 270c53fcb5..c7ad1eb4bc 100644
--- a/web/apps/wps-web/src/features/fba/slices/fireCentreTPIStatsSlice.ts
+++ b/web/apps/wps-web/src/features/fba/slices/fireCentreTPIStatsSlice.ts
@@ -1,5 +1,6 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit'
-import { type FireCentreTPIResponse, getFireCentreTPIStats, type RunType } from '@wps/api/fbaAPI'
+import { type FireCentreTPIResponse, getFireCentreTPIStats } from '@wps/api/fbaAPI'
+import type { RunType } from '@wps/api/runType'
 import { logError } from '@wps/utils/error'
 import type { AppThunk } from 'app/store'
 
diff --git a/web/apps/wps-web/src/features/fba/slices/fireZoneElevationInfoSlice.ts b/web/apps/wps-web/src/features/fba/slices/fireZoneElevationInfoSlice.ts
index 6aa4b16745..374b14ecf4 100644
--- a/web/apps/wps-web/src/features/fba/slices/fireZoneElevationInfoSlice.ts
+++ b/web/apps/wps-web/src/features/fba/slices/fireZoneElevationInfoSlice.ts
@@ -2,9 +2,9 @@ import { createSlice, type PayloadAction } from '@reduxjs/toolkit'
 import {
   type ElevationInfoByThreshold,
   type FireZoneElevationInfoResponse,
-  getFireZoneElevationInfo,
-  type RunType
+  getFireZoneElevationInfo
 } from '@wps/api/fbaAPI'
+import type { RunType } from '@wps/api/runType'
 import { logError } from '@wps/utils/error'
 import type { AppThunk } from 'app/store'
 
diff --git a/web/apps/wps-web/src/features/fba/slices/provincialSummarySlice.ts b/web/apps/wps-web/src/features/fba/slices/provincialSummarySlice.ts
index 08ba1f61cb..b00b13161e 100644
--- a/web/apps/wps-web/src/features/fba/slices/provincialSummarySlice.ts
+++ b/web/apps/wps-web/src/features/fba/slices/provincialSummarySlice.ts
@@ -1,10 +1,6 @@
 import { createSelector, createSlice, type PayloadAction } from '@reduxjs/toolkit'
-import {
-  type FireShapeStatusDetail,
-  getProvincialSummary,
-  type ProvincialSummaryResponse,
-  type RunType
-} from '@wps/api/fbaAPI'
+import { type FireShapeStatusDetail, getProvincialSummary, type ProvincialSummaryResponse } from '@wps/api/fbaAPI'
+import type { RunType } from '@wps/api/runType'
 import { logError } from '@wps/utils/error'
 import type { RootState } from 'app/rootReducer'
 import type { AppThunk } from 'app/store'
diff --git a/web/apps/wps-web/src/features/fba/slices/runDatesSlice.test.ts b/web/apps/wps-web/src/features/fba/slices/runDatesSlice.test.ts
index e6f9057e14..4c9402b308 100644
--- a/web/apps/wps-web/src/features/fba/slices/runDatesSlice.test.ts
+++ b/web/apps/wps-web/src/features/fba/slices/runDatesSlice.test.ts
@@ -1,12 +1,7 @@
 import { combineReducers } from '@reduxjs/toolkit'
-import {
-  getAllRunDates,
-  getMostRecentRunDate,
-  getSFMSBounds,
-  RunType,
-  type SFMSBounds,
-  type SFMSBoundsResponse
-} from '@wps/api/fbaAPI'
+import { getAllRunDates, getMostRecentRunDate, getSFMSBounds } from '@wps/api/fbaAPI'
+import { RunType } from '@wps/api/runType'
+import type { SFMSBounds, SFMSBoundsResponse } from '@wps/api/sfmsBounds'
 import { logError } from '@wps/utils/error'
 import { DateTime } from 'luxon'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
diff --git a/web/apps/wps-web/src/features/fba/slices/runDatesSlice.ts b/web/apps/wps-web/src/features/fba/slices/runDatesSlice.ts
index 3667f93584..d9db8b97ee 100644
--- a/web/apps/wps-web/src/features/fba/slices/runDatesSlice.ts
+++ b/web/apps/wps-web/src/features/fba/slices/runDatesSlice.ts
@@ -1,5 +1,7 @@
 import { createSelector, createSlice, type PayloadAction } from '@reduxjs/toolkit'
-import { getAllRunDates, getMostRecentRunDate, getSFMSBounds, type RunType, type SFMSBounds } from '@wps/api/fbaAPI'
+import { getAllRunDates, getMostRecentRunDate, getSFMSBounds } from '@wps/api/fbaAPI'
+import type { RunType } from '@wps/api/runType'
+import type { SFMSBounds } from '@wps/api/sfmsBounds'
 import { logError } from '@wps/utils/error'
 import type { AppThunk } from 'app/store'
 import type { DateTime } from 'luxon'
diff --git a/web/apps/wps-web/src/features/sfmsInsights/components/RunTypeDropdown.test.tsx b/web/apps/wps-web/src/features/sfmsInsights/components/RunTypeDropdown.test.tsx
new file mode 100644
index 0000000000..a78be0f6ea
--- /dev/null
+++ b/web/apps/wps-web/src/features/sfmsInsights/components/RunTypeDropdown.test.tsx
@@ -0,0 +1,24 @@
+import { fireEvent, render, screen } from '@testing-library/react'
+import { RunType } from '@wps/api/runType'
+import RunTypeDropdown from './RunTypeDropdown'
+
+describe('RunTypeDropdown', () => {
+  it('shows actuals and forecasts', () => {
+    render(<RunTypeDropdown selectedRunType={RunType.ACTUAL} setSelectedRunType={vi.fn()} />)
+
+    fireEvent.mouseDown(screen.getByRole('combobox', { name: 'Source' }))
+
+    expect(screen.getByRole('option', { name: 'Actual' })).toBeInTheDocument()
+    expect(screen.getByRole('option', { name: 'Forecast' })).toBeInTheDocument()
+  })
+
+  it('updates the selected run type', () => {
+    const setSelectedRunType = vi.fn()
+    render(<RunTypeDropdown selectedRunType={RunType.ACTUAL} setSelectedRunType={setSelectedRunType} />)
+
+    fireEvent.mouseDown(screen.getByRole('combobox', { name: 'Source' }))
+    fireEvent.click(screen.getByRole('option', { name: 'Forecast' }))
+
+    expect(setSelectedRunType).toHaveBeenCalledWith(RunType.FORECAST)
+  })
+})
diff --git a/web/apps/wps-web/src/features/sfmsInsights/components/RunTypeDropdown.tsx b/web/apps/wps-web/src/features/sfmsInsights/components/RunTypeDropdown.tsx
new file mode 100644
index 0000000000..4d7bbe6601
--- /dev/null
+++ b/web/apps/wps-web/src/features/sfmsInsights/components/RunTypeDropdown.tsx
@@ -0,0 +1,39 @@
+import { FormControl, InputLabel, MenuItem, Select, type SelectChangeEvent } from '@mui/material'
+import { RunType } from '@wps/api/runType'
+
+const RUN_TYPE_LABELS: Record<RunType, string> = {
+  [RunType.ACTUAL]: 'Actual',
+  [RunType.FORECAST]: 'Forecast'
+}
+
+interface RunTypeDropdownProps {
+  selectedRunType: RunType
+  setSelectedRunType: (runType: RunType) => void
+}
+
+const RunTypeDropdown = ({ selectedRunType, setSelectedRunType }: RunTypeDropdownProps) => {
+  const handleChange = (event: SelectChangeEvent<RunType>) => {
+    setSelectedRunType(event.target.value as RunType)
+  }
+
+  return (
+    <FormControl sx={{ minWidth: 140 }}>
+      <InputLabel id="sfms-run-type-label">Source</InputLabel>
+      <Select
+        labelId="sfms-run-type-label"
+        id="sfms-run-type-select"
+        value={selectedRunType}
+        label="Source"
+        onChange={handleChange}
+      >
+        {Object.values(RunType).map(runType => (
+          <MenuItem key={runType} value={runType}>
+            {RUN_TYPE_LABELS[runType]}
+          </MenuItem>
+        ))}
+      </Select>
+    </FormControl>
+  )
+}
+
+export default RunTypeDropdown
diff --git a/web/apps/wps-web/src/features/sfmsInsights/components/map/SFMSMap.tsx b/web/apps/wps-web/src/features/sfmsInsights/components/map/SFMSMap.tsx
index 9e32a94bfb..0d0a7716f4 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/components/map/SFMSMap.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/components/map/SFMSMap.tsx
@@ -1,5 +1,6 @@
 import { Box, CircularProgress } from '@mui/material'
 import { ErrorBoundary } from '@sentry/react'
+import { RunType } from '@wps/api/runType'
 import { BC_EXTENT, CENTER_OF_BC } from '@wps/utils/constants'
 import { BASEMAP_STYLE_URL, BASEMAP_TILE_URL } from '@wps/utils/env'
 import { createVectorTileLayer, getStyleJson } from '@wps/utils/vectorLayerUtils'
@@ -36,10 +37,17 @@ interface SFMSMapProps {
   snowDate: DateTime | null
   rasterDate: DateTime | null
   rasterType?: RasterType
+  runType?: RunType
   showSnow?: boolean
 }
 
-const SFMSMap = ({ snowDate, rasterDate, rasterType = 'fwi', showSnow = true }: SFMSMapProps) => {
+const SFMSMap = ({
+  snowDate,
+  rasterDate,
+  rasterType = 'fwi',
+  runType = RunType.ACTUAL,
+  showSnow = true
+}: SFMSMapProps) => {
   const token = useSelector(selectToken)
   const [map, setMap] = useState<OlMap | null>(null)
   const [rasterTooltipData, setRasterTooltipData] = useState<RasterTooltipData>({
@@ -114,11 +122,11 @@ const SFMSMap = ({ snowDate, rasterDate, rasterType = 'fwi', showSnow = true }:
 
     // Only load raster layer if we have a date (for fire weather) or if type is fuel (date-independent)
     if (rasterDate || rasterType === 'fuel') {
-      rasterLayerManagerRef.current.updateLayer(getRasterLayer(rasterDate, rasterType, token))
+      rasterLayerManagerRef.current.updateLayer(getRasterLayer(rasterDate, rasterType, token, runType))
     } else {
       rasterLayerManagerRef.current.updateLayer(null)
     }
-  }, [rasterDate, rasterType, token])
+  }, [rasterDate, rasterType, runType, token])
 
   return (
     <ErrorBoundary>
diff --git a/web/apps/wps-web/src/features/sfmsInsights/components/map/layerDefinitions.test.ts b/web/apps/wps-web/src/features/sfmsInsights/components/map/layerDefinitions.test.ts
index 728debc1f2..1747e526e8 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/components/map/layerDefinitions.test.ts
+++ b/web/apps/wps-web/src/features/sfmsInsights/components/map/layerDefinitions.test.ts
@@ -1,10 +1,6 @@
+import { RunType } from '@wps/api/runType'
 import { DateTime } from 'luxon'
-import {
-  getFireWeatherRasterLayer,
-  getRasterLayer,
-  getSFMSNGActualRasterPath,
-  getSnowPMTilesLayer
-} from './layerDefinitions'
+import { getFireWeatherRasterLayer, getRasterLayer, getSFMSNGRasterPath, getSnowPMTilesLayer } from './layerDefinitions'
 
 type Listener = (...args: unknown[]) => void
 
@@ -113,17 +109,25 @@ describe('layerDefinitions', () => {
     it('should generate SFMSNG actual COG paths for FWI rasters', () => {
       const rasterDate = DateTime.fromISO('2025-11-02')
 
-      expect(getSFMSNGActualRasterPath(rasterDate, 'fwi')).toBe('sfms_ng/actual/2025/11/02/fwi_20251102_cog.tif')
+      expect(getSFMSNGRasterPath(rasterDate, 'fwi')).toBe('sfms_ng/actual/2025/11/02/fwi_20251102_cog.tif')
     })
 
     it('should generate SFMSNG actual COG paths for weather rasters', () => {
       const rasterDate = DateTime.fromISO('2025-11-02')
 
-      expect(getSFMSNGActualRasterPath(rasterDate, 'relative_humidity')).toBe(
+      expect(getSFMSNGRasterPath(rasterDate, 'relative_humidity')).toBe(
         'sfms_ng/actual/2025/11/02/relative_humidity_20251102_cog.tif'
       )
     })
 
+    it('should generate SFMSNG forecast COG paths', () => {
+      const rasterDate = DateTime.fromISO('2025-11-05')
+
+      expect(getSFMSNGRasterPath(rasterDate, 'fwi', RunType.FORECAST)).toBe(
+        'sfms_ng/forecast/2025/11/05/fwi_20251105_cog.tif'
+      )
+    })
+
     it('should create fire weather layer with zIndex 52', () => {
       const rasterDate = DateTime.fromISO('2025-11-02')
       const layer = getFireWeatherRasterLayer(rasterDate, 'fwi', 'test-token')
@@ -192,6 +196,15 @@ describe('layerDefinitions', () => {
       expect(layer!.getProperties().rasterType).toBe('temperature')
     })
 
+    it('should return a forecast fire weather layer when forecast data is selected', () => {
+      const date = DateTime.fromISO('2025-11-05')
+      const layer = getRasterLayer(date, 'fwi', 'test-token', RunType.FORECAST)
+
+      expect(layer).toBeDefined()
+      expect(layer).not.toBeNull()
+      expect(layer!.getProperties().rasterType).toBe('fwi')
+    })
+
     it('should return null and log error when date is null for fire weather raster', () => {
       const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
       const layer = getRasterLayer(null, 'fwi', 'test-token')
diff --git a/web/apps/wps-web/src/features/sfmsInsights/components/map/layerDefinitions.ts b/web/apps/wps-web/src/features/sfmsInsights/components/map/layerDefinitions.ts
index 8e7301e2db..2db016dcc0 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/components/map/layerDefinitions.ts
+++ b/web/apps/wps-web/src/features/sfmsInsights/components/map/layerDefinitions.ts
@@ -1,3 +1,4 @@
+import { RunType } from '@wps/api/runType'
 import { BC_EXTENT } from '@wps/utils/constants'
 import { API_BASE_URL } from '@wps/utils/env'
 import type { DateTime } from 'luxon'
@@ -19,11 +20,15 @@ export const BASEMAP_LAYER_NAME = 'basemapLayer'
 export const SNOW_LAYER_NAME = 'snowVector'
 export const FWI_LAYER_NAME = 'fwiRaster'
 
-export const getSFMSNGActualRasterPath = (date: DateTime, rasterType: SFMSNGRasterType) => {
+export const getSFMSNGRasterPath = (
+  date: DateTime,
+  rasterType: SFMSNGRasterType,
+  runType: RunType = RunType.ACTUAL
+) => {
   const dateString = date.toISODate() ?? ''
   const datePath = dateString.replaceAll('-', '/')
   const dateStringBasic = dateString.replaceAll('-', '')
-  return `sfms_ng/actual/${datePath}/${rasterType}_${dateStringBasic}_cog.tif`
+  return `sfms_ng/${runType}/${datePath}/${rasterType}_${dateStringBasic}_cog.tif`
 }
 
 export const getSnowPMTilesLayer = (snowDate: DateTime, token?: string) => {
@@ -59,9 +64,10 @@ export const getFireWeatherRasterLayer = (
   date: DateTime,
   rasterType: SFMSNGRasterType,
   token: string | undefined,
+  runType: RunType = RunType.ACTUAL,
   layerName: string = FWI_LAYER_NAME
 ) => {
-  const path = getSFMSNGActualRasterPath(date, rasterType)
+  const path = getSFMSNGRasterPath(date, rasterType, runType)
   const url = `${API_BASE_URL}/object-store-proxy/${path}`
 
   // Prepare headers for authentication
@@ -136,7 +142,12 @@ export const getFuelCOGTiles = (token?: string) => {
  * Get the appropriate raster layer based on type
  * Handles both fire weather rasters (date-dependent) and fuel raster (static)
  */
-export const getRasterLayer = (date: DateTime | null, rasterType: RasterType, token: string | undefined) => {
+export const getRasterLayer = (
+  date: DateTime | null,
+  rasterType: RasterType,
+  token: string | undefined,
+  runType: RunType = RunType.ACTUAL
+) => {
   if (rasterType === 'fuel') {
     return getFuelCOGTiles(token)
   }
@@ -144,5 +155,5 @@ export const getRasterLayer = (date: DateTime | null, rasterType: RasterType, to
     console.error('date is required for fire weather rasters')
     return null
   }
-  return getFireWeatherRasterLayer(date, rasterType, token)
+  return getFireWeatherRasterLayer(date, rasterType, token, runType)
 }
diff --git a/web/apps/wps-web/src/features/sfmsInsights/components/map/sfmsMap.test.tsx b/web/apps/wps-web/src/features/sfmsInsights/components/map/sfmsMap.test.tsx
index 05d8abc527..67e6681a08 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/components/map/sfmsMap.test.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/components/map/sfmsMap.test.tsx
@@ -1,4 +1,5 @@
 import { act, fireEvent, render, screen } from '@testing-library/react'
+import { RunType } from '@wps/api/runType'
 import { createVectorTileLayer, getStyleJson } from '@wps/utils/vectorLayerUtils'
 import { DateTime } from 'luxon'
 import { Provider } from 'react-redux'
@@ -148,7 +149,8 @@ describe('SFMSMap', () => {
     expect(layerDefinitions.getRasterLayer).toHaveBeenLastCalledWith(
       DateTime.fromISO('2025-11-03'),
       'fwi',
-      'test-token'
+      'test-token',
+      'actual'
     )
   })
 
@@ -159,7 +161,7 @@ describe('SFMSMap', () => {
 
   it('should request raster layer for fuel type even when rasterDate is null', () => {
     renderWithStore(<SFMSMap snowDate={null} rasterDate={null} rasterType="fuel" />)
-    expect(layerDefinitions.getRasterLayer).toHaveBeenCalledWith(null, 'fuel', 'test-token')
+    expect(layerDefinitions.getRasterLayer).toHaveBeenCalledWith(null, 'fuel', 'test-token', 'actual')
   })
 
   it('should request new layer when rasterType changes', () => {
@@ -179,10 +181,29 @@ describe('SFMSMap', () => {
     expect(layerDefinitions.getRasterLayer).toHaveBeenLastCalledWith(
       DateTime.fromISO('2025-11-02'),
       'ffmc',
-      'test-token'
+      'test-token',
+      'actual'
     )
   })
 
+  it('should request a new layer when runType changes', () => {
+    const store = makeStore()
+    const rasterDate = DateTime.fromISO('2025-11-02')
+    const { rerender } = render(
+      <Provider store={store}>
+        <SFMSMap snowDate={null} rasterDate={rasterDate} runType={RunType.ACTUAL} />
+      </Provider>
+    )
+
+    rerender(
+      <Provider store={store}>
+        <SFMSMap snowDate={null} rasterDate={rasterDate} runType={RunType.FORECAST} />
+      </Provider>
+    )
+
+    expect(layerDefinitions.getRasterLayer).toHaveBeenLastCalledWith(rasterDate, 'fwi', 'test-token', RunType.FORECAST)
+  })
+
   it('should clear error when rasterDate changes', () => {
     const store = makeStore()
     const { rerender } = render(
@@ -242,7 +263,12 @@ describe('SFMSMap', () => {
       </Provider>
     )
 
-    expect(layerDefinitions.getRasterLayer).toHaveBeenLastCalledWith(DateTime.fromISO('2025-11-02'), 'fwi', 'new-token')
+    expect(layerDefinitions.getRasterLayer).toHaveBeenLastCalledWith(
+      DateTime.fromISO('2025-11-02'),
+      'fwi',
+      'new-token',
+      'actual'
+    )
   })
 
   it('should update snow layer when snowDate changes', () => {
diff --git a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
index 1c26bb8e7d..1f2231cad5 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
@@ -21,12 +21,14 @@ vi.mock('@/features/sfmsInsights/components/map/SFMSMap', () => {
       showSnow,
       snowDate,
       rasterDate,
-      rasterType
+      rasterType,
+      runType
     }: {
       showSnow: boolean
       snowDate: DateTime | null
       rasterDate: DateTime | null
       rasterType: string
+      runType: string
     }) => (
       <div
         data-testid="sfms-map"
@@ -34,6 +36,7 @@ vi.mock('@/features/sfmsInsights/components/map/SFMSMap', () => {
         data-snow-date={snowDate?.toISO() ?? 'null'}
         data-raster-date={rasterDate?.toISO() ?? 'null'}
         data-raster-type={rasterType}
+        data-run-type={runType}
       >
         Mock SFMS Map
       </div>
@@ -136,6 +139,10 @@ describe('SFMSInsightsPage', () => {
         actual: {
           minimum: '2025-01-01',
           maximum: '2025-11-02'
+        },
+        forecast: {
+          minimum: '2025-11-03',
+          maximum: '2025-11-05'
         }
       }
     }
@@ -194,6 +201,51 @@ describe('SFMSInsightsPage', () => {
     expect(map).toHaveAttribute('data-raster-type', 'fuel')
   })
 
+  it('should show actuals by default', async () => {
+    renderWithStore()
+    await waitForPageLoad()
+
+    expect(screen.getByRole('combobox', { name: 'Source' })).toHaveTextContent('Actual')
+    expect(screen.getByTestId('sfms-map')).toHaveAttribute('data-run-type', 'actual')
+  })
+
+  it('should switch to the latest forecast date and forecast raster data', async () => {
+    renderWithStore()
+    await waitForPageLoad()
+
+    fireEvent.mouseDown(screen.getByRole('combobox', { name: 'Source' }))
+    fireEvent.click(screen.getByRole('option', { name: 'Forecast' }))
+
+    await waitFor(() => {
+      expect(screen.getByTestId('current-date')).toHaveTextContent('2025-11-05')
+      expect(screen.getByTestId('historical-min-date')).toHaveTextContent('2025-11-03')
+      expect(screen.getByTestId('historical-max-date')).toHaveTextContent('2025-11-05')
+      expect(screen.getByTestId('sfms-map')).toHaveAttribute('data-run-type', 'forecast')
+    })
+  })
+
+  it('should disable dated raster controls when forecasts are unavailable', async () => {
+    renderWithStore({
+      '2025': {
+        actual: {
+          minimum: '2025-01-01',
+          maximum: '2025-11-02'
+        }
+      }
+    })
+    await waitForPageLoad()
+
+    fireEvent.mouseDown(screen.getByRole('combobox', { name: 'Source' }))
+    fireEvent.click(screen.getByRole('option', { name: 'Forecast' }))
+
+    await waitFor(() => {
+      expect(screen.getByTestId('current-date')).toHaveTextContent('null')
+      expect(screen.getByTestId('date-picker')).toHaveAttribute('data-disabled', 'true')
+      expect(screen.getByTestId('raster-type-dropdown')).toHaveAttribute('data-raster-data-available', 'false')
+      expect(screen.getByTestId('sfms-map')).toHaveAttribute('data-run-type', 'forecast')
+    })
+  })
+
   it('should set date picker max date based on SFMS bounds', async () => {
     renderWithStore()
     await waitForPageLoad()
@@ -385,7 +437,7 @@ describe('SFMSInsightsPage', () => {
     expect(minDate.textContent).toBe('2025-05-01')
   })
 
-  it('should set rasterDate to today when latestBounds is null', async () => {
+  it('should disable date selection when SFMS bounds are unavailable', async () => {
     renderWithStore(null)
 
     // Wait for fetch to complete
@@ -394,8 +446,8 @@ describe('SFMSInsightsPage', () => {
     })
 
     const currentDate = screen.getByTestId('current-date')
-    // Should default to today's date (mocked as 2025-11-02)
-    expect(currentDate.textContent).toBe('2025-11-02')
+    expect(currentDate.textContent).toBe('null')
+    expect(screen.getByTestId('date-picker')).toHaveAttribute('data-disabled', 'true')
 
     // Min/max dates should use default values
     const minDate = screen.getByTestId('historical-min-date')
@@ -404,7 +456,7 @@ describe('SFMSInsightsPage', () => {
     expect(maxDate.textContent).toBe('2025-11-12')
   })
 
-  it('should set rasterDate to today when latestBounds.maximum is empty', async () => {
+  it('should disable date selection when latestBounds.maximum is empty', async () => {
     renderWithStore({
       '2025': {
         actual: {
@@ -419,15 +471,15 @@ describe('SFMSInsightsPage', () => {
     expect(datePicker).toBeInTheDocument()
 
     const currentDate = screen.getByTestId('current-date')
-    // Should default to today's date (mocked as 2025-11-02)
-    expect(currentDate.textContent).toBe('2025-11-02')
+    expect(currentDate.textContent).toBe('null')
+    expect(datePicker).toHaveAttribute('data-disabled', 'true')
 
     // minDate should be set from bounds
     const minDate = screen.getByTestId('historical-min-date')
     expect(minDate.textContent).toBe('2025-05-01')
   })
 
-  it('should not set minDate when earliestBounds.minimum is empty', async () => {
+  it('should limit minDate to the latest date when earliestBounds.minimum is empty', async () => {
     renderWithStore({
       '2025': {
         actual: {
@@ -440,11 +492,10 @@ describe('SFMSInsightsPage', () => {
 
     const minDate = screen.getByTestId('historical-min-date')
 
-    // minDate should use default value since earliestBounds.minimum is empty
-    expect(minDate.textContent).toBe('2025-01-01')
+    expect(minDate.textContent).toBe('2025-10-15')
   })
 
-  it('should set rasterDate to today when all years have empty maximum', async () => {
+  it('should disable date selection when all years have empty maximum', async () => {
     renderWithStore({
       '2024': {
         actual: {
@@ -465,8 +516,8 @@ describe('SFMSInsightsPage', () => {
     expect(datePicker).toBeInTheDocument()
 
     const currentDate = screen.getByTestId('current-date')
-    // Should default to today's date (mocked as 2025-11-02)
-    expect(currentDate.textContent).toBe('2025-11-02')
+    expect(currentDate.textContent).toBe('null')
+    expect(datePicker).toHaveAttribute('data-disabled', 'true')
 
     // minDate should be set from 2024 bounds
     const minDate = screen.getByTestId('historical-min-date')
diff --git a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
index 807d98a4ef..a5a29fcf44 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
@@ -1,4 +1,5 @@
 import { Box, Checkbox, CircularProgress, FormControlLabel, Grid } from '@mui/material'
+import { RunType } from '@wps/api/runType'
 import { getMostRecentProcessedSnowByDate } from '@wps/api/snow'
 import AboutDataPopover from '@wps/ui/AboutDataPopover'
 import { GeneralHeader } from '@wps/ui/GeneralHeader'
@@ -9,12 +10,14 @@ import { isNull } from 'lodash'
 import { DateTime } from 'luxon'
 import { useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
+import type { RootState } from '@/app/rootReducer'
 import type { AppDispatch } from '@/app/store'
 import ASADatePicker from '@/features/fba/components/ASADatePicker'
 import Footer from '@/features/landingPage/components/Footer'
 import type { RasterType } from '@/features/sfmsInsights/components/map/rasterConfig'
 import SFMSMap from '@/features/sfmsInsights/components/map/SFMSMap'
 import RasterTypeDropdown from '@/features/sfmsInsights/components/RasterTypeDropdown'
+import RunTypeDropdown from '@/features/sfmsInsights/components/RunTypeDropdown'
 import { SfmsInsightsAboutDataContent } from '@/features/sfmsInsights/components/SfmsInsightsAboutDataContent'
 import {
   fetchSFMSInsightsBounds,
@@ -26,20 +29,28 @@ import {
 
 export const SFMSInsightsPage = () => {
   const dispatch = useDispatch<AppDispatch>()
-  const sfmsBounds = useSelector(selectSFMSInsightsBounds)
-  const sfmsBoundsLoading = useSelector(selectSFMSInsightsBoundsLoading)
-  const latestBounds = useSelector(selectLatestSFMSInsightsBounds)
-  const earliestBounds = useSelector(selectEarliestSFMSInsightsBounds)
+
+  // state
+  const [runType, setRunType] = useState<RunType>(RunType.ACTUAL)
+  const [rasterType, setRasterType] = useState<RasterType>('fuel')
+  const [rasterDate, setRasterDate] = useState<DateTime | null>(null)
   const [snowDate, setSnowDate] = useState<DateTime | null>(null)
-  const [rasterDate, setRasterDate] = useState<DateTime | null>(getDateTimeNowPST())
-  const [maxDate, setMaxDate] = useState<DateTime>(getDateTimeNowPST().plus({ days: 10 }))
+  const [showSnow, setShowSnow] = useState<boolean>(true)
   const [minDate, setMinDate] = useState<DateTime>(
     DateTime.fromObject({ day: 1, month: 1, year: getDateTimeNowPST().year })
   )
+  const [maxDate, setMaxDate] = useState<DateTime>(getDateTimeNowPST().plus({ days: 10 }))
 
-  const [rasterType, setRasterType] = useState<RasterType>('fuel')
-  const [showSnow, setShowSnow] = useState<boolean>(true)
+  // selectors
+  const sfmsBounds = useSelector(selectSFMSInsightsBounds)
+  const sfmsBoundsLoading = useSelector(selectSFMSInsightsBoundsLoading)
+  const latestBounds = useSelector((state: RootState) => selectLatestSFMSInsightsBounds(state, runType))
+  const earliestBounds = useSelector((state: RootState) => selectEarliestSFMSInsightsBounds(state, runType))
+
+  // derived values
+  const rasterDataAvailable = !!latestBounds?.maximum
 
+  // effects
   useEffect(() => {
     if (sfmsBounds !== undefined || sfmsBoundsLoading) {
       return
@@ -49,18 +60,23 @@ export const SFMSInsightsPage = () => {
   }, [dispatch, sfmsBounds, sfmsBoundsLoading])
 
   useEffect(() => {
-    if (earliestBounds?.minimum) {
-      setMinDate(DateTime.fromISO(earliestBounds.minimum))
+    if (!latestBounds?.maximum) {
+      setRasterDate(null)
+      return
     }
-  }, [earliestBounds])
+
+    const latestDate = DateTime.fromISO(latestBounds.maximum)
+    setMaxDate(latestDate)
+    setRasterDate(latestDate)
+  }, [latestBounds])
 
   useEffect(() => {
-    if (latestBounds?.maximum) {
-      const latestDate = DateTime.fromISO(latestBounds.maximum)
-      setMaxDate(latestDate)
-      setRasterDate(currentDate => (currentDate?.toISODate() === latestDate.toISODate() ? currentDate : latestDate))
+    if (earliestBounds?.minimum) {
+      setMinDate(DateTime.fromISO(earliestBounds.minimum))
+    } else if (latestBounds?.maximum) {
+      setMinDate(DateTime.fromISO(latestBounds.maximum))
     }
-  }, [latestBounds])
+  }, [earliestBounds, latestBounds])
 
   useEffect(() => {
     // Only fetch snow data once rasterDate is set
@@ -82,6 +98,12 @@ export const SFMSInsightsPage = () => {
     fetchLastProcessedSnow(rasterDate)
   }, [rasterDate])
 
+  // handlers
+  const updateRunType = (newRunType: RunType) => {
+    setRasterDate(null)
+    setRunType(newRunType)
+  }
+
   return (
     <Box sx={{ height: '100vh', display: 'flex', flexDirection: 'column', overflow: 'hidden' }}>
       <GeneralHeader isBeta={true} spacing={1} title={SFMS_INSIGHTS_NAME} />
@@ -113,6 +135,7 @@ export const SFMSInsightsPage = () => {
               <StyledFormControl>
                 <ASADatePicker
                   date={rasterDate}
+                  disabled={!rasterDataAvailable}
                   updateDate={setRasterDate}
                   historicalMinDate={minDate}
                   historicalMaxDate={maxDate}
@@ -122,12 +145,17 @@ export const SFMSInsightsPage = () => {
               </StyledFormControl>
             </Grid>
           )}
+          <Grid>
+            <StyledFormControl>
+              <RunTypeDropdown selectedRunType={runType} setSelectedRunType={updateRunType} />
+            </StyledFormControl>
+          </Grid>
           <Grid>
             <StyledFormControl>
               <RasterTypeDropdown
                 selectedRasterType={rasterType}
                 setSelectedRasterType={setRasterType}
-                rasterDataAvailable={!!latestBounds?.maximum}
+                rasterDataAvailable={rasterDataAvailable}
               />
             </StyledFormControl>
           </Grid>
@@ -147,7 +175,13 @@ export const SFMSInsightsPage = () => {
         </Grid>
       </Box>
       <Box sx={{ flex: 1, position: 'relative' }}>
-        <SFMSMap snowDate={snowDate} rasterDate={rasterDate} rasterType={rasterType} showSnow={showSnow} />
+        <SFMSMap
+          snowDate={snowDate}
+          rasterDate={rasterDate}
+          rasterType={rasterType}
+          runType={runType}
+          showSnow={showSnow}
+        />
       </Box>
       <Footer />
     </Box>
diff --git a/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.test.ts b/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.test.ts
index fab38f0570..abb9d4f84f 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.test.ts
+++ b/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.test.ts
@@ -1,5 +1,7 @@
 import { combineReducers } from '@reduxjs/toolkit'
-import { getSFMSInsightsBounds, type SFMSBounds, type SFMSBoundsResponse } from '@wps/api/sfmsAPI'
+import { RunType } from '@wps/api/runType'
+import { getSFMSInsightsBounds } from '@wps/api/sfmsAPI'
+import type { SFMSBounds, SFMSBoundsResponse } from '@wps/api/sfmsBounds'
 import { logError } from '@wps/utils/error'
 import type { AppDispatch } from '@/app/store'
 import { createTestStore } from '@/test/testUtils'
@@ -129,6 +131,10 @@ describe('SFMS Insights bounds selectors', () => {
       actual: {
         minimum: '2025-01-01',
         maximum: '2025-11-02'
+      },
+      forecast: {
+        minimum: '2025-11-03',
+        maximum: '2025-11-05'
       }
     }
   }
@@ -160,6 +166,24 @@ describe('SFMS Insights bounds selectors', () => {
     })
   })
 
+  it('selectors return forecast bounds when forecasts are selected', () => {
+    const state = {
+      sfmsInsights: {
+        ...initialState,
+        sfmsBounds: fullSfmsBounds
+      }
+    }
+
+    expect(selectLatestSFMSInsightsBounds(state, RunType.FORECAST)).toEqual({
+      minimum: '2025-11-03',
+      maximum: '2025-11-05'
+    })
+    expect(selectEarliestSFMSInsightsBounds(state, RunType.FORECAST)).toEqual({
+      minimum: '2025-11-03',
+      maximum: '2025-11-05'
+    })
+  })
+
   it('selectLatestSFMSInsightsBounds skips years with empty maximum', () => {
     const state = {
       sfmsInsights: {
diff --git a/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.ts b/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.ts
index 7304657896..58748aac01 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.ts
+++ b/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.ts
@@ -1,5 +1,7 @@
 import { createSelector, createSlice, type PayloadAction } from '@reduxjs/toolkit'
-import { getSFMSInsightsBounds, type SFMSBounds, type SFMSBoundsResponse } from '@wps/api/sfmsAPI'
+import { RunType } from '@wps/api/runType'
+import { getSFMSInsightsBounds } from '@wps/api/sfmsAPI'
+import type { SFMSBounds, SFMSBoundsResponse } from '@wps/api/sfmsBounds'
 import { logError } from '@wps/utils/error'
 import type { AppThunk } from 'app/store'
 
@@ -62,15 +64,16 @@ export const selectSFMSInsightsBoundsLoading = createSelector(
   sfmsInsights => sfmsInsights.sfmsBoundsLoading
 )
 
-const findActualBoundsInOrder = (
+const findBoundsInOrder = (
   sfmsBounds: SFMSBounds | null | undefined,
+  runType: RunType,
   sortFn: (a: string, b: string) => number,
   hasValue: (bounds: { minimum: string; maximum: string }) => boolean
 ) => {
   if (!sfmsBounds) return null
 
   for (const year of Object.keys(sfmsBounds).sort(sortFn)) {
-    const bounds = sfmsBounds[year]?.actual
+    const bounds = sfmsBounds[year]?.[runType]
     if (bounds && hasValue(bounds)) {
       return bounds
     }
@@ -78,18 +81,20 @@ const findActualBoundsInOrder = (
   return null
 }
 
-export const selectLatestSFMSInsightsBounds = createSelector([selectSFMSInsightsBounds], sfmsBounds =>
-  findActualBoundsInOrder(
-    sfmsBounds,
+type SFMSInsightsRootState = { sfmsInsights: SFMSInsightsState }
+
+export const selectLatestSFMSInsightsBounds = (state: SFMSInsightsRootState, runType: RunType = RunType.ACTUAL) =>
+  findBoundsInOrder(
+    selectSFMSInsightsBounds(state),
+    runType,
     (a, b) => b.localeCompare(a),
     bounds => !!bounds.maximum
   )
-)
 
-export const selectEarliestSFMSInsightsBounds = createSelector([selectSFMSInsightsBounds], sfmsBounds =>
-  findActualBoundsInOrder(
-    sfmsBounds,
+export const selectEarliestSFMSInsightsBounds = (state: SFMSInsightsRootState, runType: RunType = RunType.ACTUAL) =>
+  findBoundsInOrder(
+    selectSFMSInsightsBounds(state),
+    runType,
     (a, b) => a.localeCompare(b),
     bounds => !!bounds.minimum
   )
-)
diff --git a/web/packages/api/src/fbaAPI.ts b/web/packages/api/src/fbaAPI.ts
index 0df4cbeb65..2f5f8d8f28 100644
--- a/web/packages/api/src/fbaAPI.ts
+++ b/web/packages/api/src/fbaAPI.ts
@@ -1,11 +1,8 @@
 import type { AdvisoryStatus } from '@wps/utils/constants'
 import type { DateTime } from 'luxon'
 import axios, { raster } from './axios'
-
-export enum RunType {
-  FORECAST = 'FORECAST',
-  ACTUAL = 'ACTUAL'
-}
+import type { RunType } from './runType'
+import type { SFMSBoundsResponse } from './sfmsBounds'
 
 export interface FireShape {
   fire_shape_id: number
@@ -109,44 +106,25 @@ export interface FireCentreHFIStats {
   }
 }
 
-export interface SFMSBoundsMinMax {
-  minimum: string
-  maximum: string
-}
-
-// Keys are 'actual' or 'forecast'
-export interface SFMSBoundsByRunType {
-  [key: string]: SFMSBoundsMinMax
-}
-
-// Keys are years (eg. 2024, 2024)
-export interface SFMSBounds {
-  [key: string]: SFMSBoundsByRunType
-}
-
-export interface SFMSBoundsResponse {
-  sfms_bounds: SFMSBounds
-}
-
 // Gets a summary of info about all fire zone units in the province
 export async function getProvincialSummary(
   run_type: RunType,
   run_datetime: string,
   for_date: string
 ): Promise<ProvincialSummaryResponse> {
-  const url = `/fba/provincial-summary/${run_type.toLowerCase()}/${encodeURI(run_datetime)}/${for_date}`
+  const url = `/fba/provincial-summary/${run_type}/${encodeURI(run_datetime)}/${for_date}`
   const { data } = await axios.get(url)
   return data
 }
 
 export async function getMostRecentRunDate(run_type: RunType, for_date: string): Promise<string> {
-  const url = `fba/sfms-run-datetimes/${run_type.toLowerCase()}/${for_date}`
+  const url = `fba/sfms-run-datetimes/${run_type}/${for_date}`
   const { data } = await axios.get(url)
   return data[0]
 }
 
 export async function getAllRunDates(run_type: RunType, for_date: string): Promise<DateTime[]> {
-  const url = `fba/sfms-run-datetimes/${run_type.toLowerCase()}/${for_date}`
+  const url = `fba/sfms-run-datetimes/${run_type}/${for_date}`
   const { data } = await axios.get(url)
   return data
 }
@@ -163,7 +141,7 @@ export async function getFireCentreHFIStats(
   run_datetime: string,
   fire_centre: string
 ): Promise<FireCentreHFIStats> {
-  const url = `fba/fire-centre-hfi-stats/${run_type.toLowerCase()}/${for_date}/${run_datetime}/${fire_centre}`
+  const url = `fba/fire-centre-hfi-stats/${run_type}/${for_date}/${run_datetime}/${fire_centre}`
   const { data } = await axios.get(url)
   return data
 }
@@ -174,7 +152,7 @@ export async function getFireZoneElevationInfo(
   run_datetime: string,
   for_date: string
 ): Promise<FireZoneElevationInfoResponse> {
-  const url = `fba/fire-zone-elevation-info/${run_type.toLowerCase()}/${run_datetime}/${for_date}/${fire_zone_id}`
+  const url = `fba/fire-zone-elevation-info/${run_type}/${run_datetime}/${for_date}/${fire_zone_id}`
   const { data } = await axios.get(url)
   return data
 }
@@ -185,7 +163,7 @@ export async function getFireCentreTPIStats(
   run_datetime: string,
   for_date: string
 ): Promise<FireCentreTPIResponse> {
-  const url = `fba/fire-centre-tpi-stats/${run_type.toLowerCase()}/${run_datetime}/${for_date}/${fire_centre_name}`
+  const url = `fba/fire-centre-tpi-stats/${run_type}/${run_datetime}/${for_date}/${fire_centre_name}`
   const { data } = await axios.get(url)
   return data
 }
diff --git a/web/packages/api/src/runType.test.ts b/web/packages/api/src/runType.test.ts
new file mode 100644
index 0000000000..4a4c58eba8
--- /dev/null
+++ b/web/packages/api/src/runType.test.ts
@@ -0,0 +1,9 @@
+import { describe, expect, it } from 'vitest'
+import { RunType } from './runType'
+
+describe('RunType', () => {
+  it('uses the lowercase API representation', () => {
+    expect(RunType.ACTUAL).toBe('actual')
+    expect(RunType.FORECAST).toBe('forecast')
+  })
+})
diff --git a/web/packages/api/src/runType.ts b/web/packages/api/src/runType.ts
new file mode 100644
index 0000000000..a813ea1e36
--- /dev/null
+++ b/web/packages/api/src/runType.ts
@@ -0,0 +1,4 @@
+export enum RunType {
+  ACTUAL = 'actual',
+  FORECAST = 'forecast'
+}
diff --git a/web/packages/api/src/sfmsAPI.ts b/web/packages/api/src/sfmsAPI.ts
index 917dfd8cb1..638f8fd7a8 100644
--- a/web/packages/api/src/sfmsAPI.ts
+++ b/web/packages/api/src/sfmsAPI.ts
@@ -1,23 +1,5 @@
 import axios from './axios'
-
-export interface SFMSBoundsMinMax {
-  minimum: string
-  maximum: string
-}
-
-// Keys are 'actual' or 'forecast'
-export interface SFMSBoundsByRunType {
-  [key: string]: SFMSBoundsMinMax
-}
-
-// Keys are years (eg. 2024, 2025)
-export interface SFMSBounds {
-  [key: string]: SFMSBoundsByRunType
-}
-
-export interface SFMSBoundsResponse {
-  sfms_bounds: SFMSBounds
-}
+import type { SFMSBoundsResponse } from './sfmsBounds'
 
 export async function getSFMSInsightsBounds(): Promise<SFMSBoundsResponse> {
   const url = 'sfmsng/run-bounds'
diff --git a/web/packages/api/src/sfmsBounds.ts b/web/packages/api/src/sfmsBounds.ts
new file mode 100644
index 0000000000..111c2bd2e9
--- /dev/null
+++ b/web/packages/api/src/sfmsBounds.ts
@@ -0,0 +1,16 @@
+import type { RunType } from './runType'
+
+export interface SFMSBoundsMinMax {
+  minimum: string
+  maximum: string
+}
+
+export type SFMSBoundsByRunType = Partial<Record<RunType, SFMSBoundsMinMax>>
+
+export interface SFMSBounds {
+  [year: string]: SFMSBoundsByRunType
+}
+
+export interface SFMSBoundsResponse {
+  sfms_bounds: SFMSBounds
+}

From 4304f15f7ecea344d82a198e5b5014e4b375bbd7 Mon Sep 17 00:00:00 2001
From: Brett Edwards <brett.1.edwards@gov.bc.ca>
Date: Wed, 29 Jul 2026 12:50:35 -0700
Subject: [PATCH 02/12] theme work

---
 .../fba/components/ActualForecastControl.tsx  | 12 +++---
 .../components/PrepDateRangeSelector.tsx      |  5 ++-
 .../components/MoreCast2DateRangePicker.tsx   |  5 ++-
 web/packages/ui/src/theme.ts                  | 43 +++++++++++++++++++
 4 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/web/apps/wps-web/src/features/fba/components/ActualForecastControl.tsx b/web/apps/wps-web/src/features/fba/components/ActualForecastControl.tsx
index 74e2494d1b..31a39e5b08 100644
--- a/web/apps/wps-web/src/features/fba/components/ActualForecastControl.tsx
+++ b/web/apps/wps-web/src/features/fba/components/ActualForecastControl.tsx
@@ -1,6 +1,6 @@
 import { FormControl, FormControlLabel, FormLabel, Radio, RadioGroup } from '@mui/material'
 import { RunType } from '@wps/api/runType'
-import { theme } from '@wps/ui/theme'
+import { CONTROL_HEIGHT } from '@wps/ui/theme'
 import { isNull } from 'lodash'
 import React from 'react'
 
@@ -17,13 +17,15 @@ const ActualForecastControl = ({ runType, setRunType }: ActualForecastControlPro
   return (
     <FormControl
       variant="outlined"
-      sx={{
+      sx={theme => ({
+        height: CONTROL_HEIGHT,
         border: '1px solid rgba(0, 0, 0, 0.23)',
-        borderRadius: '4px',
-        padding: '8px 12px 4px',
+        borderRadius: `${theme.shape.borderRadius}px`,
+        padding: '0 12px',
+        justifyContent: 'center',
         position: 'relative',
         margin: theme.spacing(1)
-      }}
+      })}
     >
       <FormLabel
         sx={{
diff --git a/web/apps/wps-web/src/features/hfiCalculator/components/PrepDateRangeSelector.tsx b/web/apps/wps-web/src/features/hfiCalculator/components/PrepDateRangeSelector.tsx
index b0fcee6f0c..53ebd43d49 100644
--- a/web/apps/wps-web/src/features/hfiCalculator/components/PrepDateRangeSelector.tsx
+++ b/web/apps/wps-web/src/features/hfiCalculator/components/PrepDateRangeSelector.tsx
@@ -13,6 +13,7 @@ import { styled } from '@mui/material/styles'
 import type { PrepDateRange } from '@wps/api/hfiCalculatorAPI'
 import DateRangePickerWrapper from '@wps/ui/dateRangePicker/DateRangePickerWrapper'
 import type { DateRange } from '@wps/ui/dateRangePicker/types'
+import { theme } from '@wps/ui/theme'
 import { isUndefined } from 'lodash'
 import { DateTime } from 'luxon'
 import React, { useState } from 'react'
@@ -30,7 +31,7 @@ export interface PrepDateRangeSelectorProps {
   setDateRange: (newDateRange: DateRange) => void
 }
 
-export const dateRangePickerTheme = createTheme({
+export const dateRangePickerTheme = createTheme(theme, {
   components: {
     MuiOutlinedInput: {
       styleOverrides: {
@@ -95,7 +96,7 @@ const PrepDateRangeSelector = ({ dateRange, setDateRange }: PrepDateRangeSelecto
       <StyledEngineProvider injectFirst>
         <ThemeProvider theme={dateRangePickerTheme}>
           <Button
-            sx={{ textTransform: 'capitalize' }}
+            sx={{ typography: 'body1', textTransform: 'capitalize' }}
             data-testid="date-range-picker-button"
             onClick={() => setDateRangePickerOpen(!dateRangePickerOpen)}
           >
diff --git a/web/apps/wps-web/src/features/moreCast2/components/MoreCast2DateRangePicker.tsx b/web/apps/wps-web/src/features/moreCast2/components/MoreCast2DateRangePicker.tsx
index 5a31ab3f01..eee704e0fd 100644
--- a/web/apps/wps-web/src/features/moreCast2/components/MoreCast2DateRangePicker.tsx
+++ b/web/apps/wps-web/src/features/moreCast2/components/MoreCast2DateRangePicker.tsx
@@ -2,6 +2,7 @@ import { Box, createTheme, StyledEngineProvider, ThemeProvider } from '@mui/mate
 import { styled } from '@mui/material/styles'
 import DateRangeSelector from '@wps/ui/DateRangeSelector'
 import type { DateRange } from '@wps/ui/dateRangePicker/types'
+import { theme } from '@wps/ui/theme'
 import { DateTime } from 'luxon'
 import React from 'react'
 
@@ -22,7 +23,7 @@ export interface MoreCase2DateRangePickerProps {
   setDateRange: (newDateRange: DateRange) => void
 }
 
-export const dateRangePickerTheme = createTheme({
+export const dateRangePickerTheme = createTheme(theme, {
   components: {
     MuiOutlinedInput: {
       styleOverrides: {
@@ -65,7 +66,7 @@ const MoreCase2DateRangePicker = ({ dateRange, setDateRange }: MoreCase2DateRang
             maxDayOffset={11}
             dateDisplayFormat={'yyyy/MM/dd'}
             setDateRange={setDateRange}
-            size="medium"
+            size="small"
             label={'Date Range'}
           />
         </ThemeProvider>
diff --git a/web/packages/ui/src/theme.ts b/web/packages/ui/src/theme.ts
index 36dd2aa3e2..196981abf9 100644
--- a/web/packages/ui/src/theme.ts
+++ b/web/packages/ui/src/theme.ts
@@ -3,7 +3,12 @@ import type { GridCellParams, GridColumnHeaderParams } from '@mui/x-data-grid-pr
 // Theme documentation: https://material-ui.com/customization/palette/
 // Theme demo: https://material.io/resources/color/#!/?view.left=1&view.right=1&primary.color=003365&secondary.color=FBC02D
 // Do not export this directly for styling! theme should be accessed within makeStyles & withStyles. Use ErrorMessage.tsx as a reference
+export const CONTROL_HEIGHT = 44
+
 export const theme = createTheme({
+  shape: {
+    borderRadius: 6
+  },
   palette: {
     primary: {
       light: '#3E5C93',
@@ -37,6 +42,11 @@ export const theme = createTheme({
     }
   },
   components: {
+    MuiAutocomplete: {
+      defaultProps: {
+        size: 'small'
+      }
+    },
     MuiTooltip: {
       styleOverrides: {
         tooltip: {
@@ -50,6 +60,39 @@ export const theme = createTheme({
           fontSize: '1em'
         }
       }
+    },
+    MuiInputLabel: {
+      styleOverrides: {
+        root: {
+          '&.MuiInputLabel-outlined.MuiInputLabel-sizeSmall:not(.MuiInputLabel-shrink)': {
+            top: '50%',
+            transform: 'translate(14px, -50%) scale(1)'
+          }
+        }
+      }
+    },
+    MuiOutlinedInput: {
+      defaultProps: {
+        size: 'small'
+      },
+      styleOverrides: {
+        root: {
+          '&:not(.MuiInputBase-multiline)': {
+            height: CONTROL_HEIGHT,
+            alignItems: 'center'
+          }
+        }
+      }
+    },
+    MuiSelect: {
+      defaultProps: {
+        size: 'small'
+      }
+    },
+    MuiTextField: {
+      defaultProps: {
+        size: 'small'
+      }
     }
   }
 })

From ad9fb54f6d21606fa97eb9dc42253d3af1d36b89 Mon Sep 17 00:00:00 2001
From: Brett Edwards <brett.1.edwards@gov.bc.ca>
Date: Tue, 4 Aug 2026 11:41:42 -0700
Subject: [PATCH 03/12] theme update

---
 web/packages/ui/src/theme.ts | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/web/packages/ui/src/theme.ts b/web/packages/ui/src/theme.ts
index 196981abf9..a76cae05c4 100644
--- a/web/packages/ui/src/theme.ts
+++ b/web/packages/ui/src/theme.ts
@@ -1,9 +1,12 @@
 import { createTheme } from '@mui/material/styles'
 import type { GridCellParams, GridColumnHeaderParams } from '@mui/x-data-grid-pro'
+import type {} from '@mui/x-date-pickers/themeAugmentation'
 // Theme documentation: https://material-ui.com/customization/palette/
 // Theme demo: https://material.io/resources/color/#!/?view.left=1&view.right=1&primary.color=003365&secondary.color=FBC02D
 // Do not export this directly for styling! theme should be accessed within makeStyles & withStyles. Use ErrorMessage.tsx as a reference
 export const CONTROL_HEIGHT = 44
+// offset MUI's 40px small label position by half the custom height difference
+const CONTROL_LABEL_Y_OFFSET = 9 + (CONTROL_HEIGHT - 40) / 2
 
 export const theme = createTheme({
   shape: {
@@ -65,8 +68,7 @@ export const theme = createTheme({
       styleOverrides: {
         root: {
           '&.MuiInputLabel-outlined.MuiInputLabel-sizeSmall:not(.MuiInputLabel-shrink)': {
-            top: '50%',
-            transform: 'translate(14px, -50%) scale(1)'
+            transform: `translate(14px, ${CONTROL_LABEL_Y_OFFSET}px) scale(1)`
           }
         }
       }
@@ -84,6 +86,18 @@ export const theme = createTheme({
         }
       }
     },
+    MuiPickersOutlinedInput: {
+      styleOverrides: {
+        root: {
+          height: CONTROL_HEIGHT
+        }
+      }
+    },
+    MuiPickersTextField: {
+      defaultProps: {
+        size: 'small'
+      }
+    },
     MuiSelect: {
       defaultProps: {
         size: 'small'

From 4d1f627cf96a9b0d096a949a2c39a6bbd31f2758 Mon Sep 17 00:00:00 2001
From: Brett Edwards <brett.1.edwards@gov.bc.ca>
Date: Thu, 6 Aug 2026 08:56:31 -0700
Subject: [PATCH 04/12] dates

---
 .../pages/SFMSInsightsPage.test.tsx           | 20 +++++++++----------
 .../sfmsInsights/pages/SFMSInsightsPage.tsx   | 19 +++++++++---------
 web/packages/utils/src/constants.ts           |  1 +
 web/packages/utils/src/date.ts                |  6 +++++-
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
index 1f2231cad5..254010a89b 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
@@ -1,6 +1,6 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { getMostRecentProcessedSnowByDate } from '@wps/api/snow'
-import { getDateTimeNowPST } from '@wps/utils/date'
+import { getDateTimeNowPDT } from '@wps/utils/date'
 import { DateTime } from 'luxon'
 import { Provider } from 'react-redux'
 import type { Mock } from 'vitest'
@@ -12,7 +12,7 @@ vi.mock('@wps/api/snow', () => ({
 }))
 
 vi.mock('@wps/utils/date', () => ({
-  getDateTimeNowPST: vi.fn()
+  getDateTimeNowPDT: vi.fn()
 }))
 
 vi.mock('@/features/sfmsInsights/components/map/SFMSMap', () => {
@@ -179,8 +179,8 @@ describe('SFMSInsightsPage', () => {
       processedDate: DateTime.fromISO('2025-11-02'),
       snowSource: 'viirs'
     })
-    // Mock getDateTimeNowPST to return a date in 2025
-    ;(getDateTimeNowPST as Mock).mockReturnValue(dateTimeNow)
+    // mock getDateTimeNowPDT to return a date in 2025
+    ;(getDateTimeNowPDT as Mock).mockReturnValue(dateTimeNow)
   })
 
   it('should load rasterDate from SFMS bounds in store', async () => {
@@ -239,7 +239,7 @@ describe('SFMSInsightsPage', () => {
     fireEvent.click(screen.getByRole('option', { name: 'Forecast' }))
 
     await waitFor(() => {
-      expect(screen.getByTestId('current-date')).toHaveTextContent('null')
+      expect(screen.getByTestId('current-date')).toHaveTextContent('2025-11-02')
       expect(screen.getByTestId('date-picker')).toHaveAttribute('data-disabled', 'true')
       expect(screen.getByTestId('raster-type-dropdown')).toHaveAttribute('data-raster-data-available', 'false')
       expect(screen.getByTestId('sfms-map')).toHaveAttribute('data-run-type', 'forecast')
@@ -446,7 +446,7 @@ describe('SFMSInsightsPage', () => {
     })
 
     const currentDate = screen.getByTestId('current-date')
-    expect(currentDate.textContent).toBe('null')
+    expect(currentDate.textContent).toBe('2025-11-02')
     expect(screen.getByTestId('date-picker')).toHaveAttribute('data-disabled', 'true')
 
     // Min/max dates should use default values
@@ -471,7 +471,7 @@ describe('SFMSInsightsPage', () => {
     expect(datePicker).toBeInTheDocument()
 
     const currentDate = screen.getByTestId('current-date')
-    expect(currentDate.textContent).toBe('null')
+    expect(currentDate.textContent).toBe('2025-11-02')
     expect(datePicker).toHaveAttribute('data-disabled', 'true')
 
     // minDate should be set from bounds
@@ -479,7 +479,7 @@ describe('SFMSInsightsPage', () => {
     expect(minDate.textContent).toBe('2025-05-01')
   })
 
-  it('should limit minDate to the latest date when earliestBounds.minimum is empty', async () => {
+  it('should not set minDate when earliestBounds.minimum is empty', async () => {
     renderWithStore({
       '2025': {
         actual: {
@@ -492,7 +492,7 @@ describe('SFMSInsightsPage', () => {
 
     const minDate = screen.getByTestId('historical-min-date')
 
-    expect(minDate.textContent).toBe('2025-10-15')
+    expect(minDate.textContent).toBe('2025-01-01')
   })
 
   it('should disable date selection when all years have empty maximum', async () => {
@@ -516,7 +516,7 @@ describe('SFMSInsightsPage', () => {
     expect(datePicker).toBeInTheDocument()
 
     const currentDate = screen.getByTestId('current-date')
-    expect(currentDate.textContent).toBe('null')
+    expect(currentDate.textContent).toBe('2025-11-02')
     expect(datePicker).toHaveAttribute('data-disabled', 'true')
 
     // minDate should be set from 2024 bounds
diff --git a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
index a5a29fcf44..0dd45ef8d9 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
@@ -5,7 +5,7 @@ import AboutDataPopover from '@wps/ui/AboutDataPopover'
 import { GeneralHeader } from '@wps/ui/GeneralHeader'
 import { StyledFormControl } from '@wps/ui/StyledFormControl'
 import { SFMS_INSIGHTS_NAME } from '@wps/utils/constants'
-import { getDateTimeNowPST } from '@wps/utils/date'
+import { getDateTimeNowPDT } from '@wps/utils/date'
 import { isNull } from 'lodash'
 import { DateTime } from 'luxon'
 import { useEffect, useState } from 'react'
@@ -33,13 +33,13 @@ export const SFMSInsightsPage = () => {
   // state
   const [runType, setRunType] = useState<RunType>(RunType.ACTUAL)
   const [rasterType, setRasterType] = useState<RasterType>('fuel')
-  const [rasterDate, setRasterDate] = useState<DateTime | null>(null)
+  const [rasterDate, setRasterDate] = useState<DateTime | null>(getDateTimeNowPDT())
   const [snowDate, setSnowDate] = useState<DateTime | null>(null)
   const [showSnow, setShowSnow] = useState<boolean>(true)
   const [minDate, setMinDate] = useState<DateTime>(
-    DateTime.fromObject({ day: 1, month: 1, year: getDateTimeNowPST().year })
+    DateTime.fromObject({ day: 1, month: 1, year: getDateTimeNowPDT().year })
   )
-  const [maxDate, setMaxDate] = useState<DateTime>(getDateTimeNowPST().plus({ days: 10 }))
+  const [maxDate, setMaxDate] = useState<DateTime>(getDateTimeNowPDT().plus({ days: 10 }))
 
   // selectors
   const sfmsBounds = useSelector(selectSFMSInsightsBounds)
@@ -61,22 +61,23 @@ export const SFMSInsightsPage = () => {
 
   useEffect(() => {
     if (!latestBounds?.maximum) {
-      setRasterDate(null)
+      // keep current snow and the static fuel grid available before seasonal FWI processing starts
+      const today = getDateTimeNowPDT()
+      setRasterDate(currentDate => (currentDate?.toISODate() === today.toISODate() ? currentDate : today))
+      setRasterType('fuel')
       return
     }
 
     const latestDate = DateTime.fromISO(latestBounds.maximum)
     setMaxDate(latestDate)
-    setRasterDate(latestDate)
+    setRasterDate(currentDate => (currentDate?.toISODate() === latestDate.toISODate() ? currentDate : latestDate))
   }, [latestBounds])
 
   useEffect(() => {
     if (earliestBounds?.minimum) {
       setMinDate(DateTime.fromISO(earliestBounds.minimum))
-    } else if (latestBounds?.maximum) {
-      setMinDate(DateTime.fromISO(latestBounds.maximum))
     }
-  }, [earliestBounds, latestBounds])
+  }, [earliestBounds])
 
   useEffect(() => {
     // Only fetch snow data once rasterDate is set
diff --git a/web/packages/utils/src/constants.ts b/web/packages/utils/src/constants.ts
index 53fc2af562..cdaf432ee8 100644
--- a/web/packages/utils/src/constants.ts
+++ b/web/packages/utils/src/constants.ts
@@ -13,6 +13,7 @@ export const FFMC_VALUES_DECIMAL = 1
 export const ISI_VALUES_DECIMAL = 1
 
 export const PACIFIC_IANA_TIMEZONE = 'Canada/Pacific'
+export const PDT_UTC_OFFSET = -7
 export const PST_UTC_OFFSET = -8
 export const PST_ISO_TIMEZONE = 'T00:00-08:00'
 
diff --git a/web/packages/utils/src/date.ts b/web/packages/utils/src/date.ts
index 06b6a2637c..9a3ced5008 100644
--- a/web/packages/utils/src/date.ts
+++ b/web/packages/utils/src/date.ts
@@ -1,6 +1,6 @@
 import { isNull } from 'lodash'
 import { DateTime } from 'luxon'
-import { PST_ISO_TIMEZONE, PST_UTC_OFFSET } from './constants'
+import { PDT_UTC_OFFSET, PST_ISO_TIMEZONE, PST_UTC_OFFSET } from './constants'
 
 const UTC_NOON_HOUR = Math.abs(PST_UTC_OFFSET) + 12
 
@@ -58,3 +58,7 @@ export const pstFormatter = (fromDate: DateTime): string => {
 export const getDateTimeNowPST = (): DateTime => {
   return DateTime.now().setZone(`UTC${PST_UTC_OFFSET}`)
 }
+
+export const getDateTimeNowPDT = (): DateTime => {
+  return DateTime.now().setZone(`UTC${PDT_UTC_OFFSET}`)
+}

From 0bfb2f64fd0feaf6362a057bf88992f791c8c23e Mon Sep 17 00:00:00 2001
From: Brett Edwards <brett.1.edwards@gov.bc.ca>
Date: Thu, 6 Aug 2026 10:14:01 -0700
Subject: [PATCH 05/12] don't disable

---
 .../sfmsInsights/pages/SFMSInsightsPage.test.tsx | 16 ++++++++--------
 .../sfmsInsights/pages/SFMSInsightsPage.tsx      |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
index 254010a89b..4e308eb258 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
@@ -224,7 +224,7 @@ describe('SFMSInsightsPage', () => {
     })
   })
 
-  it('should disable dated raster controls when forecasts are unavailable', async () => {
+  it('should keep date selection available when forecasts are unavailable', async () => {
     renderWithStore({
       '2025': {
         actual: {
@@ -240,7 +240,7 @@ describe('SFMSInsightsPage', () => {
 
     await waitFor(() => {
       expect(screen.getByTestId('current-date')).toHaveTextContent('2025-11-02')
-      expect(screen.getByTestId('date-picker')).toHaveAttribute('data-disabled', 'true')
+      expect(screen.getByTestId('date-picker')).not.toHaveAttribute('data-disabled')
       expect(screen.getByTestId('raster-type-dropdown')).toHaveAttribute('data-raster-data-available', 'false')
       expect(screen.getByTestId('sfms-map')).toHaveAttribute('data-run-type', 'forecast')
     })
@@ -437,7 +437,7 @@ describe('SFMSInsightsPage', () => {
     expect(minDate.textContent).toBe('2025-05-01')
   })
 
-  it('should disable date selection when SFMS bounds are unavailable', async () => {
+  it('should set rasterDate to today when latestBounds is null', async () => {
     renderWithStore(null)
 
     // Wait for fetch to complete
@@ -447,7 +447,7 @@ describe('SFMSInsightsPage', () => {
 
     const currentDate = screen.getByTestId('current-date')
     expect(currentDate.textContent).toBe('2025-11-02')
-    expect(screen.getByTestId('date-picker')).toHaveAttribute('data-disabled', 'true')
+    expect(screen.getByTestId('date-picker')).not.toHaveAttribute('data-disabled')
 
     // Min/max dates should use default values
     const minDate = screen.getByTestId('historical-min-date')
@@ -456,7 +456,7 @@ describe('SFMSInsightsPage', () => {
     expect(maxDate.textContent).toBe('2025-11-12')
   })
 
-  it('should disable date selection when latestBounds.maximum is empty', async () => {
+  it('should set rasterDate to today when latestBounds.maximum is empty', async () => {
     renderWithStore({
       '2025': {
         actual: {
@@ -472,7 +472,7 @@ describe('SFMSInsightsPage', () => {
 
     const currentDate = screen.getByTestId('current-date')
     expect(currentDate.textContent).toBe('2025-11-02')
-    expect(datePicker).toHaveAttribute('data-disabled', 'true')
+    expect(datePicker).not.toHaveAttribute('data-disabled')
 
     // minDate should be set from bounds
     const minDate = screen.getByTestId('historical-min-date')
@@ -495,7 +495,7 @@ describe('SFMSInsightsPage', () => {
     expect(minDate.textContent).toBe('2025-01-01')
   })
 
-  it('should disable date selection when all years have empty maximum', async () => {
+  it('should set rasterDate to today when all years have empty maximum', async () => {
     renderWithStore({
       '2024': {
         actual: {
@@ -517,7 +517,7 @@ describe('SFMSInsightsPage', () => {
 
     const currentDate = screen.getByTestId('current-date')
     expect(currentDate.textContent).toBe('2025-11-02')
-    expect(datePicker).toHaveAttribute('data-disabled', 'true')
+    expect(datePicker).not.toHaveAttribute('data-disabled')
 
     // minDate should be set from 2024 bounds
     const minDate = screen.getByTestId('historical-min-date')
diff --git a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
index 0dd45ef8d9..720ecaf55c 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
@@ -136,7 +136,6 @@ export const SFMSInsightsPage = () => {
               <StyledFormControl>
                 <ASADatePicker
                   date={rasterDate}
-                  disabled={!rasterDataAvailable}
                   updateDate={setRasterDate}
                   historicalMinDate={minDate}
                   historicalMaxDate={maxDate}

From 104dd1478aead965f2b757c9d2e58647767626bc Mon Sep 17 00:00:00 2001
From: Brett Edwards <brett.1.edwards@gov.bc.ca>
Date: Thu, 6 Aug 2026 10:18:34 -0700
Subject: [PATCH 06/12] comments

---
 .../src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
index 4e308eb258..ec9f864f66 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
@@ -446,6 +446,7 @@ describe('SFMSInsightsPage', () => {
     })
 
     const currentDate = screen.getByTestId('current-date')
+    // should default to today's date (mocked as 2025-11-02)
     expect(currentDate.textContent).toBe('2025-11-02')
     expect(screen.getByTestId('date-picker')).not.toHaveAttribute('data-disabled')
 
@@ -471,6 +472,7 @@ describe('SFMSInsightsPage', () => {
     expect(datePicker).toBeInTheDocument()
 
     const currentDate = screen.getByTestId('current-date')
+    // should default to today's date (mocked as 2025-11-02)
     expect(currentDate.textContent).toBe('2025-11-02')
     expect(datePicker).not.toHaveAttribute('data-disabled')
 
@@ -492,6 +494,7 @@ describe('SFMSInsightsPage', () => {
 
     const minDate = screen.getByTestId('historical-min-date')
 
+    // minDate should use default value since earliestBounds.minimum is empty
     expect(minDate.textContent).toBe('2025-01-01')
   })
 
@@ -516,6 +519,7 @@ describe('SFMSInsightsPage', () => {
     expect(datePicker).toBeInTheDocument()
 
     const currentDate = screen.getByTestId('current-date')
+    // should default to today's date (mocked as 2025-11-02)
     expect(currentDate.textContent).toBe('2025-11-02')
     expect(datePicker).not.toHaveAttribute('data-disabled')
 

From 078c718b9d950630bf9b146f30c524bd670f9914 Mon Sep 17 00:00:00 2001
From: Brett Edwards <brett.1.edwards@gov.bc.ca>
Date: Thu, 6 Aug 2026 10:38:25 -0700
Subject: [PATCH 07/12] theme simplify

---
 web/packages/ui/src/theme.ts | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/web/packages/ui/src/theme.ts b/web/packages/ui/src/theme.ts
index a76cae05c4..f569c60f4a 100644
--- a/web/packages/ui/src/theme.ts
+++ b/web/packages/ui/src/theme.ts
@@ -1,6 +1,6 @@
 import { createTheme } from '@mui/material/styles'
 import type { GridCellParams, GridColumnHeaderParams } from '@mui/x-data-grid-pro'
-import type {} from '@mui/x-date-pickers/themeAugmentation'
+import type { PickerComponents } from '@mui/x-date-pickers/themeAugmentation'
 // Theme documentation: https://material-ui.com/customization/palette/
 // Theme demo: https://material.io/resources/color/#!/?view.left=1&view.right=1&primary.color=003365&secondary.color=FBC02D
 // Do not export this directly for styling! theme should be accessed within makeStyles & withStyles. Use ErrorMessage.tsx as a reference
@@ -8,6 +8,21 @@ export const CONTROL_HEIGHT = 44
 // offset MUI's 40px small label position by half the custom height difference
 const CONTROL_LABEL_Y_OFFSET = 9 + (CONTROL_HEIGHT - 40) / 2
 
+const pickerThemeComponents = {
+  MuiPickersOutlinedInput: {
+    styleOverrides: {
+      root: {
+        height: CONTROL_HEIGHT
+      }
+    }
+  },
+  MuiPickersTextField: {
+    defaultProps: {
+      size: 'small'
+    }
+  }
+} satisfies PickerComponents
+
 export const theme = createTheme({
   shape: {
     borderRadius: 6
@@ -45,6 +60,7 @@ export const theme = createTheme({
     }
   },
   components: {
+    ...pickerThemeComponents,
     MuiAutocomplete: {
       defaultProps: {
         size: 'small'
@@ -86,18 +102,6 @@ export const theme = createTheme({
         }
       }
     },
-    MuiPickersOutlinedInput: {
-      styleOverrides: {
-        root: {
-          height: CONTROL_HEIGHT
-        }
-      }
-    },
-    MuiPickersTextField: {
-      defaultProps: {
-        size: 'small'
-      }
-    },
     MuiSelect: {
       defaultProps: {
         size: 'small'

From a1aa452b5a172df26ac6f41d9424b2c96b4a1337 Mon Sep 17 00:00:00 2001
From: Brett Edwards <brett.1.edwards@gov.bc.ca>
Date: Thu, 6 Aug 2026 11:04:22 -0700
Subject: [PATCH 08/12] dates

---
 .../components/map/sfmsMap.test.tsx           |  2 +-
 .../pages/SFMSInsightsPage.test.tsx           | 19 +++++----
 .../sfmsInsights/pages/SFMSInsightsPage.tsx   | 41 ++++++++-----------
 .../slices/sfmsInsightsSlice.test.ts          | 36 ++++++++++++++++
 .../sfmsInsights/slices/sfmsInsightsSlice.ts  | 28 +++++++++++++
 5 files changed, 91 insertions(+), 35 deletions(-)

diff --git a/web/apps/wps-web/src/features/sfmsInsights/components/map/sfmsMap.test.tsx b/web/apps/wps-web/src/features/sfmsInsights/components/map/sfmsMap.test.tsx
index 67e6681a08..53759d1041 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/components/map/sfmsMap.test.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/components/map/sfmsMap.test.tsx
@@ -186,7 +186,7 @@ describe('SFMSMap', () => {
     )
   })
 
-  it('should request a new layer when runType changes', () => {
+  it('should request a new layer for the same date when runType changes', () => {
     const store = makeStore()
     const rasterDate = DateTime.fromISO('2025-11-02')
     const { rerender } = render(
diff --git a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
index ec9f864f66..0b63875289 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
@@ -209,7 +209,7 @@ describe('SFMSInsightsPage', () => {
     expect(screen.getByTestId('sfms-map')).toHaveAttribute('data-run-type', 'actual')
   })
 
-  it('should switch to the latest forecast date and forecast raster data', async () => {
+  it('should keep the selected date when switching to forecast raster data', async () => {
     renderWithStore()
     await waitForPageLoad()
 
@@ -217,10 +217,11 @@ describe('SFMSInsightsPage', () => {
     fireEvent.click(screen.getByRole('option', { name: 'Forecast' }))
 
     await waitFor(() => {
-      expect(screen.getByTestId('current-date')).toHaveTextContent('2025-11-05')
-      expect(screen.getByTestId('historical-min-date')).toHaveTextContent('2025-11-03')
+      expect(screen.getByTestId('current-date')).toHaveTextContent('2025-11-02')
+      expect(screen.getByTestId('historical-min-date')).toHaveTextContent('2024-01-01')
       expect(screen.getByTestId('historical-max-date')).toHaveTextContent('2025-11-05')
       expect(screen.getByTestId('sfms-map')).toHaveAttribute('data-run-type', 'forecast')
+      expect(getMostRecentProcessedSnowByDate).toHaveBeenCalledTimes(1)
     })
   })
 
@@ -250,7 +251,7 @@ describe('SFMSInsightsPage', () => {
     renderWithStore()
     await waitForPageLoad()
 
-    // The date picker should be rendered with max date from SFMS bounds (2025-11-02)
+    // the date picker should use the combined maximum bound (2025-11-05)
     const datePicker = screen.getByTestId('date-picker')
     expect(datePicker).toBeInTheDocument()
   })
@@ -395,15 +396,15 @@ describe('SFMSInsightsPage', () => {
     })
   })
 
-  it('should set maxDate from latestSFMSBounds.maximum', async () => {
+  it('should set maxDate from combined Actual and Forecast bounds', async () => {
     renderWithStore()
     await waitForPageLoad()
 
     const maxDate = screen.getByTestId('historical-max-date')
-    expect(maxDate.textContent).toBe('2025-11-02')
+    expect(maxDate.textContent).toBe('2025-11-05')
   })
 
-  it('should set minDate from earliestSFMSBounds.minimum', async () => {
+  it('should set minDate from combined Actual and Forecast bounds', async () => {
     renderWithStore()
     await waitForPageLoad()
 
@@ -419,10 +420,10 @@ describe('SFMSInsightsPage', () => {
     const maxDate = screen.getByTestId('current-year-max-date')
 
     expect(minDate.textContent).toBe('2024-01-01')
-    expect(maxDate.textContent).toBe('2025-11-02')
+    expect(maxDate.textContent).toBe('2025-11-05')
   })
 
-  it('should update min bounds when latestBounds changes', async () => {
+  it('should update minDate when combined bounds change', async () => {
     renderWithStore({
       '2025': {
         actual: {
diff --git a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
index 720ecaf55c..c87f13a05e 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
@@ -21,7 +21,7 @@ import RunTypeDropdown from '@/features/sfmsInsights/components/RunTypeDropdown'
 import { SfmsInsightsAboutDataContent } from '@/features/sfmsInsights/components/SfmsInsightsAboutDataContent'
 import {
   fetchSFMSInsightsBounds,
-  selectEarliestSFMSInsightsBounds,
+  selectCombinedSFMSInsightsBounds,
   selectLatestSFMSInsightsBounds,
   selectSFMSInsightsBounds,
   selectSFMSInsightsBoundsLoading
@@ -44,11 +44,12 @@ export const SFMSInsightsPage = () => {
   // selectors
   const sfmsBounds = useSelector(selectSFMSInsightsBounds)
   const sfmsBoundsLoading = useSelector(selectSFMSInsightsBoundsLoading)
-  const latestBounds = useSelector((state: RootState) => selectLatestSFMSInsightsBounds(state, runType))
-  const earliestBounds = useSelector((state: RootState) => selectEarliestSFMSInsightsBounds(state, runType))
+  const combinedBounds = useSelector(selectCombinedSFMSInsightsBounds)
+  const latestActualBounds = useSelector((state: RootState) => selectLatestSFMSInsightsBounds(state))
+  const latestSelectedBounds = useSelector((state: RootState) => selectLatestSFMSInsightsBounds(state, runType))
 
   // derived values
-  const rasterDataAvailable = !!latestBounds?.maximum
+  const rasterDataAvailable = !!latestSelectedBounds?.maximum
 
   // effects
   useEffect(() => {
@@ -60,24 +61,20 @@ export const SFMSInsightsPage = () => {
   }, [dispatch, sfmsBounds, sfmsBoundsLoading])
 
   useEffect(() => {
-    if (!latestBounds?.maximum) {
-      // keep current snow and the static fuel grid available before seasonal FWI processing starts
-      const today = getDateTimeNowPDT()
-      setRasterDate(currentDate => (currentDate?.toISODate() === today.toISODate() ? currentDate : today))
-      setRasterType('fuel')
-      return
+    if (latestActualBounds?.maximum) {
+      const latestDate = DateTime.fromISO(latestActualBounds.maximum)
+      setRasterDate(currentDate => (currentDate?.toISODate() === latestDate.toISODate() ? currentDate : latestDate))
     }
-
-    const latestDate = DateTime.fromISO(latestBounds.maximum)
-    setMaxDate(latestDate)
-    setRasterDate(currentDate => (currentDate?.toISODate() === latestDate.toISODate() ? currentDate : latestDate))
-  }, [latestBounds])
+  }, [latestActualBounds])
 
   useEffect(() => {
-    if (earliestBounds?.minimum) {
-      setMinDate(DateTime.fromISO(earliestBounds.minimum))
+    if (combinedBounds?.maximum) {
+      setMaxDate(DateTime.fromISO(combinedBounds.maximum))
     }
-  }, [earliestBounds])
+    if (combinedBounds?.minimum) {
+      setMinDate(DateTime.fromISO(combinedBounds.minimum))
+    }
+  }, [combinedBounds])
 
   useEffect(() => {
     // Only fetch snow data once rasterDate is set
@@ -99,12 +96,6 @@ export const SFMSInsightsPage = () => {
     fetchLastProcessedSnow(rasterDate)
   }, [rasterDate])
 
-  // handlers
-  const updateRunType = (newRunType: RunType) => {
-    setRasterDate(null)
-    setRunType(newRunType)
-  }
-
   return (
     <Box sx={{ height: '100vh', display: 'flex', flexDirection: 'column', overflow: 'hidden' }}>
       <GeneralHeader isBeta={true} spacing={1} title={SFMS_INSIGHTS_NAME} />
@@ -147,7 +138,7 @@ export const SFMSInsightsPage = () => {
           )}
           <Grid>
             <StyledFormControl>
-              <RunTypeDropdown selectedRunType={runType} setSelectedRunType={updateRunType} />
+              <RunTypeDropdown selectedRunType={runType} setSelectedRunType={setRunType} />
             </StyledFormControl>
           </Grid>
           <Grid>
diff --git a/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.test.ts b/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.test.ts
index abb9d4f84f..28c7cf856f 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.test.ts
+++ b/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.test.ts
@@ -11,6 +11,7 @@ import reducer, {
   getSFMSInsightsBoundsStart,
   getSFMSInsightsBoundsSuccess,
   initialState,
+  selectCombinedSFMSInsightsBounds,
   selectEarliestSFMSInsightsBounds,
   selectLatestSFMSInsightsBounds
 } from './sfmsInsightsSlice'
@@ -138,6 +139,40 @@ describe('SFMS Insights bounds selectors', () => {
       }
     }
   }
+
+  it('selectCombinedSFMSInsightsBounds returns the full Actual and Forecast date range', () => {
+    const state = {
+      sfmsInsights: {
+        ...initialState,
+        sfmsBounds: fullSfmsBounds
+      }
+    }
+
+    expect(selectCombinedSFMSInsightsBounds(state)).toEqual({
+      minimum: '2024-01-01',
+      maximum: '2025-11-05'
+    })
+  })
+
+  it('selectCombinedSFMSInsightsBounds ignores empty boundary values', () => {
+    const state = {
+      sfmsInsights: {
+        ...initialState,
+        sfmsBounds: {
+          '2025': {
+            actual: { minimum: '2025-01-01', maximum: '' },
+            forecast: { minimum: '', maximum: '2025-01-03' }
+          }
+        }
+      }
+    }
+
+    expect(selectCombinedSFMSInsightsBounds(state)).toEqual({
+      minimum: '2025-01-01',
+      maximum: '2025-01-03'
+    })
+  })
+
   it('selectLatestSFMSInsightsBounds returns actual bounds from most recent year', () => {
     const state = {
       sfmsInsights: {
@@ -254,5 +289,6 @@ describe('SFMS Insights bounds selectors', () => {
 
     expect(selectLatestSFMSInsightsBounds(state)).toBeNull()
     expect(selectEarliestSFMSInsightsBounds(state)).toBeNull()
+    expect(selectCombinedSFMSInsightsBounds(state)).toBeNull()
   })
 })
diff --git a/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.ts b/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.ts
index 58748aac01..81a53f7166 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.ts
+++ b/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.ts
@@ -64,6 +64,34 @@ export const selectSFMSInsightsBoundsLoading = createSelector(
   sfmsInsights => sfmsInsights.sfmsBoundsLoading
 )
 
+const getEarliestDate = (current: string, candidate: string) => {
+  if (!candidate) return current
+  if (!current || candidate < current) return candidate
+  return current
+}
+
+const getLatestDate = (current: string, candidate: string) => {
+  if (!candidate) return current
+  if (!current || candidate > current) return candidate
+  return current
+}
+
+export const selectCombinedSFMSInsightsBounds = createSelector([selectSFMSInsightsBounds], sfmsBounds => {
+  if (!sfmsBounds) return null
+
+  let minimum = ''
+  let maximum = ''
+
+  for (const yearBounds of Object.values(sfmsBounds)) {
+    for (const sourceBounds of Object.values(yearBounds)) {
+      minimum = getEarliestDate(minimum, sourceBounds.minimum)
+      maximum = getLatestDate(maximum, sourceBounds.maximum)
+    }
+  }
+
+  return minimum || maximum ? { minimum, maximum } : null
+})
+
 const findBoundsInOrder = (
   sfmsBounds: SFMSBounds | null | undefined,
   runType: RunType,

From 069f7505524653302cdbfa4da8ce523940e0c68c Mon Sep 17 00:00:00 2001
From: Brett Edwards <brett.1.edwards@gov.bc.ca>
Date: Thu, 6 Aug 2026 12:04:53 -0700
Subject: [PATCH 09/12] remove theming

---
 .../fba/components/ActualForecastControl.tsx  | 12 ++--
 .../components/PrepDateRangeSelector.tsx      |  5 +-
 .../components/MoreCast2DateRangePicker.tsx   |  5 +-
 web/packages/ui/src/theme.ts                  | 61 -------------------
 4 files changed, 9 insertions(+), 74 deletions(-)

diff --git a/web/apps/wps-web/src/features/fba/components/ActualForecastControl.tsx b/web/apps/wps-web/src/features/fba/components/ActualForecastControl.tsx
index 31a39e5b08..74e2494d1b 100644
--- a/web/apps/wps-web/src/features/fba/components/ActualForecastControl.tsx
+++ b/web/apps/wps-web/src/features/fba/components/ActualForecastControl.tsx
@@ -1,6 +1,6 @@
 import { FormControl, FormControlLabel, FormLabel, Radio, RadioGroup } from '@mui/material'
 import { RunType } from '@wps/api/runType'
-import { CONTROL_HEIGHT } from '@wps/ui/theme'
+import { theme } from '@wps/ui/theme'
 import { isNull } from 'lodash'
 import React from 'react'
 
@@ -17,15 +17,13 @@ const ActualForecastControl = ({ runType, setRunType }: ActualForecastControlPro
   return (
     <FormControl
       variant="outlined"
-      sx={theme => ({
-        height: CONTROL_HEIGHT,
+      sx={{
         border: '1px solid rgba(0, 0, 0, 0.23)',
-        borderRadius: `${theme.shape.borderRadius}px`,
-        padding: '0 12px',
-        justifyContent: 'center',
+        borderRadius: '4px',
+        padding: '8px 12px 4px',
         position: 'relative',
         margin: theme.spacing(1)
-      })}
+      }}
     >
       <FormLabel
         sx={{
diff --git a/web/apps/wps-web/src/features/hfiCalculator/components/PrepDateRangeSelector.tsx b/web/apps/wps-web/src/features/hfiCalculator/components/PrepDateRangeSelector.tsx
index 53ebd43d49..b0fcee6f0c 100644
--- a/web/apps/wps-web/src/features/hfiCalculator/components/PrepDateRangeSelector.tsx
+++ b/web/apps/wps-web/src/features/hfiCalculator/components/PrepDateRangeSelector.tsx
@@ -13,7 +13,6 @@ import { styled } from '@mui/material/styles'
 import type { PrepDateRange } from '@wps/api/hfiCalculatorAPI'
 import DateRangePickerWrapper from '@wps/ui/dateRangePicker/DateRangePickerWrapper'
 import type { DateRange } from '@wps/ui/dateRangePicker/types'
-import { theme } from '@wps/ui/theme'
 import { isUndefined } from 'lodash'
 import { DateTime } from 'luxon'
 import React, { useState } from 'react'
@@ -31,7 +30,7 @@ export interface PrepDateRangeSelectorProps {
   setDateRange: (newDateRange: DateRange) => void
 }
 
-export const dateRangePickerTheme = createTheme(theme, {
+export const dateRangePickerTheme = createTheme({
   components: {
     MuiOutlinedInput: {
       styleOverrides: {
@@ -96,7 +95,7 @@ const PrepDateRangeSelector = ({ dateRange, setDateRange }: PrepDateRangeSelecto
       <StyledEngineProvider injectFirst>
         <ThemeProvider theme={dateRangePickerTheme}>
           <Button
-            sx={{ typography: 'body1', textTransform: 'capitalize' }}
+            sx={{ textTransform: 'capitalize' }}
             data-testid="date-range-picker-button"
             onClick={() => setDateRangePickerOpen(!dateRangePickerOpen)}
           >
diff --git a/web/apps/wps-web/src/features/moreCast2/components/MoreCast2DateRangePicker.tsx b/web/apps/wps-web/src/features/moreCast2/components/MoreCast2DateRangePicker.tsx
index eee704e0fd..5a31ab3f01 100644
--- a/web/apps/wps-web/src/features/moreCast2/components/MoreCast2DateRangePicker.tsx
+++ b/web/apps/wps-web/src/features/moreCast2/components/MoreCast2DateRangePicker.tsx
@@ -2,7 +2,6 @@ import { Box, createTheme, StyledEngineProvider, ThemeProvider } from '@mui/mate
 import { styled } from '@mui/material/styles'
 import DateRangeSelector from '@wps/ui/DateRangeSelector'
 import type { DateRange } from '@wps/ui/dateRangePicker/types'
-import { theme } from '@wps/ui/theme'
 import { DateTime } from 'luxon'
 import React from 'react'
 
@@ -23,7 +22,7 @@ export interface MoreCase2DateRangePickerProps {
   setDateRange: (newDateRange: DateRange) => void
 }
 
-export const dateRangePickerTheme = createTheme(theme, {
+export const dateRangePickerTheme = createTheme({
   components: {
     MuiOutlinedInput: {
       styleOverrides: {
@@ -66,7 +65,7 @@ const MoreCase2DateRangePicker = ({ dateRange, setDateRange }: MoreCase2DateRang
             maxDayOffset={11}
             dateDisplayFormat={'yyyy/MM/dd'}
             setDateRange={setDateRange}
-            size="small"
+            size="medium"
             label={'Date Range'}
           />
         </ThemeProvider>
diff --git a/web/packages/ui/src/theme.ts b/web/packages/ui/src/theme.ts
index f569c60f4a..36dd2aa3e2 100644
--- a/web/packages/ui/src/theme.ts
+++ b/web/packages/ui/src/theme.ts
@@ -1,32 +1,9 @@
 import { createTheme } from '@mui/material/styles'
 import type { GridCellParams, GridColumnHeaderParams } from '@mui/x-data-grid-pro'
-import type { PickerComponents } from '@mui/x-date-pickers/themeAugmentation'
 // Theme documentation: https://material-ui.com/customization/palette/
 // Theme demo: https://material.io/resources/color/#!/?view.left=1&view.right=1&primary.color=003365&secondary.color=FBC02D
 // Do not export this directly for styling! theme should be accessed within makeStyles & withStyles. Use ErrorMessage.tsx as a reference
-export const CONTROL_HEIGHT = 44
-// offset MUI's 40px small label position by half the custom height difference
-const CONTROL_LABEL_Y_OFFSET = 9 + (CONTROL_HEIGHT - 40) / 2
-
-const pickerThemeComponents = {
-  MuiPickersOutlinedInput: {
-    styleOverrides: {
-      root: {
-        height: CONTROL_HEIGHT
-      }
-    }
-  },
-  MuiPickersTextField: {
-    defaultProps: {
-      size: 'small'
-    }
-  }
-} satisfies PickerComponents
-
 export const theme = createTheme({
-  shape: {
-    borderRadius: 6
-  },
   palette: {
     primary: {
       light: '#3E5C93',
@@ -60,12 +37,6 @@ export const theme = createTheme({
     }
   },
   components: {
-    ...pickerThemeComponents,
-    MuiAutocomplete: {
-      defaultProps: {
-        size: 'small'
-      }
-    },
     MuiTooltip: {
       styleOverrides: {
         tooltip: {
@@ -79,38 +50,6 @@ export const theme = createTheme({
           fontSize: '1em'
         }
       }
-    },
-    MuiInputLabel: {
-      styleOverrides: {
-        root: {
-          '&.MuiInputLabel-outlined.MuiInputLabel-sizeSmall:not(.MuiInputLabel-shrink)': {
-            transform: `translate(14px, ${CONTROL_LABEL_Y_OFFSET}px) scale(1)`
-          }
-        }
-      }
-    },
-    MuiOutlinedInput: {
-      defaultProps: {
-        size: 'small'
-      },
-      styleOverrides: {
-        root: {
-          '&:not(.MuiInputBase-multiline)': {
-            height: CONTROL_HEIGHT,
-            alignItems: 'center'
-          }
-        }
-      }
-    },
-    MuiSelect: {
-      defaultProps: {
-        size: 'small'
-      }
-    },
-    MuiTextField: {
-      defaultProps: {
-        size: 'small'
-      }
     }
   }
 })

From 71326fb1c8fb32c13c1afbb3b02ea629be06b5ed Mon Sep 17 00:00:00 2001
From: Brett Edwards <brett.1.edwards@gov.bc.ca>
Date: Thu, 6 Aug 2026 13:23:13 -0700
Subject: [PATCH 10/12] selectors

---
 .../sfmsInsights/pages/SFMSInsightsPage.tsx   |  4 +-
 .../sfmsInsights/slices/sfmsInsightsSlice.ts  | 41 +++++++++++--------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
index c87f13a05e..5b09bd585e 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.tsx
@@ -45,7 +45,7 @@ export const SFMSInsightsPage = () => {
   const sfmsBounds = useSelector(selectSFMSInsightsBounds)
   const sfmsBoundsLoading = useSelector(selectSFMSInsightsBoundsLoading)
   const combinedBounds = useSelector(selectCombinedSFMSInsightsBounds)
-  const latestActualBounds = useSelector((state: RootState) => selectLatestSFMSInsightsBounds(state))
+  const latestActualBounds = useSelector(selectLatestSFMSInsightsBounds)
   const latestSelectedBounds = useSelector((state: RootState) => selectLatestSFMSInsightsBounds(state, runType))
 
   // derived values
@@ -60,6 +60,7 @@ export const SFMSInsightsPage = () => {
     dispatch(fetchSFMSInsightsBounds())
   }, [dispatch, sfmsBounds, sfmsBoundsLoading])
 
+  // initialize from actual bounds so source changes do not move the date, while retaining today's fallback if empty
   useEffect(() => {
     if (latestActualBounds?.maximum) {
       const latestDate = DateTime.fromISO(latestActualBounds.maximum)
@@ -67,6 +68,7 @@ export const SFMSInsightsPage = () => {
     }
   }, [latestActualBounds])
 
+  // expose the combined actual and forecast range while preserving fallback limits when either bound is unavailable
   useEffect(() => {
     if (combinedBounds?.maximum) {
       setMaxDate(DateTime.fromISO(combinedBounds.maximum))
diff --git a/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.ts b/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.ts
index 81a53f7166..df31c77b78 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.ts
+++ b/web/apps/wps-web/src/features/sfmsInsights/slices/sfmsInsightsSlice.ts
@@ -55,7 +55,10 @@ export const fetchSFMSInsightsBounds = (): AppThunk => async dispatch => {
   }
 }
 
-const selectSFMSInsights = (state: { sfmsInsights: SFMSInsightsState }) => state.sfmsInsights
+type SFMSInsightsRootState = { sfmsInsights: SFMSInsightsState }
+
+const selectSFMSInsights = (state: SFMSInsightsRootState) => state.sfmsInsights
+const selectRunType = (_state: SFMSInsightsRootState, runType: RunType = RunType.ACTUAL) => runType
 
 export const selectSFMSInsightsBounds = createSelector([selectSFMSInsights], sfmsInsights => sfmsInsights.sfmsBounds)
 
@@ -109,20 +112,24 @@ const findBoundsInOrder = (
   return null
 }
 
-type SFMSInsightsRootState = { sfmsInsights: SFMSInsightsState }
+export const selectLatestSFMSInsightsBounds = createSelector(
+  [selectSFMSInsightsBounds, selectRunType],
+  (sfmsBounds, runType) =>
+    findBoundsInOrder(
+      sfmsBounds,
+      runType,
+      (a, b) => b.localeCompare(a),
+      bounds => !!bounds.maximum
+    )
+)
 
-export const selectLatestSFMSInsightsBounds = (state: SFMSInsightsRootState, runType: RunType = RunType.ACTUAL) =>
-  findBoundsInOrder(
-    selectSFMSInsightsBounds(state),
-    runType,
-    (a, b) => b.localeCompare(a),
-    bounds => !!bounds.maximum
-  )
-
-export const selectEarliestSFMSInsightsBounds = (state: SFMSInsightsRootState, runType: RunType = RunType.ACTUAL) =>
-  findBoundsInOrder(
-    selectSFMSInsightsBounds(state),
-    runType,
-    (a, b) => a.localeCompare(b),
-    bounds => !!bounds.minimum
-  )
+export const selectEarliestSFMSInsightsBounds = createSelector(
+  [selectSFMSInsightsBounds, selectRunType],
+  (sfmsBounds, runType) =>
+    findBoundsInOrder(
+      sfmsBounds,
+      runType,
+      (a, b) => a.localeCompare(b),
+      bounds => !!bounds.minimum
+    )
+)

From 04d7be27276392e400ff0861ff453e7522ad51ab Mon Sep 17 00:00:00 2001
From: Brett Edwards <brett.1.edwards@gov.bc.ca>
Date: Mon, 10 Aug 2026 16:33:57 -0700
Subject: [PATCH 11/12] snckbar

---
 .../map/RasterErrorNotification.test.tsx      | 21 ++++++++++++++++---
 .../map/RasterErrorNotification.tsx           | 14 ++++++++++---
 .../sfmsInsights/components/map/SFMSMap.tsx   |  1 +
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/web/apps/wps-web/src/features/sfmsInsights/components/map/RasterErrorNotification.test.tsx b/web/apps/wps-web/src/features/sfmsInsights/components/map/RasterErrorNotification.test.tsx
index 24b7ccdf0b..5b1200dc29 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/components/map/RasterErrorNotification.test.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/components/map/RasterErrorNotification.test.tsx
@@ -1,5 +1,6 @@
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
+import { RunType } from '@wps/api/runType'
 import { describe, expect, it, vi } from 'vitest'
 import type { RasterError } from './layerManager'
 import RasterErrorNotification, { getAlertSeverity } from './RasterErrorNotification'
@@ -26,14 +27,28 @@ describe('RasterErrorNotification', () => {
     expect(getAlertSeverity('unknown')).toBe('warning')
   })
 
-  it('should display correct message for not_found error', () => {
+  it('should identify unavailable actual data without ruling out forecast data', () => {
     const error: RasterError = {
       type: 'not_found',
       message: 'Test message'
     }
-    render(<RasterErrorNotification error={error} onClose={vi.fn()} rasterLabel="FWI" />)
+    render(<RasterErrorNotification error={error} onClose={vi.fn()} rasterLabel="FWI" runType={RunType.ACTUAL} />)
 
-    expect(screen.getByText(/FWI data not available for this date/i)).toBeInTheDocument()
+    expect(
+      screen.getByText('Actual FWI data is not available for this date. Forecast data may be available.')
+    ).toBeInTheDocument()
+  })
+
+  it('should identify unavailable forecast data', () => {
+    const error: RasterError = {
+      type: 'not_found',
+      message: 'Test message'
+    }
+    render(<RasterErrorNotification error={error} onClose={vi.fn()} rasterLabel="FWI" runType={RunType.FORECAST} />)
+
+    expect(
+      screen.getByText('Forecast FWI data is not available for this date. It may not be generated yet.')
+    ).toBeInTheDocument()
   })
 
   it('should display correct message for forbidden error', () => {
diff --git a/web/apps/wps-web/src/features/sfmsInsights/components/map/RasterErrorNotification.tsx b/web/apps/wps-web/src/features/sfmsInsights/components/map/RasterErrorNotification.tsx
index a0062512e3..37d3d9abc9 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/components/map/RasterErrorNotification.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/components/map/RasterErrorNotification.tsx
@@ -1,4 +1,5 @@
 import { Alert, type AlertColor, Snackbar } from '@mui/material'
+import { RunType } from '@wps/api/runType'
 import React from 'react'
 import type { RasterError } from '@/features/sfmsInsights/components/map/layerManager'
 
@@ -6,6 +7,7 @@ interface RasterErrorNotificationProps {
   error: RasterError | null
   onClose: () => void
   rasterLabel?: string
+  runType?: RunType
 }
 
 export const getAlertSeverity = (errorType: RasterError['type']): AlertColor => {
@@ -19,9 +21,15 @@ export const getAlertSeverity = (errorType: RasterError['type']): AlertColor =>
   }
 }
 
-const getErrorMessage = (error: RasterError, rasterLabel: string): string => {
+const getErrorMessage = (error: RasterError, rasterLabel: string, runType?: RunType): string => {
   switch (error.type) {
     case 'not_found':
+      if (runType === RunType.ACTUAL) {
+        return `Actual ${rasterLabel} data is not available for this date. Forecast data may be available.`
+      }
+      if (runType === RunType.FORECAST) {
+        return `Forecast ${rasterLabel} data is not available for this date. It may not be generated yet.`
+      }
       return `${rasterLabel} data not available for this date. It may not be generated yet.`
     case 'forbidden':
       return `Access denied to ${rasterLabel} data. Please check your authentication.`
@@ -32,13 +40,13 @@ const getErrorMessage = (error: RasterError, rasterLabel: string): string => {
   }
 }
 
-const RasterErrorNotification = ({ error, onClose, rasterLabel = 'Raster' }: RasterErrorNotificationProps) => {
+const RasterErrorNotification = ({ error, onClose, rasterLabel = 'Raster', runType }: RasterErrorNotificationProps) => {
   if (!error) {
     return null
   }
 
   const severity = getAlertSeverity(error.type)
-  const message = getErrorMessage(error, rasterLabel)
+  const message = getErrorMessage(error, rasterLabel, runType)
 
   return (
     <Snackbar
diff --git a/web/apps/wps-web/src/features/sfmsInsights/components/map/SFMSMap.tsx b/web/apps/wps-web/src/features/sfmsInsights/components/map/SFMSMap.tsx
index 0d0a7716f4..9525aeceee 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/components/map/SFMSMap.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/components/map/SFMSMap.tsx
@@ -172,6 +172,7 @@ const SFMSMap = ({
             error={rasterError}
             onClose={handleErrorClose}
             rasterLabel={RASTER_CONFIG[rasterType].label}
+            runType={runType}
           />
         </Box>
       </MapContext.Provider>

From 74c0707a45bf3c333517cc30cc95e0c893c35e27 Mon Sep 17 00:00:00 2001
From: Brett Edwards <brett.1.edwards@gov.bc.ca>
Date: Tue, 11 Aug 2026 09:21:10 -0700
Subject: [PATCH 12/12] test

---
 .../features/sfmsInsights/pages/SFMSInsightsPage.test.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
index 0b63875289..ce8d79a7c3 100644
--- a/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
+++ b/web/apps/wps-web/src/features/sfmsInsights/pages/SFMSInsightsPage.test.tsx
@@ -251,7 +251,7 @@ describe('SFMSInsightsPage', () => {
     renderWithStore()
     await waitForPageLoad()
 
-    // the date picker should use the combined maximum bound (2025-11-05)
+    // The date picker should use the combined maximum bound (2025-11-05)
     const datePicker = screen.getByTestId('date-picker')
     expect(datePicker).toBeInTheDocument()
   })
@@ -447,7 +447,7 @@ describe('SFMSInsightsPage', () => {
     })
 
     const currentDate = screen.getByTestId('current-date')
-    // should default to today's date (mocked as 2025-11-02)
+    // Should default to today's date (mocked as 2025-11-02)
     expect(currentDate.textContent).toBe('2025-11-02')
     expect(screen.getByTestId('date-picker')).not.toHaveAttribute('data-disabled')
 
@@ -473,7 +473,7 @@ describe('SFMSInsightsPage', () => {
     expect(datePicker).toBeInTheDocument()
 
     const currentDate = screen.getByTestId('current-date')
-    // should default to today's date (mocked as 2025-11-02)
+    // Should default to today's date (mocked as 2025-11-02)
     expect(currentDate.textContent).toBe('2025-11-02')
     expect(datePicker).not.toHaveAttribute('data-disabled')
 
@@ -520,7 +520,7 @@ describe('SFMSInsightsPage', () => {
     expect(datePicker).toBeInTheDocument()
 
     const currentDate = screen.getByTestId('current-date')
-    // should default to today's date (mocked as 2025-11-02)
+    // Should default to today's date (mocked as 2025-11-02)
     expect(currentDate.textContent).toBe('2025-11-02')
     expect(datePicker).not.toHaveAttribute('data-disabled')