From ce940e8a544e909fea1f64da1214873a1f1f0643 Mon Sep 17 00:00:00 2001
From: Sarah Breen <sarah.breen@opentrons.com>
Date: Fri, 9 Feb 2024 11:42:24 -0500
Subject: [PATCH]  fix(app): add prop so run setup pipette flows are strung
 together (#14460)

fix RQA-2305
---
 .../InstrumentMountItem/ProtocolInstrumentMountItem.tsx        | 3 +++
 app/src/organisms/PipetteWizardFlows/MountingPlate.tsx         | 3 +++
 app/src/organisms/ProtocolSetupInstruments/index.tsx           | 1 +
 3 files changed, 7 insertions(+)

diff --git a/app/src/organisms/InstrumentMountItem/ProtocolInstrumentMountItem.tsx b/app/src/organisms/InstrumentMountItem/ProtocolInstrumentMountItem.tsx
index fa356cf753a..6c614404866 100644
--- a/app/src/organisms/InstrumentMountItem/ProtocolInstrumentMountItem.tsx
+++ b/app/src/organisms/InstrumentMountItem/ProtocolInstrumentMountItem.tsx
@@ -19,6 +19,7 @@ import {
   NINETY_SIX_CHANNEL,
   PipetteName,
   SINGLE_MOUNT_PIPETTES,
+  LoadedPipette,
 } from '@opentrons/shared-data'
 
 import { SmallButton } from '../../atoms/buttons'
@@ -49,6 +50,7 @@ interface ProtocolInstrumentMountItemProps {
   attachedInstrument: InstrumentData | null
   speccedName: PipetteName | GripperModel
   instrumentsRefetch?: () => void
+  pipetteInfo?: LoadedPipette[]
 }
 export function ProtocolInstrumentMountItem(
   props: ProtocolInstrumentMountItemProps
@@ -172,6 +174,7 @@ export function ProtocolInstrumentMountItem(
           closeFlow={() => setShowPipetteWizardFlow(false)}
           selectedPipette={selectedPipette}
           mount={mount as Mount}
+          pipetteInfo={props.pipetteInfo}
           onComplete={props.instrumentsRefetch}
         />
       ) : null}
diff --git a/app/src/organisms/PipetteWizardFlows/MountingPlate.tsx b/app/src/organisms/PipetteWizardFlows/MountingPlate.tsx
index a4bf6ed8d2f..51347bd18f4 100644
--- a/app/src/organisms/PipetteWizardFlows/MountingPlate.tsx
+++ b/app/src/organisms/PipetteWizardFlows/MountingPlate.tsx
@@ -5,6 +5,7 @@ import { COLORS, SPACING } from '@opentrons/components'
 import { StyledText } from '../../atoms/text'
 import { SimpleWizardBody } from '../../molecules/SimpleWizardBody'
 import { GenericWizardTile } from '../../molecules/GenericWizardTile'
+import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal'
 import { getPipetteAnimations96 } from './utils'
 import { BODY_STYLE, FLOWS, SECTIONS } from './constants'
 import type { PipetteWizardStepProps } from './types'
@@ -13,6 +14,7 @@ export const MountingPlate = (
   props: PipetteWizardStepProps
 ): JSX.Element | null => {
   const {
+    isRobotMoving,
     goBack,
     proceed,
     flowType,
@@ -46,6 +48,7 @@ export const MountingPlate = (
       })
   }
 
+  if (isRobotMoving) return <InProgressModal description={t('stand_back')} />
   return errorMessage ? (
     <SimpleWizardBody
       iconColor={COLORS.red50}
diff --git a/app/src/organisms/ProtocolSetupInstruments/index.tsx b/app/src/organisms/ProtocolSetupInstruments/index.tsx
index 7b4c50cd1f8..09341e71bcf 100644
--- a/app/src/organisms/ProtocolSetupInstruments/index.tsx
+++ b/app/src/organisms/ProtocolSetupInstruments/index.tsx
@@ -86,6 +86,7 @@ export function ProtocolSetupInstruments({
             speccedName={loadedPipette.pipetteName}
             attachedInstrument={attachedPipetteMatch}
             instrumentsRefetch={refetch}
+            pipetteInfo={mostRecentAnalysis?.pipettes}
           />
         )
       })}