Merge branch 'chore_release-8.4.1' into chore-mergeback-8.4.1-to-8.5.0

Author: sfoster1

api/release-notes.md

@@ -8,6 +8,12 @@ By installing and using Opentrons software, you agree to the Opentrons End-User
 
 ---
 
+## Opentrons Robot Software Changes in 8.4.1
+
+There are no changes to the robot software in v8.4.1, but it is required for running protocols in v8.4.1 of the Opentrons App.
+
+---
+
 ## Opentrons Robot Software Changes in 8.4.0
 
 Welcome to the v8.4.0 release of the Opentrons robot software! This release includes updated liquid handling commands for pipetting relative to a liquid meniscus, and other new features, improvements, and bug fixes.

app-shell/build/release-notes.md

@@ -8,6 +8,15 @@ By installing and using Opentrons software, you agree to the Opentrons End-User
 
 ---
 
+## Opentrons App Changes in 8.4.1
+
+The 8.4.1 hotfix release fixes two issues:
+
+- Placing a Magnetic Block in slot C2 no longer prevents Labware Position Check from running.
+- Existing labware offsets are no longer doubled during Labware Position Check.
+
+---
+
 ## Opentrons App Changes in 8.4.0
 
 Welcome to the v8.4.0 release of the Opentrons App! This release includes updates to labware offsets on the Flex, as well as other new features, improvements, and bug fixes.
@@ -45,6 +54,8 @@ There are no changes to the Opentrons App in v8.3.2, but it is required for upda
 
 The 8.3.1 hotfix release includes a small fix to allow all robots to properly reboot after an upgrade to v8.3.0.
 
+---
+
 ## Opentrons App Changes in 8.3.0
 
 Welcome to the v8.3.0 release of the Opentrons App! This release adds support for Mandarin in the app or Flex touchscreen and includes other beta features for our commercial partners.

app/src/organisms/LabwarePositionCheck/LPCFlows/__tests__/utils.test.ts

@@ -1,21 +1,22 @@
-import { useEffect, useMemo, useState } from 'react'
-
 import { getLabwareDefinitionsFromCommands } from '@opentrons/components'
 import {
   useCreateMaintenanceRunLabwareDefinitionMutation,
   useDeleteMaintenanceRunMutation,
 } from '@opentrons/react-api-client'
-import { FLEX_ROBOT_TYPE } from '@opentrons/shared-data'
-
+import { FLEX_ROBOT_TYPE, OT2_ROBOT_TYPE } from '@opentrons/shared-data'
+import type { RobotType } from '@opentrons/shared-data'
 import { useInitLPCStore } from '/app/organisms/LabwarePositionCheck/LPCFlows/hooks/useInitLPCStore'
-import { getRelevantOffsets } from '/app/organisms/LabwarePositionCheck/LPCFlows/utils'
+import type {
+  LegacySupportLPCFlowsProps,
+  LPCFlowsProps,
+} from '/app/organisms/LabwarePositionCheck/LPCFlows/LPCFlows'
 import { useNotifyDeckConfigurationQuery } from '/app/resources/deck_configuration'
 import {
   useCreateTargetedMaintenanceRunMutation,
   useMostRecentCompletedAnalysis,
   useNotifyRunQuery,
 } from '/app/resources/runs'
-
+import { useEffect, useMemo, useState } from 'react'
 import {
   useCompatibleAnalysis,
   useHandleClientAppliedOffsets,
@@ -27,12 +28,6 @@ import {
 } from './hooks'
 import { useLPCAnalytics } from './useLPCAnalytics'
 
-import type { RobotType } from '@opentrons/shared-data'
-import type {
-  LegacySupportLPCFlowsProps,
-  LPCFlowsProps,
-} from '/app/organisms/LabwarePositionCheck/LPCFlows/LPCFlows'
-
 interface UseLPCFlowsBase {
   showLPC: boolean
   lpcProps: LPCFlowsProps | null
@@ -158,14 +153,12 @@ export function useLPCFlows({
     if (!isLaunching) {
       analytics.reportLaunchLpcWizard()
       setIsLaunching(true)
-      const labwareOffsets = getRelevantOffsets(
-        robotType,
-        ot2Offsets,
-        flexOffsets ?? []
-      )
-      const createRunData = labwareOffsets != null ? { labwareOffsets } : {}
+      // Inject OT-2 offsets into the maintenance run upon creation.
+      // The Flex injects offsets directly in LPC commands and therefore should not load them into the maintenance run.
+      const injectedOffsets =
+        robotType === OT2_ROBOT_TYPE ? { labwareOffsets: ot2Offsets } : {}
 
-      return createTargetedMaintenanceRun(createRunData).then(
+      return createTargetedMaintenanceRun(injectedOffsets).then(
         maintenanceRun => {
           setMaintenanceRunId(maintenanceRun.data.id)
         }