From 59d4cc618e56181cf26597b8173e7593f791cb72 Mon Sep 17 00:00:00 2001
From: Jethary Rader <66035149+jerader@users.noreply.github.com>
Date: Tue, 16 Apr 2024 13:03:53 -0400
Subject: [PATCH] =?UTF-8?q?fix(protocol-designer):=20moveLabware=20newLoca?=
 =?UTF-8?q?tion=20error=20accounts=20for=20cu=E2=80=A6=20(#14917)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…stom labware

closes RESC-243 and RQA-2573
---
 .../src/steplist/formLevel/moveLabwareFormErrors.ts  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/protocol-designer/src/steplist/formLevel/moveLabwareFormErrors.ts b/protocol-designer/src/steplist/formLevel/moveLabwareFormErrors.ts
index 28828c7524d..b9ee871772d 100644
--- a/protocol-designer/src/steplist/formLevel/moveLabwareFormErrors.ts
+++ b/protocol-designer/src/steplist/formLevel/moveLabwareFormErrors.ts
@@ -1,8 +1,9 @@
-import { LabwareLocation } from '@opentrons/shared-data'
+import { getLabwareDefIsStandard } from '@opentrons/shared-data'
 import {
   COMPATIBLE_LABWARE_ALLOWLIST_BY_MODULE_TYPE,
   COMPATIBLE_LABWARE_ALLOWLIST_FOR_ADAPTER,
 } from '../../utils/labwareModuleCompatibility'
+import type { LabwareLocation } from '@opentrons/shared-data'
 import type {
   InvariantContext,
   LabwareEntity,
@@ -11,15 +12,18 @@ import type { ProfileFormError } from './profileErrors'
 
 type HydratedFormData = any
 
-//  TODO(Jr, 1/16/24): look into the use case of this util since the i18n strings
-//  previously listed in this util were not found in any json.
 const getMoveLabwareError = (
   labware: LabwareEntity,
   newLocation: LabwareLocation,
   invariantContext: InvariantContext
 ): string | null => {
   let errorString: string | null = null
-  if (labware == null || newLocation == null || newLocation === 'offDeck')
+  if (
+    labware == null ||
+    newLocation == null ||
+    newLocation === 'offDeck' ||
+    !getLabwareDefIsStandard(labware?.def)
+  )
     return null
   const selectedLabwareDefUri = labware?.labwareDefURI
   if ('moduleId' in newLocation) {