fix(app): return calibration flow even if pipette is already calibrated

fix RQA-2357
Opentrons · Feb 15, 2024 · 01fc7d7 · 01fc7d7
1 parent 9dc8f2d
commit 01fc7d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/app/src/organisms/PipetteWizardFlows/getPipetteWizardSteps.ts b/app/src/organisms/PipetteWizardFlows/getPipetteWizardSteps.ts
@@ -12,7 +12,7 @@ export const getPipetteWizardSteps = (
   mount: PipetteMount,
   selectedPipette: SelectablePipettes,
   isGantryEmpty: boolean
-): PipetteWizardStep[] => {
+): PipetteWizardStep[] | null => {
   switch (flowType) {
     case FLOWS.CALIBRATE: {
       return [
@@ -205,5 +205,5 @@ export const getPipetteWizardSteps = (
       }
     }
   }
-  return []
+  return null
 }
diff --git a/app/src/organisms/PipetteWizardFlows/getPipetteWizardStepsForProtocol.ts b/app/src/organisms/PipetteWizardFlows/getPipetteWizardStepsForProtocol.ts
@@ -8,23 +8,17 @@ export const getPipetteWizardStepsForProtocol = (
   attachedPipettes: AttachedPipettesFromInstrumentsQuery,
   pipetteInfo: LoadedPipette[],
   mount: Mount
-): PipetteWizardStep[] => {
+): PipetteWizardStep[] | null => {
   const requiredPipette = pipetteInfo.find(pipette => pipette.mount === mount)
   const nintySixChannelAttached =
     attachedPipettes[LEFT]?.instrumentName === 'p1000_96'
 
-  //  return empty array when correct pipette is attached && pipette cal not needed or
-  //  no pipette is required in the protocol
-  if (
-    (requiredPipette?.pipetteName === attachedPipettes[mount]?.instrumentName &&
-      attachedPipettes[mount]?.data?.calibratedOffset?.last_modified != null) ||
-    requiredPipette == null
-  ) {
-    return []
-    //    return calibration flow only if correct pipette is attached and pipette cal null
+  //  return empty array if no pipette is required in the protocol
+  if (requiredPipette == null) {
+    return null
+    // return calibration flow if correct pipette is attached
   } else if (
-    requiredPipette?.pipetteName === attachedPipettes[mount]?.instrumentName &&
-    attachedPipettes[mount]?.data?.calibratedOffset?.last_modified == null
+    requiredPipette?.pipetteName === attachedPipettes[mount]?.instrumentName
   ) {
     return [
       {