app(fix): Fix liquids always required during protocol setup (#16762)

Closes RQA-3535
Opentrons · Nov 12, 2024 · 6ed5aaf · 6ed5aaf
1 parent 60dca54
commit 6ed5aaf
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/app/src/redux-resources/runs/hooks/useRequiredSetupStepsInOrder.ts b/app/src/redux-resources/runs/hooks/useRequiredSetupStepsInOrder.ts
@@ -56,14 +56,19 @@ const keysInOrder = (
     protocolAnalysis == null
       ? NO_ANALYSIS_STEPS_IN_ORDER
       : ALL_STEPS_IN_ORDER.filter((stepKey: StepKey) => {
-          if (protocolAnalysis.modules.length === 0) {
-            return stepKey !== MODULE_SETUP_STEP_KEY
+          if (
+            stepKey === MODULE_SETUP_STEP_KEY &&
+            protocolAnalysis.modules.length === 0
+          ) {
+            return false
+          } else if (
+            stepKey === LIQUID_SETUP_STEP_KEY &&
+            protocolAnalysis.liquids.length === 0
+          ) {
+            return false
+          } else {
+            return true
           }
-
-          if (protocolAnalysis.liquids.length === 0) {
-            return stepKey !== LIQUID_SETUP_STEP_KEY
-          }
-          return true
         })
   return { orderedSteps: orderedSteps as StepKey[], orderedApplicableSteps }
 }