Skip to content

Fix battery data sorting to avoid mutating state #1156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1Blademaster merged 2 commits into from
Apr 10, 2026
Merged

Fix battery data sorting to avoid mutating state #1156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0c148d
Fix battery data sorting to avoid mutating state
1Blademaster Apr 10, 2026
4995fa1
Memoize selectBatteryData with createSelector to avoid rerenders
Copilot Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions gcs/src/redux/slices/droneInfoSlice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,7 @@ const droneInfoSlice = createSlice({
selectRSSI: (state) => state.rssi,
selectAircraftType: (state) => state.aircraftType,

selectBatteryData: (state) =>
state.batteryData.sort((b1, b2) => b1.id - b2.id),
selectRawBatteryData: (state) => state.batteryData,
selectGuidedModePinData: (state) => state.guidedModePinData,
selectSelectedDisplayTelemetry: (state) => state.selectedDisplayTelemetry,
selectStatusText: (state) => state.statusText,
Expand Down Expand Up @@ -462,6 +461,11 @@ export const {
} = droneInfoSlice.actions

// Memoized selectors because redux is a bitch
export const selectBatteryData = createSelector(
[droneInfoSlice.selectors.selectRawBatteryData],
(batteryData) => [...batteryData].sort((b1, b2) => b1.id - b2.id),
)

export const selectDroneCoords = createSelector(
[droneInfoSlice.selectors.selectGPS],
({ lat, lon }) => {
Expand Down Expand Up @@ -611,7 +615,6 @@ export const {
selectEscTelemetry5To8,
selectFlightMode,
selectAircraftType,
selectBatteryData,
selectGuidedModePinData,
selectSelectedDisplayTelemetry,
selectGraphValues,
Expand Down
Loading