fix(app): change pipette exit button text (#6930)

If you don't detach a pipette during the detach step, you shouldn't be prompted to "skip calibration".
Opentrons · Nov 5, 2020 · 7d4a6bd · 7d4a6bd
1 parent 7dec936
commit 7d4a6bd
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/src/components/ChangePipette/ConfirmPipette.js b/app/src/components/ChangePipette/ConfirmPipette.js
@@ -201,10 +201,11 @@ function TryAgainButton(props: Props) {
 }
 
 function ExitButton(props: Props) {
-  const { exit, attachedWrong, actualPipetteOffset } = props
+  const { exit, attachedWrong, actualPipetteOffset, wantedPipette } = props
   let buttonText = EXIT_BUTTON_MESSAGE
   if (attachedWrong) buttonText = EXIT_BUTTON_MESSAGE_WRONG
-  else if (!actualPipetteOffset) buttonText = EXIT_WITHOUT_CAL
+  else if (Boolean(wantedPipette) && !actualPipetteOffset)
+    buttonText = EXIT_WITHOUT_CAL
 
   return (
     <PrimaryBtn marginBottom={SPACING_2} width="100%" onClick={exit}>