Opentrons · rclarke0 · Jul 30, 2025 · Jul 30, 2025 · Jul 30, 2025 · Jul 30, 2025
diff --git a/...es/labware/deckmap/96-PCR-flat-active.png → ...ets/images/deckmap/96-PCR-flat-active.png b/...es/labware/deckmap/96-PCR-flat-active.png → ...ets/images/deckmap/96-PCR-flat-active.png
diff --git a/...ts/images/labware/deckmap/96-PCR-flat.png → ...src/assets/images/deckmap/96-PCR-flat.png b/...ts/images/labware/deckmap/96-PCR-flat.png → ...src/assets/images/deckmap/96-PCR-flat.png
diff --git a/.../labware/deckmap/tiprack-200ul-active.png → ...s/images/deckmap/tiprack-200ul-active.png b/.../labware/deckmap/tiprack-200ul-active.png → ...s/images/deckmap/tiprack-200ul-active.png
diff --git a/.../images/labware/deckmap/tiprack-200ul.png → ...c/assets/images/deckmap/tiprack-200ul.png b/.../images/labware/deckmap/tiprack-200ul.png → ...c/assets/images/deckmap/tiprack-200ul.png
diff --git a/...s/labware/deckmap/trough-12row-active.png → ...ts/images/deckmap/trough-12row-active.png b/...s/labware/deckmap/trough-12row-active.png → ...ts/images/deckmap/trough-12row-active.png
diff --git a/...s/images/labware/deckmap/trough-12row.png → ...rc/assets/images/deckmap/trough-12row.png b/...s/images/labware/deckmap/trough-12row.png → ...rc/assets/images/deckmap/trough-12row.png
diff --git a/...mages/labware/deckmap/tube-rack-2ml-2.png → ...assets/images/deckmap/tube-rack-2ml-2.png b/...mages/labware/deckmap/tube-rack-2ml-2.png → ...assets/images/deckmap/tube-rack-2ml-2.png
diff --git a/.../labware/deckmap/tube-rack-2ml-active.png → ...s/images/deckmap/tube-rack-2ml-active.png b/.../labware/deckmap/tube-rack-2ml-active.png → ...s/images/deckmap/tube-rack-2ml-active.png
diff --git a/.../images/labware/deckmap/tube-rack-2ml.png → ...c/assets/images/deckmap/tube-rack-2ml.png b/.../images/labware/deckmap/tube-rack-2ml.png → ...c/assets/images/deckmap/tube-rack-2ml.png
diff --git a/...mages/labware/deckmap/tuberack_single.png → ...assets/images/deckmap/tuberack_single.png b/...mages/labware/deckmap/tuberack_single.png → ...assets/images/deckmap/tuberack_single.png
diff --git a/app/src/assets/images/labware/96-PCR-flat.png b/app/src/assets/images/labware/96-PCR-flat.png
diff --git a/app/src/assets/images/labware/circularWell.svg b/app/src/assets/images/labware/circularWell.svg
diff --git a/app/src/assets/images/labware/generic_2ml_screwcap_tube.jpg b/app/src/assets/images/labware/generic_2ml_screwcap_tube.jpg
diff --git a/app/src/assets/images/labware/generic_pcr_strip_200ul_tubes.jpg b/app/src/assets/images/labware/generic_pcr_strip_200ul_tubes.jpg
diff --git a/app/src/assets/images/labware/opentrons_24_tuberack_side_view.jpg b/app/src/assets/images/labware/opentrons_24_tuberack_side_view.jpg
diff --git a/app/src/assets/images/labware/opentrons_evotip_short_adapter.png b/app/src/assets/images/labware/opentrons_evotip_short_adapter.png
diff --git a/app/src/assets/images/labware/opentrons_evotip_tall_adapter.png b/app/src/assets/images/labware/opentrons_evotip_tall_adapter.png
diff --git a/app/src/assets/images/labware/rectangularWell.svg b/app/src/assets/images/labware/rectangularWell.svg
diff --git a/app/src/assets/images/labware/thermoscientificnunc_96_wellplate_1300ul.jpg b/app/src/assets/images/labware/thermoscientificnunc_96_wellplate_1300ul.jpg
diff --git a/app/src/assets/images/labware/tiprack-200ul.png b/app/src/assets/images/labware/tiprack-200ul.png
diff --git a/app/src/assets/images/labware/tiprack_multi.png b/app/src/assets/images/labware/tiprack_multi.png
diff --git a/app/src/assets/images/labware/tiprack_single.png b/app/src/assets/images/labware/tiprack_single.png
diff --git a/app/src/assets/images/labware/trough-12row.png b/app/src/assets/images/labware/trough-12row.png
diff --git a/app/src/assets/images/labware/trough_multi.png b/app/src/assets/images/labware/trough_multi.png
diff --git a/app/src/assets/images/labware/trough_single.png b/app/src/assets/images/labware/trough_single.png
diff --git a/app/src/assets/images/labware/tube-rack-2ml.png b/app/src/assets/images/labware/tube-rack-2ml.png
diff --git a/app/src/assets/images/labware/tuberack_single.png b/app/src/assets/images/labware/tuberack_single.png
diff --git a/app/src/assets/images/labware/wellShapeFlat.svg b/app/src/assets/images/labware/wellShapeFlat.svg
diff --git a/app/src/assets/images/labware/wellShapeU.svg b/app/src/assets/images/labware/wellShapeU.svg
diff --git a/app/src/assets/images/labware/wellShapeV.svg b/app/src/assets/images/labware/wellShapeV.svg
diff --git a/app/src/local-resources/labware/utils/index.ts b/app/src/local-resources/labware/utils/index.ts
@@ -1,3 +1,2 @@
 export * from './getAllDefinitions'
-export * from './labwareImages'
 export * from './getAllDefs'
diff --git a/app/src/local-resources/labware/utils/labwareImages.ts b/app/src/local-resources/labware/utils/labwareImages.ts
diff --git a/app/src/molecules/WizardRequiredEquipmentList/index.tsx b/app/src/molecules/WizardRequiredEquipmentList/index.tsx
@@ -17,9 +17,9 @@ import {
   SPACING,
   TYPOGRAPHY,
 } from '@opentrons/components'
+import { labwareImages } from '@opentrons/shared-data'
 
 import { Divider } from '/app/atoms/structure'
-import { labwareImages } from '/app/local-resources/labware'
 import { getIsOnDevice } from '/app/redux/config'
 
 import { equipmentImages } from './equipmentImages'
@@ -133,7 +133,7 @@ function RequiredEquipmentCard(props: RequiredEquipmentCardProps): JSX.Element {
 
   let imageSrc: string | null = null
   if (loadName in labwareImages) {
-    imageSrc = labwareImages[loadName as keyof typeof labwareImages]
+    imageSrc = labwareImages[loadName as keyof typeof labwareImages][0]
   } else if (loadName in equipmentImages) {
     imageSrc = equipmentImages[loadName as keyof typeof equipmentImages]
   }

diff --git a/app/src/organisms/Desktop/CalibrateTipLength/AskForCalibrationBlockModal.tsx b/app/src/organisms/Desktop/CalibrateTipLength/AskForCalibrationBlockModal.tsx
@@ -18,9 +18,9 @@
   SPACING,
   TYPOGRAPHY,
 } from '@opentrons/components'
+import { labwareImages } from '@opentrons/shared-data'
 
 import { getTopPortalEl } from '/app/App/portal'
-import { labwareImages } from '/app/local-resources/labware'
 import { WizardHeader } from '/app/molecules/WizardHeader'
 import { setUseTrashSurfaceForTipCal } from '/app/redux/calibration'
 
@@ -96,7 +96,7 @@
           <Flex flex="1" justifyContent={JUSTIFY_CENTER}>
             <img
               className={styles.block_image}
-              src={labwareImages[CAL_BLOCK_LOAD_NAME]}
+              src={labwareImages[CAL_BLOCK_LOAD_NAME][0]}
             />
           </Flex>
         </Flex>

diff --git a/app/src/organisms/Desktop/CalibrationPanels/ChosenTipRackRender.tsx b/app/src/organisms/Desktop/CalibrationPanels/ChosenTipRackRender.tsx
@@ -8,8 +8,7 @@
   LegacyStyledText,
   SPACING,
 } from '@opentrons/components'
-
-import { labwareImages } from '/app/local-resources/labware'
+import { labwareImages } from '@opentrons/shared-data'
 
 import type { SelectOption } from '@opentrons/components'
 
@@ -41,7 +40,7 @@
           max-width: 7rem;
           max-height: 3.7rem;
         `}
-        src={imageSrc}
+        src={imageSrc[0]}
         alt={`${String(displayName)} image`}
       />
       <Box>

diff --git a/app/src/organisms/Desktop/Labware/LabwareDetails/Gallery.tsx b/app/src/organisms/Desktop/Labware/LabwareDetails/Gallery.tsx
@@ -11,9 +11,7 @@ import {
   SPACING,
   SPACING_AUTO,
 } from '@opentrons/components'
-import { getLabwareViewBox } from '@opentrons/shared-data'
-
-import { labwareImages } from './labware-images'
+import { getLabwareViewBox, labwareImages } from '@opentrons/shared-data'
 
 import type { LabwareDefinition } from '@opentrons/shared-data'
 

diff --git a/app/src/organisms/Desktop/Labware/LabwareDetails/__tests__/Gallery.test.tsx b/app/src/organisms/Desktop/Labware/LabwareDetails/__tests__/Gallery.test.tsx
@@ -1,11 +1,12 @@
 import { fireEvent, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it } from 'vitest'
 
+import { labwareImages } from '@opentrons/shared-data'
+
 import { renderWithProviders } from '/app/__testing-utils__'
 import { mockDefinition } from '/app/redux/custom-labware/__fixtures__'
 
 import { Gallery } from '../Gallery'
-import { labwareImages } from '../labware-images'
 
 import type { ComponentProps } from 'react'