Merge remote-tracking branch 'ChrisMart21/rtk' into pr/ChrisMart21/1113

OpenEnergyDashboard · Mar 5, 2024 · c023dcc · c023dcc
2 parents dda8170 + ca21cd3
commit c023dcc
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/client/app/components/meters/CreateMeterModalComponent.tsx b/src/client/app/components/meters/CreateMeterModalComponent.tsx
@@ -53,6 +53,15 @@ export default function CreateMeterModalComponent() {
 		selectCreateMeterUnitCompatibility(state, meterDetails as unknown as MeterData)
 	);
 	const { meterIsValid, defaultGraphicUnitIsValid } = useAppSelector(state => isValidCreateMeter(state, meterDetails as unknown as MeterData));
+
+	// Reset default graphingUnit when selected is invalid with updated unitId.
+	React.useEffect(() => {
+		if (!defaultGraphicUnitIsValid) {
+			setMeterDetails(details => ({ ...details, defaultGraphicUnit: -999 }));
+		}
+	}, [meterDetails.unitId]);
+
+
 	const handleShow = () => setShowModal(true);
 
 	const handleStringChange = (e: React.ChangeEvent<HTMLInputElement>) => {