fix(app): set default selected robot on slideout to first valid robot (…

…#14925) closes RQA-2578
Opentrons · Apr 16, 2024 · 4abe652 · 4abe652
1 parent 385d123
commit 4abe652
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/app/src/organisms/ChooseRobotSlideout/index.tsx b/app/src/organisms/ChooseRobotSlideout/index.tsx
@@ -193,12 +193,18 @@ export function ChooseRobotSlideout(
 
  // this useEffect sets the default selection to the first robot in the list. state is managed by the caller
  React.useEffect(() => {
- if (selectedRobot == null && reducerAvailableRobots.length > 0) {
+ if (
+ (selectedRobot == null ||
+ !reducerAvailableRobots.some(
+ robot => robot.name === selectedRobot.name
+ )) &&
+ reducerAvailableRobots.length > 0
+ ) {
  setSelectedRobot(reducerAvailableRobots[0])
  } else if (reducerAvailableRobots.length === 0) {
  setSelectedRobot(null)
  }
- }, [healthyReachableRobots, selectedRobot, setSelectedRobot])
+ }, [reducerAvailableRobots, selectedRobot, setSelectedRobot])
 
  const unavailableCount =
  unhealthyReachableRobots.length + unreachableRobots.length